The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at
https://src.openvz.org/scm/ovz/vzkernel.git
after ark-5.14
------>
commit a92a3ea81bc15bbae4db567bd8de75591a2e2ab7
Author: Andrey Ryabinin <ryabinin....@gmail.com>
Date: Thu Sep 30 16:03:57 2021 +0300
net: silence high-order allocation warning from UDP with big headers.
Silence this one:
WARNING: CPU: 2 PID: 180404 at mm/page_alloc.c:3533
__alloc_pages_nodemask+0x1b1/0x600
order 3 >= 3, gfp 0x2044d0
Call Trace:
dump_stack+0x19/0x1b
__warn+0xd8/0x100
warn_slowpath_fmt+0x5f/0x80
__alloc_pages_nodemask+0x1b1/0x600
kmalloc_large_node+0x5f/0x80
__kmalloc_node_track_caller+0x292/0x300
__kmalloc_reserve.isra.32+0x44/0xa0
__alloc_skb+0x8d/0x2d0
alloc_skb_with_frags+0x57/0x1e0
sock_alloc_send_pskb+0x1b9/0x260
sock_alloc_send_skb+0x18/0x20
__ip6_append_data.isra.37+0x9a3/0xd30
ip6_make_skb+0x152/0x1e0
udpv6_sendmsg+0x961/0xc30
inet_sendmsg+0x69/0xb0
sock_sendmsg+0xb0/0xf0
SYSC_sendto+0x121/0x1c0
SyS_sendto+0xe/0x10
tracesys+0xa3/0xc9
https://jira.sw.ru/browse/PSBM-94717
Signed-off-by: Andrey Ryabinin <aryabi...@virtuozzo.com>
(cherry-picked from vz7 commit d6fd105efd33 ("net: silence high-order
allocation
warning from UDP with big headers."))
https://jira.sw.ru/browse/PSBM-127846
Signed-off-by: Valeriy Vdovin <valeriy.vdo...@virtuozzo.com>
(cherry picked from vz8 commit 8d6e1dd4d2e3f1bc9ca5337e3a7463e9d831530f)
Signed-off-by: Andrey Zhadchenko <andrey.zhadche...@virtuozzo.com>
---
include/net/sock.h | 5 +++++
net/core/sock.c | 21 ++++++++++++++++++---
net/ipv4/ip_output.c | 5 +++--
net/ipv6/ip6_output.c | 5 +++--
4 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index f23cb259b0e2..eebc2a671f62 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1717,6 +1717,11 @@ int sock_gettstamp(struct socket *sock, void __user
*userstamp,
bool timeval, bool time32);
struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,
int noblock, int *errcode);
+struct sk_buff *sock_alloc_send_skb_flags(struct sock *sk,
+ unsigned long size,
+ int noblock,
+ int *errcode,
+ gfp_t extra_flags);
struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
unsigned long data_len, int noblock,
int *errcode, int max_page_order);
diff --git a/net/core/sock.c b/net/core/sock.c
index 29c907648342..202ea92adccb 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2428,9 +2428,9 @@ static long sock_wait_for_wmem(struct sock *sk, long
timeo)
* Generic send/receive buffer handlers
*/
-struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
+static inline struct sk_buff *__sock_alloc_send_pskb(struct sock *sk, unsigned
long header_len,
unsigned long data_len, int noblock,
- int *errcode, int max_page_order)
+ int *errcode, int max_page_order, gfp_t
extra_flags)
{
struct sk_buff *skb;
long timeo;
@@ -2459,7 +2459,7 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk,
unsigned long header_len,
timeo = sock_wait_for_wmem(sk, timeo);
}
skb = alloc_skb_with_frags(header_len, data_len, max_page_order,
- errcode, sk->sk_allocation);
+ errcode, sk->sk_allocation|extra_flags);
if (skb)
skb_set_owner_w(skb, sk);
return skb;
@@ -2470,6 +2470,14 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk,
unsigned long header_len,
*errcode = err;
return NULL;
}
+
+struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
+ unsigned long data_len, int noblock,
+ int *errcode, int max_page_order)
+{
+ return __sock_alloc_send_pskb(sk, header_len, data_len, noblock,
+ errcode, max_page_order, 0);
+}
EXPORT_SYMBOL(sock_alloc_send_pskb);
struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,
@@ -2479,6 +2487,13 @@ struct sk_buff *sock_alloc_send_skb(struct sock *sk,
unsigned long size,
}
EXPORT_SYMBOL(sock_alloc_send_skb);
+struct sk_buff *sock_alloc_send_skb_flags(struct sock *sk, unsigned long size,
+ int noblock, int *errcode, gfp_t
extra_flags)
+{
+ return __sock_alloc_send_pskb(sk, size, 0, noblock, errcode, 0,
extra_flags);
+}
+EXPORT_SYMBOL(sock_alloc_send_skb_flags);
+
int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
struct sockcm_cookie *sockc)
{
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 8d8a8da3ae7e..922bdabbe085 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1100,8 +1100,9 @@ static int __ip_append_data(struct sock *sk,
alloclen += alloc_extra;
if (transhdrlen) {
- skb = sock_alloc_send_skb(sk, alloclen,
- (flags & MSG_DONTWAIT), &err);
+ skb = sock_alloc_send_skb_flags(sk, alloclen,
+ (flags & MSG_DONTWAIT), &err,
+ __GFP_ORDER_NOWARN);
} else {
skb = NULL;
if (refcount_read(&sk->sk_wmem_alloc) +
wmem_alloc_delta <=
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index e714104286b8..11f8238111b9 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1667,8 +1667,9 @@ static int __ip6_append_data(struct sock *sk,
goto error;
}
if (transhdrlen) {
- skb = sock_alloc_send_skb(sk, alloclen,
- (flags & MSG_DONTWAIT), &err);
+ skb = sock_alloc_send_skb_flags(sk, alloclen,
+ (flags & MSG_DONTWAIT), &err,
+ __GFP_ORDER_NOWARN);
} else {
skb = NULL;
if (refcount_read(&sk->sk_wmem_alloc) +
wmem_alloc_delta <=
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
