[Devel] [PATCH RHEL8 COMMIT] memcg: disable memcg accounting for nf_ct hash tables

[Konstantin Khorenko]

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 c2b0765854651ffc22f674ad9fd23ece61aebe85
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Tue Apr 13 13:20:30 2021 +0300

    memcg: disable memcg accounting for nf_ct hash tables
    
    vz8 does not use per-container conntracks hash tables,
    all nf_ct_alloc_hashtable() calls allocates global hash tables only.
    
    Fixes: 06fac184ac6 ("memcg: charge kmem allocations accounted to UBC in
    PCS6 to memcg")
    https://jira.sw.ru/browse/PSBM-120694
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 net/netfilter/nf_conntrack_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 8c861089d65a..23cbe8ed81e2 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2474,10 +2474,10 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls)
 		return NULL;
 
 	sz = nr_slots * sizeof(struct hlist_nulls_head);
-	hash = (void *)__get_free_pages(GFP_KERNEL_ACCOUNT | __GFP_NOWARN | __GFP_ZERO,
+	hash = (void *)__get_free_pages(GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
 					get_order(sz));
 	if (!hash)
-		hash = vzalloc_account(sz);
+		hash = vzalloc(sz);
 
 	if (hash && nulls)
 		for (i = 0; i < nr_slots; i++)