From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (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 52A591878 for ; Fri, 18 Oct 2024 18:53:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729277620; cv=none; b=Me2oX1TwDSKx1FrzBee2200iUQbPv86Lwji1XJxARGFbJZOBWRKUyzWLomTGdFPdSs4mmqYDB+Uu5OyC+NFLWb+qxZ3ezEwwQ9RUadggG7UeelxqXv8ZUcjCFEfXzDnWwvBhw8/d8RG8o+AfRNhPFefKURRCG8yH/3H7o3UcTmM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729277620; c=relaxed/simple; bh=wfRkbDUEGNL++oybIfRhyLJViztO7ln5vIkSu4O5LH4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=kpl3MoErRyx7BMfZ+uK/1LwmDqVpW4B8oIixrlkw3Yby8bMh3+W+1c7l8GMuJ2zoW2E7g8st+2bMkPwUN9uKWwSS//91H09vNSZhB79cSTtotnPappvFbuQsGb9RCkLjwB2aBJsyBCFCNvyEl9n5vt7FAa9b7YDdzHubDKiIIms= 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=UcXAKeFb; arc=none smtp.client-ip=209.85.167.52 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="UcXAKeFb" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-539e13375d3so2871256e87.3 for ; Fri, 18 Oct 2024 11:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729277616; x=1729882416; darn=lists.linux.dev; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=N+C37RFzcILnMsZFYBuRVkaO1NAcl0ehLYM/0ikIXvM=; b=UcXAKeFbX2Ph40qJ9w7CAuipK6Elq2gUC+N4Y9WlMcsZajtegqnWEtFgfGoHTpTBJF BR9JCiNaBy1oToxh1vQVNnarOsQfKmGf22nyMHxsCnldvwB8Q21/AWayCVYladVj7CrZ aidHgZEPdC3LlKaJ5MjKsrfyReYwdu14fUzqsIOlyCK8KIKMWK9OhB22sahPhqPXXI6e iak70y2ZQUgtj4m3+kqH7SwA0RDMa01HGAVJfTh5AI64se8WKnT7XFOQB75lq0C2bD8G L7t8/gamUJGBPyvP/H5XpBIHlCEWhylXTumyzsebeutv7ETrcyE9I41mV32hT4X+b3J7 rh8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729277616; x=1729882416; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=N+C37RFzcILnMsZFYBuRVkaO1NAcl0ehLYM/0ikIXvM=; b=wGDnrGGyC7koDYZ5CIhIw4BKlf24SKshvQVoBzfOjvlcNYb8/TuHNigolo76dJPmUt YWBSpj/wAojzQ0LE6EfLiOu4o1SSy86iZlZ6VmN8igRbmGTAA67FTRxMqssU0jtQW1+i 1NIXsUq5Eg32DcdkJft2o1AEtEl1cggd1bwzjbTIAvWy54kKkSRD3DZ61ct9/84hwxea TogEq0jrmLMGRE/h9Pw9TxSNvb536rBduz0sz2400a8uO+AzGFOG9B12OKQtuQgp0H7V zAlvVgr34AniIABqltUGriYyYNI9a9zbJrIlXIopwFzxEep2OOy9Kqy4HSOa8VYE0KNw ZNKQ== X-Forwarded-Encrypted: i=1; AJvYcCURX0YLt/pH45krewDPUbhPyXGpnoYtU2NxKIXMItJGa8rddyqRa+h1EgiTz9FSc+RQW9axcl8=@lists.linux.dev X-Gm-Message-State: AOJu0Yx2l0RCsWBDfr+vk1rHvw1AoD1xhvq8T+0BNmI82rTH3HvZerf1 47IbjJkouKItu6jdCVObSes5FsYAE8EMZ57WLwiPOJ+dG+UCAJUZ X-Google-Smtp-Source: AGHT+IFTECmpui4bEAd6LfXlK56bk60zCpZroN7QeGRG8HvefwSVsCLjpZDdolPkBbtIu2/ZZR22ag== X-Received: by 2002:a05:6512:2352:b0:539:fc45:a292 with SMTP id 2adb3069b0e04-53a154fa754mr2044964e87.43.1729277616138; Fri, 18 Oct 2024 11:53:36 -0700 (PDT) Received: from ?IPV6:2001:1c00:20d:1300:1b1c:4449:176a:89ea? (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 4fb4d7f45d1cf-5ca0b08c3easm1036170a12.50.2024.10.18.11.53.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 18 Oct 2024 11:53:35 -0700 (PDT) Message-ID: <56c3d435-e93c-405c-9bf5-e9ea9c038d13@gmail.com> Date: Fri, 18 Oct 2024 20:53:33 +0200 Precedence: bulk X-Mailing-List: bridge@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC v1 net-next 02/12] netfilter: bridge: Add conntrack double vlan and pppoe To: Vladimir Oltean Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Pablo Neira Ayuso , Jozsef Kadlecsik , Roopa Prabhu , Nikolay Aleksandrov , Matthias Brugger , AngeloGioacchino Del Regno , Jiri Pirko , Sebastian Andrzej Siewior , Lorenzo Bianconi , Frank Wunderlich , Daniel Golle , 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 References: <20241013185509.4430-1-ericwouds@gmail.com> <20241013185509.4430-3-ericwouds@gmail.com> <20241018131754.ikrrnsspjsu5ppfz@skbuf> From: Eric Woudstra Content-Language: en-US In-Reply-To: <20241018131754.ikrrnsspjsu5ppfz@skbuf> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 10/18/24 3:17 PM, Vladimir Oltean wrote: > On Sun, Oct 13, 2024 at 08:54:58PM +0200, Eric Woudstra wrote: >> This adds the capability to conntrack 802.1ad, QinQ, PPPoE and PPPoE-in-Q >> packets that are passing a bridge. >> >> Signed-off-by: Eric Woudstra >> --- > > Whatever you choose to do forward with these patches, please squash this > build fix here (you can drop my authorship info and commit message): Thanks, I had already fixed the errors from patchwork.kernel.org->checks for the next version of the rfc patch. This is indeed one of them. > From e73315196c3143de2af2fe39e3b0e95391849d6c Mon Sep 17 00:00:00 2001 > From: Vladimir Oltean > Date: Fri, 18 Oct 2024 13:59:27 +0300 > Subject: [PATCH] netfilter: bridge: fix build failures in nf_ct_bridge_pre() > > clang-16 fails to build, stating: > > net/bridge/netfilter/nf_conntrack_bridge.c:257:3: error: expected expression > struct ppp_hdr { > ^ > net/bridge/netfilter/nf_conntrack_bridge.c:262:20: error: use of undeclared identifier 'ph' > data_len = ntohs(ph->hdr.length) - 2; > ^ > net/bridge/netfilter/nf_conntrack_bridge.c:262:20: error: use of undeclared identifier 'ph' > net/bridge/netfilter/nf_conntrack_bridge.c:262:20: error: use of undeclared identifier 'ph' > net/bridge/netfilter/nf_conntrack_bridge.c:262:20: error: use of undeclared identifier 'ph' > net/bridge/netfilter/nf_conntrack_bridge.c:265:11: error: use of undeclared identifier 'ph' > switch (ph->proto) { > ^ > > net/bridge/netfilter/nf_conntrack_bridge.c:278:3: error: expected expression > struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data); > ^ > net/bridge/netfilter/nf_conntrack_bridge.c:283:17: error: use of undeclared identifier 'vhdr' > inner_proto = vhdr->h_vlan_encapsulated_proto; > ^ > > One cannot have variable declarations placed this way in a switch/case > statement, a new scope must be opened. > > Signed-off-by: Vladimir Oltean > --- > net/bridge/netfilter/nf_conntrack_bridge.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c > index fb2f79396aa0..31e2bcd71735 100644 > --- a/net/bridge/netfilter/nf_conntrack_bridge.c > +++ b/net/bridge/netfilter/nf_conntrack_bridge.c > @@ -253,7 +253,7 @@ static unsigned int nf_ct_bridge_pre(void *priv, struct sk_buff *skb, > return NF_ACCEPT; > > switch (skb->protocol) { > - case htons(ETH_P_PPP_SES): > + case htons(ETH_P_PPP_SES): { > struct ppp_hdr { > struct pppoe_hdr hdr; > __be16 proto; > @@ -273,7 +273,8 @@ static unsigned int nf_ct_bridge_pre(void *priv, struct sk_buff *skb, > return NF_ACCEPT; > } > break; > - case htons(ETH_P_8021Q): > + } > + case htons(ETH_P_8021Q): { > struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data); > > data_len = 0xffffffff; > @@ -281,6 +282,7 @@ static unsigned int nf_ct_bridge_pre(void *priv, struct sk_buff *skb, > outer_proto = skb->protocol; > inner_proto = vhdr->h_vlan_encapsulated_proto; > break; > + } > default: > data_len = 0xffffffff; > break;