From nobody Fri Nov 28 20:59:38 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 4dJ5Jq0HT7z6JGvb for ; Fri, 28 Nov 2025 20:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dJ5Jp6kMYz3cTX for ; Fri, 28 Nov 2025 20:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764363579; 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=ZhSkBlnNgVIgh3oxaIwjVHZdoyEU1K/2d8lYMZLIJ2w=; b=QO1kSCaULnhaNUptuYZzd27DzTshbZDwy1djPtMSZAZYunedJq42l4yeloW5OESx+3s6uP KNOeGna3VCw7qJdKXADHqaTFmCOrK8rWtPla6G3LTOBTtWCVF0j0os5+aKbMGl8ckfZJm5 THGN5ecQjKm43oiuhWRMsu5e3Tnw2npFawroVG5jxpuhw5xn8WZKTWMtCoqcV3Iux1Kew1 yPs5zp7ZkM5XbnPSxalCVY7uKsz2ksUOG85cEmGOs+bvmVhF7HLnZFpqtrCD+ByYICOpJW o7cVt4B7ZRNJ0OkIs6qHofRFMnVnKDYVuUPWKY2Fxp+8zW8rO9OEnZZQ1zLANw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764363579; 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=ZhSkBlnNgVIgh3oxaIwjVHZdoyEU1K/2d8lYMZLIJ2w=; b=hUPkKBDW0zx/Cg/eHhl/D3cV6DvwpAamaL/PsHjYI7n8j5Ou3ikBwQri9GEDRcjEoytX8M TbULojOtVau08n9+8xgZBVxyWDxFAeXydtTOdc0d06J5wUHwYlWvz6tye1Y6bpQ53oUSR1 EuJpA+4TWfcTDTK4WhHF5JU3McY7a8+SgCnOkprnaslOT0j/Q1lsNk+c8H6vsmgFXrv6CU 2qne7+hSFpLuGg+udaFBFc5pDN+XOU2ddsfEwFOXHJuuSuISabNkWOdnvCXklsrUWpXU3F G+oL3J0/JBxgU9JS5HGlYB8gtrG05vUk5sXVvOExCk34j7uaQZmeD71+t5bpjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764363579; a=rsa-sha256; cv=none; b=JMHqqWwDbfBxrynJCygVlDkUnkLzALh9A1Tr36ONV2XPOxWVjthRGSZu0vrbXwtdCuV1VY VkL7hWMhRtNsYrgu1pEonPvtGBBFZmPgEVK0MkCztFQr3UyR/B1/vYvWA/Y+Wein+fFl5S 6WRUTLOI+ijA/EzAC1u6lbat7BAI4rMeA7B5R84CIWkG34W/Tz6/GRYMgjedN/nunM0K8B yXuufm5AA0OsbykTT+9T5KTIvj7mJr+mpTDws8E9NdGvJFunC7ixzwVbl1ed/GTcegjTLT D6qfOVVhgRX3QDaDKjInWD+OhYRt+FYx8DGlveP1iz1jCkZwvDGFUX+08eYy+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dJ5Jp613Wz39J for ; Fri, 28 Nov 2025 20:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a8f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 20:59:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Krzysztof Galazka Subject: git: 40a6ada9e614 - stable/14 - igb(4): Fix VLAN support on VFs 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: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 40a6ada9e614c1a6fd93e4164f7de416af1a23b2 Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 20:59:38 +0000 Message-Id: <692a0d3a.30a8f.3f503b03@gitrepo.freebsd.org> The branch stable/14 has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=40a6ada9e614c1a6fd93e4164f7de416af1a23b2 commit 40a6ada9e614c1a6fd93e4164f7de416af1a23b2 Author: Krzysztof Galazka AuthorDate: 2025-11-17 15:30:26 +0000 Commit: Krzysztof Galazka CommitDate: 2025-11-28 20:59:24 +0000 igb(4): Fix VLAN support on VFs Virtual Functions are considered untrusted and have no control over VLAN filtering configuration in HW. To allow using VLANs on VF intreface driver has to assume that VLAN HW Filtering is always enabled and pass requests for adding or removing VLAN tags to Physical Function driver using Mailbox API. Signed-off-by: Krzysztof Galazka Approved by: kbowling (mentor) Reviewed by: erj (previous version) Tested by: gowtham.kumar.ks_intel.com Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D53245 (cherry picked from commit 1839526b7315cae62efbd2d1493e6243439effcb) --- sys/dev/e1000/if_em.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 9040949b36c7..ce4269728903 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4048,7 +4048,15 @@ em_if_vlan_register(if_ctx_t ctx, u16 vtag) bit = vtag & 0x1F; sc->shadow_vfta[index] |= (1 << bit); ++sc->num_vlans; - em_if_vlan_filter_write(sc); + if (!sc->vf_ifp) + em_if_vlan_filter_write(sc); + else + /* + * Physical funtion may reject registering VLAN + * but we have no way to inform the stack + * about that. + */ + e1000_vfta_set_vf(&sc->hw, vtag, true); } static void @@ -4061,7 +4069,10 @@ em_if_vlan_unregister(if_ctx_t ctx, u16 vtag) bit = vtag & 0x1F; sc->shadow_vfta[index] &= ~(1 << bit); --sc->num_vlans; - em_if_vlan_filter_write(sc); + if (!sc->vf_ifp) + em_if_vlan_filter_write(sc); + else + e1000_vfta_set_vf(&sc->hw, vtag, false); } static bool @@ -4119,22 +4130,15 @@ em_if_vlan_filter_write(struct e1000_softc *sc) { struct e1000_hw *hw = &sc->hw; - if (sc->vf_ifp) - return; + KASSERT(!sc->vf_ifp, ("VLAN filter write on VF\n")); /* Disable interrupts for lem(4) devices during the filter change */ if (hw->mac.type < em_mac_min) em_if_intr_disable(sc->ctx); for (int i = 0; i < EM_VFTA_SIZE; i++) - if (sc->shadow_vfta[i] != 0) { - /* XXXKB: incomplete VF support, we returned above */ - if (sc->vf_ifp) - e1000_vfta_set_vf(hw, sc->shadow_vfta[i], - true); - else - e1000_write_vfta(hw, i, sc->shadow_vfta[i]); - } + if (sc->shadow_vfta[i] != 0) + e1000_write_vfta(hw, i, sc->shadow_vfta[i]); /* Re-enable interrupts for lem-class devices */ if (hw->mac.type < em_mac_min) @@ -4149,8 +4153,10 @@ em_setup_vlan_hw_support(if_ctx_t ctx) if_t ifp = iflib_get_ifp(ctx); u32 reg; - /* XXXKB: Return early if we are a VF until VF decap and filter - * management is ready and tested. + /* + * Only PFs have control over VLAN HW filtering + * configuration. VFs have to act as if it's always + * enabled. */ if (sc->vf_ifp) return;