mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Remove a qualcommax patch
This commit is contained in:
Ycarus (Yannick Chabanois)
parent
b4b6f82d1b
commit
1d25cb65d0
2 changed files with 0 additions and 796 deletions
|
|
@ -1,412 +0,0 @@
|
|||
--- a/include/linux/cpuhotplug.h
|
||||
+++ b/include/linux/cpuhotplug.h
|
||||
@@ -94,6 +94,7 @@ enum cpuhp_state {
|
||||
CPUHP_RADIX_DEAD,
|
||||
CPUHP_PAGE_ALLOC,
|
||||
CPUHP_NET_DEV_DEAD,
|
||||
+ CPUHP_SKB_RECYCLER_DEAD,
|
||||
CPUHP_PCI_XGENE_DEAD,
|
||||
CPUHP_IOMMU_IOVA_DEAD,
|
||||
CPUHP_LUSTRE_CFS_DEAD,
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -1240,7 +1240,7 @@ static inline void kfree_skb_list(struct sk_buff *segs)
|
||||
kfree_skb_list_reason(segs, SKB_DROP_REASON_NOT_SPECIFIED);
|
||||
}
|
||||
|
||||
-#ifdef CONFIG_TRACEPOINTS
|
||||
+#ifdef CONFIG_SKB_RECYCLER
|
||||
void consume_skb(struct sk_buff *skb);
|
||||
#else
|
||||
static inline void consume_skb(struct sk_buff *skb)
|
||||
@@ -1252,6 +1252,8 @@ static inline void consume_skb(struct sk_buff *skb)
|
||||
void __consume_stateless_skb(struct sk_buff *skb);
|
||||
void __kfree_skb(struct sk_buff *skb);
|
||||
extern struct kmem_cache *skbuff_head_cache;
|
||||
+extern void kfree_skbmem(struct sk_buff *skb);
|
||||
+extern void skb_release_data(struct sk_buff *skb);
|
||||
|
||||
void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
|
||||
bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
|
||||
--- a/net/Kconfig
|
||||
+++ b/net/Kconfig
|
||||
@@ -332,6 +332,27 @@ config NET_FLOW_LIMIT
|
||||
with many clients some protection against DoS by a single (spoofed)
|
||||
flow that greatly exceeds average workload.
|
||||
|
||||
+config SKB_RECYCLER
|
||||
+ bool "Generic skb recycling"
|
||||
+ default y
|
||||
+ help
|
||||
+ SKB_RECYCLER is used to implement RX-to-RX skb recycling.
|
||||
+ This config enables the recycling scheme for bridging and
|
||||
+ routing workloads. It can reduce skbuff freeing or
|
||||
+ reallocation overhead.
|
||||
+
|
||||
+config SKB_RECYCLER_MULTI_CPU
|
||||
+ bool "Cross-CPU recycling for CPU-locked workloads"
|
||||
+ depends on SMP && SKB_RECYCLER
|
||||
+ default n
|
||||
+
|
||||
+config ALLOC_SKB_PAGE_FRAG_DISABLE
|
||||
+ bool "Disable page fragment based skbuff payload allocations"
|
||||
+ depends on !SKB_RECYCLER
|
||||
+ default n
|
||||
+ help
|
||||
+ Disable page fragment based allocations for skbuff payloads.
|
||||
+
|
||||
menu "Network testing"
|
||||
|
||||
config NET_PKTGEN
|
||||
--- a/net/core/Makefile
|
||||
+++ b/net/core/Makefile
|
||||
@@ -40,3 +40,4 @@ obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o
|
||||
obj-$(CONFIG_BPF_SYSCALL) += sock_map.o
|
||||
obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o
|
||||
obj-$(CONFIG_OF) += of_net.o
|
||||
+obj-$(CONFIG_SKB_RECYCLER) += skbuff_recycle.o
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -5974,10 +5974,16 @@ static int process_backlog(struct napi_struct *napi, int quota)
|
||||
|
||||
napi->weight = READ_ONCE(dev_rx_weight);
|
||||
while (again) {
|
||||
- struct sk_buff *skb;
|
||||
+ struct sk_buff *skb, *next_skb;
|
||||
|
||||
while ((skb = __skb_dequeue(&sd->process_queue))) {
|
||||
rcu_read_lock();
|
||||
+
|
||||
+ next_skb = skb_peek(&sd->process_queue);
|
||||
+ if (likely(next_skb)) {
|
||||
+ prefetch(next_skb->data);
|
||||
+ }
|
||||
+
|
||||
__netif_receive_skb(skb);
|
||||
rcu_read_unlock();
|
||||
input_queue_head_incr(sd);
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -84,6 +84,33 @@
|
||||
#include "dev.h"
|
||||
#include "sock_destructor.h"
|
||||
|
||||
+struct kmem_cache *skb_data_cache;
|
||||
+
|
||||
+/*
|
||||
+ * For low memory profile, NSS_SKB_FIXED_SIZE_2K is enabled and
|
||||
+ * CONFIG_SKB_RECYCLER is disabled. For premium and enterprise profile
|
||||
+ * CONFIG_SKB_RECYCLER is enabled and NSS_SKB_FIXED_SIZE_2K is disabled.
|
||||
+ * Irrespective of NSS_SKB_FIXED_SIZE_2K enabled/disabled, the
|
||||
+ * CONFIG_SKB_RECYCLER and __LP64__ determines the value of SKB_DATA_CACHE_SIZE
|
||||
+ */
|
||||
+#if defined(CONFIG_SKB_RECYCLER)
|
||||
+/*
|
||||
+ * 2688 for 64bit arch, 2624 for 32bit arch
|
||||
+ */
|
||||
+#define SKB_DATA_CACHE_SIZE (SKB_DATA_ALIGN(SKB_RECYCLE_SIZE + NET_SKB_PAD) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
|
||||
+#else
|
||||
+/*
|
||||
+ * 2368 for 64bit arch, 2176 for 32bit arch
|
||||
+ */
|
||||
+#if defined(__LP64__)
|
||||
+#define SKB_DATA_CACHE_SIZE ((SKB_DATA_ALIGN(1984 + NET_SKB_PAD)) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
|
||||
+#else
|
||||
+#define SKB_DATA_CACHE_SIZE ((SKB_DATA_ALIGN(1856 + NET_SKB_PAD)) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
+#include "skbuff_recycle.h"
|
||||
+
|
||||
struct kmem_cache *skbuff_head_cache __ro_after_init;
|
||||
static struct kmem_cache *skbuff_fclone_cache __ro_after_init;
|
||||
#ifdef CONFIG_SKB_EXTENSIONS
|
||||
@@ -426,32 +453,46 @@ EXPORT_SYMBOL(napi_build_skb);
|
||||
* memory is free
|
||||
*/
|
||||
static void *kmalloc_reserve(unsigned int *size, gfp_t flags, int node,
|
||||
- bool *pfmemalloc)
|
||||
-{
|
||||
- bool ret_pfmemalloc = false;
|
||||
- size_t obj_size;
|
||||
- void *obj;
|
||||
+ bool *pfmemalloc)
|
||||
+ {
|
||||
+ void *obj;
|
||||
+ bool ret_pfmemalloc = false;
|
||||
+ unsigned int obj_size = *size;
|
||||
+
|
||||
+ if (obj_size > SZ_2K && obj_size <= SKB_DATA_CACHE_SIZE) {
|
||||
+ obj = kmem_cache_alloc_node(skb_data_cache,
|
||||
+ flags | __GFP_NOMEMALLOC | __GFP_NOWARN,
|
||||
+ node);
|
||||
+ *size = SKB_DATA_CACHE_SIZE;
|
||||
+ if (obj || !(gfp_pfmemalloc_allowed(flags)))
|
||||
+ goto out;
|
||||
|
||||
- obj_size = SKB_HEAD_ALIGN(*size);
|
||||
+ /* Try again but now we are using pfmemalloc reserves */
|
||||
+ ret_pfmemalloc = true;
|
||||
+ obj = kmem_cache_alloc_node(skb_data_cache, flags, node);
|
||||
+ goto out;
|
||||
+ }
|
||||
|
||||
obj_size = kmalloc_size_roundup(obj_size);
|
||||
- /* The following cast might truncate high-order bits of obj_size, this
|
||||
+
|
||||
+ /*
|
||||
+ * The following cast might truncate high-order bits of obj_size, this
|
||||
* is harmless because kmalloc(obj_size >= 2^32) will fail anyway.
|
||||
*/
|
||||
*size = (unsigned int)obj_size;
|
||||
|
||||
- /*
|
||||
- * Try a regular allocation, when that fails and we're not entitled
|
||||
- * to the reserves, fail.
|
||||
- */
|
||||
+ /*
|
||||
+ * Try a regular allocation, when that fails and we're not entitled
|
||||
+ * to the reserves, fail.
|
||||
+ */
|
||||
obj = kmalloc_node_track_caller(obj_size,
|
||||
- flags | __GFP_NOMEMALLOC | __GFP_NOWARN,
|
||||
- node);
|
||||
- if (obj || !(gfp_pfmemalloc_allowed(flags)))
|
||||
- goto out;
|
||||
+ flags | __GFP_NOMEMALLOC | __GFP_NOWARN,
|
||||
+ node);
|
||||
+ if (obj || !(gfp_pfmemalloc_allowed(flags)))
|
||||
+ goto out;
|
||||
|
||||
- /* Try again but now we are using pfmemalloc reserves */
|
||||
- ret_pfmemalloc = true;
|
||||
+ /* Try again but now we are using pfmemalloc reserves */
|
||||
+ ret_pfmemalloc = true;
|
||||
obj = kmalloc_node_track_caller(obj_size, flags, node);
|
||||
|
||||
out:
|
||||
@@ -513,10 +554,12 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
|
||||
* aligned memory blocks, unless SLUB/SLAB debug is enabled.
|
||||
* Both skb->head and skb_shared_info are cache line aligned.
|
||||
*/
|
||||
+ size = SKB_DATA_ALIGN(size);
|
||||
+ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
data = kmalloc_reserve(&size, gfp_mask, node, &pfmemalloc);
|
||||
if (unlikely(!data))
|
||||
goto nodata;
|
||||
- /* kmalloc_size_roundup() might give us more room than requested.
|
||||
+ /* kmalloc_reserve(size) might give us more room than requested.
|
||||
* Put skb_shared_info exactly at the end of allocated zone,
|
||||
* to allow max possible filling before reallocation.
|
||||
*/
|
||||
@@ -551,7 +594,7 @@ EXPORT_SYMBOL(__alloc_skb);
|
||||
/**
|
||||
* __netdev_alloc_skb - allocate an skbuff for rx on a specific device
|
||||
* @dev: network device to receive on
|
||||
- * @len: length to allocate
|
||||
+ * @length: length to allocate
|
||||
* @gfp_mask: get_free_pages mask, passed to alloc_skb
|
||||
*
|
||||
* Allocate a new &sk_buff and assign it a usage count of one. The
|
||||
@@ -561,29 +604,53 @@ EXPORT_SYMBOL(__alloc_skb);
|
||||
*
|
||||
* %NULL is returned if there is no free memory.
|
||||
*/
|
||||
-struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
|
||||
- gfp_t gfp_mask)
|
||||
+struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
|
||||
+ unsigned int length, gfp_t gfp_mask)
|
||||
{
|
||||
- struct page_frag_cache *nc;
|
||||
struct sk_buff *skb;
|
||||
+ unsigned int len = length;
|
||||
+
|
||||
+#ifdef CONFIG_SKB_RECYCLER
|
||||
+ skb = skb_recycler_alloc(dev, length);
|
||||
+ if (likely(skb))
|
||||
+ return skb;
|
||||
+
|
||||
+ len = SKB_RECYCLE_SIZE;
|
||||
+ if (unlikely(length > SKB_RECYCLE_SIZE))
|
||||
+ len = length;
|
||||
+
|
||||
+ skb = __alloc_skb(len + NET_SKB_PAD, gfp_mask,
|
||||
+ SKB_ALLOC_RX, NUMA_NO_NODE);
|
||||
+ if (!skb)
|
||||
+ goto skb_fail;
|
||||
+ goto skb_success;
|
||||
+#else
|
||||
+ struct page_frag_cache *nc;
|
||||
bool pfmemalloc;
|
||||
+ bool page_frag_alloc_enable = true;
|
||||
void *data;
|
||||
|
||||
len += NET_SKB_PAD;
|
||||
|
||||
+
|
||||
+#ifdef CONFIG_ALLOC_SKB_PAGE_FRAG_DISABLE
|
||||
+ page_frag_alloc_enable = false;
|
||||
+#endif
|
||||
/* If requested length is either too small or too big,
|
||||
* we use kmalloc() for skb->head allocation.
|
||||
*/
|
||||
if (len <= SKB_WITH_OVERHEAD(1024) ||
|
||||
len > SKB_WITH_OVERHEAD(PAGE_SIZE) ||
|
||||
- (gfp_mask & (__GFP_DIRECT_RECLAIM | GFP_DMA))) {
|
||||
+ (gfp_mask & (__GFP_DIRECT_RECLAIM | GFP_DMA)) ||
|
||||
+ !page_frag_alloc_enable) {
|
||||
skb = __alloc_skb(len, gfp_mask, SKB_ALLOC_RX, NUMA_NO_NODE);
|
||||
if (!skb)
|
||||
goto skb_fail;
|
||||
goto skb_success;
|
||||
}
|
||||
|
||||
- len = SKB_HEAD_ALIGN(len);
|
||||
+ len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
+ len = SKB_DATA_ALIGN(len);
|
||||
|
||||
if (sk_memalloc_socks())
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
@@ -612,6 +679,7 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
|
||||
if (pfmemalloc)
|
||||
skb->pfmemalloc = 1;
|
||||
skb->head_frag = 1;
|
||||
+#endif
|
||||
|
||||
skb_success:
|
||||
skb_reserve(skb, NET_SKB_PAD);
|
||||
@@ -682,7 +750,8 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
|
||||
data = page_frag_alloc_1k(&nc->page_small, gfp_mask);
|
||||
pfmemalloc = NAPI_SMALL_PAGE_PFMEMALLOC(nc->page_small);
|
||||
} else {
|
||||
- len = SKB_HEAD_ALIGN(len);
|
||||
+ len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
+ len = SKB_DATA_ALIGN(len);
|
||||
|
||||
data = page_frag_alloc(&nc->page, len, gfp_mask);
|
||||
pfmemalloc = nc->page.pfmemalloc;
|
||||
@@ -780,7 +849,7 @@ static void skb_free_head(struct sk_buff *skb)
|
||||
}
|
||||
}
|
||||
|
||||
-static void skb_release_data(struct sk_buff *skb)
|
||||
+void skb_release_data(struct sk_buff *skb)
|
||||
{
|
||||
struct skb_shared_info *shinfo = skb_shinfo(skb);
|
||||
int i;
|
||||
@@ -822,7 +891,7 @@ static void skb_release_data(struct sk_buff *skb)
|
||||
/*
|
||||
* Free an skbuff by memory without cleaning the state.
|
||||
*/
|
||||
-static void kfree_skbmem(struct sk_buff *skb)
|
||||
+void kfree_skbmem(struct sk_buff *skb)
|
||||
{
|
||||
struct sk_buff_fclones *fclones;
|
||||
|
||||
@@ -1034,7 +1103,6 @@ void skb_tx_error(struct sk_buff *skb)
|
||||
}
|
||||
EXPORT_SYMBOL(skb_tx_error);
|
||||
|
||||
-#ifdef CONFIG_TRACEPOINTS
|
||||
/**
|
||||
* consume_skb - free an skbuff
|
||||
* @skb: buffer to free
|
||||
@@ -1043,13 +1111,50 @@ EXPORT_SYMBOL(skb_tx_error);
|
||||
* Functions identically to kfree_skb, but kfree_skb assumes that the frame
|
||||
* is being dropped after a failure and notes that
|
||||
*/
|
||||
+#ifdef CONFIG_SKB_RECYCLER
|
||||
void consume_skb(struct sk_buff *skb)
|
||||
{
|
||||
if (!skb_unref(skb))
|
||||
return;
|
||||
|
||||
+ prefetch(&skb->destructor);
|
||||
+
|
||||
+ /*Tian: Not sure if we need to continue using this since
|
||||
+ * since unref does the work in 5.4
|
||||
+ */
|
||||
+
|
||||
+ /*
|
||||
+ if (likely(atomic_read(&skb->users) == 1))
|
||||
+ smp_rmb();
|
||||
+ else if (likely(!atomic_dec_and_test(&skb->users)))
|
||||
+ return;
|
||||
+ */
|
||||
+
|
||||
+ /* If possible we'd like to recycle any skb rather than just free it,
|
||||
+ * but in order to do that we need to release any head state too.
|
||||
+ * We don't want to do this later because we'll be in a pre-emption
|
||||
+ * disabled state.
|
||||
+ */
|
||||
+ skb_release_head_state(skb);
|
||||
+
|
||||
+ /* Can we recycle this skb? If we can then it will be much faster
|
||||
+ * for us to recycle this one later than to allocate a new one
|
||||
+ * from scratch.
|
||||
+ */
|
||||
+ if (likely(skb->head) && likely(skb_recycler_consume(skb)))
|
||||
+ return;
|
||||
+
|
||||
+#ifdef CONFIG_TRACEPOINTS
|
||||
trace_consume_skb(skb);
|
||||
- __kfree_skb(skb);
|
||||
+#endif
|
||||
+ /* We're not recycling so now we need to do the rest of what we would
|
||||
+ * have done in __kfree_skb (above and beyond the skb_release_head_state
|
||||
+ * that we already did).
|
||||
+ */
|
||||
+ if (likely(skb->head))
|
||||
+ skb_release_data(skb);
|
||||
+
|
||||
+ kfree_skbmem(skb);
|
||||
}
|
||||
EXPORT_SYMBOL(consume_skb);
|
||||
#endif
|
||||
@@ -1856,6 +1961,8 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
|
||||
if (skb_pfmemalloc(skb))
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
|
||||
+ size = SKB_DATA_ALIGN(size);
|
||||
+ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
|
||||
if (!data)
|
||||
goto nodata;
|
||||
@@ -4557,6 +4664,11 @@ static void skb_extensions_init(void) {}
|
||||
|
||||
void __init skb_init(void)
|
||||
{
|
||||
+ skb_data_cache = kmem_cache_create_usercopy("skb_data_cache",
|
||||
+ SKB_DATA_CACHE_SIZE,
|
||||
+ 0, SLAB_PANIC, 0, SKB_DATA_CACHE_SIZE,
|
||||
+ NULL);
|
||||
+
|
||||
skbuff_head_cache = kmem_cache_create_usercopy("skbuff_head_cache",
|
||||
sizeof(struct sk_buff),
|
||||
0,
|
||||
@@ -4570,6 +4682,7 @@ void __init skb_init(void)
|
||||
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
|
||||
NULL);
|
||||
skb_extensions_init();
|
||||
+ skb_recycler_init();
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -6224,6 +6337,8 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,
|
||||
if (skb_pfmemalloc(skb))
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
|
||||
+ size = SKB_DATA_ALIGN(size);
|
||||
+ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
@@ -6340,6 +6455,8 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,
|
||||
if (skb_pfmemalloc(skb))
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
|
||||
+ size = SKB_DATA_ALIGN(size);
|
||||
+ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
|
|
@ -1,384 +0,0 @@
|
|||
--- a/include/linux/cpuhotplug.h
|
||||
+++ b/include/linux/cpuhotplug.h
|
||||
@@ -94,6 +94,7 @@ enum cpuhp_state {
|
||||
CPUHP_RADIX_DEAD,
|
||||
CPUHP_PAGE_ALLOC,
|
||||
CPUHP_NET_DEV_DEAD,
|
||||
+ CPUHP_SKB_RECYCLER_DEAD,
|
||||
CPUHP_PCI_XGENE_DEAD,
|
||||
CPUHP_IOMMU_IOVA_DEAD,
|
||||
CPUHP_LUSTRE_CFS_DEAD,
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -1065,6 +1065,10 @@ struct sk_buff {
|
||||
/* only useable after checking ->active_extensions != 0 */
|
||||
struct skb_ext *extensions;
|
||||
#endif
|
||||
+
|
||||
+#ifdef CONFIG_DEBUG_OBJECTS_SKBUFF
|
||||
+ void *free_addr;
|
||||
+#endif
|
||||
};
|
||||
|
||||
/* if you move pkt_type around you also must adapt those constants */
|
||||
@@ -1250,7 +1254,7 @@ static inline void kfree_skb_list(struct sk_buff *segs)
|
||||
kfree_skb_list_reason(segs, SKB_DROP_REASON_NOT_SPECIFIED);
|
||||
}
|
||||
|
||||
-#ifdef CONFIG_TRACEPOINTS
|
||||
+#ifdef CONFIG_SKB_RECYCLER
|
||||
void consume_skb(struct sk_buff *skb);
|
||||
#else
|
||||
static inline void consume_skb(struct sk_buff *skb)
|
||||
@@ -1262,6 +1266,9 @@ static inline void consume_skb(struct sk_buff *skb)
|
||||
void __consume_stateless_skb(struct sk_buff *skb);
|
||||
void __kfree_skb(struct sk_buff *skb);
|
||||
extern struct kmem_cache *skbuff_cache;
|
||||
+extern void kfree_skbmem(struct sk_buff *skb);
|
||||
+extern void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason,
|
||||
+ bool napi_safe);
|
||||
|
||||
void kfree_skb_partial(struct sk_buff *skb, bool head_stolen);
|
||||
bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
|
||||
--- a/net/Kconfig
|
||||
+++ b/net/Kconfig
|
||||
@@ -369,6 +369,27 @@ config NET_FLOW_LIMIT
|
||||
with many clients some protection against DoS by a single (spoofed)
|
||||
flow that greatly exceeds average workload.
|
||||
|
||||
+config SKB_RECYCLER
|
||||
+ bool "Generic skb recycling"
|
||||
+ default y
|
||||
+ help
|
||||
+ SKB_RECYCLER is used to implement RX-to-RX skb recycling.
|
||||
+ This config enables the recycling scheme for bridging and
|
||||
+ routing workloads. It can reduce skbuff freeing or
|
||||
+ reallocation overhead.
|
||||
+
|
||||
+config SKB_RECYCLER_MULTI_CPU
|
||||
+ bool "Cross-CPU recycling for CPU-locked workloads"
|
||||
+ depends on SMP && SKB_RECYCLER
|
||||
+ default n
|
||||
+
|
||||
+config ALLOC_SKB_PAGE_FRAG_DISABLE
|
||||
+ bool "Disable page fragment based skbuff payload allocations"
|
||||
+ depends on !SKB_RECYCLER
|
||||
+ default n
|
||||
+ help
|
||||
+ Disable page fragment based allocations for skbuff payloads.
|
||||
+
|
||||
menu "Network testing"
|
||||
|
||||
config NET_PKTGEN
|
||||
--- a/net/core/Makefile
|
||||
+++ b/net/core/Makefile
|
||||
@@ -41,3 +41,4 @@ obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o
|
||||
obj-$(CONFIG_BPF_SYSCALL) += sock_map.o
|
||||
obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o
|
||||
obj-$(CONFIG_OF) += of_net.o
|
||||
+obj-$(CONFIG_SKB_RECYCLER) += skbuff_recycle.o
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -6016,10 +6016,16 @@ static int process_backlog(struct napi_struct *napi, int quota)
|
||||
|
||||
napi->weight = READ_ONCE(dev_rx_weight);
|
||||
while (again) {
|
||||
- struct sk_buff *skb;
|
||||
+ struct sk_buff *skb, *next_skb;
|
||||
|
||||
while ((skb = __skb_dequeue(&sd->process_queue))) {
|
||||
rcu_read_lock();
|
||||
+
|
||||
+ next_skb = skb_peek(&sd->process_queue);
|
||||
+ if (likely(next_skb)) {
|
||||
+ prefetch(next_skb->data);
|
||||
+ }
|
||||
+
|
||||
__netif_receive_skb(skb);
|
||||
rcu_read_unlock();
|
||||
input_queue_head_incr(sd);
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -87,6 +87,31 @@
|
||||
|
||||
#include "dev.h"
|
||||
#include "sock_destructor.h"
|
||||
+#include "skbuff_recycle.h"
|
||||
+
|
||||
+struct kmem_cache *skb_data_cache;
|
||||
+/*
|
||||
+ * For low memory profile, NSS_SKB_FIXED_SIZE_2K is enabled and
|
||||
+ * CONFIG_SKB_RECYCLER is disabled. For premium and enterprise profile
|
||||
+ * CONFIG_SKB_RECYCLER is enabled and NSS_SKB_FIXED_SIZE_2K is disabled.
|
||||
+ * Irrespective of NSS_SKB_FIXED_SIZE_2K enabled/disabled, the
|
||||
+ * CONFIG_SKB_RECYCLER and __LP64__ determines the value of SKB_DATA_CACHE_SIZE
|
||||
+ */
|
||||
+#if defined(CONFIG_SKB_RECYCLER)
|
||||
+/*
|
||||
+ * 2688 for 64bit arch, 2624 for 32bit arch
|
||||
+ */
|
||||
+#define SKB_DATA_CACHE_SIZE (SKB_DATA_ALIGN(SKB_RECYCLE_SIZE + NET_SKB_PAD) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
|
||||
+#else
|
||||
+/*
|
||||
+ * 2368 for 64bit arch, 2176 for 32bit arch
|
||||
+ */
|
||||
+#if defined(__LP64__)
|
||||
+#define SKB_DATA_CACHE_SIZE ((SKB_DATA_ALIGN(1984 + NET_SKB_PAD)) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
|
||||
+#else
|
||||
+#define SKB_DATA_CACHE_SIZE ((SKB_DATA_ALIGN(1856 + NET_SKB_PAD)) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
struct kmem_cache *skbuff_cache __ro_after_init;
|
||||
static struct kmem_cache *skbuff_fclone_cache __ro_after_init;
|
||||
@@ -551,21 +576,20 @@ static void *kmalloc_reserve(unsigned int *size, gfp_t flags, int node,
|
||||
bool *pfmemalloc)
|
||||
{
|
||||
bool ret_pfmemalloc = false;
|
||||
- size_t obj_size;
|
||||
+ unsigned int obj_size = *size;
|
||||
void *obj;
|
||||
|
||||
obj_size = SKB_HEAD_ALIGN(*size);
|
||||
- if (obj_size <= SKB_SMALL_HEAD_CACHE_SIZE &&
|
||||
- !(flags & KMALLOC_NOT_NORMAL_BITS)) {
|
||||
- obj = kmem_cache_alloc_node(skb_small_head_cache,
|
||||
- flags | __GFP_NOMEMALLOC | __GFP_NOWARN,
|
||||
- node);
|
||||
- *size = SKB_SMALL_HEAD_CACHE_SIZE;
|
||||
+ if (obj_size > SZ_2K && obj_size <= SKB_DATA_CACHE_SIZE) {
|
||||
+ obj = kmem_cache_alloc_node(skb_data_cache,
|
||||
+ flags | __GFP_NOMEMALLOC | __GFP_NOWARN,
|
||||
+ node);
|
||||
+ *size = SKB_DATA_CACHE_SIZE;
|
||||
if (obj || !(gfp_pfmemalloc_allowed(flags)))
|
||||
goto out;
|
||||
/* Try again but now we are using pfmemalloc reserves */
|
||||
ret_pfmemalloc = true;
|
||||
- obj = kmem_cache_alloc_node(skb_small_head_cache, flags, node);
|
||||
+ obj = kmem_cache_alloc_node(skb_data_cache, flags, node);
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -648,10 +671,12 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
|
||||
* aligned memory blocks, unless SLUB/SLAB debug is enabled.
|
||||
* Both skb->head and skb_shared_info are cache line aligned.
|
||||
*/
|
||||
+ size = SKB_DATA_ALIGN(size);
|
||||
+ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
data = kmalloc_reserve(&size, gfp_mask, node, &pfmemalloc);
|
||||
if (unlikely(!data))
|
||||
goto nodata;
|
||||
- /* kmalloc_size_roundup() might give us more room than requested.
|
||||
+ /* kmalloc_reserve(size) might give us more room than requested.
|
||||
* Put skb_shared_info exactly at the end of allocated zone,
|
||||
* to allow max possible filling before reallocation.
|
||||
*/
|
||||
@@ -686,7 +711,7 @@ EXPORT_SYMBOL(__alloc_skb);
|
||||
/**
|
||||
* __netdev_alloc_skb - allocate an skbuff for rx on a specific device
|
||||
* @dev: network device to receive on
|
||||
- * @len: length to allocate
|
||||
+ * @length: length to allocate
|
||||
* @gfp_mask: get_free_pages mask, passed to alloc_skb
|
||||
*
|
||||
* Allocate a new &sk_buff and assign it a usage count of one. The
|
||||
@@ -696,29 +721,53 @@ EXPORT_SYMBOL(__alloc_skb);
|
||||
*
|
||||
* %NULL is returned if there is no free memory.
|
||||
*/
|
||||
-struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
|
||||
- gfp_t gfp_mask)
|
||||
+struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
|
||||
+ unsigned int length, gfp_t gfp_mask)
|
||||
{
|
||||
- struct page_frag_cache *nc;
|
||||
struct sk_buff *skb;
|
||||
+ unsigned int len = length;
|
||||
+
|
||||
+#ifdef CONFIG_SKB_RECYCLER
|
||||
+ skb = skb_recycler_alloc(dev, length);
|
||||
+ if (likely(skb))
|
||||
+ return skb;
|
||||
+
|
||||
+ len = SKB_RECYCLE_SIZE;
|
||||
+ if (unlikely(length > SKB_RECYCLE_SIZE))
|
||||
+ len = length;
|
||||
+
|
||||
+ skb = __alloc_skb(len + NET_SKB_PAD, gfp_mask,
|
||||
+ SKB_ALLOC_RX, NUMA_NO_NODE);
|
||||
+ if (!skb)
|
||||
+ goto skb_fail;
|
||||
+ goto skb_success;
|
||||
+#else
|
||||
+ struct page_frag_cache *nc;
|
||||
bool pfmemalloc;
|
||||
+ bool page_frag_alloc_enable = true;
|
||||
void *data;
|
||||
|
||||
len += NET_SKB_PAD;
|
||||
|
||||
+
|
||||
+#ifdef CONFIG_ALLOC_SKB_PAGE_FRAG_DISABLE
|
||||
+ page_frag_alloc_enable = false;
|
||||
+#endif
|
||||
/* If requested length is either too small or too big,
|
||||
* we use kmalloc() for skb->head allocation.
|
||||
*/
|
||||
if (len <= SKB_WITH_OVERHEAD(1024) ||
|
||||
len > SKB_WITH_OVERHEAD(PAGE_SIZE) ||
|
||||
- (gfp_mask & (__GFP_DIRECT_RECLAIM | GFP_DMA))) {
|
||||
+ (gfp_mask & (__GFP_DIRECT_RECLAIM | GFP_DMA)) ||
|
||||
+ !page_frag_alloc_enable) {
|
||||
skb = __alloc_skb(len, gfp_mask, SKB_ALLOC_RX, NUMA_NO_NODE);
|
||||
if (!skb)
|
||||
goto skb_fail;
|
||||
goto skb_success;
|
||||
}
|
||||
|
||||
- len = SKB_HEAD_ALIGN(len);
|
||||
+ len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
+ len = SKB_DATA_ALIGN(len);
|
||||
|
||||
if (sk_memalloc_socks())
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
@@ -747,6 +796,7 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
|
||||
if (pfmemalloc)
|
||||
skb->pfmemalloc = 1;
|
||||
skb->head_frag = 1;
|
||||
+#endif
|
||||
|
||||
skb_success:
|
||||
skb_reserve(skb, NET_SKB_PAD);
|
||||
@@ -817,7 +867,8 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
|
||||
data = page_frag_alloc_1k(&nc->page_small, gfp_mask);
|
||||
pfmemalloc = NAPI_SMALL_PAGE_PFMEMALLOC(nc->page_small);
|
||||
} else {
|
||||
- len = SKB_HEAD_ALIGN(len);
|
||||
+ len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
+ len = SKB_DATA_ALIGN(len);
|
||||
|
||||
data = page_frag_alloc(&nc->page, len, gfp_mask);
|
||||
pfmemalloc = nc->page.pfmemalloc;
|
||||
@@ -975,7 +1026,7 @@ static void skb_free_head(struct sk_buff *skb, bool napi_safe)
|
||||
}
|
||||
}
|
||||
|
||||
-static void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason,
|
||||
+void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason,
|
||||
bool napi_safe)
|
||||
{
|
||||
struct skb_shared_info *shinfo = skb_shinfo(skb);
|
||||
@@ -1018,7 +1069,7 @@ static void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason,
|
||||
/*
|
||||
* Free an skbuff by memory without cleaning the state.
|
||||
*/
|
||||
-static void kfree_skbmem(struct sk_buff *skb)
|
||||
+void kfree_skbmem(struct sk_buff *skb)
|
||||
{
|
||||
struct sk_buff_fclones *fclones;
|
||||
|
||||
@@ -1282,7 +1333,6 @@ void skb_tx_error(struct sk_buff *skb)
|
||||
}
|
||||
EXPORT_SYMBOL(skb_tx_error);
|
||||
|
||||
-#ifdef CONFIG_TRACEPOINTS
|
||||
/**
|
||||
* consume_skb - free an skbuff
|
||||
* @skb: buffer to free
|
||||
@@ -1291,13 +1341,48 @@ EXPORT_SYMBOL(skb_tx_error);
|
||||
* Functions identically to kfree_skb, but kfree_skb assumes that the frame
|
||||
* is being dropped after a failure and notes that
|
||||
*/
|
||||
+#ifdef CONFIG_SKB_RECYCLER
|
||||
void consume_skb(struct sk_buff *skb)
|
||||
{
|
||||
if (!skb_unref(skb))
|
||||
return;
|
||||
+ prefetch(&skb->destructor);
|
||||
+
|
||||
+ /*Tian: Not sure if we need to continue using this since
|
||||
+ * since unref does the work in 5.4
|
||||
+ */
|
||||
+
|
||||
+ /*
|
||||
+ if (likely(atomic_read(&skb->users) == 1))
|
||||
+ smp_rmb();
|
||||
+ else if (likely(!atomic_dec_and_test(&skb->users)))
|
||||
+ return;
|
||||
+ */
|
||||
|
||||
+ /* If possible we'd like to recycle any skb rather than just free it,
|
||||
+ * but in order to do that we need to release any head state too.
|
||||
+ * We don't want to do this later because we'll be in a pre-emption
|
||||
+ * disabled state.
|
||||
+ */
|
||||
+ skb_release_head_state(skb);
|
||||
+
|
||||
+ /* Can we recycle this skb? If we can then it will be much faster
|
||||
+ * for us to recycle this one later than to allocate a new one
|
||||
+ * from scratch.
|
||||
+ */
|
||||
+ if (likely(skb->head) && likely(skb_recycler_consume(skb)))
|
||||
+ return;
|
||||
+
|
||||
+#ifdef CONFIG_TRACEPOINTS
|
||||
trace_consume_skb(skb, __builtin_return_address(0));
|
||||
- __kfree_skb(skb);
|
||||
+#endif
|
||||
+ /* We're not recycling so now we need to do the rest of what we would
|
||||
+ * have done in __kfree_skb (above and beyond the skb_release_head_state
|
||||
+ * that we already did).
|
||||
+ */
|
||||
+ if (likely(skb->head))
|
||||
+ skb_release_data(skb, SKB_CONSUMED, false);
|
||||
+ kfree_skbmem(skb);
|
||||
}
|
||||
EXPORT_SYMBOL(consume_skb);
|
||||
#endif
|
||||
@@ -2107,6 +2192,8 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
|
||||
if (skb_pfmemalloc(skb))
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
|
||||
+ size = SKB_DATA_ALIGN(size);
|
||||
+ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
|
||||
if (!data)
|
||||
goto nodata;
|
||||
@@ -4854,6 +4941,10 @@ static void skb_extensions_init(void) {}
|
||||
|
||||
void __init skb_init(void)
|
||||
{
|
||||
+ skb_data_cache = kmem_cache_create_usercopy("skb_data_cache",
|
||||
+ SKB_DATA_CACHE_SIZE,
|
||||
+ 0, SLAB_PANIC, 0, SKB_DATA_CACHE_SIZE,
|
||||
+ NULL);
|
||||
skbuff_cache = kmem_cache_create_usercopy("skbuff_head_cache",
|
||||
sizeof(struct sk_buff),
|
||||
0,
|
||||
@@ -4879,6 +4970,7 @@ void __init skb_init(void)
|
||||
SKB_SMALL_HEAD_HEADROOM,
|
||||
NULL);
|
||||
skb_extensions_init();
|
||||
+ skb_recycler_init();
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -6382,6 +6474,8 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,
|
||||
if (skb_pfmemalloc(skb))
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
|
||||
+ size = SKB_DATA_ALIGN(size);
|
||||
+ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
@@ -6498,6 +6592,8 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,
|
||||
if (skb_pfmemalloc(skb))
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
|
||||
+ size = SKB_DATA_ALIGN(size);
|
||||
+ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
||||
data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
Loading…
Add table
Add a link
Reference in a new issue