From nobody Sun Apr 2 01:09:55 2023 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 4PpwtC4yhsz43g1s; Sun, 2 Apr 2023 01:09:55 +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 4PpwtC4TDvz3HCg; Sun, 2 Apr 2023 01:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680397795; 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=3MaP2hvVpsam7gb+XUlex/nImGudQbrHUy3U7bHSjDY=; b=C2Ohfmt5iOqzcw5oZQ4NToCaafTWTmAzY1LiBcoU7/fU25TE/8/u5wm1W4Wh0u94VgD6sj /GfkpLGKHTmXgAlRjOLePwuLi9LB23Kv9eGz23oMA6Y59P/Ef0WyAe335RY/TvXhVjEOEV 7qcDBM/s+0+U4RyKtdWaOmJIZSGpfOvd+J19zicE98lpD2HxiB59jJME5VRar1VdSQ4ahz YpAPdjNbQYTQAMaw6DIdeidNyevQr3DVC7xPmedEkI2356BdMUqBU+3GxhJ6HGP49UjZNZ nb/94Frxv2QRSNGyqroxfodR3YqlK6OcSIE9h+HdMAP+rYHscXv8F1KmgzU4dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680397795; 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=3MaP2hvVpsam7gb+XUlex/nImGudQbrHUy3U7bHSjDY=; b=gun3Aoua0XeLWyG1nAvJkpxsLyArKnCrFUgVXh3QgbdRvNTsTvski+uWuB4ZSIX6zEKnee v4WAAXSJxNLHLRywKkzUaq/4Q9aEjDoTzIKkNaIhajym8tZs21eFR5l/5s+R29kFzncuLc dcv3qOv2ZablrKANLJI0E2P9hiD7rlVp3v4AYQi01hEJX5K+UfoJ4L3AsQ5LH29rkyzywA 7gnFspFZVSqROcRemtzZNYOaQL8XvyHg6fqRDHP91DhY0ScXauci1Qw+8DhA4RHJMKzbCS Yq0+DjXYf+0P5GGi1UBVBJA4UbXHVQQ001U1c8PUXcoMilUw4psfeZHyuYFbVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680397795; a=rsa-sha256; cv=none; b=HfOBypMtr7lso8N1tuXuK+HoX/ynRCtNFOSOXnL5QxPeHg5E26yjFM1VpMY7Iv8NbLZapU YPgnWnxcS/3TKTUoFY3MyyGe7kkU9MfIwzXWoBX8nMnNiT7RxupKCLIMoklDXEWnROqgnc GgFNmJCP52HgMr6yx3InRcjRRHff3jDm8LX5ZRTFwmg7y6ZuH5ubWKmb4KbcOhBlfF/AfQ bU893ScQ8sTT0xIHEe/zr+4UrTJLJqg2YcOYBUxDQKW4DJ2evMSTGXMsjeh/hK6obyrSC+ 0tTh4xvMAvcF54Art0iU0wq5OkAcXahqgQmtuiwBN7Sn765t38DIbVnuJ8PrRA== 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 4PpwtC3TslzxbD; Sun, 2 Apr 2023 01:09:55 +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 33219t5I054551; Sun, 2 Apr 2023 01:09:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33219tun054550; Sun, 2 Apr 2023 01:09:55 GMT (envelope-from git) Date: Sun, 2 Apr 2023 01:09:55 GMT Message-Id: <202304020109.33219tun054550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 531ef35241b5 - main - cxgbe/iw_cxgbe: Always set a vnet around calls to IN_LOOPBACK. 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 531ef35241b5b5934f8cd78ca628c21cb0494d88 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=531ef35241b5b5934f8cd78ca628c21cb0494d88 commit 531ef35241b5b5934f8cd78ca628c21cb0494d88 Author: Navdeep Parhar AuthorDate: 2022-10-13 22:34:56 +0000 Commit: Navdeep Parhar CommitDate: 2023-04-01 23:19:10 +0000 cxgbe/iw_cxgbe: Always set a vnet around calls to IN_LOOPBACK. This is catch up with efe58855f3ea. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/iw_cxgbe/cm.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index 457290875583..045da316a0a0 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -933,7 +933,7 @@ err: return; } -static inline int c4iw_zero_addr(struct sockaddr *addr) +static inline bool c4iw_zero_addr(struct sockaddr *addr) { struct in6_addr *ip6; @@ -946,19 +946,29 @@ static inline int c4iw_zero_addr(struct sockaddr *addr) } } -static inline int c4iw_loopback_addr(struct sockaddr *addr) +#define _IN_LOOPBACK(i) (((in_addr_t)(i) & 0xff000000) == 0x7f000000) +static inline bool c4iw_loopback_addr(struct sockaddr *addr, struct vnet *vnet) { - if (addr->sa_family == AF_INET) - return IN_LOOPBACK( - ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr)); - else - return IN6_IS_ADDR_LOOPBACK( - &((struct sockaddr_in6 *) addr)->sin6_addr); + bool ret; + + if (addr->sa_family == AF_INET) { + if (vnet == NULL) + ret = _IN_LOOPBACK(ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr)); + else { + CURVNET_SET_QUIET(vnet); + ret = IN_LOOPBACK(ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr)); + CURVNET_RESTORE(); + } + } else { + ret = IN6_IS_ADDR_LOOPBACK(&((struct sockaddr_in6 *) addr)->sin6_addr); + } + return (ret); } +#undef _IN_LOOPBACK -static inline int c4iw_any_addr(struct sockaddr *addr) +static inline bool c4iw_any_addr(struct sockaddr *addr, struct vnet *vnet) { - return c4iw_zero_addr(addr) || c4iw_loopback_addr(addr); + return c4iw_zero_addr(addr) || c4iw_loopback_addr(addr, vnet); } static void @@ -971,7 +981,8 @@ process_newconn(struct c4iw_listen_ep *master_lep, struct socket *new_so) MPASS(new_so != NULL); - if (c4iw_any_addr((struct sockaddr *)&master_lep->com.local_addr)) { + if (c4iw_any_addr((struct sockaddr *)&master_lep->com.local_addr, + new_so->so_vnet)) { /* Here we need to find the 'real_lep' that belongs to the * incomming socket's network interface, such that the newly * created 'ep' can be attached to the real 'lep'. @@ -2734,7 +2745,7 @@ c4iw_create_listen(struct iw_cm_id *cm_id, int backlog) * invoke solisten() as first listener callback has already created * listeners for all other devices(via solisten). */ - if (c4iw_any_addr((struct sockaddr *)&lep->com.local_addr)) { + if (c4iw_any_addr((struct sockaddr *)&lep->com.local_addr, NULL)) { port_info = add_ep_to_listenlist(lep); /* skip solisten() if refcnt > 1, as the listeners were * already created by 'Master lep' @@ -2788,7 +2799,8 @@ c4iw_destroy_listen(struct iw_cm_id *cm_id) states[lep->com.state]); lep->com.state = DEAD; - if (c4iw_any_addr((struct sockaddr *)&lep->com.local_addr)) { + if (c4iw_any_addr((struct sockaddr *)&lep->com.local_addr, + lep->com.so->so_vnet)) { /* if no refcount then close listen socket */ if (!rem_ep_from_listenlist(lep)) close_socket(lep->com.so);