From nobody Tue Jul 08 10:05:03 2025 X-Original-To: dev-commits-src-branches@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 4bbxYW5yLRz60hpm; Tue, 08 Jul 2025 10:05:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbxYW4c8Rz3Fbw; Tue, 08 Jul 2025 10:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969103; 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=jBny3hhhpz1jJ86Ic2AC9YpSfIj/z+Nd4Ppy5XPjyqM=; b=lV6xHBEs0VJf+ArKkfil3zJDpNRsqZiPL8q5aRrte8936cJKrgxSCYQ9KxcQYypwTX2FWY mL9THbCaC80m9CLZlaOxA5FB5qjHvC3n2Wv7jszediLs7UWUAhhHMuT5P8fBYoTidcWlbi zCuigmLTFVvon/QppEIBTtf0QIASq1rE/Fb8e4daZEtoO8NXLAhjaP2kZ7HOyxWqo9DuVn 7ofQZfPD5eC0Y8o4x8bgyDzE4Lmxcyb+H2XAkEU+xJ6FdwXilt0i5wHc96emSa2EcvSkpm pAXDzTNKr+oTLt4B0bEO2M4MGuG8nubtRGV2Nc6b/U2Aqdvuej4vw0OEtZ1DZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969103; 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=jBny3hhhpz1jJ86Ic2AC9YpSfIj/z+Nd4Ppy5XPjyqM=; b=SB8WqLpNJjFL9rTKmtTwJf2dugirs5WjJiYJQwA1ce7M+ziLqK5KjL5aJ5j4AMDrAoYp5e 4SePYfmLfLph0alRvdJv3jqRFNvhYhj3IPiKlLW5xN5KzH5sIsn3g6p/V4EosOaT/DjZwE QFn38CV7KM3MDUuESt4J4uu7kYw9S/u303g96EHktYvBP2KWKOP3mwLPn+LrJKALojhzzE gpVDvshnm3lW06K14AiJMgiSqj6WX2lCnsXcVPe6pKOKO1dJbqp3NU+NoefXj6xiRrrgvj AfVDskCMU2A30T+LXSKr9HD+BIS92qbL6+GPLt7vFI+4husIVJpw3eFal2uL7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751969103; a=rsa-sha256; cv=none; b=rGw1OCPzxQlcmdBmnIEkOj2qVcPSCBLyj0EFrxP9v36SKx7xpqkYKN4bgYCu5PiFFvtn5P l4/yUPRrODGITFU8K2sOUggyrmiVVr6NOrsU/j7kh8ibFr6d3DJ1fcDZgN0lTvl+avgd2T 1OYaiAiBD/nyB1vgWIdbK0UFMDiIFJXRF/h1O52XPigoCDvWsFv+tT+88Mq0nv4V425wws Q1YyHgIGsdlMqNZfmF3xVjaU8Z29k+Wg8JN9M9X+LUjVpsgWdnOKzjHJYe5ybMqlbvEDwq qVyLH/kQCpmRaL0RAMblecC6I52t1GJ+zu/Ex7LXiYHaXo5rDFONetdiOfvn3w== 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 4bbxYW3kWPzXYm; Tue, 08 Jul 2025 10:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 568A53wo067258; Tue, 8 Jul 2025 10:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568A53id067255; Tue, 8 Jul 2025 10:05:03 GMT (envelope-from git) Date: Tue, 8 Jul 2025 10:05:03 GMT Message-Id: <202507081005.568A53id067255@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: afaa32661b48 - stable/13 - axgbe: Fix setting promisc mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: afaa32661b482323c3cce149fb74aa7b3b14ffa5 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=afaa32661b482323c3cce149fb74aa7b3b14ffa5 commit afaa32661b482323c3cce149fb74aa7b3b14ffa5 Author: Zhenlei Huang AuthorDate: 2024-10-12 13:56:56 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-08 10:03:28 +0000 axgbe: Fix setting promisc mode Ethernet drivers should respect IFF_PROMISC rather than IFF_PPROMISC. The latter is for user-requested promisc mode, it implies the former but not vice versa. Some in-kernel components such as if_bridge(4) and bpf(4) will set promisc mode for interfaces on-demand. While here, update the debugging message to be not confusing. This was spotted while reviewing markj@ 's work D46524. Test from Franco shows that the interface seems to be unconditionally initialized to promisc mode regardless of this fix. That needs further investigation. Reviewed by: markj, Franco Fichtner Tested by: Franco Fichtner MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46794 (cherry picked from commit c7a2636889a649985e323de23fe495608b6fe483) --- sys/dev/axgbe/if_axgbe_pci.c | 10 ++++++---- sys/dev/axgbe/xgbe-dev.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index 679de1c6092a..52f9abaafb45 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -2342,11 +2342,11 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) struct ifnet *ifp = pdata->netdev; axgbe_printf(1, "%s: MAC_PFR 0x%x drv_flags 0x%x if_flags 0x%x\n", - __func__, XGMAC_IOREAD(pdata, MAC_PFR), ifp->if_drv_flags, ifp->if_flags); + __func__, XGMAC_IOREAD(pdata, MAC_PFR), ifp->if_drv_flags, flags); - if (ifp->if_flags & IFF_PPROMISC) { + if (flags & IFF_PROMISC) { - axgbe_printf(1, "User requested to enter promisc mode\n"); + axgbe_printf(1, "Requested to enter promisc mode\n"); if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PR) == 1) { axgbe_printf(1, "Already in promisc mode\n"); @@ -2355,10 +2355,11 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "Entering promisc mode\n"); XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 1); + /* Disable VLAN filtering */ XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 0); } else { - axgbe_printf(1, "User requested to leave promisc mode\n"); + axgbe_printf(1, "Requested to leave promisc mode\n"); if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PR) == 0) { axgbe_printf(1, "Already not in promisc mode\n"); @@ -2367,6 +2368,7 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "Leaving promisc mode\n"); XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 0); + /* Enable VLAN filtering */ XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 1); } diff --git a/sys/dev/axgbe/xgbe-dev.c b/sys/dev/axgbe/xgbe-dev.c index 214ff8d4fbe3..beffa47cae7e 100644 --- a/sys/dev/axgbe/xgbe-dev.c +++ b/sys/dev/axgbe/xgbe-dev.c @@ -971,7 +971,7 @@ xgbe_config_rx_mode(struct xgbe_prv_data *pdata) { unsigned int pr_mode, am_mode; - pr_mode = ((pdata->netdev->if_flags & IFF_PPROMISC) != 0); + pr_mode = ((pdata->netdev->if_flags & IFF_PROMISC) != 0); am_mode = ((pdata->netdev->if_flags & IFF_ALLMULTI) != 0); xgbe_set_promiscuous_mode(pdata, pr_mode);