From nobody Fri Mar 17 09:59:20 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 4PdKNS57Thz3y8tW; Fri, 17 Mar 2023 09:59:20 +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 4PdKNS4bY6z3CqY; Fri, 17 Mar 2023 09:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679047160; 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=NCmyFrPz0MoV/7DHFl/3+euiLGlku77oQyJYIcLdfME=; b=RdBmffb3dnYvOS5EJdD8rYjgzAOVlvX/0aFTwiE1K+jo67lABFCze/TeJ5KCKVG86P0zuN /L+yLFW3rJb92ZgfRBJzBp/nPlzHlHMYCom3XvC3xcCY7YalRT5N8Yo/J0ll7P7gI5e/7T GBrumNSGbBr33BIZV4ligf/C8IIfc2MvDARhqjn+MGxXS7ysPEeBmPIXkD+fGOimrx/S2M v+aPIwXWeGPVc/WreX2wrOnkMA3xASI241RSDY18VOGO37W9DAgUN+o1jnZLPWjDLedmeH LQLfjr7AJmeC6YqtxLZu6GUUvO9QtJX41L7klZamnXabH/nzm89Grns13Ly2aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679047160; 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=NCmyFrPz0MoV/7DHFl/3+euiLGlku77oQyJYIcLdfME=; b=XSjhJPcSW7a6gMINu/VozzBv1/cllDpfe2hLIYuUJjzyT2/mv4n3R0P6msGNE77vSkD2vz Xs5Vf+w3Mtu5tD0qvrJg730CtzR8MLPosYTmiu3QTOnGm3Q83UhpiWisM/tL9wnBZBC6Cy rdJ7H21nwRe71gJTGP+2ZC7vl9G0DdiwfrSpoztOJp5/5wPlqpX+bKmhaQdvSp04vJHA5t Bi8wj/9NVFEwRJ9sdW3btScmcHcPtoIkn3W0QKE7/Vad50n+nCnaromuilw1tSP7S3lVys qb762ZLMdSvp3ZXwVfYayTv09C+N8qAhd7WX4VqDNVnO0zalt6y3yNBTPo4tBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679047160; a=rsa-sha256; cv=none; b=gbmAJIYkrfcoPBy7gCQ9euRocRDl6f9mPBlKjWOTgBWUsDkxxI4B1xY/6iEASsnuaSec// pWkARdyBX8zf/CQlXEMzCdNz7rpCYdT/vd6v+3RnFhR9ct09v329qRTU/w9prXvA9m+XrA rRK+1PDgkVTWiqnnMINx5ZSieWGw4f+pczq3YuatIX6pFCFrrYDXXGiTq04LcxVFYHFAOM PsIsnr+zaDiZCjpQkDlBle6EoGtZ2jztoeUOYb9h263yq+O08dg0yUEERL9cjirS6BEcTn bPUDT5cTAyHO4SAJbFUSsrKa2BjpIRLDalZepq6RqAjjdnbQlauul1Z4TAHEjg== 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 4PdKNS3ddfzLSj; Fri, 17 Mar 2023 09:59:20 +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 32H9xKgX017199; Fri, 17 Mar 2023 09:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32H9xKUr017198; Fri, 17 Mar 2023 09:59:20 GMT (envelope-from git) Date: Fri, 17 Mar 2023 09:59:20 GMT Message-Id: <202303170959.32H9xKUr017198@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: c15ceae9e7f9 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c15ceae9e7f98f7e74ff7848b3aff7176c7e263a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c15ceae9e7f98f7e74ff7848b3aff7176c7e263a commit c15ceae9e7f98f7e74ff7848b3aff7176c7e263a Author: Zhenlei Huang AuthorDate: 2023-03-16 10:00:13 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-17 09:55:00 +0000 carp: carp_master_down_locked() requires net epoch Reviewed by: kp Fixes: 1d126e9b9474 carp: Widen epoch coverage MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D39113 (cherry picked from commit 49cad3daf2a3abe8270f71ee5b15b8990a19529d) --- 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;