From nobody Thu Mar 16 10:08:10 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 4Pcjd641lhz3yfZX; Thu, 16 Mar 2023 10:08:10 +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 4Pcjd6241rz46MM; Thu, 16 Mar 2023 10:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678961290; 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=QC3OVIJ8y8OXfOR2pJ/ijGhKkKQ6w9oxo5Y+ZAR3cUU=; b=N8cJwiuuZa9lRrC7Z4uxM8h0igG259VLTchr5YgEGOo4l4TsbckDTvTyWFuKA0F7BeEwjI tjyoSrRef3fgkhDjnGa5eDB6JXgSbcHzi3T3teqWlIfOGRr/wXVkh5LNAdvlSvryo2yKKB Ji+lOJl8b7TomFbjCqeT3w8DOV83jDSD3ezCIgKcytU+/jhIBBW9sB5hLeIl89b4X+pjed pVKLZPyeNxcX8cPCMxiT/wvs/7Lp9qXliGCd7EeF+s36wXShqhbs9vGsXsLpDdQd8jkmmL ibqHacpQ4ySvP3syD2aPS7C02qzqzHEmXLZO/+BMP6/+Q0LML6SLcK7TlT1Exw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678961290; 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=QC3OVIJ8y8OXfOR2pJ/ijGhKkKQ6w9oxo5Y+ZAR3cUU=; b=gFo52AHQ+uJloTG2Q+7l9y5c8P0I2AYr3O+jFhkbwn2J/a7+1lB8YgVK5lVFrQcS9GkCSC QEyLuYHKX1AlNzNGPJmF3LYh+2pRmlViSOslemHWfvF6Aj4iW7yN/75ZxAFXNK/sBGT4ni +TV4xApibkRpeMjtuXFxQuRn1MhmGB30hMrgg1lekY1wbiNAhrdoqy6i58B4DCUKAhG6Ez YZMXh9Njo4YvLFtjARpmYRxXhAqmSIsEIT0o9ekIQvT+oaLZha3txPeDY5c51L6L5/VaBC OTbrf4PptgKeuffG1t9mwf/dUAYrYQ/BXvBrOsN57gPKrUiPN38OwndOCBcbbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678961290; a=rsa-sha256; cv=none; b=gGMze1E0kZKlBtybJrSOuQNc7PwAiptDZJZONVmU2T9gD1vwACiAM9sj5Hb6Q0rd17vCYe t6EA3wj2wSg7Cs/hLdGq3kHzJD1dNsMrv8VmDNwYQ84GNgsiAEYMEvVQtrc0W5k/u9Ygwp vz+9jWe+s3LYjtnxhrofwepgzWiB9/InDuzCMQxeYN5OTTTAbHA7Eb9AhKPGSzVwS9KWLN 7OLnOl2/twMIum4Q9SBNPLlQLHbKHJOsr9YmmAMAcLZM07S58Oc9prP9GZOOvk1bBoMLEc fAlvuRu7OilNJzxWqsDmgwPKmbu/9SKGsXMrYHiL1VSQzPbxMaXYADjTQOZhvw== 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 4Pcjd60t4zzffN; Thu, 16 Mar 2023 10:08:10 +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 32GA8A0h065588; Thu, 16 Mar 2023 10:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32GA8AIS065587; Thu, 16 Mar 2023 10:08:10 GMT (envelope-from git) Date: Thu, 16 Mar 2023 10:08:10 GMT Message-Id: <202303161008.32GA8AIS065587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 49cad3daf2a3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 49cad3daf2a3abe8270f71ee5b15b8990a19529d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=49cad3daf2a3abe8270f71ee5b15b8990a19529d commit 49cad3daf2a3abe8270f71ee5b15b8990a19529d Author: Zhenlei Huang AuthorDate: 2023-03-16 10:00:13 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-16 10:07:03 +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 --- 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 22b256238774..1b8b10b06168 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1728,6 +1728,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; @@ -1812,8 +1813,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;