git: af28d08bda99 - releng/13.2 - carp: carp_master_down_locked() requires net epoch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Mar 2023 15:50:32 UTC
The branch releng/13.2 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=af28d08bda99d7a841743f75d736cf677ab0ad0e
commit af28d08bda99d7a841743f75d736cf677ab0ad0e
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2023-03-16 10:00:13 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-03-22 15:46:43 +0000
carp: carp_master_down_locked() requires net epoch
Reviewed by: kp
Approved by: re (gjb)
Fixes: 1d126e9b9474 carp: Widen epoch coverage
MFC after: 1 day
Differential Revision: https://reviews.freebsd.org/D39113
(cherry picked from commit 49cad3daf2a3abe8270f71ee5b15b8990a19529d)
(cherry picked from commit c15ceae9e7f98f7e74ff7848b3aff7176c7e263a)
---
sys/netinet/ip_carp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index e84a85ebc11e..b6326b14c802 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1732,6 +1732,7 @@ carp_carprcp(struct carpreq *carpr, struct carp_softc *sc, int priv)
int
carp_ioctl(struct ifreq *ifr, u_long cmd, struct thread *td)
{
+ struct epoch_tracker et;
struct carpreq carpr;
struct ifnet *ifp;
struct carp_softc *sc = NULL;
@@ -1816,8 +1817,10 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct thread *td)
carp_delroute(sc);
break;
case MASTER:
+ NET_EPOCH_ENTER(et);
carp_master_down_locked(sc,
"user requested via ifconfig");
+ NET_EPOCH_EXIT(et);
break;
default:
break;