Commit 66244337 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'page_pool-a-couple-of-assorted-optimizations' 

Alexander Lobakin says:

====================
page_pool: a couple of assorted optimizations

That initially was a spin-off of the IAVF PP series[0], but has grown
(and shrunk) since then a bunch. In fact, it consists of three
semi-independent blocks:

* #1-2: Compile-time optimization. Split page_pool.h into 2 headers to
  not overbloat the consumers not needing complex inline helpers and
  then stop including it in skbuff.h at all. The first patch is also
  prereq for the whole series.
* #3: Improve cacheline locality for users of the Page Pool frag API.
* #4-6: Use direct cache recycling more aggressively, when it is safe
  obviously. In addition, make sure nobody wants to use Page Pool API
  with disabled interrupts.

Patches #1 and #5 are authored by Yunsheng and Jakub respectively, with
small modifications from my side as per ML discussions.
For the perf numbers for #3-6, please see individual commit messages.

Also available on my GH with many more Page Pool goodies[1].

[0] https://lore.kernel.org/netdev/20230530150035.1943669-1-aleksander.lobakin@intel.com
[1] https://github.com/alobakin/linux/commits/iavf-pp-frag
====================

Link: https://lore.kernel.org/r/20230804180529.2483231-1-aleksander.lobakin@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 96bc3137 4a36d018

Documentation/networking/page_pool.rst

+3 −3
Original line number Diff line number Diff line
@@ -67,10 +67,10 @@ a page will cause no race conditions is enough. 
.. kernel-doc:: net/core/page_pool.c

   :identifiers: page_pool_create



.. kernel-doc:: include/net/page_pool.h

.. kernel-doc:: include/net/page_pool/types.h

   :identifiers: struct page_pool_params



.. kernel-doc:: include/net/page_pool.h

.. kernel-doc:: include/net/page_pool/helpers.h

   :identifiers: page_pool_put_page page_pool_put_full_page

		 page_pool_recycle_direct page_pool_dev_alloc_pages

		 page_pool_get_dma_addr page_pool_get_dma_dir
@@ -122,7 +122,7 @@ page_pool_stats allocated by the caller. 
The API will fill in the provided struct page_pool_stats with

statistics about the page_pool.



.. kernel-doc:: include/net/page_pool.h

.. kernel-doc:: include/net/page_pool/types.h

   :identifiers: struct page_pool_recycle_stats

		 struct page_pool_alloc_stats

		 struct page_pool_stats

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -16020,7 +16020,7 @@ M: Ilias Apalodimas <ilias.apalodimas@linaro.org> 
L:	netdev@vger.kernel.org

S:	Supported

F:	Documentation/networking/page_pool.rst

F:	include/net/page_pool.h

F:	include/net/page_pool/

F:	include/trace/events/page_pool.h

F:	net/core/page_pool.c


































drivers/net/ethernet/broadcom/bnxt/bnxt.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -54,7 +54,7 @@







#include <net/pkt_cls.h>









#include <linux/hwmon.h>









#include <linux/hwmon-sysfs.h>









#include <net/page_pool.h>









#include <net/page_pool/helpers.h>









#include <linux/align.h>









#include <net/netdev_queues.h>












































drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -15,7 +15,7 @@







#include <linux/bpf.h>









#include <linux/bpf_trace.h>









#include <linux/filter.h>









#include <net/page_pool.h>









#include <net/page_pool/helpers.h>









#include "bnxt_hsi.h"









#include "bnxt.h"









#include "bnxt_xdp.h"


































drivers/net/ethernet/engleder/tsnep_main.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -28,6 +28,7 @@







#include <linux/iopoll.h>









#include <linux/bpf.h>









#include <linux/bpf_trace.h>









#include <net/page_pool/helpers.h>









#include <net/xdp_sock_drv.h>



















#define TSNEP_RX_OFFSET (max(NET_SKB_PAD, XDP_PACKET_HEADROOM) + NET_IP_ALIGN)