From patchwork Sat Mar 15 20:00:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 14018189 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (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 CC29819E804; Sat, 15 Mar 2025 20:00:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068860; cv=none; b=X7sWSS7M/+ZG+Q99EPZG0YlFlwRAlDS98OyxncFvs465Izew1BSA6hBlPSTZlezMUkD4x43z/NuuR/PMiJJwW2yFxVpDLF3aE+yrek2KYuRZYbSu971Vm8yfuf4IG9NAmM/JwKdK5rXhtXrS2dRCZBWWhBsXWv/vnmdnNZW77eE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068860; c=relaxed/simple; bh=uRS6L652Q8U04wSm9vVBsJo+AraqGWbdvUpqcrlUEAQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Exm1oT46QdT/ZTZbyq9rFkOkDtsLaRLcKbUPZ8eUpsWAU/jDueBuH5nJvSJz6OIfdndimfREihvm78XsDndKd+5lhy3f0G/FSkdDxI9HU4AR6feD/6ldakwS/qqHYy8Tr29Qm1EbatBMkC9YoG9hckgjoiUcBx6fZpo6rwjYIXM= 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=C+0PXWhc; arc=none smtp.client-ip=209.85.218.47 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="C+0PXWhc" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-ab7430e27b2so600888566b.3; Sat, 15 Mar 2025 13:00:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742068857; x=1742673657; 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=pWKZKslFax2kV4u5PDGKsv4N0lJQ1f1k8yO/foh+po0=; b=C+0PXWhc5ryGLuZd5Z7aOjoFSGKTmC1AMk7eeOoCyZ7ID4/3A8Y5gvOQuodICEsi45 CrRbDQz08c6zfJrCT/33PO9x73B++mXQ5bcXVPAyV5PjeArkKXGQoKlZq8cogPjLAwUP D2SdH1QboiAhPShPQeNE9+tshDHcAyfpJ6YTRoA8buzxRW5KYeh3xAcQsjhnEyxOBi5/ eLWT3Hlsl+1UQB3IWfkTBDHirSjpzD82FLE2+phtVioZpbrQttWpRCp0esGX02ehJUqo 6v0N3mulZ2NE77H/sI4IxzoZ26gwuze6mr0k1sYN0AIMc8zu6uVBuMl07AzUESCvpufo qlVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742068857; x=1742673657; 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=pWKZKslFax2kV4u5PDGKsv4N0lJQ1f1k8yO/foh+po0=; b=LIpeV0fGccxijkCWHjHzX3Y2cyYoE2L091MBYakNQIA44T+IF0nxgqE1uR31Zm3ltl Yluya/UROD+9R5StJucf0AjVJVWgXT2ch7GbyTkuSYVeKFYBTHJcgGVTviHW3xPN2gjV BGU9wshSL/G3CTxyX9vVNPWRGhSEyZl+L/d4NiZfk8rJd84lBDRV2ihe8tSkodjOOeLR vfu+Mkw6g7GjNhjju443F6H00TaBbkvr1GEHWpU/V9uDLY0jB251Uqnet1AV0imTAuEB W4bjKlNJIMkAEfWP4ZX5jQm1dfXClds55eY5f6HIpSEH9FmocFzzXKKM3AT4rYDB8a4z Zxpw== X-Forwarded-Encrypted: i=1; AJvYcCUMhpZ0B2WC0Bk+mt8iomDb0Xzhgu0bnm8Z98LQ62Zxk2S7j51ShIXLwFxMZD+wa42TgDAOnB8L@vger.kernel.org, AJvYcCXYG3fFGLRDF2dw6yJf98+RRo/eZI8kKKaP6JITwz60Zy8wpT7kCYJxl3HYjW578TPwYzxC5taqXtf0GyaX6nA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8rBECCrfKVLe37wMYhelWQY6fGJjdITONtCrYmfYhVi0tKwdG XMfVVTtbLCXKHQXdZ3Fif/PGnfshPKEPtURGTAG8GszaAr7tPtt1 X-Gm-Gg: ASbGncu4FxqavOm3ZjI834JO8X5/uBqCWZlIBXkhiuAiR7WhX3fAiIyexhtZAX8jSVn BFDKbs3/L2AriaC5y+ekzb6tJeFjQOqVJbiUCGN0MVHMaIr7CqkLdYUpIWeuMQ46/+9mpRwpyGC 6IvBa9Ve8HOXUdJvj/WZYgK6o0+mSIB1H6Iwfh/n70Uk8vrcYsqeoi3O3STrUkYughiK+SnVrty caHFxZjuDI2p/+5ANQq+gSDl99+Sr6aSp40AOCQEa0mCqo3wsn39//6kFJYuzc/Px0Lx2Oynh/I 0hkFGKPm542KFhrIDM1sM5sLqMIQW7AiQmMj9d7Y3n/LwTK4CYNGFwm3ZrM39hJzeQd7pTEEBon AXmO7Xg4EeFc8ICTeLIFf2gejPnIti8PtkCls+g8Ts/z6+KkOoumLGRf/n5quG5Y= X-Google-Smtp-Source: AGHT+IHmdpDrN39o/IkwTJNEru1TccCo+dNGWNgs5Efv+MeU9fbRfzseyMtpshQDwMjKn08rtN8PEA== X-Received: by 2002:a17:907:94c7:b0:ac2:1c64:b0a with SMTP id a640c23a62f3a-ac3301940d2mr675256966b.14.1742068856975; Sat, 15 Mar 2025 13:00:56 -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-ac3147e9bc6sm405908066b.49.2025.03.15.13.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 13:00:55 -0700 (PDT) From: Eric Woudstra To: Pablo Neira Ayuso , Jozsef Kadlecsik , Roopa Prabhu , Nikolay Aleksandrov , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: netfilter-devel@vger.kernel.org, bridge@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Eric Woudstra Subject: [PATCH v10 nf-next 1/3] netfilter: bridge: Add conntrack double vlan and pppoe Date: Sat, 15 Mar 2025 21:00:31 +0100 Message-ID: <20250315200033.17820-2-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250315200033.17820-1-ericwouds@gmail.com> References: <20250315200033.17820-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 This adds the capability to conntrack 802.1ad, QinQ, PPPoE and PPPoE-in-Q packets that are passing a bridge. Reviewed-by: Nikolay Aleksandrov Signed-off-by: Eric Woudstra --- net/bridge/netfilter/nf_conntrack_bridge.c | 83 ++++++++++++++++++---- 1 file changed, 71 insertions(+), 12 deletions(-) diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c index 816bb0fde718..4b4e3751fb13 100644 --- a/net/bridge/netfilter/nf_conntrack_bridge.c +++ b/net/bridge/netfilter/nf_conntrack_bridge.c @@ -242,53 +242,112 @@ static unsigned int nf_ct_bridge_pre(void *priv, struct sk_buff *skb, { struct nf_hook_state bridge_state = *state; enum ip_conntrack_info ctinfo; + int ret, offset = 0; struct nf_conn *ct; - u32 len; - int ret; + __be16 outer_proto; + u32 len, data_len; ct = nf_ct_get(skb, &ctinfo); if ((ct && !nf_ct_is_template(ct)) || ctinfo == IP_CT_UNTRACKED) return NF_ACCEPT; + switch (skb->protocol) { + case htons(ETH_P_PPP_SES): { + struct ppp_hdr { + struct pppoe_hdr hdr; + __be16 proto; + } *ph; + + offset = PPPOE_SES_HLEN; + if (!pskb_may_pull(skb, offset)) + return NF_ACCEPT; + outer_proto = skb->protocol; + ph = (struct ppp_hdr *)(skb->data); + switch (ph->proto) { + case htons(PPP_IP): + skb->protocol = htons(ETH_P_IP); + break; + case htons(PPP_IPV6): + skb->protocol = htons(ETH_P_IPV6); + break; + default: + nf_ct_set(skb, NULL, IP_CT_UNTRACKED); + return NF_ACCEPT; + } + data_len = ntohs(ph->hdr.length) - 2; + skb_pull_rcsum(skb, offset); + skb_reset_network_header(skb); + break; + } + case htons(ETH_P_8021Q): { + struct vlan_hdr *vhdr; + + offset = VLAN_HLEN; + if (!pskb_may_pull(skb, offset)) + return NF_ACCEPT; + outer_proto = skb->protocol; + vhdr = (struct vlan_hdr *)(skb->data); + skb->protocol = vhdr->h_vlan_encapsulated_proto; + data_len = U32_MAX; + skb_pull_rcsum(skb, offset); + skb_reset_network_header(skb); + break; + } + default: + data_len = U32_MAX; + break; + } + + ret = NF_ACCEPT; switch (skb->protocol) { case htons(ETH_P_IP): if (!pskb_may_pull(skb, sizeof(struct iphdr))) - return NF_ACCEPT; + goto do_not_track; len = skb_ip_totlen(skb); + if (data_len < len) + len = data_len; if (pskb_trim_rcsum(skb, len)) - return NF_ACCEPT; + goto do_not_track; if (nf_ct_br_ip_check(skb)) - return NF_ACCEPT; + goto do_not_track; bridge_state.pf = NFPROTO_IPV4; ret = nf_ct_br_defrag4(skb, &bridge_state); break; case htons(ETH_P_IPV6): if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) - return NF_ACCEPT; + goto do_not_track; len = sizeof(struct ipv6hdr) + ntohs(ipv6_hdr(skb)->payload_len); + if (data_len < len) + len = data_len; if (pskb_trim_rcsum(skb, len)) - return NF_ACCEPT; + goto do_not_track; if (nf_ct_br_ipv6_check(skb)) - return NF_ACCEPT; + goto do_not_track; bridge_state.pf = NFPROTO_IPV6; ret = nf_ct_br_defrag6(skb, &bridge_state); break; default: nf_ct_set(skb, NULL, IP_CT_UNTRACKED); - return NF_ACCEPT; + goto do_not_track; } - if (ret != NF_ACCEPT) - return ret; + if (ret == NF_ACCEPT) + ret = nf_conntrack_in(skb, &bridge_state); - return nf_conntrack_in(skb, &bridge_state); +do_not_track: + if (offset) { + skb_push_rcsum(skb, offset); + skb_reset_network_header(skb); + skb->protocol = outer_proto; + } + return ret; } static unsigned int nf_ct_bridge_in(void *priv, struct sk_buff *skb, From patchwork Sat Mar 15 20:00:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 14018190 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 BEE6019F127; Sat, 15 Mar 2025 20:00:59 +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=1742068861; cv=none; b=KfcvUs0Sht2j9S2EB1w6Sh52JU9e1/Viy+sjNOI3cwCN5xzyyVPTtsJvGNLDqjQzsMGB+R5H5lK5J/k3RQlAvp8k6awOdiKU5Sgxw5C/098TgAu/jyEV4l8Hj/jL8EOjwdZfCc8x5aMtWjOc008ViLNWPMwBAOEhUbolZZvqxUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068861; c=relaxed/simple; bh=WOvVk2IW6QUSaxpGvpwW6W6ywpdv9Y60/i896yobQ+k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sgvcZt8Vi3uuJ3KmSLZf4fzQyUwB08Uqoy1PDeVYVdXaf8XSLyXsrHW51UMxoNhmI4ewQ2CeNRZEzbpUEHKhr8TITl5CTT5NgnUIkbQxRL2/KTHLmdurKZhk0lTqFa7m73rCSAMW0TplGzr2bQqS1xFR5nKvUX1thYa+kSV78/o= 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=CvtNczB4; 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="CvtNczB4" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ac2902f7c2aso587929966b.1; Sat, 15 Mar 2025 13:00:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742068858; x=1742673658; 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=ukwtTV0ExXBJKM7v4LhbJXSMG6hQJqW8GgzzDxNF23M=; b=CvtNczB4hoVbwdIG4YkYzWfrZt9c8A2OA7c8mMkEme0i5bWuNn3/BBJrBXKldVmzqF lW9gBtCd7iTkDQfBu20AzjgnEvTs460FLbutTIUZWt+sEOYWOAb3uoAhsPGLv99j7h4z 8HyygT30kesF++MC4Qt3h59selAH+nh1F7DtZxKmYSrDX1GDAYVw6gyGuhyxTeQzDj6x LWPrHD/aalQMGyy2vBZmiOujt4dV9eM9rNVbwho6fXE9w+2vMKknGIkRD2WUNEaneRZs Yd9jl4S8PEFPBk1KkR+aIcUNttgb41ryJFEKdmIEIYFAwjGpmBSLQtoItKY4YOutV1tj LH1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742068858; x=1742673658; 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=ukwtTV0ExXBJKM7v4LhbJXSMG6hQJqW8GgzzDxNF23M=; b=kxsBN7++go5hqNBKpwpc2BObyZdVWg/A3WUJhK4CKvK6MvC1ZkOkAEANkoypuYcuIc c3psXTjSr96Nsqy14AJWvzPNKKrK95vyZDAQRImOoJ6NFXNwrfgUCi2i/vk9e2SO1Pqq Bq6OBYuiqfziGqEM0/vSjfklu0bcQqrjBzT1INlVjWSha0CBo4PrVPMEkVwecS+7IyCm ynZ4M8cyrw1+cLjGwFQLPFHE+wSrB5Gky3nKJSLHuZYetQMHNrs+DjswqruzkY6Ig+QP h8D+jEvlHRudvMWi6/fnjeFGTA8Zgn+56edFl8q8MHzN7+sl8nl+3+JXUOq2Tu6dc25r DnAw== X-Forwarded-Encrypted: i=1; AJvYcCVX3n2fjH70jay+4T6GjzJrbDcFF/9NHw77oMI0HG3m4AtP/wK4XWHOtz7/qkztnDKAtnUIoFoc@vger.kernel.org, AJvYcCWAP0vkZNY7mp+ag1DH1b941K7cAcpZ6yNd0faZlvtQatbt+g30tEDY7yUNRZGoIQZ3hLIBw/nMxBO1zpzrvW8=@vger.kernel.org X-Gm-Message-State: AOJu0Yyv6N8Q75yuFNlXoeSNVeNGo4/IYgvHOvkkIhCQdLDB4tW22Vc2 ZPZZjSq8Tj3bOGR2Z24tl/wqPxNXTBw2NHRpYlljOKlqSDaqFkrM7PRXjA== X-Gm-Gg: ASbGncuoLZi4T4vUsIQ3YPh+ZkjjcW/676Z2cOIXuSTttxaKDHWykI4o8FSbMcToXii 7NNZY8piJEyGsaR7hasBDXXXNl//6CZfagdt8Alb8Ntkz4KV7xPCEsGWFQ+QCbYt6QqGWjqaGXr A+FMOxxviaC702rh3UCtWTKHarwQAVF17tS/CYrYjtr46+sXPrAQt9gPnNAVp6mQnqFXx4FAVt5 aCgNmHyDXeC05IUBfEkqE6Nik6Jku+PrPMN6aDxyowMpSY29PjFy3hehjHrrW7Y6RXwbiSyxjRF BMOn9yklXsBkjZkPG5iHIwZniqj4v0wkIynJ9+06E0whzfXFsOeCRmuXQM/hKFBNFmO9gqHT/eX Avjs/6hhVO9JOXi10xHOk/LduJKn3TmBUTns0z7Qdz/GO05V/wY7ZnORmfGCph3E= X-Google-Smtp-Source: AGHT+IHUG1k/HafScItz7647c4vgB0uWfWGe/KDk6+6POY+YOWwiV4SdbYmPp+R4rwe/RASZYCq8Yw== X-Received: by 2002:a17:907:7290:b0:ab6:362b:a83a with SMTP id a640c23a62f3a-ac3301dd62cmr796461766b.8.1742068858019; Sat, 15 Mar 2025 13:00:58 -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-ac3147e9bc6sm405908066b.49.2025.03.15.13.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 13:00:57 -0700 (PDT) From: Eric Woudstra To: Pablo Neira Ayuso , Jozsef Kadlecsik , Roopa Prabhu , Nikolay Aleksandrov , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: netfilter-devel@vger.kernel.org, bridge@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Eric Woudstra Subject: [PATCH v10 nf-next 2/3] netfilter: nft_chain_filter: Add bridge double vlan and pppoe Date: Sat, 15 Mar 2025 21:00:32 +0100 Message-ID: <20250315200033.17820-3-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250315200033.17820-1-ericwouds@gmail.com> References: <20250315200033.17820-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 This adds the capability to evaluate 802.1ad, QinQ, PPPoE and PPPoE-in-Q packets in the bridge filter chain. Reviewed-by: Nikolay Aleksandrov Signed-off-by: Eric Woudstra --- net/netfilter/nft_chain_filter.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nft_chain_filter.c b/net/netfilter/nft_chain_filter.c index 19a553550c76..7c7080c1a67d 100644 --- a/net/netfilter/nft_chain_filter.c +++ b/net/netfilter/nft_chain_filter.c @@ -232,11 +232,27 @@ nft_do_chain_bridge(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { + struct ethhdr *ethh = eth_hdr(skb); struct nft_pktinfo pkt; + int thoff; nft_set_pktinfo(&pkt, skb, state); - switch (eth_hdr(skb)->h_proto) { + switch (ethh->h_proto) { + case htons(ETH_P_PPP_SES): + thoff = PPPOE_SES_HLEN; + ethh += thoff; + break; + case htons(ETH_P_8021Q): + thoff = VLAN_HLEN; + ethh += thoff; + break; + default: + thoff = 0; + break; + } + + switch (ethh->h_proto) { case htons(ETH_P_IP): nft_set_pktinfo_ipv4_validate(&pkt); break; @@ -248,6 +264,8 @@ nft_do_chain_bridge(void *priv, break; } + pkt.thoff += thoff; + return nft_do_chain(&pkt, priv); } From patchwork Sat Mar 15 20:00:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 14018191 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 004921A2391; Sat, 15 Mar 2025 20:01:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068863; cv=none; b=Rl7q82Bt443MECxp0p/tt8VLuA0Nrs4otyzGwyXKqjxwqVGGU+Y0lO53W54T5II510vqobpL6+6ddBxlQNPEfrfLrh6LFcCuyrXKLjjwNOfFuvtR9GpRgOx9ORZwI8M/KEXlJl3tZxp5ndzYmKLzaPgQn1V5hilx4VvPcPnVDtQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742068863; c=relaxed/simple; bh=0F9R/j6yTe/QG1ZiLEakkkx9BEQ8WqPxJQQJx7PDgLw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IJPy2gWvcnSdLLvRLhL8/uEvjxLahTaUD7vCt0Yq+ePy5eRGT21jRE7Yt+a3qTRBP/FXjNSR0ILt9lzaVHvPE4k/BJBzqzvfj8I3Cnmb0pwEyr/dRE+Nm106GzDGnJXp0UiC7ovjwJ1D0og32X+UnyfAyKKorAwZC1hPLmBbkNg= 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=AChmXWHV; arc=none smtp.client-ip=209.85.218.43 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="AChmXWHV" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-ac2aeada833so619907866b.0; Sat, 15 Mar 2025 13:01:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742068860; x=1742673660; 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=T25jQdtL6Ghs3k28V+ta25q96RJ5mAE93MydZdqFWhU=; b=AChmXWHVnTmCNdDZ+mhxRl5l8i/odHGzKp/IrwsKUzfpGOMilKxFAB/nnOPrzJkIcD JXT7b2uKUsszWVr+bLd4MBUW1ZDZ8kLec1vUifW0OZ/f/uazRCPZLHr0LOBeK5ZDjOmF vQMHC33MY6fezqbu7ER3GaegtF70Z0pLS1ZHCGpVt18LceoB3+H8L4Tc+Q1597PO5LVT qFZi+1JPx3wFLBpV15QKNpVsYw+5d0uHdt4wG7W9P9M0wrJ65N02tQQDHkBzKsg2pePo AfEcr9m5iD6E0VxGFumBj1G6ErtGSdnEMLXjW/nlrcyg5sZ9S4UWBLF8SXoyimpZC1zb UPNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742068860; x=1742673660; 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=T25jQdtL6Ghs3k28V+ta25q96RJ5mAE93MydZdqFWhU=; b=s0kVVMJOMpBf4WE2ocx6Q3HE93cVlKQeH8vAZ/64mWIbcnbBs+tAiFCAKuB7VbYtFZ vjh0oEX6gsaL3HPpt34A43WdSlgiBEB8BQ2KyZQPaNnyBrZnamQW7b0F7GbceuJWA3zk i6FL1JqKv/HomY0HjlFlpRMaGpPUaG5x89CWalgyR/ajzGetmVnv7JM8u3WcTFDo/lZR IbxfKdIsKO3cViuet19OEGFSNkaVNbv+fbdpv2GcWASIpp5K7ah//UpyS6irkK9ivxnw X9X9ejmEz1if9fIZEtAGMCAex6hmiD5HqTZjTJptk9hmdD7/fZdXXHBbgbJK3xdpK547 hBvQ== X-Forwarded-Encrypted: i=1; AJvYcCX2oCGXRZhlcIeI1reab1cSeOjJNJVH52e2+KwUtgCt8+bujUrYZrX1+qtRq41p/uH6nWjM7IWqiBuEc1fdUxE=@vger.kernel.org, AJvYcCXDJinGp7Ul3B12lZ+oENckvH1uEqZHj2kE5bOsag1FjAjb3yu28QgVErclI0rDEPnaCHASxl9b@vger.kernel.org X-Gm-Message-State: AOJu0YxFfnR8USKuHB2NZw54Yx5Z8NEhIN7qB17T+6AWcIJRtTalqfYG I1qrSjKSTD7aKaERbxioOFoy1NNEk1vElIhwNCCW2m8qdod2x5VpSK0QWg== X-Gm-Gg: ASbGncuHW2tX+iWlo60jpLbzkzs9FL8z0njqN1Qa0gQqUDFLTYESA1PMY2O2TuRwMNB 4SSyeczmpkjrfY84CDKEtRXEGl1ZYZKkdhph50O0sp1TplI0Ra+5W8d94Jkz6tW6qkxhiH0n9GO XxxmYumvbcetSecnLI7C+EpjYlnhcglJYNYkVAT8MNwGVgHydaQP0VQqE7P6p1VT8q9tjXXIRhz 2cpdrnVOMh1RUkSczl5kr6OFS1KAdAAI7qQKfMakHIGjePf2WuIpb9Kyf1lUyhmfu6y8YO3xQ6c pjO9W1tdQsIF7p+5KRQCbL6ypUF3e64KEyLchwO0toME91DxOhtnbpjWXXFqlWMEd00gX2LMJPA okv+/6LmEoduZHAlulZ++tC4Mh4vOa89kuMV/XuFnmVTI2ZrwJ4fDaMLhXz2TvY8= X-Google-Smtp-Source: AGHT+IHXc3iBDf8ib1JnOQZU9P4sM7gMd43rDie9fReqHUMq/fuvd6EnMEIA80Ah+N94qtaKEMo3GQ== X-Received: by 2002:a17:907:2d0f:b0:ac1:17fe:c74f with SMTP id a640c23a62f3a-ac3314f2d7cmr674702766b.21.1742068860201; Sat, 15 Mar 2025 13:01:00 -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-ac3147e9bc6sm405908066b.49.2025.03.15.13.00.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 13:00:59 -0700 (PDT) From: Eric Woudstra To: Pablo Neira Ayuso , Jozsef Kadlecsik , Roopa Prabhu , Nikolay Aleksandrov , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: netfilter-devel@vger.kernel.org, bridge@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Eric Woudstra Subject: [PATCH v10 nf-next 3/3] selftests: netfilter: Add conntrack_bridge.sh Date: Sat, 15 Mar 2025 21:00:33 +0100 Message-ID: <20250315200033.17820-4-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250315200033.17820-1-ericwouds@gmail.com> References: <20250315200033.17820-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 Check conntrack bridge is functional in various vlan setups. Signed-off-by: Eric Woudstra --- .../testing/selftests/net/netfilter/Makefile | 1 + .../net/netfilter/conntrack_bridge.sh | 176 ++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100755 tools/testing/selftests/net/netfilter/conntrack_bridge.sh diff --git a/tools/testing/selftests/net/netfilter/Makefile b/tools/testing/selftests/net/netfilter/Makefile index ffe161fac8b5..bee403d423f5 100644 --- a/tools/testing/selftests/net/netfilter/Makefile +++ b/tools/testing/selftests/net/netfilter/Makefile @@ -8,6 +8,7 @@ MNL_LDLIBS := $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl) TEST_PROGS := br_netfilter.sh bridge_brouter.sh TEST_PROGS += br_netfilter_queue.sh +TEST_PROGS += conntrack_bridge.sh TEST_PROGS += conntrack_dump_flush.sh TEST_PROGS += conntrack_icmp_related.sh TEST_PROGS += conntrack_ipip_mtu.sh diff --git a/tools/testing/selftests/net/netfilter/conntrack_bridge.sh b/tools/testing/selftests/net/netfilter/conntrack_bridge.sh new file mode 100755 index 000000000000..806551ef8cc2 --- /dev/null +++ b/tools/testing/selftests/net/netfilter/conntrack_bridge.sh @@ -0,0 +1,176 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# Check conntrack bridge is functional in various vlan setups. +# +# Setup is: +# +# nsclient1 -> nsbr -> nsclient2 +# ping nsclient2 from nsclient1, checking that conntrack established +# packets are seen. +# + +source lib.sh + +if ! nft --version > /dev/null 2>&1;then + echo "SKIP: Could not run test without nft tool" + exit $ksft_skip +fi + +cleanup() { + cleanup_all_ns +} + +trap cleanup EXIT + +setup_ns nsclient1 nsclient2 nsbr + +ret=0 + +add_addr() +{ + ns=$1 + dev=$2 + i=$3 + + ip -net "$ns" link set "$dev" up + ip -net "$ns" addr add "192.168.1.$i/24" dev "$dev" + ip -net "$ns" addr add "dead:1::$i/64" dev "$dev" nodad + ip -net "$ns" route add default dev "$dev" +} + +del_addr() +{ + ns=$1 + dev=$2 + i=$3 + + ip -net "$ns" route del default dev "$dev" + ip -net "$ns" addr del "dead:1::$i/64" dev "$dev" nodad + ip -net "$ns" addr del "192.168.1.$i/24" dev "$dev" + ip -net "$ns" link set "$dev" down +} + +send_pings() +{ + for ad in "$@"; do + if ! ip netns exec "$nsclient1" ping -c 1 -s 962 -q "$ad" >/dev/null; then + echo "ERROR: netns routing/connectivity broken to $ad" 1>&2 + exit 1 + fi + done +} + +check_counter() +{ + ns=$1 + name=$2 + expect=$3 + local lret=0 + + if ! ip netns exec "$ns" nft list counter bridge filter "$name" | grep -q "$expect"; then + echo "ERROR: counter $name in $ns has unexpected value (expected $expect)" 1>&2 + ip netns exec "$ns" nft list counter bridge filter "$name" 1>&2 + lret=1 + fi + ip netns exec "$ns" nft reset counters >/dev/null + + return $lret +} + +BR=br0 +if ! ip -net "$nsbr" link add $BR type bridge; then + echo "SKIP: Can't create bridge $BR" + exit $ksft_skip +fi + +DEV=veth0 +ip link add "$DEV" netns "$nsclient1" type veth peer name eth1 netns "$nsbr" +ip link add "$DEV" netns "$nsclient2" type veth peer name eth2 netns "$nsbr" + +ip -net "$nsbr" link set eth1 master $BR up +ip -net "$nsbr" link set eth2 master $BR up +ip -net "$nsbr" link set $BR up + +ip netns exec "$nsbr" nft -f - <