From nobody Tue Jan 11 10:19:45 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 2AA7E19424CC; Tue, 11 Jan 2022 10:19:47 +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 4JY6BV1cXkz4nQj; Tue, 11 Jan 2022 10:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CD07316FEF; Tue, 11 Jan 2022 10:19:45 +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 20BAJjVi058260; Tue, 11 Jan 2022 10:19:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BAJjCg058259; Tue, 11 Jan 2022 10:19:45 GMT (envelope-from git) Date: Tue, 11 Jan 2022 10:19:45 GMT Message-Id: <202201111019.20BAJjCg058259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: 2e72208b6c62 - main - ip_mroute: do not call epoch_waitwhen lock is taken 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: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e72208b6c622505323ed48dc58830fc307392b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641896386; 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=c0Uq+MvKRdXXAog1fOi3qghCzm9+Zqt/LHWc9AqLrrg=; b=YL+cNs8d+tFagnNjz12+7ozfeM++FmctX99cJo4222Gilzo9CIaqQPe968IvIf94HBZAwX nD/cT1i0kXtdDaAwxyfJjFx/CQ9Fn1FjcDUTknC9M6m0e18Kc0lqMmRJZwNLMlHRIJuhZp qboU6jz6hMKB4ivqbTfRW3nehdyhaqdDsJkCZyhDqtMRV00ewngYTTBHoQMnGGdRBsrN4P hEhiP0ZGzjZJSWwEDfgEPS1OqEYUtpw7qKslehE13LwSISahzgc8691XJPAE8WpkfQ6fRs A2fSjLpb7rM+euHBtkf9NvT/sQGuakOrqw2AVvNcVw7aZB6BrtwAHotPn/SOOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641896386; a=rsa-sha256; cv=none; b=cVBLGht8DyG2LO/4nuBkKlRQXHiL9WCifRWfFu4iqAN9qwfvz3VoIZrzWbxtbix7i9ZwDF JrxtgFuaqn5sgoNJQHiIcNOu9S3LUp3/fJKIU7l7By68iIOmzEWsF6/S2Ug4VcJ9XMzK3+ u3F4cuB/ao2TOnRnld7dvbbr5fxph5ml3SzXf3wLO7qmQyu52y9DmIPEz6xqYypczegNe6 QlX5zuzFBd2jN96zD/MP+GVK8A2DBewDVMJ2zQIaqNuthjAUXYC1qHkdKJHSV3iHdYT4j9 D6be7OPmLVUHEkgPPJSDCwXHN+Z6jEt0W+p1qIQ5P6ChOIet6qTgpRJ6zxPx6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=2e72208b6c622505323ed48dc58830fc307392b1 commit 2e72208b6c622505323ed48dc58830fc307392b1 Author: Wojciech Macek AuthorDate: 2022-01-11 10:08:35 +0000 Commit: Wojciech Macek CommitDate: 2022-01-11 10:19:32 +0000 ip_mroute: do not call epoch_waitwhen lock is taken mrouter_done is called with RAW IP lock taken. Some annoying printfs are visible on the console if INVARIANTS option is enabled. Provide atomic-based mechanism which counts enters and exits from/to critical section in ip_input and ip_output. Before de-initialization of function pointers ensure (with busy-wait) that mrouter de-initialization is visible to all readers and that we don't remove pointers (like ip_mforward etc.) in the middle of packet processing. --- sys/netinet/ip_mroute.h | 9 +++++---- sys/netinet/raw_ip.c | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index 65c5bdd3a025..faf5b8c72a46 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -365,11 +365,12 @@ extern int (*ip_mrouter_set)(struct socket *, struct sockopt *); extern int (*ip_mrouter_get)(struct socket *, struct sockopt *); extern int (*ip_mrouter_done)(void); extern int (*mrt_ioctl)(u_long, caddr_t, int); +extern int ip_mrouter_critical_section_cnt; -#define MROUTER_RLOCK_TRACKER struct epoch_tracker mrouter_et -#define MROUTER_RLOCK() epoch_enter_preempt(net_epoch_preempt, &mrouter_et) -#define MROUTER_RUNLOCK() epoch_exit_preempt(net_epoch_preempt, &mrouter_et) -#define MROUTER_WAIT() epoch_wait_preempt(net_epoch_preempt) +#define MROUTER_RLOCK_TRACKER +#define MROUTER_RLOCK() atomic_add_int(&ip_mrouter_critical_section_cnt, 1) +#define MROUTER_RUNLOCK() atomic_subtract_int(&ip_mrouter_critical_section_cnt, 1) +#define MROUTER_WAIT() do {} while (atomic_load_int(&ip_mrouter_critical_section_cnt) != 0) #endif /* _KERNEL */ diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 7c495745806e..dc49c36f25ad 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -120,6 +120,7 @@ VNET_DEFINE(struct socket *, ip_mrouter); int (*ip_mrouter_set)(struct socket *, struct sockopt *); int (*ip_mrouter_get)(struct socket *, struct sockopt *); int (*ip_mrouter_done)(void); +int ip_mrouter_critical_section_cnt; int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); int (*mrt_ioctl)(u_long, caddr_t, int);