From nobody Mon Jan 23 22:12:07 2023
X-Original-To: dev-commits-src-branches@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 4P148R4GJjz2t0bq;
Mon, 23 Jan 2023 22:12:07 +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 4P148R2ZfMz3LTB;
Mon, 23 Jan 2023 22:12:07 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1674511927;
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=ZeCYFRDlVeYB7US5YOiC7PRKsGFNtFmZqYJVPvLlLxc=;
b=A23rAg+/GQ6OOof2Y8O7ud1gS4o4T3IFeUyxv04XcX3YXpUr5pYLYdAWugJX2d2XM6h/mh
L3KudD39Yjbmv0vXHymFo2NGl0lXkRyRTMZHNMkVfV2t4rl837gpTZ1rFot87XWbHZG/TQ
T5vz0gJV0tbwaKthIQE4c27TuKhVfnYwlLRrGp+u6DgsM/bO/I4IycTtR/g2nkeRkazr21
BvMjX/OOexsts17tgRx6wJtqyTEYhLYl92t/pFvgU7cnhn++pzmydChVQgJSnK6LYflDUN
UtBhbRZTbv1EPTIZPbn3YREhqtpGTArHAuOwPt3b2Q+Xu4g5/37igEKcCkqAGA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1674511927;
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=ZeCYFRDlVeYB7US5YOiC7PRKsGFNtFmZqYJVPvLlLxc=;
b=hrcbntOULKQQfdn9I5w9jE7759hN77Z63n/VQxpIP9sreW7gGj7b6lnKp/i9Zq+TOIqX1y
qx2T+taPH7Dsjv8RUFbplV9Bp+HzBVr8mq6eablXhFo3d5i3qEePWqKKRDsMGrckWryvQx
FxOlAd2LM37AT4dp9jfkTqaRj/OKDEl7w9+Ow36U5YfKikNW4UoTBRnF6KKyWUWKJsL4qz
BM2rQ/tQ8/mAXKPtfZb7CeYuYmeo4anmcDXkSv9kU+6FdxVjfvw8YkRkjVTB+WTgN1+2WN
uUcmh/JkysO/zoPKTLugddZZVFIht8ijSGxdHavUhxt4SPGrTtBAVfOndLrbIw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511927; a=rsa-sha256; cv=none;
b=Bl5IFxNKMybFWhyvtUlLyIU3am0JTeHXQWx9s/uB7fVpTijtxaoq9j+BpFr3LplJ5tWgwr
69yx5TtTZr02vLfjs8AdhSKUjNTXeKqvfsU/C0ZiI5wodYfpgYhMwmdEz37l6zWEj6X2yp
/+ju6ydNk3VmDSpj/5DhKUm3/v1FXnrH55N8OOTNOtBxzcAqkkPua0cHw4fjOv0nN+m6vh
AQTvwZOKOMKPXD+9oIUjxduh4SALfHxHPT6YIjMNveRU9QtkpbI/x+gzgOqXJV9PFWD5QN
v35REZsIMAu6CKwuGsikK8rESEH0zSmxFjEKinUQirXVrzxfGXP52n5iYy64+g==
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 4P148R1dYczlrC;
Mon, 23 Jan 2023 22:12:07 +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 30NMC7Fi013944;
Mon, 23 Jan 2023 22:12:07 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMC7Px013939;
Mon, 23 Jan 2023 22:12:07 GMT
(envelope-from git)
Date: Mon, 23 Jan 2023 22:12:07 GMT
Message-Id: <202301232212.30NMC7Px013939@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Subject: git: e121eaf737dd - stable/13 - netlink: Use NET_EPOCH_[CALL|WAIT] macros
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: melifaro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e121eaf737dd8131ca4a674a397cbd6af6321585
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by melifaro:
URL: https://cgit.FreeBSD.org/src/commit/?id=e121eaf737dd8131ca4a674a397cbd6af6321585
commit e121eaf737dd8131ca4a674a397cbd6af6321585
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2022-12-21 01:40:05 +0000
Commit: Alexander V. Chernikov <melifaro@FreeBSD.org>
CommitDate: 2023-01-23 22:04:03 +0000
netlink: Use NET_EPOCH_[CALL|WAIT] macros
Reviewed by: melifaro, kp
Approved by: kp (mentor)
Differential Revision: https://reviews.freebsd.org/D37730
(cherry picked from commit ab591c874b68512170750a7a54e41fd508249814)
---
sys/netlink/netlink_domain.c | 2 +-
sys/netlink/netlink_generic.c | 2 +-
sys/netlink/netlink_route.c | 2 +-
sys/netlink/route/nexthop.c | 5 ++---
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c
index b0ff84401c84..f35cc7f09991 100644
--- a/sys/netlink/netlink_domain.c
+++ b/sys/netlink/netlink_domain.c
@@ -486,7 +486,7 @@ nl_pru_detach(struct socket *so)
NL_LOG(LOG_DEBUG3, "socket %p, detached", so);
/* XXX: is delayed free needed? */
- epoch_call(net_epoch_preempt, destroy_nlpcb_epoch, &nlp->nl_epoch_ctx);
+ NET_EPOCH_CALL(destroy_nlpcb_epoch, &nlp->nl_epoch_ctx);
}
static int
diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c
index 267024dfee4b..028ea24fc5e9 100644
--- a/sys/netlink/netlink_generic.c
+++ b/sys/netlink/netlink_generic.c
@@ -513,6 +513,6 @@ genl_unload(void *u __unused)
{
genl_nlctrl_destroy();
GENL_LOCK_DESTROY();
- epoch_wait_preempt(net_epoch_preempt);
+ NET_EPOCH_WAIT();
}
SYSUNINIT(genl_unload, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, genl_unload, NULL);
diff --git a/sys/netlink/netlink_route.c b/sys/netlink/netlink_route.c
index 0622656715c4..42b0bc66666e 100644
--- a/sys/netlink/netlink_route.c
+++ b/sys/netlink/netlink_route.c
@@ -134,6 +134,6 @@ rtnl_unload(void *u __unused)
rtnl_neighs_destroy();
/* Wait till all consumers read nlbridge data */
- epoch_wait_preempt(net_epoch_preempt);
+ NET_EPOCH_WAIT();
}
SYSUNINIT(rtnl_unload, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rtnl_unload, NULL);
diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c
index cd184a635eb4..e9f008842644 100644
--- a/sys/netlink/route/nexthop.c
+++ b/sys/netlink/route/nexthop.c
@@ -553,8 +553,7 @@ delete_unhop(struct unhop_ctl *ctl, struct nlmsghdr *hdr, uint32_t uidx)
while (unhop_base != NULL) {
unhop_chain = unhop_base->un_nextchild;
- epoch_call(net_epoch_preempt, destroy_unhop_epoch,
- &unhop_base->un_epoch_ctx);
+ NET_EPOCH_CALL(destroy_unhop_epoch, &unhop_base->un_epoch_ctx);
unhop_base = unhop_chain;
}
@@ -632,7 +631,7 @@ vnet_destroy_unhops(const void *unused __unused)
V_un_ctl = NULL;
/* Wait till all unhop users finish their reads */
- epoch_wait_preempt(net_epoch_preempt);
+ NET_EPOCH_WAIT();
UN_WLOCK(ctl);
CHT_SLIST_FOREACH_SAFE(&ctl->un_head, unhop, unhop, tmp) {