From nobody Sat Apr 4 07:49:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 210D230F95A for ; Fri, 20 Mar 2026 13:53:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774014829; cv=none; b=n6qElFg+nZuyxTji7kXPjQlIa4zIrkBt7D351av8Sctqq4ZrdtvYOktGJV02MmnEixlS/Hzz8jE3VUJIUFoVpFzJhdhCFrr2BJ17X8IWzLqtjpdMTKE/86PzqH/rfI6sGtcVxCVNE3DG5F7xzuPq5sB4G4Y0fB1j0XS0v/f3pwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774014829; c=relaxed/simple; bh=nsansbrA9exd4wl5vfPa+yMLVXrtAYJN0VW+tgOTLXo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=p1NCqtw1yxw6ysMtmcOFTKjEXsRhO39rOgrxuGBDJ1ZuusXOV6HASt47B32ROnNMXp1Dfxgc8YnJYMatPN8D5q6CSDzcs13Retd+UZgwubSgNVIW2kuKWh1QA28qGf/KhfFJN7Q+I15n3kszFFMzuXP+8gdXlxwojzDpebQLZuk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=RSWMcehS; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RSWMcehS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774014820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/EP253Ita56izT2rWbDKalNcQ8a/uClSIqHZjfuXQU0=; b=RSWMcehSMzabrREKDLhJjm3F2lHOeQ/RB8FIufsVy9oV/d883rRfaVwKQM4g8ZMDo2bckm xZT9qBJMlzRkGUMH1T+tTOrejdL31fIDlXzRcvwuAETnt0ElHoDxOXKSm7k1JU/6L33fUj 1CPvOCYvS71fakT2Ayeh6KFBRNJDjVI= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-680-QFNSuCzfONOXi7UmaxPa2g-1; Fri, 20 Mar 2026 09:53:35 -0400 X-MC-Unique: QFNSuCzfONOXi7UmaxPa2g-1 X-Mimecast-MFC-AGG-ID: QFNSuCzfONOXi7UmaxPa2g_1774014814 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B980719560AF; Fri, 20 Mar 2026 13:53:33 +0000 (UTC) Received: from ShadowPeak.redhat.com (unknown [10.45.224.50]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2335B195394A; Fri, 20 Mar 2026 13:53:29 +0000 (UTC) From: Petr Oros To: netdev@vger.kernel.org Cc: Petr Oros , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jacob Keller , Mateusz Polchlopek , intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH iwl-net] iavf: fix wrong VLAN mask for legacy Rx descriptors L2TAG2 Date: Fri, 20 Mar 2026 14:53:26 +0100 Message-ID: <20260320135326.1171433-1-poros@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" The IAVF_RXD_LEGACY_L2TAG2_M mask was incorrectly defined as GENMASK_ULL(63, 32), extracting 32 bits from qw2 instead of the 16-bit VLAN tag. In the legacy Rx descriptor layout, the 2nd L2TAG2 (VLAN tag) occupies bits 63:48 of qw2, not 63:32. The oversized mask causes FIELD_GET to return a 32-bit value where the actual VLAN tag sits in bits 31:16. When this value is passed to iavf_receive_skb() as a u16 parameter, it gets truncated to the lower 16 bits (which contain the 1st L2TAG2, typically zero). As a result, __vlan_hwaccel_put_tag() is never called and software VLAN interfaces on VFs receive no traffic. This affects VFs behind ice PF (VIRTCHNL VLAN v2) when the PF advertises VLAN stripping into L2TAG2_2 and legacy descriptors are used. The flex descriptor path already uses the correct mask (IAVF_RXD_FLEX_L2TAG2_2_M =3D GENMASK_ULL(63, 48)). Fixes: 2dc8e7c36d80 ("iavf: refactor iavf_clean_rx_irq to support legacy an= d flex descriptors") Signed-off-by: Petr Oros Reviewed-by: Aleksandr Loktionov Reviewed-by: Paul Menzel --- drivers/net/ethernet/intel/iavf/iavf_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_type.h b/drivers/net/ethe= rnet/intel/iavf/iavf_type.h index 1d8cf29cb65ac5..5bb1de1cfd33b1 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_type.h +++ b/drivers/net/ethernet/intel/iavf/iavf_type.h @@ -277,7 +277,7 @@ struct iavf_rx_desc { /* L2 Tag 2 Presence */ #define IAVF_RXD_LEGACY_L2TAG2P_M BIT(0) /* Stripped S-TAG VLAN from the receive packet */ -#define IAVF_RXD_LEGACY_L2TAG2_M GENMASK_ULL(63, 32) +#define IAVF_RXD_LEGACY_L2TAG2_M GENMASK_ULL(63, 48) /* Stripped S-TAG VLAN from the receive packet */ #define IAVF_RXD_FLEX_L2TAG2_2_M GENMASK_ULL(63, 48) /* The packet is a UDP tunneled packet */ --=20 2.52.0