From: Alexander Lobakin <aleksander.lobakin@intel.com>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Alexander Lobakin <aleksander.lobakin@intel.com>,
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>,
Marcin Szycik <marcin.szycik@linux.intel.com>,
Wojciech Drewek <wojciech.drewek@intel.com>,
Yury Norov <yury.norov@gmail.com>,
Andy Shevchenko <andy@kernel.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Alexander Potapenko <glider@google.com>,
Jiri Pirko <jiri@resnulli.us>, Ido Schimmel <idosch@nvidia.com>,
Przemek Kitszel <przemyslaw.kitszel@intel.com>,
Simon Horman <horms@kernel.org>,
linux-btrfs@vger.kernel.org, dm-devel@redhat.com,
ntfs3@lists.linux.dev, linux-s390@vger.kernel.org,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Simon Horman <simon.horman@corigine.com>
Subject: [PATCH net-next v5 20/21] ice: refactor ICE_TC_FLWR_FIELD_ENC_OPTS
Date: Thu, 1 Feb 2024 13:22:15 +0100 [thread overview]
Message-ID: <20240201122216.2634007-21-aleksander.lobakin@intel.com> (raw)
In-Reply-To: <20240201122216.2634007-1-aleksander.lobakin@intel.com>
From: Marcin Szycik <marcin.szycik@linux.intel.com>
FLOW_DISSECTOR_KEY_ENC_OPTS can be used for multiple headers, but currently
it is treated as GTP-exclusive in ice. Rename ICE_TC_FLWR_FIELD_ENC_OPTS to
ICE_TC_FLWR_FIELD_GTP_OPTS and check for tunnel type earlier. After this
refactor, it is easier to add new headers using FLOW_DISSECTOR_KEY_ENC_OPTS
- instead of checking tunnel type in ice_tc_count_lkups() and
ice_tc_fill_tunnel_outer(), it needs to be checked only once, in
ice_parse_tunnel_attr().
Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
---
drivers/net/ethernet/intel/ice/ice_tc_lib.h | 2 +-
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.h b/drivers/net/ethernet/intel/ice/ice_tc_lib.h
index 65d387163a46..5d188ad7517a 100644
--- a/drivers/net/ethernet/intel/ice/ice_tc_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.h
@@ -22,7 +22,7 @@
#define ICE_TC_FLWR_FIELD_ENC_SRC_L4_PORT BIT(15)
#define ICE_TC_FLWR_FIELD_ENC_DST_MAC BIT(16)
#define ICE_TC_FLWR_FIELD_ETH_TYPE_ID BIT(17)
-#define ICE_TC_FLWR_FIELD_ENC_OPTS BIT(18)
+#define ICE_TC_FLWR_FIELD_GTP_OPTS BIT(18)
#define ICE_TC_FLWR_FIELD_CVLAN BIT(19)
#define ICE_TC_FLWR_FIELD_PPPOE_SESSID BIT(20)
#define ICE_TC_FLWR_FIELD_PPP_PROTO BIT(21)
diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
index b890410a2bc0..80797db9f2b9 100644
--- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
@@ -35,7 +35,7 @@ ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers,
if (flags & ICE_TC_FLWR_FIELD_ENC_DST_MAC)
lkups_cnt++;
- if (flags & ICE_TC_FLWR_FIELD_ENC_OPTS)
+ if (flags & ICE_TC_FLWR_FIELD_GTP_OPTS)
lkups_cnt++;
if (flags & (ICE_TC_FLWR_FIELD_ENC_SRC_IPV4 |
@@ -219,8 +219,7 @@ ice_tc_fill_tunnel_outer(u32 flags, struct ice_tc_flower_fltr *fltr,
i++;
}
- if (flags & ICE_TC_FLWR_FIELD_ENC_OPTS &&
- (fltr->tunnel_type == TNL_GTPU || fltr->tunnel_type == TNL_GTPC)) {
+ if (flags & ICE_TC_FLWR_FIELD_GTP_OPTS) {
list[i].type = ice_proto_type_from_tunnel(fltr->tunnel_type);
if (fltr->gtp_pdu_info_masks.pdu_type) {
@@ -1401,7 +1400,8 @@ ice_parse_tunnel_attr(struct net_device *dev, struct flow_rule *rule,
}
}
- if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_OPTS)) {
+ if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_OPTS) &&
+ (fltr->tunnel_type == TNL_GTPU || fltr->tunnel_type == TNL_GTPC)) {
struct flow_match_enc_opts match;
flow_rule_match_enc_opts(rule, &match);
@@ -1412,7 +1412,7 @@ ice_parse_tunnel_attr(struct net_device *dev, struct flow_rule *rule,
memcpy(&fltr->gtp_pdu_info_masks, &match.mask->data[0],
sizeof(struct gtp_pdu_session_info));
- fltr->flags |= ICE_TC_FLWR_FIELD_ENC_OPTS;
+ fltr->flags |= ICE_TC_FLWR_FIELD_GTP_OPTS;
}
return 0;
--
2.43.0
next prev parent reply other threads:[~2024-02-01 12:25 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-01 12:21 [PATCH net-next v5 00/21] ice: add PFCP filter support Alexander Lobakin
2024-02-01 12:21 ` [PATCH net-next v5 01/21] lib/bitmap: add bitmap_{read,write}() Alexander Lobakin
2024-02-01 13:23 ` Arnd Bergmann
2024-02-01 13:45 ` Alexander Potapenko
2024-02-01 14:02 ` Arnd Bergmann
2024-02-28 16:10 ` Yury Norov
2024-02-01 15:49 ` Alexander Lobakin
2024-02-01 12:21 ` [PATCH net-next v5 02/21] lib/test_bitmap: add tests for bitmap_{read,write}() Alexander Lobakin
2024-02-28 16:13 ` Yury Norov
2024-02-01 12:21 ` [PATCH net-next v5 03/21] lib/test_bitmap: use pr_info() for non-error messages Alexander Lobakin
2024-02-28 16:16 ` Yury Norov
2024-02-01 12:21 ` [PATCH net-next v5 04/21] bitops: add missing prototype check Alexander Lobakin
2024-02-28 16:18 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 05/21] bitops: make BYTES_TO_BITS() treewide-available Alexander Lobakin
2024-02-28 16:20 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 06/21] bitops: let the compiler optimize {__,}assign_bit() Alexander Lobakin
2024-02-28 16:23 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 07/21] linkmode: convert linkmode_{test,set,clear,mod}_bit() to macros Alexander Lobakin
2024-02-28 16:24 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 08/21] s390/cio: rename bitmap_size() -> idset_bitmap_size() Alexander Lobakin
2024-02-26 17:13 ` Peter Oberparleiter
2024-02-01 12:22 ` [PATCH net-next v5 09/21] fs/ntfs3: add prefix to bitmap_size() and use BITS_TO_U64() Alexander Lobakin
2024-02-28 16:26 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 10/21] btrfs: rename bitmap_set_bits() -> btrfs_bitmap_set_bits() Alexander Lobakin
2024-02-28 16:27 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 11/21] tools: move alignment-related macros to new <linux/align.h> Alexander Lobakin
2024-02-02 11:37 ` Przemek Kitszel
2024-02-28 16:28 ` Yury Norov
2024-02-28 16:29 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 12/21] bitmap: introduce generic optimized bitmap_size() Alexander Lobakin
2024-02-28 16:31 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 13/21] bitmap: make bitmap_{get,set}_value8() use bitmap_{read,write}() Alexander Lobakin
2024-02-02 11:39 ` Przemek Kitszel
2024-02-28 16:31 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 14/21] lib/bitmap: add compile-time test for __assign_bit() optimization Alexander Lobakin
2024-02-28 16:32 ` Yury Norov
2024-02-01 12:22 ` [PATCH net-next v5 15/21] ip_tunnel: use a separate struct to store tunnel params in the kernel Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 16/21] ip_tunnel: convert __be16 tunnel flags to bitmaps Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 17/21] lib/bitmap: add tests for IP tunnel flags conversion helpers Alexander Lobakin
2024-02-28 16:38 ` Yury Norov
2024-03-26 12:20 ` Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 18/21] pfcp: add PFCP module Alexander Lobakin
2024-02-01 12:22 ` [PATCH net-next v5 19/21] pfcp: always set pfcp metadata Alexander Lobakin
2024-02-01 12:22 ` Alexander Lobakin [this message]
2024-02-01 12:22 ` [PATCH net-next v5 21/21] ice: Add support for PFCP hardware offload in switchdev Alexander Lobakin
2024-02-06 12:46 ` [PATCH net-next v5 00/21] ice: add PFCP filter support Alexander Lobakin
2024-02-06 15:37 ` Jakub Kicinski
2024-02-07 15:05 ` Jakub Kicinski
2024-02-12 11:35 ` [Intel-wired-lan] " Alexander Lobakin
2024-02-28 16:46 ` Yury Norov
2024-04-02 10:59 ` Niklas Schnelle
2024-04-02 11:00 ` Alexander Lobakin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240201122216.2634007-21-aleksander.lobakin@intel.com \
--to=aleksander.lobakin@intel.com \
--cc=andy@kernel.org \
--cc=davem@davemloft.net \
--cc=dm-devel@redhat.com \
--cc=edumazet@google.com \
--cc=glider@google.com \
--cc=horms@kernel.org \
--cc=idosch@nvidia.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=marcin.szycik@linux.intel.com \
--cc=michal.swiatkowski@linux.intel.com \
--cc=netdev@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=pabeni@redhat.com \
--cc=przemyslaw.kitszel@intel.com \
--cc=simon.horman@corigine.com \
--cc=wojciech.drewek@intel.com \
--cc=yury.norov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).