From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C2F50C43334 for ; Wed, 6 Jul 2022 10:40:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 58F7E81378; Wed, 6 Jul 2022 10:40:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 58F7E81378 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1657104012; bh=XTW7K7Iq/KLpsJ30FcVWWlnem7hpp7Bqc613irVwsN0=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=lkM3spgbdJJTb5woEFkd778+ioUuGq+oekFiMpQCJgTk0B2nro7K6+ZglKfz1ORB7 iGd4F/nYGGfrzMJx9ZhmDXMF/AjeISt4MKXlqluj3Ad1bHtcWi4QBQysJrm9ONzQD4 IAKCLmmBdGTgpt5WUELpmKHczMYQBKVnt8l2L9B8dpEWyMxPqWvqGG6remFkGJVezR hBqgVWwfg1ZXFV8B590IEqE1UZgGNo5P2xSl8LFjh2wyKNOP6y29KuZ6ZI73d7/4WC vs3pI7gGw1FnnaAoqURr1h74gmf/98imL3lZ14QYzp4BWyUwtdt8inB6ADZeC7J2vv zSHzrzYAc6SUw== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5LwMSESbsI0C; Wed, 6 Jul 2022 10:40:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 05F148138A; Wed, 6 Jul 2022 10:40:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 05F148138A Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EFF7E1BF20B for ; Wed, 6 Jul 2022 10:40:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D621840283 for ; Wed, 6 Jul 2022 10:40:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D621840283 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FvpH4sa6wy4P for ; Wed, 6 Jul 2022 10:40:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B64094015F Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by smtp2.osuosl.org (Postfix) with ESMTPS id B64094015F for ; Wed, 6 Jul 2022 10:40:07 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="263495219" X-IronPort-AV: E=Sophos;i="5.92,249,1650956400"; d="scan'208";a="263495219" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2022 03:40:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,249,1650956400"; d="scan'208";a="769998536" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by orsmga005.jf.intel.com with ESMTP; 06 Jul 2022 03:40:05 -0700 Received: from newjersey.igk.intel.com (newjersey.igk.intel.com [10.102.20.203]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 266Ae4Aq006295; Wed, 6 Jul 2022 11:40:05 +0100 From: Alexander Lobakin To: Marcin Szycik Date: Wed, 6 Jul 2022 12:39:40 +0200 Message-Id: <20220706103940.6444-1-alexandr.lobakin@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220701163222.318531-1-marcin.szycik@linux.intel.com> References: <20220701163222.318531-1-marcin.szycik@linux.intel.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657104007; x=1688640007; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LpSHNpTqOU9+cPL78/qfULoHfwIrjaMYFvtCeE+THN4=; b=FPAvY5mWun9t0KihEP2bOOlk/emCyyWURV2hjNrN5RP2SAcM60FOE8Or AHKZpLLBcj570/2aEy773UQizimHGTJjWT/Yh3jtJ51gEFhejG0w9LFGv lxomHRKwL5HtG//LIAEPNQX0gDXG1f6idb72LjKYeB97+XOaLIK6jhrAY /oYCp2CLz1BncbLnesjnLfubhlFxzUiJ4dH5wMMjeeZFxDywgtIAZnkiR IMyG8lu8xYetQnwjIP2hEm1wqGPk4kabQaudt3jsTcVs2y1KQHnaIJjS8 9GSIoyxkZV9C1bxBDMk20wkG4lUKOhmatJHuaEuWSkDji339uLMwKrm1k g==; X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=FPAvY5mW Subject: Re: [Intel-wired-lan] [PATCH net-next] ice: Add support for ip TTL & ToS offload X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-wired-lan@lists.osuosl.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Marcin Szycik Date: Fri, 1 Jul 2022 18:32:22 +0200 > Add support for parsing TTL and ToS (Hop Limit and Traffic Class) tc fields > and matching on those fields in filters. Incomplete part of implementation > was already in place (getting enc_ip and enc_tos from flow_match_ip and > writing them to filter header). > > Note: matching on ipv6 hop_limit is currently not supported by DDP package. > > Signed-off-by: Marcin Szycik > Reviewed-by: Michal Swiatkowski > --- > drivers/net/ethernet/intel/ice/ice_tc_lib.c | 138 +++++++++++++++++++- > drivers/net/ethernet/intel/ice/ice_tc_lib.h | 6 + > 2 files changed, 140 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c > index 14795157846b..f482715cdf7f 100644 > --- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c > +++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c > @@ -36,6 +36,10 @@ ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers, > ICE_TC_FLWR_FIELD_ENC_DEST_IPV6)) > lkups_cnt++; > > + if (flags & (ICE_TC_FLWR_FIELD_ENC_IP_TOS | > + ICE_TC_FLWR_FIELD_ENC_IP_TTL)) > + lkups_cnt++; > + > if (flags & ICE_TC_FLWR_FIELD_ENC_DEST_L4_PORT) > lkups_cnt++; > > @@ -59,6 +63,9 @@ ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers, > ICE_TC_FLWR_FIELD_DEST_IPV6 | ICE_TC_FLWR_FIELD_SRC_IPV6)) > lkups_cnt++; > > + if (flags & (ICE_TC_FLWR_FIELD_IP_TOS | ICE_TC_FLWR_FIELD_IP_TTL)) > + lkups_cnt++; > + > /* is L4 (TCP/UDP/any other L4 protocol fields) specified? */ > if (flags & (ICE_TC_FLWR_FIELD_DEST_L4_PORT | > ICE_TC_FLWR_FIELD_SRC_L4_PORT)) > @@ -252,6 +259,48 @@ ice_tc_fill_tunnel_outer(u32 flags, struct ice_tc_flower_fltr *fltr, > i++; > } > > + if (fltr->inner_headers.l2_key.n_proto == htons(ETH_P_IP) && > + flags & (ICE_TC_FLWR_FIELD_ENC_IP_TOS | > + ICE_TC_FLWR_FIELD_ENC_IP_TTL)) { > + list[i].type = ice_proto_type_from_ipv4(false); > + > + if (flags & ICE_TC_FLWR_FIELD_ENC_IP_TOS) { > + list[i].h_u.ipv4_hdr.tos = hdr->l3_key.tos; > + list[i].m_u.ipv4_hdr.tos = hdr->l3_mask.tos; > + } > + > + if (flags & ICE_TC_FLWR_FIELD_ENC_IP_TTL) { > + list[i].h_u.ipv4_hdr.time_to_live = hdr->l3_key.ttl; > + list[i].m_u.ipv4_hdr.time_to_live = hdr->l3_mask.ttl; > + } > + > + i++; > + } > + > + if (fltr->inner_headers.l2_key.n_proto == htons(ETH_P_IPV6) && > + flags & (ICE_TC_FLWR_FIELD_ENC_IP_TOS | > + ICE_TC_FLWR_FIELD_ENC_IP_TTL)) { Please wrap the second condition in a separate set of braces as it's a bitop. > + struct ice_ipv6_hdr *hdr_h, *hdr_m; > + > + hdr_h = &list[i].h_u.ipv6_hdr; > + hdr_m = &list[i].m_u.ipv6_hdr; > + list[i].type = ice_proto_type_from_ipv6(false); > + > + if (flags & ICE_TC_FLWR_FIELD_ENC_IP_TOS) { > + hdr_h->be_ver_tc_flow |= htonl(hdr->l3_key.tos << > + ICE_IPV6_HDR_TC_OFFSET); ^^^^^^^^^^^^^^^^^^^^^^ A candidate for FIELD_PREP()? > + hdr_m->be_ver_tc_flow |= htonl(hdr->l3_mask.tos << > + ICE_IPV6_HDR_TC_OFFSET); > + } > + > + if (flags & ICE_TC_FLWR_FIELD_ENC_IP_TTL) { > + hdr_h->hop_limit = hdr->l3_key.ttl; > + hdr_m->hop_limit = hdr->l3_mask.ttl; > + } > + > + i++; > + } > + > if ((flags & ICE_TC_FLWR_FIELD_ENC_DEST_L4_PORT) && > hdr->l3_key.ip_proto == IPPROTO_UDP) { > list[i].type = ICE_UDP_OF; > @@ -393,6 +442,48 @@ ice_tc_fill_rules(struct ice_hw *hw, u32 flags, > i++; > } > > + if (headers->l2_key.n_proto == htons(ETH_P_IP) && > + flags & (ICE_TC_FLWR_FIELD_IP_TOS | ICE_TC_FLWR_FIELD_IP_TTL)) { Also a bitop here, so a separate pair of brackets is recommended. > + list[i].type = ice_proto_type_from_ipv4(inner); > + > + if (flags & ICE_TC_FLWR_FIELD_IP_TOS) { > + list[i].h_u.ipv4_hdr.tos = headers->l3_key.tos; > + list[i].m_u.ipv4_hdr.tos = headers->l3_mask.tos; > + } > + > + if (flags & ICE_TC_FLWR_FIELD_IP_TTL) { > + list[i].h_u.ipv4_hdr.time_to_live = > + headers->l3_key.ttl; > + list[i].m_u.ipv4_hdr.time_to_live = > + headers->l3_mask.ttl; > + } > + > + i++; > + } > + > + if (headers->l2_key.n_proto == htons(ETH_P_IPV6) && > + flags & (ICE_TC_FLWR_FIELD_IP_TOS | ICE_TC_FLWR_FIELD_IP_TTL)) { Same. > + struct ice_ipv6_hdr *hdr_h, *hdr_m; > + > + hdr_h = &list[i].h_u.ipv6_hdr; > + hdr_m = &list[i].m_u.ipv6_hdr; > + list[i].type = ice_proto_type_from_ipv6(inner); > + > + if (flags & ICE_TC_FLWR_FIELD_IP_TOS) { > + hdr_h->be_ver_tc_flow |= htonl(headers->l3_key.tos << > + ICE_IPV6_HDR_TC_OFFSET); Same regarding FIELD_PREP(). You can even use be32_encode_bits() or be32p_replace_bits, e.g. hdr_h->be_ver_tc_flow |= be32_encode_bits(headers->l3_key.tos, ICE_IPV6_HDR_TC_OFFSET); or be32p_replace_bits(&hdr_h->be_ver_tc_flow, headers->l3_key.tos, ICE_IPV6_HDR_TC_OFFSET); > + hdr_m->be_ver_tc_flow |= htonl(headers->l3_mask.tos << > + ICE_IPV6_HDR_TC_OFFSET); > + } > + > + if (flags & ICE_TC_FLWR_FIELD_IP_TTL) { > + hdr_h->hop_limit = headers->l3_key.ttl; > + hdr_m->hop_limit = headers->l3_mask.ttl; > + } > + > + i++; > + } > + > /* copy L4 (src, dest) port */ > if (flags & (ICE_TC_FLWR_FIELD_DEST_L4_PORT | > ICE_TC_FLWR_FIELD_SRC_L4_PORT)) { > @@ -786,6 +877,40 @@ ice_tc_set_ipv6(struct flow_match_ipv6_addrs *match, > return 0; > } > > +/** > + * ice_tc_set_tos_ttl - Parse IP ToS/TTL from TC flower filter > + * @match: Pointer to flow match structure > + * @fltr: Pointer to filter structure > + * @headers: inner or outer header fields > + * @is_encap: set true for tunnel > + */ > +static void > +ice_tc_set_tos_ttl(struct flow_match_ip *match, > + struct ice_tc_flower_fltr *fltr, > + struct ice_tc_flower_lyr_2_4_hdrs *headers, > + bool is_encap) > +{ > + if (match->mask->tos) { > + if (is_encap) > + fltr->flags |= ICE_TC_FLWR_FIELD_ENC_IP_TOS; > + else > + fltr->flags |= ICE_TC_FLWR_FIELD_IP_TOS; > + > + headers->l3_key.tos = match->key->tos; > + headers->l3_mask.tos = match->mask->tos; > + } > + > + if (match->mask->ttl) { > + if (is_encap) > + fltr->flags |= ICE_TC_FLWR_FIELD_ENC_IP_TTL; > + else > + fltr->flags |= ICE_TC_FLWR_FIELD_IP_TTL; > + > + headers->l3_key.ttl = match->key->ttl; > + headers->l3_mask.ttl = match->mask->ttl; > + } > +} > + > /** > * ice_tc_set_port - Parse ports from TC flower filter > * @match: Flow match structure > @@ -915,10 +1040,7 @@ ice_parse_tunnel_attr(struct net_device *dev, struct flow_rule *rule, > struct flow_match_ip match; > > flow_rule_match_enc_ip(rule, &match); > - headers->l3_key.tos = match.key->tos; > - headers->l3_key.ttl = match.key->ttl; > - headers->l3_mask.tos = match.mask->tos; > - headers->l3_mask.ttl = match.mask->ttl; > + ice_tc_set_tos_ttl(&match, fltr, headers, true); > } > > if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_PORTS) && > @@ -987,6 +1109,7 @@ ice_parse_cls_flower(struct net_device *filter_dev, struct ice_vsi *vsi, > BIT(FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS) | > BIT(FLOW_DISSECTOR_KEY_ENC_PORTS) | > BIT(FLOW_DISSECTOR_KEY_ENC_OPTS) | > + BIT(FLOW_DISSECTOR_KEY_IP) | > BIT(FLOW_DISSECTOR_KEY_ENC_IP) | > BIT(FLOW_DISSECTOR_KEY_PORTS))) { > NL_SET_ERR_MSG_MOD(fltr->extack, "Unsupported key used"); > @@ -1148,6 +1271,13 @@ ice_parse_cls_flower(struct net_device *filter_dev, struct ice_vsi *vsi, > return -EINVAL; > } > > + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IP)) { > + struct flow_match_ip match; > + > + flow_rule_match_ip(rule, &match); > + ice_tc_set_tos_ttl(&match, fltr, headers, false); > + } > + > if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS)) { > struct flow_match_ports match; > > diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.h b/drivers/net/ethernet/intel/ice/ice_tc_lib.h > index 0193874cd203..a083dcaed0c4 100644 > --- a/drivers/net/ethernet/intel/ice/ice_tc_lib.h > +++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.h > @@ -24,9 +24,15 @@ > #define ICE_TC_FLWR_FIELD_ETH_TYPE_ID BIT(17) > #define ICE_TC_FLWR_FIELD_ENC_OPTS BIT(18) > #define ICE_TC_FLWR_FIELD_CVLAN BIT(19) > +#define ICE_TC_FLWR_FIELD_IP_TOS BIT(20) > +#define ICE_TC_FLWR_FIELD_IP_TTL BIT(21) > +#define ICE_TC_FLWR_FIELD_ENC_IP_TOS BIT(22) > +#define ICE_TC_FLWR_FIELD_ENC_IP_TTL BIT(23) > > #define ICE_TC_FLOWER_MASK_32 0xFFFFFFFF > > +#define ICE_IPV6_HDR_TC_OFFSET 20 > + > struct ice_indr_block_priv { > struct net_device *netdev; > struct ice_netdev_priv *np; > -- > 2.35.1 Those are minors anyway, great job in general! Thanks, Olek _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan