From nobody Sat Jan 27 18:52:20 2024 X-Original-To: dev-commits-src-main@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 4TMkFc4RGZz58kCX; Sat, 27 Jan 2024 18:52: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 4TMkFc2mkVz4lxn; Sat, 27 Jan 2024 18:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381540; 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=RNVMBTbVrJEaAv2VI4QaCpwXt5KD2UgtQlIxSKmKBk0=; b=BtyiaS30I5jDcczEjLZ25j6ADs7+vsWnfzxGs0RIN8boFqxGid/xpWA+7UhKDUBELkWTrE D4367X4PyZch9qiyGQlerYZAdq8cHl6IkqSQyKAtHrK3sQZkCx0BqX47tWU4vppz5Q/vyO rOl3Ubgwwc8oMrkg/W3eXH/QVmoLfSLe5veeLS86kdYNubUWKJznqWv+NjbYvZ2RIHT8hL UTvt4wgoeH4OKGOyTE75mljjWzgnDO8EKDSpe/jhUmfT/eVwLDnT2UZkqH9/1RNJzbw3Ir 41XCesjJBgj/hXAg645+4tH3LDrdz+Xt52V/XBnR6AyvvG2jRj/f1H2ulvMTeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381540; 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=RNVMBTbVrJEaAv2VI4QaCpwXt5KD2UgtQlIxSKmKBk0=; b=J1oyecfu6hSu2sPDnagiEQOyzB+lzhmMnTM56Qw8/JkAGT+djF2ZNeWz2+v5Q677XNAr4w epmAxMIOYKxX5mrJYws81VPum4CNPXJ6WfMbzoIecihV8bgA5ePG11cvhkWRDU6OabAeiR 3WPY0AOSNDSyTWzvPA1YQgAcorU3Hm9OTujJL/XG0daj5QS9KgTuiNFYC8FxtZvNfmb1ro kG58pAuW8tXM+QEETTyWz03Ry1RECvJO0mQ0TmcZy0c+xq7P0y5E+CcqhnUQLYfCexGG38 93/nTaqSyb9MfnU8kSGVTrIgkw+QFE8lgJ1uN0p1Ruazr9ypba7gSJFhG5Hw6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706381540; a=rsa-sha256; cv=none; b=lIXh2Uy4bpa59yNPKFVllv8LkQXx5BewHtlogAA8s3UdNLIBCs+eJd7Bl5ZB90YH9VJqs1 zM2sL5LlFpqSz4/LjjRQbqS7oZI0EBY11Y7M8cZ/nVCl6wd4Kf2i4qBppe7kUKfEE/EUgI /454TzLTJUcCC2uvisLlSlCBOHarUIGKspoKZatKFeSgOyA5DP3a8vMgi3T6OhDM8wDX/W uMSFYB9di87Dc6C75AjqqflW3jkxZbCK/HyP0XhgNYF1C+tclhbpbj6wisWyydPX9elT0Q JqdHK8zV/ZWWtQ6liuSpyJStgPhL4yBMRFV4IbcXXVW7UuCM2DGA4olXOuz3LA== 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 4TMkFc1rF1zcN4; Sat, 27 Jan 2024 18:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40RIqKCi088777; Sat, 27 Jan 2024 18:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIqKVW088771; Sat, 27 Jan 2024 18:52:20 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:52:20 GMT Message-Id: <202401271852.40RIqKVW088771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bbf86c65d04d - main - netinet: Remove stale references to Giant from comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbf86c65d04d6013fd3f7b6d74a341256c4e7336 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bbf86c65d04d6013fd3f7b6d74a341256c4e7336 commit bbf86c65d04d6013fd3f7b6d74a341256c4e7336 Author: Mark Johnston AuthorDate: 2023-03-12 18:59:42 +0000 Commit: Mark Johnston CommitDate: 2024-01-27 18:51:13 +0000 netinet: Remove stale references to Giant from comments MFC after: 1 week --- sys/netinet/igmp.c | 2 -- sys/netinet/in_mcast.c | 15 +++++---------- sys/netinet6/in6_mcast.c | 7 ++----- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 1655963e6cff..454668c2aadc 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -166,7 +166,6 @@ static const struct netisr_handler igmp_nh = { * Any may be taken independently; if any are held at the same * time, the above lock order must be followed. * * All output is delegated to the netisr. - * Now that Giant has been eliminated, the netisr may be inlined. * * IN_MULTI_LIST_LOCK covers in_multi. * * IGMP_LOCK covers igmp_ifsoftc and any global variables in this file, * including the output queue. @@ -1672,7 +1671,6 @@ igmp_fasttimo(void *arg __unused) /* * Fast timeout handler (per-vnet). - * Sends are shuffled off to a netisr to deal with Giant. * * VIMAGE: Assume caller has set up our curvnet. */ diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index 6d68ebcb188c..f5b20c49ffd2 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -92,8 +92,8 @@ static MALLOC_DEFINE(M_IPMSOURCE, "ip_msource", /* * Locking: * - * - Lock order is: Giant, IN_MULTI_LOCK, INP_WLOCK, - * IN_MULTI_LIST_LOCK, IGMP_LOCK, IF_ADDR_LOCK. + * - Lock order is: IN_MULTI_LOCK, INP_WLOCK, IN_MULTI_LIST_LOCK, IGMP_LOCK, + * IF_ADDR_LOCK. * - The IF_ADDR_LOCK is implicitly taken by inm_lookup() earlier, however * it can be taken by code in net/if.c also. * - ip_moptions and in_mfilter are covered by the INP_WLOCK. @@ -1186,9 +1186,9 @@ inm_purge(struct in_multi *inm) /* * Join a multicast group; unlocked entry point. * - * SMPng: XXX: in_joingroup() is called from in_control() when Giant - * is not held. Fortunately, ifp is unlikely to have been detached - * at this point, so we assume it's OK to recurse. + * SMPng: XXX: in_joingroup() is called from in_control(). Fortunately, + * ifp is unlikely to have been detached at this point, so we assume + * it's OK to recurse. */ int in_joingroup(struct ifnet *ifp, const struct in_addr *gina, @@ -1362,8 +1362,6 @@ in_leavegroup_locked(struct in_multi *inm, /*const*/ struct in_mfilter *imf) * The delta-based API applies only to exclusive-mode memberships. * An IGMP downcall will be performed. * - * SMPng: NOTE: Must take Giant as a join may create a new ifma. - * * Return 0 if successful, otherwise return an appropriate error code. */ static int @@ -1550,7 +1548,6 @@ out_inp_locked: * Given an inpcb, return its multicast options structure pointer. Accepts * an unlocked inpcb pointer, but will return it locked. May sleep. * - * SMPng: NOTE: Potentially calls malloc(M_WAITOK) with Giant held. * SMPng: NOTE: Returns with the INP write lock held. */ static struct ip_moptions * @@ -2520,8 +2517,6 @@ inp_set_multicast_if(struct inpcb *inp, struct sockopt *sopt) /* * Atomically set source filters on a socket for an IPv4 multicast group. - * - * SMPng: NOTE: Potentially calls malloc(M_WAITOK) with Giant held. */ static int inp_set_source_filters(struct inpcb *inp, struct sockopt *sopt) diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c index db2176614f38..a6186568ecb2 100644 --- a/sys/netinet6/in6_mcast.c +++ b/sys/netinet6/in6_mcast.c @@ -101,8 +101,8 @@ RB_GENERATE(ip6_msource_tree, ip6_msource, im6s_link, ip6_msource_cmp); /* * Locking: - * - Lock order is: Giant, IN6_MULTI_LOCK, INP_WLOCK, - * IN6_MULTI_LIST_LOCK, MLD_LOCK, IF_ADDR_LOCK. + * - Lock order is: IN6_MULTI_LOCK, INP_WLOCK, IN6_MULTI_LIST_LOCK, MLD_LOCK, + * IF_ADDR_LOCK. * - The IF_ADDR_LOCK is implicitly taken by in6m_lookup() earlier, however * it can be taken by code in net/if.c also. * - ip6_moptions and in6_mfilter are covered by the INP_WLOCK. @@ -1418,8 +1418,6 @@ in6_leavegroup_locked(struct in6_multi *inm, /*const*/ struct in6_mfilter *imf) * The delta-based API applies only to exclusive-mode memberships. * An MLD downcall will be performed. * - * SMPng: NOTE: Must take Giant as a join may create a new ifma. - * * Return 0 if successful, otherwise return an appropriate error code. */ static int @@ -1581,7 +1579,6 @@ out_in6p_locked: * Given an inpcb, return its multicast options structure pointer. Accepts * an unlocked inpcb pointer, but will return it locked. May sleep. * - * SMPng: NOTE: Potentially calls malloc(M_WAITOK) with Giant held. * SMPng: NOTE: Returns with the INP write lock held. */ static struct ip6_moptions *