From nobody Mon Feb 07 22:00:24 2022 X-Original-To: dev-commits-src-main@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 EFEEB19A23AC; Mon, 7 Feb 2022 22:00:24 +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 4Jt0SS6K1zz3kpP; Mon, 7 Feb 2022 22:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644271224; 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=NG+k4tGhU9THcDMG7uiPcwHfNMxCJ7BuGUAK3JEBMDo=; b=c9P2XoyuijplB9VFLpv1S75PO7UvIg56lWkL2drY5awyHIcctmCsS0JXAMfQzkAYMWyvO2 t1Cm/zqpsvRpRzJVrlbt0aWz+BDgc9gqMUmcO95dh3WmX4lMpg9Qnxgx9SCBbXUf9AsbaW 6EYfRqk1RzX/ZlDTBHEDPqzwDlyID0i2qsZFW2mJANGCYt2u+w15NQUM69d4eY/x6LWrIB z68oY96Xkrj3QADR96Yp0xLqqweRbQCnB/0FkPPPFE57BVzoKwWV32aqiTd3GgOukVBd6J 9hxMxAdkxXzdxNzw0moewMk1l7aPO2ZxaV6O1Wbvaa8pBoAn7fqk3TvGnhww1A== 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 B94875762; Mon, 7 Feb 2022 22:00:24 +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 217M0Oaj040726; Mon, 7 Feb 2022 22:00:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217M0O4X040725; Mon, 7 Feb 2022 22:00:24 GMT (envelope-from git) Date: Mon, 7 Feb 2022 22:00:24 GMT Message-Id: <202202072200.217M0O4X040725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 3f3e4f3c7472 - main - dummynet: don't use per-vnet locks to protect global data. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f3e4f3c7472640aab998612a2253da95102345a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644271224; 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=NG+k4tGhU9THcDMG7uiPcwHfNMxCJ7BuGUAK3JEBMDo=; b=AjISuRUGZF7sOKzsv4mUZTvn4D6tWuLsXIAPMlqd6ysZMm5ADosNP8ONrPNeNcuiYpu4hZ odIdfWi4yJ7a6VjbADUH0TkoK29jK21BLoR6etlBuI7rZ3jgWJCgO52EaxPoPWKmIkE3o9 FJeCIpLx9VixKwQMccT0eHnBh6FMbYOGxAR/MH1EVE2ATKbOjWFUa+jH05q1PL7pDYo9M4 3Fj3x5wxYOOM8H0tmFrVAYLw6PuZ2Lp3cxrV6zasx5zcZeYPYF7tBHg8tZ4PuyjRPR29ak dFQLRbCgnkuR1GJRAEJ+qtZbAxZSytJReZFmMsZn6tfuqzU7zXCgm8d2K9GFFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644271224; a=rsa-sha256; cv=none; b=u4vrx3nh6e2xrcynKJZ/j6YevO79iUPG0WgoOXH3LYg3lRtfU9JZ7BSv2efhFi7TCiyPAa 0qBtNfR45Bc2/kkP/4DPhLaoxveHZY7N6Inh125aYX3f61feroNLQZuK41OlsfZ+HPf+Nc y19u+bvXXuvFyffZw876tbtw4lLjrrPTVDzS7R4n0cQXbB/PwB6GQ3bd8JQri/JJLY2Mvw eNz1hzgdkWWCEiBloNmMvPlHD0m9Jd9uyylq/JS8S2rCUJ7uD2fNk1/Vafx6qM7QnznUAy Ebk7MMcSCm7shxVJEW+tIUofe5m1u21PN+UanDHl2Iy8d3coCVo1GhOjXoPKcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3f3e4f3c7472640aab998612a2253da95102345a commit 3f3e4f3c7472640aab998612a2253da95102345a Author: Kristof Provost AuthorDate: 2022-01-27 10:41:21 +0000 Commit: Kristof Provost CommitDate: 2022-02-07 21:59:46 +0000 dummynet: don't use per-vnet locks to protect global data. The ref_count counter is global (i.e. not per-vnet) so we can't use a per-vnet lock to protect it. Moreover, in callouts curvnet is not set, so we'd end up panicing when trying to use DN_BH_WLOCK(). Instead we use the global sched_lock, which is already used when evaluating ref_count (in unload_dn_aqm()). Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D34059 --- sys/netpfil/ipfw/dn_aqm_pie.c | 6 ++++-- sys/netpfil/ipfw/dn_sched_fq_pie.c | 6 ++++-- sys/netpfil/ipfw/ip_dn_private.h | 2 ++ sys/netpfil/ipfw/ip_dummynet.c | 12 ++++++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/ipfw/dn_aqm_pie.c b/sys/netpfil/ipfw/dn_aqm_pie.c index 5eadf08a4860..5079118a7f35 100644 --- a/sys/netpfil/ipfw/dn_aqm_pie.c +++ b/sys/netpfil/ipfw/dn_aqm_pie.c @@ -597,8 +597,10 @@ aqm_pie_init(struct dn_queue *q) } pst = q->aqm_status; + dummynet_sched_lock(); /* increase reference count for PIE module */ pie_desc.ref_count++; + dummynet_sched_unlock(); pst->pq = q; pst->parms = pprms; @@ -632,9 +634,9 @@ pie_callout_cleanup(void *x) mtx_unlock(&pst->lock_mtx); mtx_destroy(&pst->lock_mtx); free(x, M_DUMMYNET); - DN_BH_WLOCK(); + dummynet_sched_lock(); pie_desc.ref_count--; - DN_BH_WUNLOCK(); + dummynet_sched_unlock(); } /* diff --git a/sys/netpfil/ipfw/dn_sched_fq_pie.c b/sys/netpfil/ipfw/dn_sched_fq_pie.c index f589614be436..7765cbd15788 100644 --- a/sys/netpfil/ipfw/dn_sched_fq_pie.c +++ b/sys/netpfil/ipfw/dn_sched_fq_pie.c @@ -581,7 +581,7 @@ fqpie_callout_cleanup(void *x) mtx_destroy(&pst->lock_mtx); psi_extra = q->psi_extra; - DN_BH_WLOCK(); + dummynet_sched_lock(); psi_extra->nr_active_q--; /* when all sub-queues are destroyed, free flows fq_pie extra vars memory */ @@ -590,7 +590,7 @@ fqpie_callout_cleanup(void *x) free(psi_extra, M_DUMMYNET); fq_pie_desc.ref_count--; } - DN_BH_WUNLOCK(); + dummynet_sched_unlock(); } /* @@ -1061,7 +1061,9 @@ fq_pie_new_sched(struct dn_sch_inst *_si) pie_init(&flows[i], schk); } + dummynet_sched_lock(); fq_pie_desc.ref_count++; + dummynet_sched_unlock(); return 0; } diff --git a/sys/netpfil/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h index 25015fe02c2d..d7df31b85345 100644 --- a/sys/netpfil/ipfw/ip_dn_private.h +++ b/sys/netpfil/ipfw/ip_dn_private.h @@ -399,6 +399,8 @@ VNET_DECLARE(struct dn_parms, dn_cfg); #define V_dn_cfg VNET(dn_cfg) int dummynet_io(struct mbuf **, struct ip_fw_args *); +void dummynet_sched_lock(void); +void dummynet_sched_unlock(void); void dummynet_task(void *context, int pending); void dn_reschedule(void); struct dn_pkt_tag * dn_tag_get(struct mbuf *m); diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c index 0cd606bd56b2..46300b90007e 100644 --- a/sys/netpfil/ipfw/ip_dummynet.c +++ b/sys/netpfil/ipfw/ip_dummynet.c @@ -109,6 +109,18 @@ dummynet(void *arg) taskqueue_enqueue(dn_tq, &dn_task); } +void +dummynet_sched_lock(void) +{ + mtx_lock(&sched_mtx); +} + +void +dummynet_sched_unlock(void) +{ + mtx_unlock(&sched_mtx); +} + void dn_reschedule(void) {