From patchwork Fri May 28 17:43:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 449876 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AC93C2B9F7 for ; Fri, 28 May 2021 17:44:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 67EFB61108 for ; Fri, 28 May 2021 17:44:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229551AbhE1Rpx (ORCPT ); Fri, 28 May 2021 13:45:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:46428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229488AbhE1Rpq (ORCPT ); Fri, 28 May 2021 13:45:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 62D4E613B5; Fri, 28 May 2021 17:44:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622223851; bh=vpPbdfyPwSKrlEO/cazA/OQmRGsWg3i09s50a/Ckt6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aci4mmdJOg2dAy1/JIhMQaxp8p6nPeZDJBDrp990uDMNu2bFzPLnBS5FzSEgzHjki eM6R+U8qMPugwxDqRC16GmWSMCk0hZDrlgCW0Cs/B32eR4XdEbWjmo+T09aUXQWQ38 iWdJK1uOPCx2hcgIZ8AYiQVoBrXFYNBSPqhpL3JRxG+/xhGN5mSarA7FuCoOW0lv4S ABMCTYF66ixBFGyu/EerkaJxjofVh3Z9urMOkeNDgxT9EZXLxmWi1NFh9DZMNiPba6 wRpASag++YVrAFbhFP0BCGLOvxbrDGYt339sO3B7ht6kDrn3ZqjLu1dAQXsvTaI6fO JzbFmIBu/qjKA== From: Lorenzo Bianconi To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, daniel@iogearbox.net, ast@kernel.org, echaudro@redhat.com, dsahern@gmail.com, magnus.karlsson@intel.com, toke@redhat.com, brouer@redhat.com, bjorn@kernel.org, maciej.fijalkowski@intel.com, john.fastabend@gmail.com Subject: [RFC bpf-next 2/4] mvneta: return csum computation result from mvneta_rx_csum Date: Fri, 28 May 2021 19:43:42 +0200 Message-Id: <3d89a6af46b4b381256e050f2a02f87db06ceabb.1622222367.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a preliminary patch to add hw csum hint support to mvneta xdp implementation Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/marvell/mvneta.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 7d5cd9bc6c99..4a7c153a2666 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -1805,18 +1805,14 @@ static void mvneta_rx_error(struct mvneta_port *pp, } /* Handle RX checksum offload based on the descriptor's status */ -static void mvneta_rx_csum(struct mvneta_port *pp, u32 status, - struct sk_buff *skb) +static int mvneta_rx_csum(struct mvneta_port *pp, u32 status) { if ((pp->dev->features & NETIF_F_RXCSUM) && (status & MVNETA_RXD_L3_IP4) && - (status & MVNETA_RXD_L4_CSUM_OK)) { - skb->csum = 0; - skb->ip_summed = CHECKSUM_UNNECESSARY; - return; - } + (status & MVNETA_RXD_L4_CSUM_OK)) + return CHECKSUM_UNNECESSARY; - skb->ip_summed = CHECKSUM_NONE; + return CHECKSUM_NONE; } /* Return tx queue pointer (find last set bit) according to returned @@ -2335,7 +2331,7 @@ mvneta_swbm_build_skb(struct mvneta_port *pp, struct mvneta_rx_queue *rxq, skb_reserve(skb, xdp->data - xdp->data_hard_start); skb_put(skb, xdp->data_end - xdp->data); - mvneta_rx_csum(pp, desc_status, skb); + skb->ip_summed = mvneta_rx_csum(pp, desc_status); for (i = 0; i < num_frags; i++) { skb_frag_t *frag = &sinfo->frags[i]; @@ -2532,7 +2528,7 @@ static int mvneta_rx_hwbm(struct napi_struct *napi, rx_bytes); skb->protocol = eth_type_trans(skb, dev); - mvneta_rx_csum(pp, rx_status, skb); + skb->ip_summed = mvneta_rx_csum(pp, rx_status); napi_gro_receive(napi, skb); rcvd_pkts++; @@ -2581,8 +2577,7 @@ static int mvneta_rx_hwbm(struct napi_struct *napi, skb_put(skb, rx_bytes); skb->protocol = eth_type_trans(skb, dev); - - mvneta_rx_csum(pp, rx_status, skb); + skb->ip_summed = mvneta_rx_csum(pp, rx_status); napi_gro_receive(napi, skb); } From patchwork Fri May 28 17:43:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 449875 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46C1FC47087 for ; Fri, 28 May 2021 17:44:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2918260C40 for ; Fri, 28 May 2021 17:44:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229569AbhE1Rp5 (ORCPT ); Fri, 28 May 2021 13:45:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:46474 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbhE1Rpx (ORCPT ); Fri, 28 May 2021 13:45:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EBABA61248; Fri, 28 May 2021 17:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622223858; bh=U/75aorPZzn/IjooJ9pxtYsQOLtdO7c8hdkxGWaE3UY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q9ErbdE+6bnwgst51xDLni9hqMBCs/foB4jhuyWZbJfzbvo4ktQje6a+YQY1RseVS OL3c1fMJ9ReFWW55Geop16jbPhpwe12PIuD3Q4HaAxtW5pmzrQVj4MR198HgCMTd8y JdadFo7x1VCPQZV9hRCuikeZpqqrCX8SYTfmSa6a33BEIG31BIhbval42Uopt74K7V XcZ9BLJUq07fu44/GrQL/sLWV+a71gfBVDRy5xSdIxS9A0ttsHXEaTqn7Pfki+8eoh LBepYUpDWKOPrg7IwAHx8YQEPIfBw5QxX+uREIa7LYvIpRN3XvUq2UtmCnCMo80j0c tC9SANx7GWNIw== From: Lorenzo Bianconi To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, daniel@iogearbox.net, ast@kernel.org, echaudro@redhat.com, dsahern@gmail.com, magnus.karlsson@intel.com, toke@redhat.com, brouer@redhat.com, bjorn@kernel.org, maciej.fijalkowski@intel.com, john.fastabend@gmail.com Subject: [RFC bpf-next 4/4] net: xdp: update csum building the skb Date: Fri, 28 May 2021 19:43:44 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org update skb->ip_summed and skb->csum filed building the skb in __xdp_build_skb_from_frame routine Co-developed-by: David Ahern Signed-off-by: David Ahern Signed-off-by: Lorenzo Bianconi --- net/core/xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/xdp.c b/net/core/xdp.c index 725d20f1b100..aadcbbc438c3 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -555,10 +555,10 @@ struct sk_buff *__xdp_build_skb_from_frame(struct xdp_frame *xdpf, skb->protocol = eth_type_trans(skb, dev); /* Optional SKB info, currently missing: - * - HW checksum info (skb->ip_summed) * - HW RX hash (skb_set_hash) * - RX ring dev queue index (skb_record_rx_queue) */ + xdp_frame_get_csum(xdpf, skb); /* Until page_pool get SKB return path, release DMA here */ xdp_release_frame(xdpf);