[Devel] [PATCH RHEL8 COMMIT] memcg: disable incomplete accounting for af_packet

[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 6bc44934c49aa17d41817e85a693aefe23ba3c76
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Tue Apr 13 19:28:54 2021 +0300

    memcg: disable incomplete accounting for af_packet
    
    This patch revert af_packet changes in alloc_pg_vec()
    
    Fixes: 06fac184ac6b
    ("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/packet/af_packet.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index c3cd4c5224d6..001a1320ce98 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -4304,8 +4304,7 @@ static struct pgv *alloc_pg_vec(struct tpacket_req *req, int order)
 	struct pgv *pg_vec;
 	int i;
 
-	pg_vec = kcalloc(block_nr, sizeof(struct pgv),
-			 GFP_KERNEL_ACCOUNT | __GFP_NOWARN);
+	pg_vec = kcalloc(block_nr, sizeof(struct pgv), GFP_KERNEL | __GFP_NOWARN);
 	if (unlikely(!pg_vec))
 		goto out;