From patchwork Wed Mar 5 10:29:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 14002711 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 35FDDC19F32 for ; Wed, 5 Mar 2025 13:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6/OfFtkDCpNUsNNnB4udxCcQxzWSEZIHYYoj3YjYWKw=; b=d+RYL66pcV03+dnRjtrSBIzsNG w5TfAHJ3H32+ox/XiuxpQP8Yp0pxzkPvjX1e3yaSI4oREHcDZLY+ai4EzsQe6Ih70Uh/HSEknW1iW PLd7Be7R5Rc/sKMIkgeW9H+diOUnOFe4XlvOxmN2k5SccqZtAqZCRL/TdIfciClVOYAJbKkaisIus QyRl3WlVV6dT7toGdeHNmu8cDKNycEZgxjWlQmkH+4Ay6fiksXOrkjx6bJp6n9zUb6V/fQZ7XZ2Y9 B+5RcwU0MtssPeHqxbKqqgVs67E+mV+dgi2H9Yxtr6BTGKfAj2igxwMbQEM1AcYkbhOUggHLZvPEM DUGv4djA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tposW-00000008Cat-44Dl; Wed, 05 Mar 2025 13:33:40 +0000 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpm12-00000007gTm-2PzZ; Wed, 05 Mar 2025 10:30:17 +0000 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-aaec111762bso1221726166b.2; Wed, 05 Mar 2025 02:30:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741170615; x=1741775415; darn=lists.infradead.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=6/OfFtkDCpNUsNNnB4udxCcQxzWSEZIHYYoj3YjYWKw=; b=faCcyBdykmJnZQX56xtRGrtkdYowMl8J0eN7fDOZOy51wdQga/aNMtcrJjrWgPPirw QAra1ZWtdn2uMyDFJUovE0CUszqfVhFLQNVN6CAhNErOCtRAjmOGJYN5SGTyOvFYNMyl thyuRS/e24/3Wv9G84/NIPFbkZF5K9/wKvqOomRKddsGo6IaRKo22BJk2kXvw9INK/cu zg9qGxs2G5B9ALUoAGLlRLgsZ/nX/wUCImGRDiy8nQbwQrY4Hs0jB00VZvmYJ1ZbHnxV e5fAwYr4aZ6K+M5aXJ2EH35+SDxxhJ5NZBamg1sjH0CC/wGZgsBSox0PtBgZ7rwwwCaA K7vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741170615; x=1741775415; 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=6/OfFtkDCpNUsNNnB4udxCcQxzWSEZIHYYoj3YjYWKw=; b=fbugmmgbDi2gv6Le5bVW83mEYCRZI/yrdEruJImr+J7SNwWWjx5hOPgPQUMNJWtsLk UNtYPcHRUBjzxwcUc3ko0ExUTh1f7xtF7Xjhh3/E24HX3gHCjffQJckyVhOTd9u7hYYS EjP7xox9mpIUbS+eBQ3yhlTI5ACI49Uj/d3Kx5KGaGzUyDZZCQXkhE6B6XSBFwRV8B5P QOz7IRDC9UWK98l0a8+7i8OHmEhEOIR1KRrmfk8gh6T5eRjpiZBOLEOzK+MASkCR8xH5 wtkAeocQJ+DCr5FI74CoJpz5PN4zCfKWHbRHOt4JIgVo2IdTvm0GoyZYLDLthttA+qmD Uj6w== X-Forwarded-Encrypted: i=1; AJvYcCVn6v37qDs07q7A3TmDGL5guO6rrUg6g4Hhw5DKcLa+lwKp91s3U0o2vFa9QV9pwv118aOGMPQ+Fpv1CG17iYw=@lists.infradead.org, AJvYcCVy18JRwUYvNz/egR/CoKy00Yx/WZ2s2J4sIG7hfnNLuOxP4ofS8lj9TyzENgx7iNNaxNQxVhgpLbEApqS9pRS9@lists.infradead.org X-Gm-Message-State: AOJu0Yya7KNMtQtrfwKtQVpCfDH4gCePVfZlw+o3l2GmA4jmL+Gri2YC TEzHZ/UWfXTgItZlNo8/Xe5xNmn1fVGNxLKY94Ceet4wYtHdYHcl X-Gm-Gg: ASbGncu8krKtKyXlT401QVhZ3+MsafoWEpo6adMSPnQ7rWqdPZdLy4lEaw/Z2mjHwSb v91dE1YllmvvgzWkSZSlfUiCIcwCLWtvlnQ3PWhj1T8kuiLa5YnTaMeeCxhMSiGTGKb8l5OlzkO 9DNgdAZHg9lkCv5nv9Z2Ru+9achy2GofqWqGd+uvfH0zLDthOZYtIigYG6qGqICf2pW7Z6YdUJb 5xazxGqupZw0ZaryMY5dTurdBmnXhuhvo5xLaHKWqymSyiGtTLsd7SMJwnB+Na2b/jsJmxSt4Dk RyVeFn0jl4NXSECuAQZCfSCvR35H4E5vAXRi+fMpQzfX35d2Klj/1MgiqR1mrcMb4J74l3Qo9Ax VtGpgKM44chavsn9OM3Jn4cEdGQTEdkAbg+t59xVQ5nO/MIuSZDcXyX8F3zM7JQ== X-Google-Smtp-Source: AGHT+IE4FBEQwtKjza4fXvfpF7ocHLI/77Iaa2ed5/2y+GnUe2UR6+/DugyKaB64GhmbWBt7MA+dgw== X-Received: by 2002:a17:907:9726:b0:ac1:da09:5d32 with SMTP id a640c23a62f3a-ac20d84621cmr283526366b.6.1741170614628; Wed, 05 Mar 2025 02:30:14 -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-ac1f7161a4esm247154266b.161.2025.03.05.02.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 02:30:14 -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 , Ahmed Zaki , 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, linux-hardening@vger.kernel.org, Kees Cook , "Gustavo A. R. Silva" , Eric Woudstra Subject: [PATCH v9 nf 09/15] netfilter: nf_flow_table_inet: Add nf_flowtable_type flowtable_bridge Date: Wed, 5 Mar 2025 11:29:43 +0100 Message-ID: <20250305102949.16370-10-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305102949.16370-1-ericwouds@gmail.com> References: <20250305102949.16370-1-ericwouds@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250305_023016_612982_2DEEAC26 X-CRM114-Status: GOOD ( 12.07 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org This will allow a flowtable to be added to the nft bridge family. Reviewed-by: Nikolay Aleksandrov Signed-off-by: Eric Woudstra --- net/netfilter/nf_flow_table_inet.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net/netfilter/nf_flow_table_inet.c b/net/netfilter/nf_flow_table_inet.c index b0f199171932..80b238196f29 100644 --- a/net/netfilter/nf_flow_table_inet.c +++ b/net/netfilter/nf_flow_table_inet.c @@ -65,6 +65,16 @@ static int nf_flow_rule_route_inet(struct net *net, return err; } +static struct nf_flowtable_type flowtable_bridge = { + .family = NFPROTO_BRIDGE, + .init = nf_flow_table_init, + .setup = nf_flow_table_offload_setup, + .action = nf_flow_rule_bridge, + .free = nf_flow_table_free, + .hook = nf_flow_offload_inet_hook, + .owner = THIS_MODULE, +}; + static struct nf_flowtable_type flowtable_inet = { .family = NFPROTO_INET, .init = nf_flow_table_init, @@ -97,6 +107,7 @@ static struct nf_flowtable_type flowtable_ipv6 = { static int __init nf_flow_inet_module_init(void) { + nft_register_flowtable_type(&flowtable_bridge); nft_register_flowtable_type(&flowtable_ipv4); nft_register_flowtable_type(&flowtable_ipv6); nft_register_flowtable_type(&flowtable_inet); @@ -109,6 +120,7 @@ static void __exit nf_flow_inet_module_exit(void) nft_unregister_flowtable_type(&flowtable_inet); nft_unregister_flowtable_type(&flowtable_ipv6); nft_unregister_flowtable_type(&flowtable_ipv4); + nft_unregister_flowtable_type(&flowtable_bridge); } module_init(nf_flow_inet_module_init); @@ -118,5 +130,6 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Pablo Neira Ayuso "); MODULE_ALIAS_NF_FLOWTABLE(AF_INET); MODULE_ALIAS_NF_FLOWTABLE(AF_INET6); +MODULE_ALIAS_NF_FLOWTABLE(AF_BRIDGE); MODULE_ALIAS_NF_FLOWTABLE(1); /* NFPROTO_INET */ MODULE_DESCRIPTION("Netfilter flow table mixed IPv4/IPv6 module");