From patchwork Sat Mar 15 20:01:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 14018201 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 5923819E99E; Sat, 15 Mar 2025 20:02:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068927; cv=none; b=FpENnd4zxIzs5WhL1lASTHPUqkLSUCYjHcSGYNzYV3xbL8WYIP9L8k2jKvYyQ7VA5wJz2AmreNHQLeJ5JLKWQwyk5lLN6i6jXHLW48QD2IDvngh44+x7C7LfYz9VInV7g6BQMmZjI+VjWYt0KbTIJCnEQBN+0hpC7DureEPcdGs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068927; c=relaxed/simple; bh=kNP8x/IMGQOh3Wqh+fa0471RIWgjq6Z4id3flj79pJU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bJI8rVvwG1vzE0IPcnbkpBciXJ/PBehynIPkL8NAj6JuFWJYwckXTJwTwZLUespFJlWk3UAUqqWqdAm0/tDgeB6jg5952nbsIEOuXHz2F6U4GgFRS4t8Z8FbxDl5MC2EsitzGmxoXcrXIKK5iubUVtu2v9+X6o1VWv23K6yUPvg= 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=d14QIIjV; arc=none smtp.client-ip=209.85.218.49 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="d14QIIjV" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-ac29fd22163so542322466b.3; Sat, 15 Mar 2025 13:02:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742068923; x=1742673723; darn=vger.kernel.org; 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=NpqiiXZms0JGOtrihsd57qCqRp7MjUMv4uKgIUJzlhQ=; b=d14QIIjVrMlZHHgOZT8GxUCsg2n/IjqxkUzISZgkiSOhqzHuNotnBPbC2fb5Q/6fkm L9UyjTNH/rQ2SBVBfZ4f1Q7lPsnTkNMhxUhpuO2p+4OqSgL9lBauqpCrg0WBFPSXHWud 6UMkcL09P7wpetPuAcWhLFm0XuBsGHACTZBIeiCw5os4n3xO0BQgTC9wGrq2CAwfqT6u Dxe/tzcXCFuNB9diQ5tkmyUlrHazPXAZQgP8m1fZwgzoK7bX8vWXOeyasxI1SsLLcbvM 87M73i5WN5QPMGhqRPeIVjVLkS528mFr9il+uk4nZrPiE3ioNQidQNW7niWj7nTA7CUb 8gaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742068923; x=1742673723; 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=NpqiiXZms0JGOtrihsd57qCqRp7MjUMv4uKgIUJzlhQ=; b=F16nsfQTBRMG86J+i3JyWM7J+N1kPnhmDMt0lOeIQMiyREllF3lCXGKIUebjUj5MFb QHP08VWS6IV3aU+rfCjeCGpr6wSIXWccJCoaRVk+L3+KFpKiAHubv+YlhU+R3F8Naknb w409AHvRzD9pI5vE6ap6Qfz8PRi6jrhCUWnHLua7N5TANZMNiKpzNyJeBDhMdUuL2zLZ mz1ksem3riFyRESdCX6B073QNEgFokrtK5XWozn3GE11LrpgEwc+4y3PSHgcVVf4c0ng VDe8+C82lQjQHujdwyvkgnE9IybvA8FIuH0sgFupLllQrTiVin4QyzAKsraqgABHIu1m NxeA== X-Forwarded-Encrypted: i=1; AJvYcCWY5Nh5IrWepkRqeDOrwiRKkcP63V/Xfh/zo79em/ym0gQ8wDydrTYasygRefpe2umNGLOGwY9Ak8bp205edHs=@vger.kernel.org X-Gm-Message-State: AOJu0Yzv7c5Xqi5q3DzoKygihb/9UA2zLmFrqhfg43fqVb/eLAW90lXq 88BCQLlBySyFNT+M5NxwrB8WOOu/MTip4qgdZdPmUk7XcHgFDuJO X-Gm-Gg: ASbGncvO5QMnKNpB+fMdgYujM++SFlrkUertamM7e6hcaz5+pYMjAMQW3YwjG+pLBrc C0VCCWKLg6ZYgCRygAkavLFl5Rfhf+B6l48SAHAMmlSvUh8OY8KcPrHBQZNsaGFP6g1H18miIin SpEzd2glrjT/vq1aBLwvy1ig01KV5nAlf2chyKxTuBtL49Z/VxfQBZky6SAxtKQpJ18O2vyI08Y goI8ljnGNLKb/NTNYt35EZyzInX5Vzl1OmmcCbzMp50w0tL1HKENqnZektZ8Jky+xVzOY8z1A5I a5ZTVHlqSFoeWRqiXMyZbKyu73fjoPvKk1ZBEQGotKajdLTpEGbblAdo2YpxkcPi/sI/EutuH1F AMoHd+dHX1UaVj43kybolAtDiCpkHFwT7+glbK37OtaRsyEVA5PqtKZ5F1fZJ8oM= X-Google-Smtp-Source: AGHT+IHCa55+wjBQiSxD140JEHodCQYGe9wVqqYoJF9zBcrAQwDR+1enIfiBTks5BKAmzlgfv6jNXQ== X-Received: by 2002:a17:907:6ea9:b0:ac2:c26:5608 with SMTP id a640c23a62f3a-ac3301e0b40mr826573566b.8.1742068922394; Sat, 15 Mar 2025 13:02:02 -0700 (PDT) Received: from localhost.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-ac314a489c9sm411456766b.152.2025.03.15.13.02.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 13:02:01 -0700 (PDT) From: Eric Woudstra To: Jiri Pirko , Ivan Vecera , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Roopa Prabhu , Nikolay Aleksandrov , Pablo Neira Ayuso , Jozsef Kadlecsik , Matthias Brugger , AngeloGioacchino Del Regno Cc: netdev@vger.kernel.org, bridge@lists.linux.dev, netfilter-devel@vger.kernel.org, linux-mediatek@lists.infradead.org, Eric Woudstra Subject: [PATCH v10 nf-next 1/3] netfilter: nft_flow_offload: Add DEV_PATH_MTK_WDMA to nft_dev_path_info() Date: Sat, 15 Mar 2025 21:01:45 +0100 Message-ID: <20250315200147.18016-2-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250315200147.18016-1-ericwouds@gmail.com> References: <20250315200147.18016-1-ericwouds@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org In case of using mediatek wireless, in nft_dev_fill_forward_path(), the forward path is filled, ending with mediatek wlan1. Because DEV_PATH_MTK_WDMA is unknown inside nft_dev_path_info() it returns with info.indev = NULL. Then nft_dev_forward_path() returns without setting the direct transmit parameters. This results in a neighbor transmit, and direct transmit not possible. But we want to use it for flow between bridged interfaces. So this patch adds DEV_PATH_MTK_WDMA to nft_dev_path_info() and makes direct transmission possible. 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 acfdf523bd3b..05786d856530 100644 --- a/net/netfilter/nft_flow_offload.c +++ b/net/netfilter/nft_flow_offload.c @@ -105,6 +105,7 @@ static void nft_dev_path_info(const struct net_device_path_stack *stack, switch (path->type) { case DEV_PATH_ETHERNET: case DEV_PATH_DSA: + case DEV_PATH_MTK_WDMA: case DEV_PATH_VLAN: case DEV_PATH_PPPOE: info->indev = path->dev; @@ -117,6 +118,10 @@ static void nft_dev_path_info(const struct net_device_path_stack *stack, i = stack->num_paths; break; } + if (path->type == DEV_PATH_MTK_WDMA) { + i = stack->num_paths; + break; + } /* DEV_PATH_VLAN and DEV_PATH_PPPOE */ if (info->num_encaps >= NF_FLOW_TABLE_ENCAP_MAX) { From patchwork Sat Mar 15 20:01:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 14018202 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 8E4BE19F127; Sat, 15 Mar 2025 20:02:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068928; cv=none; b=AtpTfbkZXmTtNRVUGHW8RuWixem2BiIwAG2KQ7BaufNM5cApS+TsfN63h4X/2sHxu6wTD9vNZAkIbq0OnVclzpo1L4ibIcNno2kh6KLdl40krYOyYK7c5iq54vH/lird8H33Rz0gILQKp4hQnvxhtkzDhRPFPYVyR2PP9QSBEMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068928; c=relaxed/simple; bh=PQaRq495yBD2gObfPrbPn3PgSekFS9Bzk4unPsNuczk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kEZAnqyZ0R9DRUycMYHlTvVPkMr2FPOAsXyOdtCfopautxWRgs+3HtCfiGeKwcthREOd5CNTxh08JSc+WbNwujK6s5EuW3S01hubw2flF7hlveoqOVntqpd7K2QFQCsGLEkxVnvQmOp5uGcdBh9NANcVOlbsUf/4YluiBgWZabI= 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=nPkx6X/p; arc=none smtp.client-ip=209.85.218.49 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="nPkx6X/p" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-ac297cbe017so777069366b.0; Sat, 15 Mar 2025 13:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742068925; x=1742673725; darn=vger.kernel.org; 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=rnv8s8ozBwrftot2Snzl1fMe2ZQjCLjk8NZLpN8fPs4=; b=nPkx6X/pIrgX6B1NkL7MIjLks5Jo4ph8fbQwRKtpkZEseTZ/bY+6iXzY5IfzArOAmh V54VuiL4KhDcmXUZ7BfO5pJy7uqNckN6qgzgxvpdKy6N9gXTiEWoOSbRwnU4zh9VAcnH vp0uxwgqZZlqcy4pFgJ9FpBJfGJ4aXqizwjBSKh1EqP9Mnu82opxKQVve9SoRjS8nFDT 48SCwo/Ra/fYnuqFFppOjFMyWwwOKpSoRJsce3tllR8+vuPRbjdFy6TZO8g1Z2ycWJod bzmo/Lx+647yf3oUx1kAYV42TNmAmTlQGYZ6EU9LTlMUHQClXXLCJIfcWdVlxdPjhy9T UE+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742068925; x=1742673725; 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=rnv8s8ozBwrftot2Snzl1fMe2ZQjCLjk8NZLpN8fPs4=; b=IlzRQ2bXWxDwXFtx98HDj5VOO4EHrillUFpu2SKoBjoqCAlv3EWRa0Av7iXku75dqT vAPl0jBeNoPeKMdsGpv4/7VCQWGsk2/Wo9PqRraf9p1hSaXU1h/oPZ3kcWf32554/Zxj 2W0FGshs+YGh0TWS8D6YGwFz9R01tHu1IB2CDcAwSSuHTkePVNQViU77Sbng6LxrLbXd CkWjHCO8miM9Fbd9n8cf0NA4Kgg6wDct46SGRzGYLIpxpzHbAyUm8ysob/xg2tJVpFNa AhDYc+ZaVGnqAtxxLHaJohj8obNLQ3po/jOQsZct7OsL8aTkNLkc92pD2QBgz4PlDpa5 TSxg== X-Forwarded-Encrypted: i=1; AJvYcCWDjH8pdY0v1/yCEz7jpJRqIDEvqHuyTnNlQ7HYgehCSaxVBakt3Lh9DAPgqy6nxlJMABoCm1LIOrSfJFtPVpM=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq6/PO2CeqycPB5fPhQJQFGUUEeWUVZD1EOSryn6Js4/WwVUit C1PhEEpqTGSmqAbWLMgYId9YdQdyLMP7zwgR2QVfPwupot1CCUmz X-Gm-Gg: ASbGncsO9POQZ/USJ95C5lUOjgE2Q17is4oSX7shniXfqzFB7rKw6kfT1bFTXOwr+hJ nSwO+Sq8HuAVhlVwlwOovULyJeRx8UUWURXuDheMo+5FAJ2A+f6wVrDE8GJGnYlLeJDddER2Tar utX57fixKQ1xc7MOUzz+y7QUOoDwBolOqP3auRddc9ElPArwzVCrabuTcSL5cPq8TeputVMUgal bmYhJgQQYCmyXHZ225GWIP/k8y2+xImeB7koLerkWrhHDsGu34Pyc5aIvEu0s8CGA/PHWeBIJd2 8x0IWTs6shKt23lQnftDO6DAcoFUG2Ybc+B5r3e6aiMBaKfTDRDiPp6aOFa6iHNmUR1VKlVYfGw Ga1GHJ5jsX7bmYhIh3YYPorqVEFvCDmVFJGs04G44H9kqFgHfpKdCd94o1BTfE9MMG7N3ucLVqg == X-Google-Smtp-Source: AGHT+IE7wQUwPzmc9fAU28R+QPw4AyOXOfaovqueWq9l20dn3Msl4kW9Ypx3UjNa/A+DViUSNtfwjw== X-Received: by 2002:a17:907:d38a:b0:ac2:9a4:700b with SMTP id a640c23a62f3a-ac31234318amr1268268766b.16.1742068924742; Sat, 15 Mar 2025 13:02:04 -0700 (PDT) Received: from localhost.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-ac314a489c9sm411456766b.152.2025.03.15.13.02.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 13:02:03 -0700 (PDT) From: Eric Woudstra To: Jiri Pirko , Ivan Vecera , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Roopa Prabhu , Nikolay Aleksandrov , Pablo Neira Ayuso , Jozsef Kadlecsik , Matthias Brugger , AngeloGioacchino Del Regno Cc: netdev@vger.kernel.org, bridge@lists.linux.dev, netfilter-devel@vger.kernel.org, linux-mediatek@lists.infradead.org, Eric Woudstra Subject: [PATCH v10 nf-next 2/3] netfilter: nft_flow_offload: No ingress_vlan forward info for dsa user port Date: Sat, 15 Mar 2025 21:01:46 +0100 Message-ID: <20250315200147.18016-3-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250315200147.18016-1-ericwouds@gmail.com> References: <20250315200147.18016-1-ericwouds@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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 05786d856530..a2c7b64261b3 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) { From patchwork Sat Mar 15 20:01:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 14018203 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 11E7519E966; Sat, 15 Mar 2025 20:02:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068930; cv=none; b=jG+d/t2plWA+/DkEXWL2wg+Uzrvi31a0R4LRPAhxO8L3uOPsrOAw+ny3Y5p8MQVVEfYSZm9E+cW7AbT+6mkVBr/gGDZ82/JTYjE7HIFXA+nJhqN5U+PsQ4wodeAxxXcFr/QTsyVens4GqRn25JNV2qDWeJ284sdQ1AC++HKgULM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068930; c=relaxed/simple; bh=GybLpAybbUmOfhk9Lf/pKIo5aScLdrW9YfE6FqksJxo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o9odo1h4d45ZOC7Dr12zar+dxd+QXUlUYN7yg9QUAhD6oMipE4ISLHWstgRco3MWZweLH38GJfpQfLbiuZk9hvP12bGRYGI6FnLRNFhevagA9jy9HRowJl6NaEvXerlCvVuCSfmY5WSHvc3e9dtKuleLjksW3KVGSuIG17ehGuY= 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=BPvk58Cj; arc=none smtp.client-ip=209.85.218.44 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="BPvk58Cj" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ac2ab99e16eso66866366b.0; Sat, 15 Mar 2025 13:02:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742068927; x=1742673727; darn=vger.kernel.org; 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=pkA4UZVIpwTz+MfKCQjyLNbONPOyz+LdYLZQ/1FoX0k=; b=BPvk58CjqaBqtS5SniHEKZfuR4hXqgcTyoB+e0WAB5898soLIJiy2kO56rdGBmXQY4 aeIH7j+t1bAr9KfPRDqThM4t5uBfMrU3H1CFSuzJt6Kbz35Ov2bZcFyqwhxWs81rzB2L GbNH5KC7tXAqMJ/3YN442ot4kaa02z2s/r+FQ8yC0UkZo+tqfwC3Pgy2FO6egx4wd9VR IINw+UbpSlsqmDU8eYTLi3t/YmmGnSWaQGec/LPc56SLuInY7wJ7vVc47VX5SKF8mVaX NH8P7F2eoP1WaZbizmFruIR7px7mqTjx+XGr8xBtDU5idiu51t1/yPXeU71lh4lif86Q fVYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742068927; x=1742673727; 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=pkA4UZVIpwTz+MfKCQjyLNbONPOyz+LdYLZQ/1FoX0k=; b=CzdP04Xjsx23y7H0R0UBc9KOZBMgxbl39KtwnHRmm7MjyOh8nqzI6uQne3B6VxoLAg aqrSeYrTn5S9tiFBSB3S98mBINDwVyu5l6MKmoCUNjsnm/agHWIl/6jSrb0loehnfVKi 2FkSnWwKe7Es91s4Tx18DWpQlle64zZzirOMGjtyqMrMamRFCEISo4SJkte4UixC20WO jkr5ksn4fDcJ/q8XcPPp+SLAZRRYcFrREODa4RpT+uZRUVqMXvCVz1xQIww+GfyAn7YE oJ+4ioe9dvTP9XcWPC1JGc+wFwaF3DM+LkAfXrTY8wiNfmBlfPRxzjV/Hp1xZZaCXs6q iAuw== X-Forwarded-Encrypted: i=1; AJvYcCUvtXLjOjgKSYiE8OWzqhC7Q0PpJ5YSW/q6ME/0hszsjEBQOTFsNEnCdrc2N/cHzV440qLyEBkk7/usCog0IWQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwIpLzezZwf8/4P6kr/dPXK/GkteHq2VHpKA1+vhXCtXo3NgKCL t7YuR+/qyEUqzFI2Y1AVGcGVydD5VwBshnJhV3c2nnbOI7HeAZH1 X-Gm-Gg: ASbGncuN31RsD4aTTs6kzXLXFTe829+FHpYdKsWU8kutwvABcPVyHgBFAOUM5bmyOrO Lf0Ex6+qOY1R69LhXfp08vCuNx7vs1iwYqOHB75K5MYM8ILjn41Uz3+T3cPs0hsaSPYVuJM+8y2 mkASZu4WU5XQGw8MvbU5aLRRQHiz66EzL3f6dnA8kpz1LXmTxFzWTA1h7E7Gs9rs9xH7I0FTaxe 5O1Er2L3PIcZG9jZ3BIuCV6IZrsUzlCM248+4g2IJ3UfIPPtAegav3AFz2ZP4xjxtxYOw4Z4fNo a/tAXOIZzH0icx+rY/W24lCt4dc7IItArhZVbstE/fihTn4y9X8EvKg7iQR38sDeTLXXUWzZP9K Rw7qMYNroEr1Jxfvs0nilh3TofeLKJtKA3KSiX0Kin9pVvBHvnyPdVGNDuLDj8S8= X-Google-Smtp-Source: AGHT+IGZrLPyzUFrsmUJ6bjiHKaOKcN6z3XUtUDmp1EbfQa4TkA4lIxe1N3KZXeS7nHJqoz8wrbu6w== X-Received: by 2002:a17:906:4795:b0:ac1:fa6f:4941 with SMTP id a640c23a62f3a-ac330253720mr766195566b.13.1742068927072; Sat, 15 Mar 2025 13:02:07 -0700 (PDT) Received: from localhost.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-ac314a489c9sm411456766b.152.2025.03.15.13.02.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 13:02:06 -0700 (PDT) From: Eric Woudstra To: Jiri Pirko , Ivan Vecera , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Roopa Prabhu , Nikolay Aleksandrov , Pablo Neira Ayuso , Jozsef Kadlecsik , Matthias Brugger , AngeloGioacchino Del Regno Cc: netdev@vger.kernel.org, bridge@lists.linux.dev, netfilter-devel@vger.kernel.org, linux-mediatek@lists.infradead.org, Eric Woudstra Subject: [PATCH v10 nf-next 3/3] bridge: No DEV_PATH_BR_VLAN_UNTAG_HW for dsa foreign Date: Sat, 15 Mar 2025 21:01:47 +0100 Message-ID: <20250315200147.18016-4-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250315200147.18016-1-ericwouds@gmail.com> References: <20250315200147.18016-1-ericwouds@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org In network setup as below: fastpath bypass .----------------------------------------. / \ | IP - forwarding | | / \ v | / wan ... | / | | | | | brlan.1 | | | +-------------------------------+ | | vlan 1 | | | | | | brlan (vlan-filtering) | | | +---------------+ | | | DSA-SWITCH | | | vlan 1 | | | | to | | | | untagged 1 vlan 1 | | +---------------+---------------+ . / \ ----->wlan1 lan0 . . . ^ ^ vlan 1 tagged packets untagged packets br_vlan_fill_forward_path_mode() sets DEV_PATH_BR_VLAN_UNTAG_HW when filling in from brlan.1 towards wlan1. But it should be set to DEV_PATH_BR_VLAN_UNTAG in this case. Using BR_VLFLAG_ADDED_BY_SWITCHDEV is not correct. The dsa switchdev adds it as a foreign port. The same problem for all foreignly added dsa vlans on the bridge. First add the vlan, trying only native devices. If this fails, we know this may be a vlan from a foreign device. Use BR_VLFLAG_TAGGING_BY_SWITCHDEV to make sure DEV_PATH_BR_VLAN_UNTAG_HW is set only when there if no foreign device involved. Acked-by: Nikolay Aleksandrov Signed-off-by: Eric Woudstra --- include/net/switchdev.h | 1 + net/bridge/br_private.h | 10 ++++++++++ net/bridge/br_switchdev.c | 15 +++++++++++++++ net/bridge/br_vlan.c | 7 ++++++- net/switchdev/switchdev.c | 2 +- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/include/net/switchdev.h b/include/net/switchdev.h index 8346b0d29542..ee500706496b 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -15,6 +15,7 @@ #define SWITCHDEV_F_NO_RECURSE BIT(0) #define SWITCHDEV_F_SKIP_EOPNOTSUPP BIT(1) #define SWITCHDEV_F_DEFER BIT(2) +#define SWITCHDEV_F_NO_FOREIGN BIT(3) enum switchdev_attr_id { SWITCHDEV_ATTR_ID_UNDEFINED, diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 1054b8a88edc..43f04bd69d73 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -180,6 +180,7 @@ enum { BR_VLFLAG_MCAST_ENABLED = BIT(2), BR_VLFLAG_GLOBAL_MCAST_ENABLED = BIT(3), BR_VLFLAG_NEIGH_SUPPRESS_ENABLED = BIT(4), + BR_VLFLAG_TAGGING_BY_SWITCHDEV = BIT(5), }; /** @@ -2182,6 +2183,8 @@ void br_switchdev_mdb_notify(struct net_device *dev, int type); int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags, bool changed, struct netlink_ext_ack *extack); +int br_switchdev_port_vlan_no_foreign_add(struct net_device *dev, u16 vid, u16 flags, + bool changed, struct netlink_ext_ack *extack); int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid); void br_switchdev_init(struct net_bridge *br); @@ -2265,6 +2268,13 @@ static inline int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, return -EOPNOTSUPP; } +static inline int br_switchdev_port_vlan_no_foreign_add(struct net_device *dev, u16 vid, + u16 flags, bool changed, + struct netlink_ext_ack *extack) +{ + return -EOPNOTSUPP; +} + static inline int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid) { return -EOPNOTSUPP; diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c index 7b41ee8740cb..efa7a055b8f9 100644 --- a/net/bridge/br_switchdev.c +++ b/net/bridge/br_switchdev.c @@ -187,6 +187,21 @@ int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags, return switchdev_port_obj_add(dev, &v.obj, extack); } +int br_switchdev_port_vlan_no_foreign_add(struct net_device *dev, u16 vid, u16 flags, + bool changed, struct netlink_ext_ack *extack) +{ + struct switchdev_obj_port_vlan v = { + .obj.orig_dev = dev, + .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN, + .obj.flags = SWITCHDEV_F_NO_FOREIGN, + .flags = flags, + .vid = vid, + .changed = changed, + }; + + return switchdev_port_obj_add(dev, &v.obj, extack); +} + int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid) { struct switchdev_obj_port_vlan v = { diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index d9a69ec9affe..6bfc7da10865 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -109,6 +109,11 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, /* Try switchdev op first. In case it is not supported, fallback to * 8021q add. */ + err = br_switchdev_port_vlan_no_foreign_add(dev, v->vid, flags, false, extack); + if (err != -EOPNOTSUPP) { + v->priv_flags |= BR_VLFLAG_ADDED_BY_SWITCHDEV | BR_VLFLAG_TAGGING_BY_SWITCHDEV; + return err; + } err = br_switchdev_port_vlan_add(dev, v->vid, flags, false, extack); if (err == -EOPNOTSUPP) return vlan_vid_add(dev, br->vlan_proto, v->vid); @@ -1487,7 +1492,7 @@ int br_vlan_fill_forward_path_mode(struct net_bridge *br, if (path->bridge.vlan_mode == DEV_PATH_BR_VLAN_TAG) path->bridge.vlan_mode = DEV_PATH_BR_VLAN_KEEP; - else if (v->priv_flags & BR_VLFLAG_ADDED_BY_SWITCHDEV) + else if (v->priv_flags & BR_VLFLAG_TAGGING_BY_SWITCHDEV) path->bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG_HW; else path->bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG; diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 6488ead9e464..c48f66643e99 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -749,7 +749,7 @@ static int __switchdev_handle_port_obj_add(struct net_device *dev, /* Event is neither on a bridge nor a LAG. Check whether it is on an * interface that is in a bridge with us. */ - if (!foreign_dev_check_cb) + if (!foreign_dev_check_cb || port_obj_info->obj->flags & SWITCHDEV_F_NO_FOREIGN) return err; br = netdev_master_upper_dev_get(dev);