From nobody Thu Jan 27 06:00:04 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 418F8196DF33; Thu, 27 Jan 2022 06:00:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JkqgT2ZMRz4qCM; Thu, 27 Jan 2022 06:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643263205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZxgpkboBeXDBxhVDxSshsENuf3moek3dH1VgCiNN3o=; b=el5PkkSIMZlfSKfVMjT+6cU0uowvKhAlVe8jSSf/Bu4CpJnCYkMWV/0AlmFnPR+az+QGmB 6b0ybKAIdjJeDFDKcHQGNEQa1TTnAOQRmtqse1uGav1QqbiElzyTuBBOV6FV5wOj1AJfnd TURGvrMMvbotqdpzV8yFHE3jI7QgeOH5IPd8hPLziJIoUYlLIMHDmijvYkWD93/m49d2mz jGlYtfWfyUmJbb4oDjBjcBBYw8a7o5d+dF+D8QD7p0kzjWLxlPBkA4AAA+c+EK9KvjrPvI EfXOkOyy39f6LxPztw6PAYmCgsNMXe3H6nzkE8jsoNIven0D4fGfAKkLJRfkSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D8DA11588; Thu, 27 Jan 2022 06:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20R604aQ060146; Thu, 27 Jan 2022 06:00:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20R604sF060143; Thu, 27 Jan 2022 06:00:04 GMT (envelope-from git) Date: Thu, 27 Jan 2022 06:00:04 GMT Message-Id: <202201270600.20R604sF060143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 165746f4e4bf - main - dummynet: use m_rcvif_serialize/restore when queueing packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 165746f4e4bf54c5902a103c2d4a3455e651c58f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643263205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZxgpkboBeXDBxhVDxSshsENuf3moek3dH1VgCiNN3o=; b=RNE3Svo1iZo1P+ZQ8HbdVM+uL9QafNapwhmLUnWUyu+QjYBnv2AEdGqWLe2RRVI1JWubAm 7FSiAAvv1iJ0HaxIq07UBkyIuwKnU050qCdSqEj7ate8A/qFbR3SBb98acn/GUhqlv6z7y r2tyK9gevNWeFDO/29u9ddMJ2Gjeddn9GR8zJg3QqAoRtjjbjVwIKmdWAlzOw7qfp3x7nO Cd7AFe1MXXOKEnN7fXK9xJUA/zQI8BwspjuGft97jM33H89e2fBU8lzUj+SOpxRCNfaCzO EY0uaUX8OZLuRL0iiy+AF42zj0DQaRaPtMEpPcT9MJe8D2RQ9i5tjkZOZpsFxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643263205; a=rsa-sha256; cv=none; b=oQltPSPgUmCUUqadWChtVKX7lsqBWfJEdZhqfKtNWn00A/5NySaRIV6t98odpdy3P7JG06 x2QP8iF09fZ5sL/DyYmt7O8p0eC/YrVsKTUl92l9+YSrD/InWipg0Vg9vIYFFD4mk3VB0d gmxrYpN15N1Bav0ssibsl0QVztoWfb1u/mNVYXzgRsQHVBVeW69jrwZ/uzxERMLhb4Vil4 PF9rmCibVSaH3wMiqtsh9uuyhw2kyKSuRq8vWU0T8PpV//oJ/XyByNQs/WfuVa2ufpyObf nxGDaM0Nwm/Ew/5c7CHZ7Scn+m66NDTc70tpJRPkFrDfmSwg+3T5D4bd3NBVHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=165746f4e4bf54c5902a103c2d4a3455e651c58f commit 165746f4e4bf54c5902a103c2d4a3455e651c58f Author: Gleb Smirnoff AuthorDate: 2022-01-27 05:58:50 +0000 Commit: Gleb Smirnoff CommitDate: 2022-01-27 05:58:50 +0000 dummynet: use m_rcvif_serialize/restore when queueing packets This fixed panic with interface being removed while packet was sitting on a queue. This allows to pass all dummynet tests including forthcoming dummynet:ipfw_interface_removal and dummynet:pf_interface_removal and demonstrates use of m_rcvif_serialize() and m_rcvif_restore(). Reviewed by: kp Differential revision: https://reviews.freebsd.org/D33267 --- sys/netpfil/ipfw/dn_aqm_codel.c | 8 +++++++- sys/netpfil/ipfw/dn_aqm_pie.c | 8 +++++++- sys/netpfil/ipfw/dn_sched.h | 10 +++++++++- sys/netpfil/ipfw/dn_sched_fq_codel.h | 9 +++++++-- sys/netpfil/ipfw/dn_sched_fq_pie.c | 8 +++++++- sys/netpfil/ipfw/ip_dn_io.c | 10 +++++++++- 6 files changed, 46 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/ipfw/dn_aqm_codel.c b/sys/netpfil/ipfw/dn_aqm_codel.c index 79c6afd8b635..2f6d145485c6 100644 --- a/sys/netpfil/ipfw/dn_aqm_codel.c +++ b/sys/netpfil/ipfw/dn_aqm_codel.c @@ -192,8 +192,9 @@ struct mbuf * codel_extract_head(struct dn_queue *q, aqm_time_t *pkt_ts) { struct m_tag *mtag; - struct mbuf *m = q->mq.head; + struct mbuf *m; +next: m = q->mq.head; if (m == NULL) return m; q->mq.head = m->m_nextpkt; @@ -213,6 +214,11 @@ codel_extract_head(struct dn_queue *q, aqm_time_t *pkt_ts) *pkt_ts = *(aqm_time_t *)(mtag + 1); m_tag_delete(m,mtag); } + if (m->m_pkthdr.rcvif != NULL && + __predict_false(m_rcvif_restore(m) == NULL)) { + m_freem(m); + goto next; + } return m; } diff --git a/sys/netpfil/ipfw/dn_aqm_pie.c b/sys/netpfil/ipfw/dn_aqm_pie.c index 746b9f031220..5eadf08a4860 100644 --- a/sys/netpfil/ipfw/dn_aqm_pie.c +++ b/sys/netpfil/ipfw/dn_aqm_pie.c @@ -328,8 +328,9 @@ static struct mbuf * pie_extract_head(struct dn_queue *q, aqm_time_t *pkt_ts, int getts) { struct m_tag *mtag; - struct mbuf *m = q->mq.head; + struct mbuf *m; +next: m = q->mq.head; if (m == NULL) return m; q->mq.head = m->m_nextpkt; @@ -351,6 +352,11 @@ pie_extract_head(struct dn_queue *q, aqm_time_t *pkt_ts, int getts) m_tag_delete(m,mtag); } } + if (m->m_pkthdr.rcvif != NULL && + __predict_false(m_rcvif_restore(m) == NULL)) { + m_freem(m); + goto next; + } return m; } diff --git a/sys/netpfil/ipfw/dn_sched.h b/sys/netpfil/ipfw/dn_sched.h index 5c506c1d30ac..ef7242cd7355 100644 --- a/sys/netpfil/ipfw/dn_sched.h +++ b/sys/netpfil/ipfw/dn_sched.h @@ -170,7 +170,10 @@ int ipdn_bound_var(int *v, int dflt, int lo, int hi, const char *msg); static __inline struct mbuf* dn_dequeue(struct dn_queue *q) { - struct mbuf *m = q->mq.head; + struct mbuf *m; + +next: + m = q->mq.head; if (m == NULL) return NULL; #ifdef NEW_AQM @@ -190,6 +193,11 @@ dn_dequeue(struct dn_queue *q) } if (q->ni.length == 0) /* queue is now idle */ q->q_time = V_dn_cfg.curr_time; + if (m->m_pkthdr.rcvif != NULL && + __predict_false(m_rcvif_restore(m) == NULL)) { + m_freem(m); + goto next; + } return m; } diff --git a/sys/netpfil/ipfw/dn_sched_fq_codel.h b/sys/netpfil/ipfw/dn_sched_fq_codel.h index 2f82a63ca093..b84dfe7579fb 100644 --- a/sys/netpfil/ipfw/dn_sched_fq_codel.h +++ b/sys/netpfil/ipfw/dn_sched_fq_codel.h @@ -138,8 +138,9 @@ fq_update_stats(struct fq_codel_flow *q, struct fq_codel_si *si, int len, __inline static struct mbuf * fq_codel_extract_head(struct fq_codel_flow *q, aqm_time_t *pkt_ts, struct fq_codel_si *si) { - struct mbuf *m = q->mq.head; + struct mbuf *m; +next: m = q->mq.head; if (m == NULL) return m; q->mq.head = m->m_nextpkt; @@ -159,7 +160,11 @@ fq_codel_extract_head(struct fq_codel_flow *q, aqm_time_t *pkt_ts, struct fq_cod *pkt_ts = *(aqm_time_t *)(mtag + 1); m_tag_delete(m,mtag); } - + if (m->m_pkthdr.rcvif != NULL && + __predict_false(m_rcvif_restore(m) == NULL)) { + m_freem(m); + goto next; + } return m; } diff --git a/sys/netpfil/ipfw/dn_sched_fq_pie.c b/sys/netpfil/ipfw/dn_sched_fq_pie.c index c3de665687a3..f589614be436 100644 --- a/sys/netpfil/ipfw/dn_sched_fq_pie.c +++ b/sys/netpfil/ipfw/dn_sched_fq_pie.c @@ -338,8 +338,9 @@ __inline static struct mbuf * fq_pie_extract_head(struct fq_pie_flow *q, aqm_time_t *pkt_ts, struct fq_pie_si *si, int getts) { - struct mbuf *m = q->mq.head; + struct mbuf *m; +next: m = q->mq.head; if (m == NULL) return m; q->mq.head = m->m_nextpkt; @@ -361,6 +362,11 @@ fq_pie_extract_head(struct fq_pie_flow *q, aqm_time_t *pkt_ts, m_tag_delete(m,mtag); } } + if (m->m_pkthdr.rcvif != NULL && + __predict_false(m_rcvif_restore(m) == NULL)) { + m_freem(m); + goto next; + } return m; } diff --git a/sys/netpfil/ipfw/ip_dn_io.c b/sys/netpfil/ipfw/ip_dn_io.c index 11ad498505f4..824e7450fb8f 100644 --- a/sys/netpfil/ipfw/ip_dn_io.c +++ b/sys/netpfil/ipfw/ip_dn_io.c @@ -500,6 +500,8 @@ dn_enqueue(struct dn_queue *q, struct mbuf* m, int drop) goto drop; if (f->plr && random() < f->plr) goto drop; + if (m->m_pkthdr.rcvif != NULL) + m_rcvif_serialize(m); #ifdef NEW_AQM /* Call AQM enqueue function */ if (q->fs->aqmfp) @@ -548,7 +550,11 @@ transmit_event(struct mq *q, struct delay_line *dline, uint64_t now) break; dline->mq.head = m->m_nextpkt; dline->mq.count--; - mq_append(q, m); + if (m->m_pkthdr.rcvif != NULL && + __predict_false(m_rcvif_restore(m) == NULL)) + m_freem(m); + else + mq_append(q, m); } if (m != NULL) { dline->oid.subtype = 1; /* in heap */ @@ -617,6 +623,8 @@ serve_sched(struct mq *q, struct dn_sch_inst *si, uint64_t now) si->credit -= len_scaled; /* Move packet in the delay line */ dn_tag_get(m)->output_time = V_dn_cfg.curr_time + s->link.delay ; + if (m->m_pkthdr.rcvif != NULL) + m_rcvif_serialize(m); mq_append(&si->dline.mq, m); }