From: Lorenzo Bianconi <lorenzo@kernel.org>
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 [thread overview]
Message-ID: <eb0cdfc9f5f3e61e38e303f908abd7beb57360e4.1570662004.git.lorenzo@kernel.org> (raw)
In-Reply-To: <cover.1570662004.git.lorenzo@kernel.org>
Move data buffer prefetch in mvneta_swbm_rx_frame after
dma_sync_single_range_for_cpu
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
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
next prev parent reply other threads:[~2019-10-09 23:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 23:18 [PATCH v2 net-next 0/8] add XDP support to mvneta driver Lorenzo Bianconi
2019-10-09 23:18 ` [PATCH v2 net-next 1/8] net: mvneta: introduce mvneta_update_stats routine Lorenzo Bianconi
2019-10-09 23:18 ` [PATCH v2 net-next 2/8] net: mvneta: introduce page pool API for sw buffer manager Lorenzo Bianconi
2019-10-09 23:18 ` [PATCH v2 net-next 3/8] net: mvneta: rely on build_skb in mvneta_rx_swbm poll routine Lorenzo Bianconi
2019-10-10 7:16 ` Ilias Apalodimas
2019-10-10 9:58 ` Lorenzo Bianconi
2019-10-09 23:18 ` [PATCH v2 net-next 4/8] net: mvneta: sync dma buffers before refilling hw queues Lorenzo Bianconi
2019-10-10 7:08 ` Jesper Dangaard Brouer
2019-10-10 7:21 ` Ilias Apalodimas
2019-10-10 9:18 ` Lorenzo Bianconi
2019-10-10 9:20 ` Lorenzo Bianconi
2019-10-09 23:18 ` [PATCH v2 net-next 5/8] net: mvneta: add basic XDP support Lorenzo Bianconi
2019-10-10 8:50 ` Jesper Dangaard Brouer
2019-10-10 9:57 ` Lorenzo Bianconi
2019-10-09 23:18 ` Lorenzo Bianconi [this message]
2019-10-09 23:18 ` [PATCH v2 net-next 7/8] net: mvneta: make tx buffer array agnostic Lorenzo Bianconi
2019-10-09 23:18 ` [PATCH v2 net-next 8/8] net: mvneta: add XDP_TX support Lorenzo Bianconi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eb0cdfc9f5f3e61e38e303f908abd7beb57360e4.1570662004.git.lorenzo@kernel.org \
--to=lorenzo@kernel.org \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=ilias.apalodimas@linaro.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=matteo.croce@redhat.com \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).