From nobody Fri Aug 7 12:56:33 2026 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 4hGkgC1Mn4z6n2fK for ; Fri, 07 Aug 2026 12:56:39 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGkgC0t8dz48Wm for ; Fri, 07 Aug 2026 12:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786107399; 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=yah/sjJWiA6gMHXjzXuNlQKdji+eit3zhBNqtsLFZiY=; b=EyVrwN37lvD0q1DlfDTKfxrMDriwaZMv6KnftbFh/1olOvNo50f/sekH1PHWvuTKl1Gis1 4+OSv8ZS9dEonmWPdD1Y3Q2nY2ARpwRQ76T4jAF8jY6Y9zw1zzdHvbNGluMeLNfzitBQjH n/aJZ+ky4suG0QqTxN7xFx+oYsdma8V/YO/NEtgOc6xM8lCzdMUVEaxXsIY0NHoQXoDiqV 1dQ4GJjKUnagEDkS/VeNkcG+vVVpxV2Ec9VkHWwSFWW4D2IfRmFHkvQpgDsGAE49ggwq/n TyB3PBGjKCL9n9Z8+9yaST1HEEFF2Ovp09iZUzZWvVYBauv+06tdn+mvay5olw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786107399; a=rsa-sha256; cv=none; b=ltNmFaXIY/ke1FOxsHXgJlAW+scWv8KxwV6fC+YYGSsna708izC+Cs0l0a5f1iFSJEf8MO UjOs/f/qt+voeHQ5UvBeSaHKItwvFNr0HOPF/wnj7+F5Z43qUdCtOLRiVpfgMBEFk7cWYX FiGvkys9ZPD4tcrOQi+OXt89QzBfXHjsNLfhQWU8KCIIqFELANdHdmHcI/wK7VFMD8CjNY l5qgI754uprcpfvxrGN8eCh1JpDhwqMAKlTQOFl7lC6SFmyl3CDZ8emgNlnymRFHHZJIXz s4Utxl/p7KmfmYQikvqDzp8YpO+dXkMRaMb8IxAMN6BcZADhSgA5O11SOSSlKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786107399; 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=yah/sjJWiA6gMHXjzXuNlQKdji+eit3zhBNqtsLFZiY=; b=ApsEkjxzsWB8uDbw71BNWamI+CE7EHfLFuVd5STPQvX4bMezIe3aDsTCmk9oNww6CfQ14o WLS2nFem3OYR70abdgfUBb1U1a/8XAJ0euZ8zFUcP2U1LdmuxNmGVguxa/vr2xsI6pSrwv QnDUGblsLPKaheNgjXxxlDrQ+0uXSzfXRCrz9vuP6NJc4skU7XaujlguFkXmjRsZcEfx7D 5eEYSPtSBAdKjelhC/cGBNtemeTrYIu0EHF8it72kzSplq4pRMAsjHq86uRILLH+MGoayG 0ao8emHaZiNKVucI/xTUSO+CaHQ7sYBKb3EL4mvnO4xrUsEmOwZFhK3PiNmV5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGkgB6xPhz16xN for ; Fri, 07 Aug 2026 12:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39067 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 12:56:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 4383ab82b0bb - main - ixgbe: force receive drops on every VF queue 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4383ab82b0bbaf1c78ecdf4eb7628f1e154db24b Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 12:56:33 +0000 Message-Id: <6a75d601.39067.59f8fdc7@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4383ab82b0bbaf1c78ecdf4eb7628f1e154db24b commit 4383ab82b0bbaf1c78ecdf4eb7628f1e154db24b Author: Kevin Bowling AuthorDate: 2026-08-01 06:43:08 +0000 Commit: Kevin Bowling CommitDate: 2026-08-07 12:51:10 +0000 ixgbe: force receive drops on every VF queue PFQDE is indexed by absolute receive queue, but the driver programs one index per VF. Only the first quarter or half of the VF queues therefore have queue-drop isolation, depending on the virtualization mode. The flow-control path can also clear those bits even though SR-IOV requires them independently of the PF pause policy. Program every queue in a VF pool before enabling receive for that VF. For an X550-family VF with an administrative port VLAN, also hide the VLAN tag as the hardware requires. Keep PF flow-control changes confined to the PF SRRCTL registers, and clear the VF queue settings when SR-IOV is torn down and the queues can be reassigned to the PF. MFC after: 2 weeks --- sys/dev/ixgbe/if_ix.c | 12 ------------ sys/dev/ixgbe/if_sriov.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 4606e735b821..0a8c5573977e 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -5265,13 +5265,6 @@ ixgbe_enable_rx_drop(struct ixgbe_softc *sc) IXGBE_WRITE_REG(hw, IXGBE_SRRCTL(rxr->me), srrctl); } - /* enable drop for each vf */ - for (int i = 0; i < sc->num_vfs; i++) { - IXGBE_WRITE_REG(hw, IXGBE_QDE, - (IXGBE_QDE_WRITE | - (i << IXGBE_QDE_IDX_SHIFT) | - IXGBE_QDE_ENABLE)); - } } /* ixgbe_enable_rx_drop */ /************************************************************************ @@ -5291,11 +5284,6 @@ ixgbe_disable_rx_drop(struct ixgbe_softc *sc) IXGBE_WRITE_REG(hw, IXGBE_SRRCTL(rxr->me), srrctl); } - /* disable drop for each vf */ - for (int i = 0; i < sc->num_vfs; i++) { - IXGBE_WRITE_REG(hw, IXGBE_QDE, - (IXGBE_QDE_WRITE | (i << IXGBE_QDE_IDX_SHIFT))); - } } /* ixgbe_disable_rx_drop */ /************************************************************************ diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c index 98c31b3d7a17..7987009eb8f0 100644 --- a/sys/dev/ixgbe/if_sriov.c +++ b/sys/dev/ixgbe/if_sriov.c @@ -587,6 +587,31 @@ ixgbe_vf_enable_transmit(struct ixgbe_softc *sc, struct ixgbe_vf *vf) } /* ixgbe_vf_enable_transmit */ +static void +ixgbe_vf_set_rx_drop(struct ixgbe_softc *sc, struct ixgbe_vf *vf, + bool enable) +{ + struct ixgbe_hw *hw; + u32 qde; + int i, queue_count; + + hw = &sc->hw; + queue_count = ixgbe_vf_queues(sc->iov_mode); + for (i = 0; i < queue_count; i++) { + qde = IXGBE_QDE_WRITE | + (ixgbe_vf_que_index(sc->iov_mode, vf->pool, i) << + IXGBE_QDE_IDX_SHIFT); + if (enable) { + qde |= IXGBE_QDE_ENABLE; + if (vf->default_vlan != 0 && + hw->mac.type >= ixgbe_mac_X550) + qde |= IXGBE_QDE_HIDE_VLAN; + } + IXGBE_WRITE_REG(hw, IXGBE_QDE, qde); + IXGBE_WRITE_FLUSH(hw); + } +} + static void ixgbe_vf_enable_receive(struct ixgbe_softc *sc, struct ixgbe_vf *vf) { @@ -594,6 +619,8 @@ ixgbe_vf_enable_receive(struct ixgbe_softc *sc, struct ixgbe_vf *vf) uint32_t vf_index, vfre; hw = &sc->hw; + /* Keep one VF without receive descriptors from blocking its peers. */ + ixgbe_vf_set_rx_drop(sc, vf, true); vf_index = IXGBE_VF_INDEX(vf->pool); vfre = IXGBE_READ_REG(hw, IXGBE_VFRE(vf_index)); @@ -1442,6 +1469,7 @@ ixgbe_if_iov_uninit(if_ctx_t ctx) for (i = 0; i < sc->num_vfs; i++) { if (!(sc->vfs[i].flags & IXGBE_VF_ACTIVE)) continue; + ixgbe_vf_set_rx_drop(sc, &sc->vfs[i], false); ixgbe_vf_clear_mac_filters(sc, &sc->vfs[i], true); sc->vfs[i].flags &= ~IXGBE_VF_ANTI_SPOOF; ixgbe_vf_set_anti_spoof(sc, &sc->vfs[i]);