From nobody Wed Jan 11 10:39:59 2023 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 4NsPMM4VkKz2r1fP; Wed, 11 Jan 2023 10:39:59 +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 4NsPMM3hGKz3P34; Wed, 11 Jan 2023 10:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673433599; 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=NVkoxMFiJp4OGyuz19vlAz3YLgkoSCaP1/ol7TqAsJ8=; b=iqzs/L0k8vJ0DmuH2AMpq5X9s18oF+NSzpcHAgh1wX55F4QF8yQZ+HPeOn+cZF18vzzB96 KSfpAYUSUla0irnugtbksOoWwXqE7uNGXrMqu0wesZrLlCVBobl2+A9fAS+4hZDmyB5SYM 9Tj3YbWby73Xf7GKn0bA793A1/ZhGN15I5W00TFd5hv7GZ8kbaStNzjzF9xdPL37WkMgNa DPfmGCl35dDmC8O++b3lmJtVxb6/EseDNZRbsaxvC67j/sY7/NV8hpSt7WY0idA8vRagUv O/4EwuIXk3ThYdoxfM8ynGQVS7BVSPk/w0gssnq5NzFD5bkifhWJH+h4e9e0VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673433599; 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=NVkoxMFiJp4OGyuz19vlAz3YLgkoSCaP1/ol7TqAsJ8=; b=qoDyWC6amrHPbfe3CTEsV9mHmO+yM6DYCvVv82PFp3ARTsQeFWPXqVVbIzM+UPdXlKjjHj 3+ChM8MZtwBxvuOMlDkIH/U2e5zuONiuGZCvE4jbXpYW8rKp957eLBTyNidyzPJnvp07dX WOSVzfBNLnkoFdc/qxYza7z/lifiGvnb5G24S4n2EIi6KOBkJsvy6fvAWsgEquWQYUGCTO s0RxFkJCLByQBQoDxOPUg7lGoMfA6MtZqkSWdivOYa61tNlkw+BixPmOwfoC26ys0oKe/n vsqovYOmeB52Oml22B3s/tk5L+0v37VDjIymYqwE7pmEzeZlHGezMrS4l4IaHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673433599; a=rsa-sha256; cv=none; b=LvOrVeeXyDHXOHGFWAznf83w4SCLgHpMYJGlATzDRq89cKbu023LAdHIQRLZ2bhdXtqvAY ZcSkCIfoXnl5i1zbySqCkS4/ZHd2F1vaJVhB0WbzJVVIq+Ur9EreUHCNBpYsg9nfk39wD3 FQiA+L8it4vEmVezhAKshHa4YEKv27Xx+/SWLpT861Xz8Noy/yH/kxgl8mBx/bF4ipnYRf vAGKgNMIksZIr4eSdURzu/WIca8S3/Ujdw2/kG8HwMWj2vms40UysF+XCkpPSbHvyCSCcd trhvk/xD7sqzN1EJC96z3cAq5aJvXt+dgQloPlknL9SXrl0MpFLpCcxKRIARdA== 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 4NsPMM2SKfzktv; Wed, 11 Jan 2023 10:39:59 +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 30BAdxLP068099; Wed, 11 Jan 2023 10:39:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BAdxp5068098; Wed, 11 Jan 2023 10:39:59 GMT (envelope-from git) Date: Wed, 11 Jan 2023 10:39:59 GMT Message-Id: <202301111039.30BAdxp5068098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 9383a51afd80 - stable/13 - Introduce and use the NET_EPOCH_DRAIN_CALLBACKS() macro 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9383a51afd805181e671254a95fc74a51fa7e0f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9383a51afd805181e671254a95fc74a51fa7e0f4 commit 9383a51afd805181e671254a95fc74a51fa7e0f4 Author: Zhenlei Huang AuthorDate: 2022-07-29 13:02:39 +0000 Commit: Zhenlei Huang CommitDate: 2023-01-11 10:35:59 +0000 Introduce and use the NET_EPOCH_DRAIN_CALLBACKS() macro Reviewed by: melifao, kp Approved by: kp (mentor) Differential Revision: https://reviews.freebsd.org/D35968 (cherry picked from commit 150486f6a940947fa7a7c6db357c3f92d07a955f) --- sys/net/if.c | 4 ++-- sys/net/if_bridge.c | 2 +- sys/net/route/fib_algo.c | 2 +- sys/net/route/route_tables.c | 2 +- sys/sys/epoch.h | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 38e1ebbb61b7..bcebd84306c8 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1182,7 +1182,7 @@ if_detach_internal(struct ifnet *ifp, int vmove, struct if_clone **ifcp) * which lead to leave group calls, which in turn access the * belonging ifnet structure: */ - epoch_drain_callbacks(net_epoch_preempt); + NET_EPOCH_DRAIN_CALLBACKS(); /* * In any case (destroy or vmove) detach us from the groups @@ -4083,7 +4083,7 @@ if_deregister_com_alloc(u_char type) * fixes issues about late invocation of if_destroy(), which leads * to memory leak from if_com_alloc[type] allocated if_l2com. */ - epoch_drain_callbacks(net_epoch_preempt); + NET_EPOCH_DRAIN_CALLBACKS(); if_com_alloc[type] = NULL; if_com_free[type] = NULL; diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 0473245a1abd..e46c7fb92793 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -600,7 +600,7 @@ vnet_bridge_uninit(const void *unused __unused) BRIDGE_LIST_LOCK_DESTROY(); /* Callbacks may use the UMA zone. */ - epoch_drain_callbacks(net_epoch_preempt); + NET_EPOCH_DRAIN_CALLBACKS(); uma_zdestroy(V_bridge_rtnode_zone); } diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c index 54b0464711a5..42ad3f43d9cf 100644 --- a/sys/net/route/fib_algo.c +++ b/sys/net/route/fib_algo.c @@ -1509,7 +1509,7 @@ set_fib_algo(uint32_t fibnum, int family, struct sysctl_oid *oidp, struct sysctl fib_cleanup_algo(rh, true, false); /* Drain cb so user can unload the module after userret if so desired */ - epoch_drain_callbacks(net_epoch_preempt); + NET_EPOCH_DRAIN_CALLBACKS(); return (0); } diff --git a/sys/net/route/route_tables.c b/sys/net/route/route_tables.c index c9a9d6a915eb..54b467f9801f 100644 --- a/sys/net/route/route_tables.c +++ b/sys/net/route/route_tables.c @@ -299,7 +299,7 @@ rtables_destroy(const void *unused __unused) * nexthops deletions will be scheduled for the next epoch run * and will be completed after vnet teardown. */ - epoch_drain_callbacks(net_epoch_preempt); + NET_EPOCH_DRAIN_CALLBACKS(); free(V_rt_tables, M_RTABLE); vnet_rtzone_destroy(); diff --git a/sys/sys/epoch.h b/sys/sys/epoch.h index 85c791d3df6c..63e03cafd985 100644 --- a/sys/sys/epoch.h +++ b/sys/sys/epoch.h @@ -104,6 +104,7 @@ extern epoch_t net_epoch_preempt; #define NET_EPOCH_EXIT(et) epoch_exit_preempt(net_epoch_preempt, &(et)) #define NET_EPOCH_WAIT() epoch_wait_preempt(net_epoch_preempt) #define NET_EPOCH_CALL(f, c) epoch_call(net_epoch_preempt, (f), (c)) +#define NET_EPOCH_DRAIN_CALLBACKS() epoch_drain_callbacks(net_epoch_preempt) #define NET_EPOCH_ASSERT() MPASS(in_epoch(net_epoch_preempt)) #define NET_TASK_INIT(t, p, f, c) TASK_INIT_FLAGS(t, p, f, c, TASK_NETWORK) #define NET_GROUPTASK_INIT(gtask, prio, func, ctx) \