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 558C0C43334 for ; Wed, 6 Jul 2022 12:28:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CA08083083; Wed, 6 Jul 2022 12:28:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CA08083083 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1657110487; bh=izBxwcfBgCfNtJ/+ff8zGsIK/WML21MLbGuQwi2mRpY=; h=Date:To:References:From:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=vfEwIeWg/wtDIs5Q5pWc4igX4BkWwr3lS3+NR/X8BK1PMrCS+LyHdY+UqnXGpFqq5 RT97U/9380GbwIElwbu5s+2Xo66aoWRqxdNw0Ec0YRXvK5c9AAR2ebhyvJi/H4KsIe CS+b53RPKsRPoKhUptYqYBLvrv71jrPc6elZjqN5Th9G/8k94UGUfHfaKpjUSOBvXM 8w8sowwnto1qGcitV4IejsQMNYI3gq8Z5RBQoCb0wQua5p6a6WJNajNn9yV483zOJu sDP2g892kQUAGmz2WDM9c493YWZbtfxAI0ecNhy6ue8I/nHmiO5dzS6t44S+Pz1lY+ 1TtMhBjJ60j/A== 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 ActNAFK4KF0e; Wed, 6 Jul 2022 12:28:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 5F5C58316A; Wed, 6 Jul 2022 12:28:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5F5C58316A Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CA0751BF5E6 for ; Wed, 6 Jul 2022 12:28:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A2CF040281 for ; Wed, 6 Jul 2022 12:28:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A2CF040281 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N5Sejw-xmZ1A for ; Wed, 6 Jul 2022 12:28:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 293C04027B Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by smtp4.osuosl.org (Postfix) with ESMTPS id 293C04027B for ; Wed, 6 Jul 2022 12:28:02 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="272520090" X-IronPort-AV: E=Sophos;i="5.92,250,1650956400"; d="scan'208";a="272520090" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2022 05:28:02 -0700 X-IronPort-AV: E=Sophos;i="5.92,250,1650956400"; d="scan'208";a="920148395" Received: from mszycik-mobl.ger.corp.intel.com (HELO [172.22.249.219]) ([172.22.249.219]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2022 05:28:01 -0700 Message-ID: <766f2d41-923c-430b-9a97-8f1931875b8b@linux.intel.com> Date: Wed, 6 Jul 2022 14:27:52 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Alexander Lobakin References: <20220701163222.318531-1-marcin.szycik@linux.intel.com> <20220706103940.6444-1-alexandr.lobakin@intel.com> From: Marcin Szycik In-Reply-To: <20220706103940.6444-1-alexandr.lobakin@intel.com> 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=1657110483; x=1688646483; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=11bgBwQXI3xG6JqzmIOQRJeMVWpqMPM1971t0hIQ8bs=; b=k9lr086FeikVfZpJSDk8NVgSbjuKmnqs29JR3XDBAaqvDhTc338rI9+K 2Ws0YYjxtsMyF6YTkQvs4wzv50myG/NV1q6LR0tENFDt8E+nGrNzwOFqD PZhV2H8fIZGY7Il8/UTNTxnAPz9amrZNvIS0udGNk7j3/3qHSm17bmhCM 9VhKIxtmgmk8Qk8L9B/ip9Z+Eux/d+fmEv5cgWeB5sPAk1oKievA+F6ZY MuKEO7XqUosdEwdgo/x5gsJPUkR1DfIxc3d8GxD7Nwbu4nIAYL8s116Wu xQ66qGU8RIPlLFllqWHBd1pdHLI6nwQ1e/oN2x96saZgJx8CmVaT8r8fS Q==; X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=k9lr086F 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" On 06-Jul-22 12:39, Alexander Lobakin wrote: > 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! Thank you for review, it will be included in v2. > > Thanks, > Olek _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan