From nobody Mon Jul 7 10:06:51 2025 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 4bbKf40n9sz61JbY; Mon, 07 Jul 2025 10:06:52 +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 4bbKf33hJVz3drj; Mon, 07 Jul 2025 10:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882811; 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=wMFJyEW+0Ym+oDdmVIbpJrEll/epM1znA2Qf4qFIPVI=; b=KVpppKXtGagIqeIE6KzKDy5C+xVtGrnwKD0RrUimSj6oOAYQW3mcoOuWK9IMPF6JNiPYsy OBCbvJy9TcN15lYCBZ89uO3eK+RDjUlVYfDf2bkrBGXf9RjeuZYTfDE8ZDmh1JdQHTMbx0 Vqc8xiq4ZBZOK661OLXYUj+WG8ZxLQsVHoUysKz+q09igLAx7xHGfEFFQBE6GImhMPbEjr iENZOHw+GFwPffLp30hMN4wEcRcYDwGAgAiwUuH/NYpdYyBaHl5sIcboL5ZEYYVS/LamQL aH2e1l9nffDvSLwMEh2KTFoy/wOwdgsYpgOlXgPAaBXS5FP0aMTlj8+gtHzvpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882811; 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=wMFJyEW+0Ym+oDdmVIbpJrEll/epM1znA2Qf4qFIPVI=; b=S0I4I3VEZy3MBbdfBPIO8UL6He29I5SzkAHmI8pwaFoJJbcSTp2HgXpq18Xnnw4r5xKLg8 2gDS5oPTKfw6VHE2hUjxmrq7gzH7hdRW6trviXgBuWdGPFaCYTqj2tukDODJRcYYGcJsaR 0pUG9GA0TpksXkzjf1lLqxT4wLat0TUJJisscfbLA8qVqmYbexFM/U7ucrdzDHuRPi27P7 qLJ2s3AArooAPvLk3yo3KL/5Dj35DohCM7Dco1uLY8gJRo6HlulRjicqtRsW4ijTzdTk7M 3B4n8qoY2t2cmDByvFiuMbF53TZNLd1RWjk1RtoegCeYNmWAUoDPp4gZ4yqiXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882811; a=rsa-sha256; cv=none; b=FBgigv/a3RNE8qNokXczhnMQDm3QOXdSyOixwMRrmBXMRz8T0YsBv2dvknGIjQy4UEpDjB /BFbxvGyuI2uWLo/DSew48yWd0WsJQpl1ApOr4uxmje5+WACZlBB+K8JI/aIf4RNr+zn4M dWk4i7cNPBelQtm4QoYMLTh3RZGcLcucZHVro5eYWP8dIv+9wEQAMKHOxDu8e9cR+Qb0w6 dbs2aIkSlifQv0scFKEncaEtMXQm+KDoQOeg1eyfYplN4rcW+pmM63CDuNd9mZCdLu5+RY zk7wAVcIDu6+CZSCf/4Ctardot4jk6aNhHUM0BLB6F1NDGOCHspVw1uml+IHmA== 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 4bbKf33H87zmcr; Mon, 07 Jul 2025 10:06:51 +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 567A6pZU053195; Mon, 7 Jul 2025 10:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6pxr053192; Mon, 7 Jul 2025 10:06:51 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:51 GMT Message-Id: <202507071006.567A6pxr053192@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: 839b9596b35d - stable/14 - axgbe: Fix setting promisc mode 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 839b9596b35d516f6df444898f477cfb3d00a8db Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=839b9596b35d516f6df444898f477cfb3d00a8db commit 839b9596b35d516f6df444898f477cfb3d00a8db Author: Zhenlei Huang AuthorDate: 2024-10-12 13:56:56 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:00:29 +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 5922e29d33a8..ee800011ff24 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -2318,11 +2318,11 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "%s: MAC_PFR 0x%x drv_flags 0x%x if_flags 0x%x\n", __func__, XGMAC_IOREAD(pdata, MAC_PFR), if_getdrvflags(ifp), - if_getflags(ifp)); + flags); - if (if_getflags(ifp) & 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"); @@ -2331,10 +2331,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"); @@ -2343,6 +2344,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 786e04930780..9f974112c2ba 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 = ((if_getflags(pdata->netdev) & IFF_PPROMISC) != 0); + pr_mode = ((if_getflags(pdata->netdev) & IFF_PROMISC) != 0); am_mode = ((if_getflags(pdata->netdev) & IFF_ALLMULTI) != 0); xgbe_set_promiscuous_mode(pdata, pr_mode);