From nobody Wed Mar 22 15:50:32 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 4PhXxP0Lkqz410Jl; Wed, 22 Mar 2023 15:50:33 +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 4PhXxN4Q3Dz3Hy0; Wed, 22 Mar 2023 15:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679500232; 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=7FlS4s6jKBhGuvHo1o+iY/yT0oscToNw8uI+F64J9TM=; b=xPDWlEppkbn6o8ugVvwunJ0lDrsxqy8qgJhMH/bocZT63n+voaAWwxV/OYwvFapXqwnAwG i9QavKOi4fId0Do0iMJIqUSlPXH9nkONKR7N0NY3PVAPmkdjpYMsfHfdrXddYjCyg3OeTG DW49XK/gbVR6TOOitzvnJtpRhPO+tCRdwnUQ+R/eJu/5Pjal/SO7Vz6hKS9vP8BXFn7HOM nNPBwkNSVdpgJzb/7x5XaKe32PWYLlnHJZPQOy9NP7lYh034VIt7nKjo+b3FQtXtcFqhMv gNQgTWHUvpgjJPghGaaBGY8RQ0+BYceOtU0HnaV0yx3wuuCxSvFRV6mxXRyitA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679500232; 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=7FlS4s6jKBhGuvHo1o+iY/yT0oscToNw8uI+F64J9TM=; b=KTGCD/3J54wyvociGFCQ0vWcdPK1/7HtRwBbecaKMjXQFvHDq1LsZ7zS7QwNlDir6m8Gm9 yxs+I+BB/53nsBcwKpIAW4dbsafVd+RUCzIK0em9qoo49cBpxJ4RNiuPxLmxJZiwSPg78L FVG1PEK0USITve/2BLmEEEqJpBZkY0FHOhHIq99R6FcRvXepGm6zg+WNsMzcHaXoqby2u/ BcQJHAyHjeXyOxTwrGwz5v/M+TPYbyLshJ9gkT0hKqqBoZwNz7zr6Ifgh++AftDOWenij7 QUNaP6ONCx5SvejgYuqOUUFD50A4xeQrbFta/pSpBmp362Kj2hX5jVcx8qURxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679500232; a=rsa-sha256; cv=none; b=i/0jI2sOOmkaPpR6DS8SZ70OMdIJbN0T8AvEdHQTlGvakCEBQoetQI+N+s60wTVDsyOdSN CoY3dzcM0OEOCtUoGgKjCI7ZEKxK/M3UHSnQ1HO29fuuOBZgRIP5Xxltul7NP2C5C2IY+s 6/p2BHgqxsbg4b2rwbqEuNXPdpAezKhLFnUq3Ea4ijor5Xqr2zJvOiiW7fcTuPhzygtvsB 8NXQCN+UG5tQKt8tXWPKopzTO459ICPLOuWVfe+k16rRKdyr/z7lMonCBcAgBD/tvUrYTA LmZON8nl+ssdjJi6U2kTHP5zDCaTWWAFnMmPCSK3Iy3yCvxXVjJfqobnFS3tQw== 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 4PhXxN3MPLz10NH; Wed, 22 Mar 2023 15:50:32 +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 32MFoWle051037; Wed, 22 Mar 2023 15:50:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MFoW26051036; Wed, 22 Mar 2023 15:50:32 GMT (envelope-from git) Date: Wed, 22 Mar 2023 15:50:32 GMT Message-Id: <202303221550.32MFoW26051036@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: af28d08bda99 - releng/13.2 - carp: carp_master_down_locked() requires net epoch 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: af28d08bda99d7a841743f75d736cf677ab0ad0e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=af28d08bda99d7a841743f75d736cf677ab0ad0e commit af28d08bda99d7a841743f75d736cf677ab0ad0e Author: Zhenlei Huang AuthorDate: 2023-03-16 10:00:13 +0000 Commit: Zhenlei Huang 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;