[Devel,rh7] ipv6/sit: account and don't WARN on ip_tunnel_prl structs allocation

Submitted by Andrey Ryabinin on Jan. 16, 2017, 4:29 p.m.

Details

Message ID 20170116162921.21634-1-aryabinin@virtuozzo.com
State New
Series "ipv6/sit: account and don't WARN on ip_tunnel_prl structs allocation"
Headers show

Commit Message

Andrey Ryabinin Jan. 16, 2017, 4:29 p.m.
The size of the ip_tunnel_prl structs allocation is controllable from user-space,
thus it's better to avoid spam in dmesg if allocation failed.
Also add __GFP_ACCOUNT as this is a good candidate for per-memcg accounting.

https://jira.sw.ru/browse/PSBM-58330

Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
 net/ipv6/sit.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 527f43a..685abf5 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -309,7 +309,7 @@  static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
 	 * we try harder to allocate.
 	 */
 	kp = (cmax <= 1 || ve_capable(CAP_NET_ADMIN)) ?
-		kcalloc(cmax, sizeof(*kp), GFP_KERNEL) :
+		kcalloc(cmax, sizeof(*kp), GFP_KERNEL_ACCOUNT | __GFP_NOWARN) :
 		NULL;
 
 	rcu_read_lock();
@@ -322,7 +322,8 @@  static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
 		 * For root users, retry allocating enough memory for
 		 * the answer.
 		 */
-		kp = kcalloc(ca, sizeof(*kp), GFP_ATOMIC);
+		kp = kcalloc(ca, sizeof(*kp), GFP_ATOMIC | __GFP_ACCOUNT |
+				__GFP_NOWARN);
 		if (!kp) {
 			ret = -ENOMEM;
 			goto out;