Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <0c40b366-cdb5-f868-00c3-d8f485452cce@intel.com>
Date:   Fri, 19 May 2023 18:46:31 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.0
Subject: Re: [PATCH RESEND bpf-next 01/15] ice: make RX hash reading code more
 reusable
Content-Language: en-US
To:     Larysa Zaremba <larysa.zaremba@intel.com>
CC:     <bpf@vger.kernel.org>, Stanislav Fomichev <sdf@google.com>,
        "Alexei Starovoitov" <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Jakub Kicinski <kuba@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        "KP Singh" <kpsingh@kernel.org>, Jiri Olsa <jolsa@kernel.org>,
        Jesse Brandeburg <jesse.brandeburg@intel.com>,
        Tony Nguyen <anthony.l.nguyen@intel.com>,
        Anatoly Burakov <anatoly.burakov@intel.com>,
        Jesper Dangaard Brouer <brouer@redhat.com>,
        Alexander Lobakin <alexandr.lobakin@intel.com>,
        "Magnus Karlsson" <magnus.karlsson@gmail.com>,
        Maryam Tahhan <mtahhan@redhat.com>,
        <xdp-hints@xdp-project.net>, <netdev@vger.kernel.org>,
        <intel-wired-lan@lists.osuosl.org>, <linux-kernel@vger.kernel.org>
References: <20230512152607.992209-1-larysa.zaremba@intel.com>
 <20230512152607.992209-2-larysa.zaremba@intel.com>
From:   Alexander Lobakin <aleksander.lobakin@intel.com>
In-Reply-To: <20230512152607.992209-2-larysa.zaremba@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eHZQSDBqaVh0MzlDT1l0N1dKTzBwVy9zcEZTRkE5dnFKcG5rcTJzUU9aUW9T?=
 =?utf-8?B?TTArN2NPSlpGUkxkTktPUDh6eGlic3U3OFBhR1JhUVRyNEk2c3Q5ckRlWHNM?=
 =?utf-8?B?VlliVVBFL2VLVUE3TjJ6Y09Cdm1PYUVFZ3k3aTkrT0dmd05UZHIxQlNCcWdp?=
 =?utf-8?B?MVp4MnFFdVlFTUFCb0pnOG1DemxNMGp0WVI1L01zaG5YdnpSK25ScDNjV1Av?=
 =?utf-8?B?ZFlmR0NxdXpjbkt1SU5iRG80SmoreE9JcGxLdFdpOFdvKzJsQ2x6Ukd3NzBa?=
 =?utf-8?B?a08zL28yb1Irb1dLR0JjWXI0T1VqSUlvd1dINW5sRHFYbFZtbmI5RjV5dEFK?=
 =?utf-8?B?a0pZQ1EzNlJmU3EvbWg2Mkk3S0U5d2pTWEJZREp2VEludFlacEp4U1pSQkNI?=
 =?utf-8?B?OVNkaFpHZDBMV3pDNy9qdE9YbVN4UnNFRy9BdkRSUnp4ck40RjdIMWFjaUdY?=
 =?utf-8?B?bGtoSU42UERDdE93OUFDSlF4NXhvak8xeUVXdm9vU2FxN3dLY1M0KzVQM2Ez?=
 =?utf-8?B?RlRLQkluZk80VFlKK2xtYWxxS2w3dU1wTFA1RGxuZjgzQkZFcHVsRTZDbkhy?=
 =?utf-8?B?dEhjOTNwWjNGTit6UU1VdU9SM2FseXljQmd3eGpqampJK2JqRDAzTHVhbmll?=
 =?utf-8?B?bWIvV1ExcUZtazUwYzB1b25lYlcxRTF1RG9kZW1NL1NMU0h6RWQrS1doeXYv?=
 =?utf-8?B?UUJYNittQXpIdUVheE1YaDN3L1FsOXBoTkJWTmlYSFd4d1llWjZSenIrcElj?=
 =?utf-8?B?dzRuWTVvVlh3ZVN1aHRaRC85NWhQUlNKeSs5MzV2ZEl0c3VZU1Z0MFduZ3Jl?=
 =?utf-8?B?WThjYzZud1MwQUZvTzVrR2FVSFluUUhMbVYvbjBFWVZXZUdvbUNiYzVTUjZZ?=
 =?utf-8?B?eDRBRWFVNERoWU9hUWJiZmpjWFAwR2ZXY0NndWFiaWZ5WlhqNlVlMElaTkNH?=
 =?utf-8?B?cUQ2YXFTVEplTzZodDdUM1VwTU8yQy8zdkdNbUoxeHJBT2pFZmhndnpENXFi?=
 =?utf-8?B?TFpCRG0ySitxS2NYaGNDUHRwVHNDUGVheTE3bDNvMW12NG85Rmhjak9jMnEw?=
 =?utf-8?B?NG0zOXJLL3ZTOVEyYmdDVmo0dkZ5dGRQOHBabTRpRjlHVkgwanBnc09Bb3Yx?=
 =?utf-8?B?THE1VkdIL3FhcHBscU1ObWQxQjlSajVxWFJnZXZMTWJGTDZ3YVpnVFpHLzZj?=
 =?utf-8?B?dkorVXZ2am9pUjUxZkowaC93VVNHeHdCMlR6Z3EwUkJEY0FXNEM0eWsxTkds?=
 =?utf-8?B?ekIzMmYwR2JjM2lFQ3k2WFJQV09tQTlmWllFU0VQSTQ3OGgzTjJzWWkrc3FI?=
 =?utf-8?B?L0h6M2xwTEV5SkxDSzNiaEhpSXlVMGFWbExsZXJiQWgrV2hzdi85bmoyY25Y?=
 =?utf-8?B?UjhkN1RaNzVzaURVakFWWTh2aU5XUHN3ZXoydGhYaXA4VEFPVlVBYVRyc3BY?=
 =?utf-8?B?a25oUExIMSt6UE9rUEt6Y1N4V1FPN3Rna2toWTJCdnVFN0ZRMzRoS3hIMjV1?=
 =?utf-8?B?TmNZUVR6MXBOc3Qra2M3dXFJS3B1d2RGQ3VGLzg0am5Lc01wc01qSUdPZURN?=
 =?utf-8?B?VFBVSFhUTzJ0NU1JT3ZTaTV0VzlQelFLdWRLdFpLNkpiSjZ5SFJhTysvWFd3?=
 =?utf-8?B?b1pIdlR0dnJhcUIrRWNTUWxDcXdYTURKSmE3WVdxRHBKYTVrNVgwczRZeTZy?=
 =?utf-8?B?WXlRTzZxMnJnNHZveXV0aTRzUlVYUXJvZVJBTEswV1NjdzAycEJhZE1lMGhP?=
 =?utf-8?B?UUxUK1ord2ZlZXBQdXFtdDFNR1RIZlo1bUVtTDJEVEk5c2JGZFAvdW9ybzB3?=
 =?utf-8?B?Ny9WellBNlowWERPempCcnlOc0swWHdvcEZ1RHpyK1VGZGIyaDFJRDB6OGhx?=
 =?utf-8?B?L29NbVhRRXpJVWt2a2RydGJucUJtQWE4ZXZ6VnBUMEZXM1lJRGFURGhIZTcz?=
 =?utf-8?B?WE5SaG1xaVkrSGVGM3hjKzNhd1poMGliWEdaZCsrNCs4cktmd0UxaFV0MXN3?=
 =?utf-8?B?UXUwVVlUeWxTbGRqa0o3eHFCQXV4Y0xuQnFkaGlCYjlxRkN6RmtFajBuUmNM?=
 =?utf-8?B?dVdTdkJiajJ2TTVNRVlDOXFscGR4SEJrQlVIcWlBZUR6QjJGVjdaQnpsemhB?=
 =?utf-8?B?T1l0RlF1SnBJWERQb1JXQm5Bd0ZLQU5yNFVYeUxjRTVVeGRQQ3M2UStpckU3?=
 =?utf-8?B?Z1E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: f92ac774-65ee-47bf-8add-08db5888c328
X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3625.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2023 16:47:42.0325
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: pTYl3gW/ui6YEkuqOf2KJ6NIGAOqZn7x2KzEwR3GzdNW6JlQqxpJSbZvyE9UMJA6tbv+iDyqrUPOo73Bi/V5lmQ62FMhIU5BlffPyqUZ9Hg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7503
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Larysa Zaremba <larysa.zaremba@intel.com>
Date: Fri, 12 May 2023 17:25:53 +0200

> Previously, we only needed RX hash in skb path,
> hence all related code was written with skb in mind.
> But with the addition of XDP hints via kfuncs to the ice driver,
> the same logic will be needed in .xmo_() callbacks.
> 
> Separate generic process of reading RX hash from a descriptor
> into a separate function.
> 
> Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 38 +++++++++++++------
>  1 file changed, 27 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> index c8322fb6f2b3..fc67bbf600af 100644
> --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> @@ -63,28 +63,44 @@ static enum pkt_hash_types ice_ptype_to_htype(u16 ptype)
>  }
>  
>  /**
> - * ice_rx_hash - set the hash value in the skb
> + * ice_copy_rx_hash_from_desc - copy hash value from descriptor to address
> + * @rx_desc: specific descriptor
> + * @dst: address to copy hash value to
> + *
> + * Returns true, if valid hash has been copied into the destination address.
> + */
> +static bool
> +ice_copy_rx_hash_from_desc(union ice_32b_rx_flex_desc *rx_desc, u32 *dst)

@rx_desc can be const.

I'm also unsure about the naming. Why not name this one ice_rx_hash()
and the one which sets it in skb ice_rx_hash_skb()?

> +{
> +	struct ice_32b_rx_flex_desc_nic *nic_mdid;

Also const. I thought you'll pick most of my optimizations from the
related commit :D

> +
> +	if (rx_desc->wb.rxdid != ICE_RXDID_FLEX_NIC)
> +		return false;
> +
> +	nic_mdid = (struct ice_32b_rx_flex_desc_nic *)rx_desc;
> +	*dst = le32_to_cpu(nic_mdid->rss_hash);
> +	return true;

You can just return the hash. `hash == 0` means there's no hash, so it
basically means `false`, while non-zero is `true`.

> +}
> +
> +/**
> + * ice_rx_hash_to_skb - set the hash value in the skb
>   * @rx_ring: descriptor ring
>   * @rx_desc: specific descriptor
>   * @skb: pointer to current skb
>   * @rx_ptype: the ptype value from the descriptor
>   */
>  static void
> -ice_rx_hash(struct ice_rx_ring *rx_ring, union ice_32b_rx_flex_desc *rx_desc,
> -	    struct sk_buff *skb, u16 rx_ptype)
> +ice_rx_hash_to_skb(struct ice_rx_ring *rx_ring,
> +		   union ice_32b_rx_flex_desc *rx_desc,
> +		   struct sk_buff *skb, u16 rx_ptype)
>  {
> -	struct ice_32b_rx_flex_desc_nic *nic_mdid;
>  	u32 hash;
>  
>  	if (!(rx_ring->netdev->features & NETIF_F_RXHASH))
>  		return;
>  
> -	if (rx_desc->wb.rxdid != ICE_RXDID_FLEX_NIC)
> -		return;
> -
> -	nic_mdid = (struct ice_32b_rx_flex_desc_nic *)rx_desc;
> -	hash = le32_to_cpu(nic_mdid->rss_hash);
> -	skb_set_hash(skb, hash, ice_ptype_to_htype(rx_ptype));
> +	if (ice_copy_rx_hash_from_desc(rx_desc, &hash))

likely()? I wouldn't care about zero-hashed frames, their perf is not
critical anyway.

> +		skb_set_hash(skb, hash, ice_ptype_to_htype(rx_ptype));
>  }
>  
>  /**
> @@ -186,7 +202,7 @@ ice_process_skb_fields(struct ice_rx_ring *rx_ring,
>  		       union ice_32b_rx_flex_desc *rx_desc,
>  		       struct sk_buff *skb, u16 ptype)
>  {
> -	ice_rx_hash(rx_ring, rx_desc, skb, ptype);
> +	ice_rx_hash_to_skb(rx_ring, rx_desc, skb, ptype);
>  
>  	/* modifies the skb - consumes the enet header */
>  	skb->protocol = eth_type_trans(skb, rx_ring->netdev);

Thanks,
Olek