From: Pavel Begunkov <asml.silence@xxxxxxxxx>
RFC only, not for upstream
Add a way to pass custom page pool parameters, but the final version
should converge with devmem.
Signed-off-by: Pavel Begunkov <asml.silence@xxxxxxxxx>
Signed-off-by: David Wei <dw@xxxxxxxxxxx>
---
include/net/netdev_rx_queue.h | 3 +++
net/core/dev.c | 2 +-
net/core/page_pool.c | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/net/netdev_rx_queue.h b/include/net/netdev_rx_queue.h
index 5dc35628633a..41f8c4e049bb 100644
--- a/include/net/netdev_rx_queue.h
+++ b/include/net/netdev_rx_queue.h
@@ -26,6 +26,9 @@ struct netdev_rx_queue {
*/
struct napi_struct *napi;
struct netdev_dmabuf_binding *binding;
+
+ const struct memory_provider_ops *pp_ops;
+ void *pp_private;
} ____cacheline_aligned_in_smp;
/*
diff --git a/net/core/dev.c b/net/core/dev.c
index 255a38cf59b1..2096ff57685a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2189,7 +2189,7 @@ int netdev_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx,
rxq = __netif_get_rx_queue(dev, rxq_idx);
- if (rxq->binding)
+ if (rxq->binding || rxq->pp_ops)
return -EEXIST;
err = xa_alloc(&binding->bound_rxq_list, &xa_idx, rxq, xa_limit_32b,
diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index 53039d2f8514..5d5b78878473 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -262,6 +262,9 @@ static int page_pool_init(struct page_pool *pool,
if (binding) {
pool->mp_ops = &dmabuf_devmem_ops;
pool->mp_priv = binding;
+ } else if (pool->p.queue && pool->p.queue->pp_ops) {
+ pool->mp_ops = pool->p.queue->pp_ops;
+ pool->mp_priv = pool->p.queue->pp_private;
}
if (pool->mp_ops) {
--
2.43.0
