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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 AC3B9ECE58C for ; Wed, 9 Oct 2019 23:19:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8ABA621920 for ; Wed, 9 Oct 2019 23:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570663158; bh=S1LhbpV16ZnX952Qwc5a9L7X3jghZgy1Yjs2LoAPoJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=if4xcbwkpaX1go/c0m4/kuKZ3ngi61vg3TOAU9h4oHR5n3yvZmh4OoL4Vvym0JOVD VlOX4h/l7YAmHQ9uhn9ihiAZpfD3APE+m0iMtxoB378fLvhhpAWmApG0KzXJv5NJ0C LFxzjwMA6KIDpuaISQqWWFpGZgxwqARIvT23B/FQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732525AbfJIXTR (ORCPT ); Wed, 9 Oct 2019 19:19:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:37028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732483AbfJIXTN (ORCPT ); Wed, 9 Oct 2019 19:19:13 -0400 Received: from localhost.localdomain (unknown [151.66.37.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 69DAF21929; Wed, 9 Oct 2019 23:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570663153; bh=S1LhbpV16ZnX952Qwc5a9L7X3jghZgy1Yjs2LoAPoJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vtOXMZDGVi4TWiH8r66TosVTL9z0tyTikB8yWeBM1WGSv8izgyKCEKy+XLVsP1/59 KpQsXo+d+6ffZ8uYOIVzif2UO14YNr/EsIP5b/qWo9ifXv4objzH3XC8GMbsan11/D rtdEdpPi+F0269hwbMrTIVpQ5bRXVfDuIraAZWNA= From: Lorenzo Bianconi To: netdev@vger.kernel.org Cc: lorenzo.bianconi@redhat.com, davem@davemloft.net, thomas.petazzoni@bootlin.com, brouer@redhat.com, ilias.apalodimas@linaro.org, matteo.croce@redhat.com, mw@semihalf.com Subject: [PATCH v2 net-next 6/8] net: mvneta: move header prefetch in mvneta_swbm_rx_frame Date: Thu, 10 Oct 2019 01:18:36 +0200 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move data buffer prefetch in mvneta_swbm_rx_frame after dma_sync_single_range_for_cpu Signed-off-by: Ilias Apalodimas Signed-off-by: Jesper Dangaard Brouer Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/marvell/mvneta.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index e2795dddbcaf..91d8cb45104f 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2009,11 +2009,8 @@ mvneta_swbm_rx_frame(struct mvneta_port *pp, struct net_device *dev = pp->dev; enum dma_data_direction dma_dir; struct xdp_buff xdp = { - .data_hard_start = data, - .data = data + MVNETA_SKB_HEADROOM + MVNETA_MH_SIZE, .rxq = &rxq->xdp_rxq, }; - xdp_set_data_meta_invalid(&xdp); if (MVNETA_SKB_SIZE(rx_desc->data_size) > PAGE_SIZE) { len = MVNETA_MAX_RX_BUF_SIZE; @@ -2022,13 +2019,20 @@ mvneta_swbm_rx_frame(struct mvneta_port *pp, len = rx_desc->data_size; data_len += len - ETH_FCS_LEN; } - xdp.data_end = xdp.data + data_len; dma_dir = page_pool_get_dma_dir(rxq->page_pool); dma_sync_single_range_for_cpu(dev->dev.parent, rx_desc->buf_phys_addr, 0, len, dma_dir); + /* Prefetch header */ + prefetch(data); + + xdp.data_hard_start = data; + xdp.data = data + MVNETA_SKB_HEADROOM + MVNETA_MH_SIZE; + xdp.data_end = xdp.data + data_len; + xdp_set_data_meta_invalid(&xdp); + if (xdp_prog) { u32 ret; @@ -2117,15 +2121,11 @@ static int mvneta_rx_swbm(struct napi_struct *napi, /* Fairness NAPI loop */ while (done < budget && done < rx_pending) { struct mvneta_rx_desc *rx_desc = mvneta_rxq_next_desc_get(rxq); - unsigned char *data; struct page *page; int index; index = rx_desc - rxq->descs; page = (struct page *)rxq->buf_virt_addr[index]; - data = page_address(page); - /* Prefetch header */ - prefetch(data); rxq->refill_num++; done++; -- 2.21.0