From patchwork Fri Jul 5 13:33:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= X-Patchwork-Id: 13725136 X-Patchwork-Delegate: kuba@kernel.org Received: from mail1.fiberby.net (mail1.fiberby.net [193.104.135.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED6CD147C9E; Fri, 5 Jul 2024 13:34:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.104.135.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720186456; cv=none; b=LMkR3j5lszHW6BqFR+ZtmXxbwnqpwHvvbBIH+u1jstkDiys6f9zT3jQ1gWx6RJOBtJhMXmwVi0P60sQXZr35Ge8fFGvP+QShz2VT7iSgFdzyNwqdeB5Yuyw/eXZUwUcfg/x0ZXDEk3yxMeMHCSplu5al6VsJ67UPk/N44LwXsFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720186456; c=relaxed/simple; bh=WQvcmcR5yHifzr47skJIiXUoYESrckFNFBxiMIM1XOI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HDzNZRNTLkYpAoPhcB13bfQK1Z9Qss+oi77JPh06BjPkekaDTuWy+8dZk1YKqBsCxHYzo+cDb4HR/9cPW+BTDyWOTxRX8X0/Rcltr6r/FS9Z8G921C86GxqGhRZQYi1cU+LUD+o7SKX+KPa67y938tuE1FDYjBvgKmjNEcNgv4Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net; spf=pass smtp.mailfrom=fiberby.net; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b=YKSD0XDW; arc=none smtp.client-ip=193.104.135.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fiberby.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b="YKSD0XDW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fiberby.net; s=202008; t=1720186450; bh=WQvcmcR5yHifzr47skJIiXUoYESrckFNFBxiMIM1XOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YKSD0XDWkz9KtUopWJduguUJYINY8NMSoJxMDqyj5Zwdls6VBbqNCTxscU9eDRq1w dRAX2bzRApz5urmXnM49bxnR8jIT+/Jd3Oz0dCT4N3+8US+jkIWObgP+Uxs3+3opOH w9W5SXaeKdfl1OfJQ/SE+b1vKVVqcu5MWtfE36YHb3VsrkDbZLsWiiIf7RxzdOzA0a rYEPgoOeK7Yg8732Ld3xZixsHxWtxJ1LVZns+SmTdzynYkgavpMz3bMT2cJ88TCXP+ jjHO4lT6YVWkWRGLclw7g3MfZOorimvax/8LQ4OQWJ+Ld9D0RHjskyV3E9JmPq7J2o kOuJ7wFysBpaA== Received: from x201s (193-104-135-243.ip4.fiberby.net [193.104.135.243]) by mail1.fiberby.net (Postfix) with ESMTPSA id 70BDA6007A; Fri, 5 Jul 2024 13:34:10 +0000 (UTC) Received: by x201s (Postfix, from userid 1000) id D7CF1204863; Fri, 05 Jul 2024 13:33:50 +0000 (UTC) From: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= To: netdev@vger.kernel.org Cc: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= , Davide Caratti , Ilya Maximets , Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , David Ahern , Simon Horman , Ratheesh Kannoth , Florian Westphal , Alexander Lobakin , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 06/10] flow_dissector: set encapsulated control flags from tun_flags Date: Fri, 5 Jul 2024 13:33:42 +0000 Message-ID: <20240705133348.728901-7-ast@fiberby.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240705133348.728901-1-ast@fiberby.net> References: <20240705133348.728901-1-ast@fiberby.net> 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 Set the new FLOW_DIS_F_TUNNEL_* encapsulated control flags, based on if their counter-part is set in tun_flags. These flags are not userspace visible yet, as the code to dump encapsulated control flags will first be added, and later activated in the following patches. Signed-off-by: Asbjørn Sloth Tønnesen Tested-by: Davide Caratti --- net/core/flow_dissector.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 1614c6708ea7c..a0263a4c5489e 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -396,6 +396,15 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb, key = &info->key; + if (test_bit(IP_TUNNEL_CSUM_BIT, key->tun_flags)) + ctrl_flags |= FLOW_DIS_F_TUNNEL_CSUM; + if (test_bit(IP_TUNNEL_DONT_FRAGMENT_BIT, key->tun_flags)) + ctrl_flags |= FLOW_DIS_F_TUNNEL_DONT_FRAGMENT; + if (test_bit(IP_TUNNEL_OAM_BIT, key->tun_flags)) + ctrl_flags |= FLOW_DIS_F_TUNNEL_OAM; + if (test_bit(IP_TUNNEL_CRIT_OPT_BIT, key->tun_flags)) + ctrl_flags |= FLOW_DIS_F_TUNNEL_CRIT_OPT; + switch (ip_tunnel_info_af(info)) { case AF_INET: skb_flow_dissect_set_enc_control(FLOW_DISSECTOR_KEY_IPV4_ADDRS,