projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c14e51
)
Revert "net: stmmac: set PP_FLAG_DMA_SYNC_DEV only if XDP is enabled"
author
Jakub Kicinski
<kuba@kernel.org>
Fri, 4 Oct 2024 14:21:15 +0000
(07:21 -0700)
committer
Jakub Kicinski
<kuba@kernel.org>
Mon, 7 Oct 2024 23:47:07 +0000
(16:47 -0700)
This reverts commit
b514c47ebf41a6536551ed28a05758036e6eca7c
.
The commit describes that we don't have to sync the page when
recycling, and it tries to optimize that case. But we do need
to sync after allocation. Recycling side should be changed to
pass the right sync size instead.
Fixes:
b514c47ebf41
("net: stmmac: set PP_FLAG_DMA_SYNC_DEV only if XDP is enabled")
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Link:
https://lore.kernel.org/20241004070846.2502e9ea@kernel.org
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Furong Xu <0x1207@gmail.com>
Link:
https://patch.msgid.link/20241004142115.910876-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index
e214048
..
d3895d7
100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@
-2035,7
+2035,7
@@
static int __alloc_dma_rx_desc_resources(struct stmmac_priv *priv,
rx_q->queue_index = queue;
rx_q->priv_data = priv;
- pp_params.flags = PP_FLAG_DMA_MAP |
(xdp_prog ? PP_FLAG_DMA_SYNC_DEV : 0)
;
+ pp_params.flags = PP_FLAG_DMA_MAP |
PP_FLAG_DMA_SYNC_DEV
;
pp_params.pool_size = dma_conf->dma_rx_size;
num_pages = DIV_ROUND_UP(dma_conf->dma_buf_sz, PAGE_SIZE);
pp_params.order = ilog2(num_pages);