| Message ID | 20230629152305.905962-5-aleksander.lobakin@intel.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: page_pool: a couple assorted optimizations | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next, async |
| netdev/apply | fail | Patch does not apply to net-next |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 4b7d00d5b5d7..931c83d7b251 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -893,7 +893,8 @@ bool page_pool_return_skb_page(struct page *page, bool napi_safe) * no possible race. */ napi = READ_ONCE(pp->p.napi); - allow_direct = napi_safe && napi && + allow_direct = napi && + (napi_safe || test_bit(NAPI_STATE_RUNNING, &napi->state)) && READ_ONCE(napi->list_owner) == smp_processor_id(); /* Driver set this to memory recycling info. Reset it on recycle.
Commit 8c48eea3adf3 ("page_pool: allow caching from safely localized NAPI") allowed direct recycling of skb pages to their PP for some cases, but unfortunately missed a couple other majors. For example, %XDP_DROP in skb mode. The netstack just calls kfree_skb(), which unconditionally passes `false` as @napi_safe. Thus, all pages go through ptr_ring and locks, although most of times we're actually inside the NAPI polling this PP is linked with, so that it would be perfectly safe to recycle pages directly. Let's address such. If @napi_safe is true, we're fine, don't change anything for this path. But if it's false, test the introduced %NAPI_STATE_RUNNING. There's good probability it will be set and, if ->list_owner is our current CPU, we're good to use direct recycling, even though @napi_safe is false. For the mentioned xdp-drop-skb-mode case, the improvement I got is 3-4% in Mpps. As for page_pool stats, recycle_ring is now 0 and alloc_slow counter doesn't change most of times, which means the MM layer is not even called to allocate any new pages. Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com> --- net/core/skbuff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)