sock: remove one redundant SKB_FRAG_PAGE_ORDER macro

Yunsheng Lin · davem330 · commit 723783d077e3 · 2021-08-26T10:46:20.000+01:00
Both SKB_FRAG_PAGE_ORDER are defined to the same value in
net/core/sock.c and drivers/vhost/net.c.

Move the SKB_FRAG_PAGE_ORDER definition to net/core/sock.h,
as both net/core/sock.c and drivers/vhost/net.c include it,
and it seems a reasonable file to put the macro.

Signed-off-by: Yunsheng Lin &lt;linyunsheng@huawei.com&gt;
Acked-by: Jason Wang &lt;jasowang@redhat.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
@@ -643,8 +643,6 @@ static bool tx_can_batch(struct vhost_virtqueue *vq, size_t total_len)
 	       !vhost_vq_avail_empty(vq->dev, vq);
 }
 
-#define SKB_FRAG_PAGE_ORDER     get_order(32768)
-
 static bool vhost_net_page_frag_refill(struct vhost_net *net, unsigned int sz,
 				       struct page_frag *pfrag, gfp_t gfp)
 {
diff --git a/include/net/sock.h b/include/net/sock.h
@@ -2717,6 +2717,7 @@ extern int sysctl_optmem_max;
 extern __u32 sysctl_wmem_default;
 extern __u32 sysctl_rmem_default;
 
+#define SKB_FRAG_PAGE_ORDER	get_order(32768)
 DECLARE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key);
 
 static inline int sk_get_wmem0(const struct sock *sk, const struct proto *proto)
diff --git a/net/core/sock.c b/net/core/sock.c
@@ -2574,7 +2574,6 @@ static void sk_leave_memory_pressure(struct sock *sk)
 	}
 }
 
-#define SKB_FRAG_PAGE_ORDER	get_order(32768)
 DEFINE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key);
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -643,8 +643,6 @@ static bool tx_can_batch(struct vhost_virtqueue *vq, size_t total_len)`
`643`	`643`	`!vhost_vq_avail_empty(vq->dev, vq);`
`644`	`644`	`}`
`645`	`645`
`646`		`-#define SKB_FRAG_PAGE_ORDER get_order(32768)`
`647`		`-`
`648`	`646`	`static bool vhost_net_page_frag_refill(struct vhost_net *net, unsigned int sz,`
`649`	`647`	`struct page_frag *pfrag, gfp_t gfp)`
`650`	`648`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2574,7 +2574,6 @@ static void sk_leave_memory_pressure(struct sock *sk)`
`2574`	`2574`	`}`
`2575`	`2575`	`}`
`2576`	`2576`
`2577`		`-#define SKB_FRAG_PAGE_ORDER get_order(32768)`
`2578`	`2577`	`DEFINE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key);`
`2579`	`2578`
`2580`	`2579`	`/**`