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;
Date:   Mon, 22 May 2023 18:05:04 +0200
From:   Larysa Zaremba <larysa.zaremba@intel.com>
To:     Alexander Lobakin <aleksander.lobakin@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>
Subject: Re: [PATCH RESEND bpf-next 03/15] ice: make RX checksum checking
 code more reusable
Message-ID: <ZGuSsBVFlEePio60@lincoln>
References: <20230512152607.992209-1-larysa.zaremba@intel.com>
 <20230512152607.992209-4-larysa.zaremba@intel.com>
 <6693bcdb-b5dc-2f5b-41fa-9a9bba909dc7@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <6693bcdb-b5dc-2f5b-41fa-9a9bba909dc7@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TO5m01ZHEitlCuBAkuNcDwtaqh6vPSicVaBu//8lAesJDizRRIEHE1wcvGvg?=
 =?us-ascii?Q?qcYxG4k3RIp92W26nJY/QoKw7ICMD6kUtHE3vZ1J8illFtCl9yyVqv8G+0bR?=
 =?us-ascii?Q?KhW1+QDftKzvWh1VVmT0frqESgaJVtcaFKzkfNbae9GQDSRzZqjK+fbXcTXm?=
 =?us-ascii?Q?MOWEnFPA4Vi9tcF/FtDMtq43LwmZWYBqafPoPLuEQMSaiU98p1ylmkP+QF7f?=
 =?us-ascii?Q?x98mQwgtqL0o9NE+ByPBG6vWFfFRgGe8P1x65F0vEQJtpIJmT7YzSkiXdX8I?=
 =?us-ascii?Q?qeLlDiMtLFh4dvGzRq0Tm4xME/05TfOIy63Lrk0iimUEgXGCegSLwMHnsy7+?=
 =?us-ascii?Q?FqHdZfWA1Gi51yl/d3xXp8hYi2jorrGaGQgNUK5+Q6P+dl2Z6hgogTOSe+oj?=
 =?us-ascii?Q?nccQcJ/ZSU/M1Bb1E3FMQpbARgK9mw/cX/jnbOsiNZn/wT3G5R6hNh/zeTXp?=
 =?us-ascii?Q?4+rFgURp8QMc6Bu37pBSihbpfegZ/zN561qSwP+r5LA0xnmn01wb2nVRNKCU?=
 =?us-ascii?Q?s3Ehf/93ZGAvAa7eycdiV5UyZMqcDVtGAoeFZ/yxpOE+0B6ADOw9o2KnojUr?=
 =?us-ascii?Q?KOzKrxOM3KartDQ7vjTXfewfiNOFqiSj51V2yx2muywim96Sn0HC03j8couK?=
 =?us-ascii?Q?vYf4mm5TvcldxJr1lJhrjLkvbXTIaOGlW5jhNPuoZMgmHgGkSyCPhYeUZINJ?=
 =?us-ascii?Q?BUPOxGudtm7RRG/FkewmumWVJ3J1wNjLMU7CJ19qwLIMgnH7bfTMQSUhzaYC?=
 =?us-ascii?Q?uiLkcyNmSSv4LWhLD5HyYJWtiddoe2wjcAV0Ig0nuJxkyDj/1JlUxG88OMjy?=
 =?us-ascii?Q?elYm2pCkIFrhx5gpkNYN1LbI1dBW16iuBB/9HQZC9VF5AOq7MUSqMb7zuxPt?=
 =?us-ascii?Q?Amf+4/vQAxKa4TsBUaiYM7HmjmHVb2v8TOAFBFbUJR4cGbM3WAek2jpy5wiv?=
 =?us-ascii?Q?/SVDxypjqMz5h676Q99edPLojkYP3jQBf39X2dbA2keQbUweNQJVbFletGYp?=
 =?us-ascii?Q?HWw5j4xQM+3uiFAU5YLFdCA+Gzz3CXGY9DBz3BKLSn2SLIQ0UQzoS4r6hdYp?=
 =?us-ascii?Q?Ym9b/M1h9ORbphhkVHG0dGkXFScu3e5FhxqwbKIlWY/Yxiflbx4qGTwyR+78?=
 =?us-ascii?Q?RdvMhadM0gow7/9IAZScvMjOxd06AJfJQVJW/5IlnIOu3WJ80Hd3x8eWMLw3?=
 =?us-ascii?Q?lBIKKGgD28mB1ESMUCy9eGazXA2kfOuonClTliC/FbJ5VBnluFR2/pH+ZIHC?=
 =?us-ascii?Q?9ho7xHfOGubFEA4VcyyMpbJEJOfB+C/Vhh3wyYA8JevP2YIxjMKz3zFkb4A7?=
 =?us-ascii?Q?+XelSRIGb48Qyc+U8sJR/KpBNxnuq2gRjXTOX1sKktXhQXx2AIP0jti/s8jm?=
 =?us-ascii?Q?7wQ4nEyH2dER2ZaKx5uy0AjyQ8Wcla4DV6Cz3K0O3g62ga2bb9ytajQd+wYS?=
 =?us-ascii?Q?N3S5zHEbPp1Zsx2HFp/zbVPWdJN2fPTTO3ItP6umKecUAHv81RsMWcXG6P0h?=
 =?us-ascii?Q?Ut+HCEFhZ7OTYTDnrMJZN908mT7B97MCpglCJKMn2zhU/w8vnNnj0/h2ZAqG?=
 =?us-ascii?Q?QoghvvEuN8RHXdj6scO1foV7taevPw3sCE4WKLqYnPsWSGl0gxbJE30OuQug?=
 =?us-ascii?Q?jA=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 50863a07-94cf-47ff-8fe3-08db5adeb077
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5471.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 16:07:49.5249
 (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: po41TiBY2XAJhCtySNskzqn1KKECZNEu27oEpfFpkvG6r8EEoVYKTtBKX/mE28HLhV3o4H56c6n4l0h3WY7c9nzqWeTN9MwQmCMnV0XWxeA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5949
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE 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

On Mon, May 22, 2023 at 05:51:37PM +0200, Alexander Lobakin wrote:
> From: Larysa Zaremba <larysa.zaremba@intel.com>
> Date: Fri, 12 May 2023 17:25:55 +0200
> 
> > Previously, we only needed RX checksum flags 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.
> > 
> > Put generic process of determining checksum status into
> > a separate function.
> > 
> > Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
> > ---
> >  drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 71 ++++++++++++-------
> >  1 file changed, 46 insertions(+), 25 deletions(-)
> > 
> > diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> > index 1aab79dc8915..6a4fd3f3fc0a 100644
> > --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> > +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> > @@ -104,17 +104,17 @@ ice_rx_hash_to_skb(struct ice_rx_ring *rx_ring,
> >  }
> >  
> >  /**
> > - * ice_rx_csum - Indicate in skb if checksum is good
> > - * @ring: the ring we care about
> > - * @skb: skb currently being received and modified
> > + * ice_rx_csum_checked - Indicates, whether hardware has checked the checksum
> 
> %CHECKSUM_UNNECESSARY means that the csum is correct / frame is not
> damaged. So "checked" is not enough I'd say, it's "verified" at least.
> OTOH that's too long already, I'd go with classic "csum_ok" :D

'csum_ok' sounds good :) 'csum_valid' if want to be fancy

> 
> >   * @rx_desc: the receive descriptor
> >   * @ptype: the packet type decoded by hardware
> > + * @csum_lvl_dst: address to put checksum level into
> > + * @ring: ring for error stats, can be NULL
> >   *
> > - * skb->protocol must be set before this function is called
> > + * Returns true, if hardware has checked the checksum.
> >   */
> > -static void
> > -ice_rx_csum(struct ice_rx_ring *ring, struct sk_buff *skb,
> > -	    union ice_32b_rx_flex_desc *rx_desc, u16 ptype)
> > +static bool
> > +ice_rx_csum_checked(union ice_32b_rx_flex_desc *rx_desc, u16 ptype,
> 
> (also const, but I guess you'll do that either way after the previous
>  mails)

OK

> 
> > +		    u8 *csum_lvl_dst, struct ice_rx_ring *ring)
> >  {
> >  	struct ice_rx_ptype_decoded decoded;
> >  	u16 rx_status0, rx_status1;
> 
> [...]
> 
> > +/**
> > + * ice_rx_csum_into_skb - Indicate in skb if checksum is good
> > + * @ring: the ring we care about
> > + * @skb: skb currently being received and modified
> > + * @rx_desc: the receive descriptor
> > + * @ptype: the packet type decoded by hardware
> > + */
> > +static void
> > +ice_rx_csum_into_skb(struct ice_rx_ring *ring, struct sk_buff *skb,
> > +		     union ice_32b_rx_flex_desc *rx_desc, u16 ptype)
> > +{
> > +	u8 csum_level = 0;
> 
> I'm not a fan of variables shorter than u32 on the stack. And since it
> gets passed by a reference, I'm not sure the compiler will inline it =\
> 
> > +
> > +	/* Start with CHECKSUM_NONE and by default csum_level = 0 */
> > +	skb->ip_summed = CHECKSUM_NONE;
> > +	skb_checksum_none_assert(skb);
> 
> Can we also remove this? Neither of these makes sense. ::ip_summed is
> always zeroed after the memset() in __build_skb_around() (somewhere
> there), while the assertion checks for `skb->ip_summed ==
> CHECKSUM_NONE`, i.e. it's *always* true here (set and check :D). It's
> some ancient pathetic rituals copied over and over again from e100
> centuries or so...

Will fix.

> 
> ...and BTW the comment is misleading, because the code doesn't zero
> ::csum_level as they claim :D
> 
> > +
> > +	/* check if Rx checksum is enabled */
> > +	if (!(ring->netdev->features & NETIF_F_RXCSUM))
> > +		return;
> > +
> > +	if (!ice_rx_csum_checked(rx_desc, ptype, &csum_level, ring))
> > +		return;
> > +
> > +	skb->ip_summed = CHECKSUM_UNNECESSARY;
> > +	skb->csum_level = csum_level;
> 
> Since csum_level is useless when ip_summed is set to NONE, what do you
> think about making the function return -1, 0, or 1 without writing
> anything by reference?
> 
> 	int csum_level;
> 
> 	csum_level = ice_rx_csum_ok(rx_desc, ptype, ring);
> 	if (csum_level < 0)
> 		return;
> 
> 	skb->ip_summed = CHECKSUM_UNNECESSARY;
> 	skb->csum_level = csum_level;
> 
> I'm not saying it's better (might be a bit at codegen), just proposing.

I think it's worth a try.

> 
> >  }
> >  
> >  /**
> > @@ -232,7 +253,7 @@ ice_process_skb_fields(struct ice_rx_ring *rx_ring,
> >  	/* modifies the skb - consumes the enet header */
> >  	skb->protocol = eth_type_trans(skb, rx_ring->netdev);
> >  
> > -	ice_rx_csum(rx_ring, skb, rx_desc, ptype);
> > +	ice_rx_csum_into_skb(rx_ring, skb, rx_desc, ptype);
> >  
> >  	if (rx_ring->ptp_rx)
> >  		ice_ptp_rx_hwts_to_skb(rx_ring, rx_desc, skb);
> 
> Thanks,
> Olek