[Devel] [PATCH RHEL8 COMMIT] Revert "mm/netlink: Make all in-cg memory be kmem accounted"

Konstantin Khorenko khorenko at virtuozzo.com
Tue Apr 13 19:28:56 MSK 2021


The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.12
------>
commit 63ae7e27b4f32489005b100cb3c8d44eceea3988
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Tue Apr 13 19:28:55 2021 +0300

    Revert "mm/netlink: Make all in-cg memory be kmem accounted"
    
    This reverts commit 6151dd2acb3968028f02c5e37a1344e565c3fa52.
    it is incorrect in vz8. Netlink memcg accounting should be
    investigated and re-implemented later
    
    https://jira.sw.ru/browse/PSBM-120694
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 net/netlink/af_netlink.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 4f06946c9923..fcd647b113a7 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1195,13 +1195,7 @@ static struct sk_buff *netlink_alloc_large_skb(unsigned int size,
 	struct sk_buff *skb;
 	void *data;
 
-	if (size <= NLMSG_GOODSIZE || broadcast ||
-			/*
-			 * Once we have vmalloc_kmem() that would account
-			 * allocated pages into memcg, this check can be
-			 * removed.
-			 */
-			!ve_is_super(get_exec_env()))
+	if (size <= NLMSG_GOODSIZE || broadcast)
 		return alloc_skb(size, GFP_KERNEL);
 
 	size = SKB_DATA_ALIGN(size) +


More information about the Devel mailing list