From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1D6D216E01 for ; Tue, 25 Feb 2025 20:16:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740514601; cv=none; b=TTVmDOGsajYwQu5bGqZBBBtLyl9/4bYRWnMucn8ujK5ccUcisDSO4gFKxPkHngPKcOiFSGuNPzebnLX9nCqsXOQhaxN8hoI6gEF+T3CDdSlnEaP/0d0yolR/tbnU9+ySTO6n7DdLRUw6pS+vZO0S6LxaNF5pTkbndN/vBLGMATY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740514601; c=relaxed/simple; bh=8dcYAV0MonhKL6O5x+ptHAAw+fbiOOhKssEKku03mBc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dOPX083GIbswfNpXOemS4WyonKS9EXgdDOckprl8RPTatgHCpSXPPcbnY6W5tRk+7RYHagrVsMUjgIEc1gPu/ejog/hjlyT5TJsh/q8ccCv/Anoe9KFkJBJvQhslkz5Uqst3koglV2kRrkV1xnMZV6Yh5T7bNAfGGIxnMlRmLg8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=m4TTSh+K; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m4TTSh+K" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-abb7f539c35so1171754066b.1 for ; Tue, 25 Feb 2025 12:16:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740514598; x=1741119398; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BVAkTZii1Gy4XRugZsnKaWDIV+1UdUIxS1E1wVQkwnU=; b=m4TTSh+KSuH3pmOyIAZOPzV5a44GO1Vq/Bz6K4FSwXFoCvVAC3mgH7aNWKD+h4VQCv CjKbAhl9UDHsgZdy6SYemGUIxH7FUJgRtNmy8p2mhVPUlWwYpbOzB0Z2lWjVfPjzFN36 VGF8sPqclER8t1iWFa69K2+Sw8e/sVjkdM3tGPMrYlRxVUZJtZN8Y6XHN8sUicw1PhR2 TzjwlupH34xkEaLjDOZYfi+2EqOWy3/p4MLO9sVzJuy9inTF/lSRUdMRbWQEEnYJdTTi d7taKOzaomYV8NT6gUxLBFyoCHkZesE86v4oc/smolXQ7By7Qrt/d9YOAHp/nNDqwb4B u45g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740514598; x=1741119398; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BVAkTZii1Gy4XRugZsnKaWDIV+1UdUIxS1E1wVQkwnU=; b=QyYVrUembkmWlVMBeojDOTRRXU28Tm9aUCnJxE26WToIdAS2Ihj4Qt5Qj8Md9dBCWj ueBfScudazlQwaD6LUP7phGI7IoTCQ9XIUFPFzSC2Jsbf7sB+uzQFf/shVRJMob2mXB3 pZOjpnidFSQVCowBOmQSq8FnkdQBTm3jQnYFjnmXTjv8uJjf8ivS0GC2Kcc13ienXhlL c8UAm5WdKhaRru4znJNfdLh9yWDJPvChGgnLVbG+7Tfd2qlsyU1z0IpS3xoIQmKP0yLh k3LJabgCPnLmqstciHSwf9Z1YICzTtBOESZk3NmL3vKXIvzRqxg64PZhSfYCKfHbZ4df 4VzQ== X-Forwarded-Encrypted: i=1; AJvYcCW24FIJQFOlTLliFZRTkP1qWjkiarQj+gXLaUTSrxr2Xht23Yl3cTeiLe34zGoPspN2coESUKw=@lists.linux.dev X-Gm-Message-State: AOJu0YxkfWr2w/rFu0HEm5K9mgn72FUOe5IBThf/9lkU/OcebtS5YDlJ 7DfrGRPHl+riZwID9N/MEk21QdGUDzqjK+UpKM1lSPgvzLRIzGIM X-Gm-Gg: ASbGncuF7TPGCXfPfrQUzHDOBTen/9KWB4Ce+Kj4m+Vm6UCNh+S6y6yxKjhgcuOnNCR l/DAITQUnhHs5o9XK1M+C+/PGiX8hWoNQpcFxeQsg6SdfxPJC4IECUgiudYYkqWJ+0QPi2AAxzc AhNaKttyMpF0BxYkFp6efKiLrJ1OesXOHVwbMdui9XXChdkN3ZsbutheFGIXjUAhFP1ohBawZ1Q nhAZRyqtC0ScRpzgOn+xOzF/HAdbmeOpcnrVUb7PlBsQAFKj0HUDJKoyktSHHB5MvJhrlyxGExH OvukCd7jsX2+O57pQejXmwTybVcFwJ10Hra97Hy5Orp2TXx1Dz32/pWDPLctrJcyzw1bR/c4Klg fO3z9mfnLYZVwKtFzKbDAjseOPASQAUtcy6ZR3ye+0YA= X-Google-Smtp-Source: AGHT+IFK/xb0AH8q2XIcdgGFCG2/1S/vlx3qUjtu2T+2XCeJrxRROpGepkKKWsPoi8GIWtQoo7ZUrw== X-Received: by 2002:a17:906:a952:b0:abe:eebf:ae54 with SMTP id a640c23a62f3a-abeeebfc352mr51844866b.20.1740514598236; Tue, 25 Feb 2025 12:16:38 -0800 (PST) Received: from corebook.localdomain (2001-1c00-020d-1300-1b1c-4449-176a-89ea.cable.dynamic.v6.ziggo.nl. [2001:1c00:20d:1300:1b1c:4449:176a:89ea]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abed201218fsm194319666b.104.2025.02.25.12.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 12:16:37 -0800 (PST) From: Eric Woudstra To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Jozsef Kadlecsik , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Nikolay Aleksandrov , Matthias Brugger , AngeloGioacchino Del Regno , Kuniyuki Iwashima , Sebastian Andrzej Siewior , Joe Damato , Alexander Lobakin , Vladimir Oltean , "Frank Wunderlich" , Daniel Golle Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Eric Woudstra Subject: [PATCH v7 net-next 11/14] netfilter: nft_flow_offload: No ingress_vlan forward info for dsa user port Date: Tue, 25 Feb 2025 21:16:13 +0100 Message-ID: <20250225201616.21114-12-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250225201616.21114-1-ericwouds@gmail.com> References: <20250225201616.21114-1-ericwouds@gmail.com> Precedence: bulk X-Mailing-List: bridge@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The bitfield info->ingress_vlans and corresponding vlan encap are used for a switchdev user port. However, they should not be set for a dsa user port. Reviewed-by: Nikolay Aleksandrov Signed-off-by: Eric Woudstra --- net/netfilter/nft_flow_offload.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c index b9e6d9e6df66..c95fad495460 100644 --- a/net/netfilter/nft_flow_offload.c +++ b/net/netfilter/nft_flow_offload.c @@ -116,6 +116,11 @@ static void nft_dev_path_info(const struct net_device_path_stack *stack, break; if (path->type == DEV_PATH_DSA) { i = stack->num_paths; + if (!info->num_encaps || + !(info->ingress_vlans & BIT(info->num_encaps - 1))) + break; + info->num_encaps--; + info->ingress_vlans &= ~BIT(info->num_encaps - 1); break; } if (path->type == DEV_PATH_MTK_WDMA) { -- 2.47.1