From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (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 388161CF8B for ; Thu, 22 Aug 2024 10:05:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724321111; cv=none; b=QEBb1ZQ86nlVzgIzGfIosZg1HahV86PkMPuN5+ahshdEfxEa+NtQFw95BS0Xhn3ZV55KtHZDfTEetcFEsPNQl96+eYVMI3hEikZgD4dIB55IWY2UxN9n/5J5uPP70eqGgkrbk+dL8iVIIbPr+9b2JAmEznfFbrW/72VPKqzf8L8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724321111; c=relaxed/simple; bh=LGDqWDhluVyRi3QnUcdGPQZqAhMpk5/LyhXofJ9pww0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=oTFNDdkLxrqYVysOSB8HuMiJTJVkqGiDbs5GoR1PMx3thectZnCREHUv196M77GVpiiToW4PLcScpwthzEQReP7hyRbYXqOsn9kg5t6gB4npyBrbLu5dM010uB8t4+Zm4pMWXc+VUhOEOwa36P3jupQx6EC2A4Va9r60SaocX4s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=Ex7XHPTA; arc=none smtp.client-ip=209.85.160.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Ex7XHPTA" Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-44fea44f725so4529051cf.1 for ; Thu, 22 Aug 2024 03:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1724321109; x=1724925909; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=OF6fNQ/TVAUdaCMFdQ7KgUT0eASl1h9Bh2nwbXzaCMw=; b=Ex7XHPTAD8Jsi7fHKZiGcpUjaHhxLX9IPlL2Jk5s/yiGqYTqRUdKdxTRoqBxOJ7Q/b +erfYVZi2v/LabVVUpvhMN+riGKaI3+VDcImspw9X9aGE8rugBrs01pGvQpG+8cao1pe FZRp6Yn3XqzsLrvx4kiXhfuhpeo/DT2ZGzraA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724321109; x=1724925909; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OF6fNQ/TVAUdaCMFdQ7KgUT0eASl1h9Bh2nwbXzaCMw=; b=Uowd39RC5oHURjJqaKzs8A+tLDFhtdohfjFaX3HhuJ397mYAjFcoQz1abUpvh+I36O sI9zQ6raEuahTSKMhnrk68IpJ8e7QNThQ3mNM8M0T2ZmqU4RBMu1luQXp59XPeA33MTQ 4fFTjIm+hrrn88xmYdQhVB82BQw2adiEia6Wwm6xiTWuon/ZlYoIOnOECoe/T9zBk2NX dlgKpTCPSewtUAjAAXlMsY+DCODxCOQ32hW4oAaj4JsWOEhQdylDIIreKA4hYvAaXW/d 8nD/6SO8uvwfDFDa+TenEjIDGZKz/HFrvQukdaRoH1eQeH/d3UxjelD7FKI6hXZ5xeL8 yilQ== X-Gm-Message-State: AOJu0Yzvyp3LBjRXGKzfXbqMcb0Oa/iinbN+haLymT8rnMt4hHNwNZak DPix7MDrjz1agBa7j6qCmhj7ii4Tf8aKmeWDuCNywsd0+BApTLEdEY2cLsGCXg== X-Google-Smtp-Source: AGHT+IHZ8DDaVpEN66dUyTD35xaIyc9eneZpe54btUki9zoKTJVWD7wkE7ffmsa6qeO691bTz31k2w== X-Received: by 2002:ac8:5996:0:b0:453:74d5:55e4 with SMTP id d75a77b69052e-454faf049bemr45925131cf.26.1724321108935; Thu, 22 Aug 2024 03:05:08 -0700 (PDT) Received: from ramen ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-454fdfbf973sm5147161cf.2.2024.08.22.03.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2024 03:05:08 -0700 (PDT) Date: Thu, 22 Aug 2024 13:04:53 +0300 From: Boris Sukholitko To: Paolo Abeni Cc: netdev@vger.kernel.org, Martin KaFai Lau , Daniel Borkmann , John Fastabend , Alexei Starovoitov , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Pravin B Shelar , Jamal Hadi Salim , Cong Wang , Jiri Pirko , Shuah Khan , Willem de Bruijn , Pavel Begunkov , Mina Almasry , Lorenzo Bianconi , Sebastian Andrzej Siewior , David Howells , Liang Chen , Alexander Lobakin , Thomas =?iso-8859-1?Q?Wei=DFschuh?= , Ido Schimmel , Ilya Lifshits Subject: Re: [PATCH net-next v3 1/3] tc: adjust network header after 2nd vlan push Message-ID: References: <20240819110609.101250-1-boris.sukholitko@broadcom.com> <20240819110609.101250-2-boris.sukholitko@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Thu, Aug 22, 2024 at 11:41:19AM +0200, Paolo Abeni wrote: > On 8/19/24 13:06, Boris Sukholitko wrote: > > diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c > > index 22f4b1e8ade9..9e2dbde3cc29 100644 > > --- a/net/sched/act_vlan.c > > +++ b/net/sched/act_vlan.c > > @@ -96,6 +96,7 @@ TC_INDIRECT_SCOPE int tcf_vlan_act(struct sk_buff *skb, > > if (skb_at_tc_ingress(skb)) > > skb_pull_rcsum(skb, skb->mac_len); > > + skb_reset_mac_header(skb); > > This should be: > skb_reset_mac_len(skb); > right? Right. Good catch, sorry. I'll send v4 with the fix shortly. > > I'm baffled by the fact that the self-tests looks still happy?!? > My guess is that the TC code path doesn't look at the faulty skb->mac_len. At least the dissector doesn't. Thanks, Boris. > Thanks, > > Paolo >