Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp393600pxu; Tue, 1 Dec 2020 14:05:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4Esk1Y/S6iLHynNSJp3ToYN/sq70rP1Fy5bK+u+0JCMP88HS7Op8JCi87RdS058tNdUPG X-Received: by 2002:a50:dac7:: with SMTP id s7mr5194175edj.106.1606860350914; Tue, 01 Dec 2020 14:05:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606860350; cv=none; d=google.com; s=arc-20160816; b=du2tIdA0PXvlmK++Gf80gRRgKpU3YQQKqXPGm7NSlv+XMTiV1JJIVbzgmimK6BpnJ9 0ZKH7UHzXQimGW3yPPg4GIrdpOgHcpMn6kUCk9XGz4CbS8Znk6VSJ5tVtMXXb9sp/rVP mwMqYqotB3Q9Y3+tx/mas5kOLoJeX46TODmhU+pXCpWKaYKWMT8dmLRB9Tzd0gOubVxb Bl/ti9ImVJhJz4INqGmP0TV/FKorCXSTqqPRzvdmEfDEBkoF7X1aqr8fvGGmN8M7Lc9P D0GUrXbP59paJBKLKUiXh43hnelMg9TilphT37YU/hnW40VtnsJysY2uNwNVU+HSX+Rp DfWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vpDcEf/JJvRZxIrpS63yw45HzaRIsnPZAAMiPKovRvA=; b=NDwXW3IlPOEQ4pSIX+8Qi4BxEzJy2cqCPpCXQJIlgdO788jPZFpI0yxniQRfHbgw/G gcQTW4WLPW69YB1wib3k96hPxs8DEcFzvD+Qz36Nrl4PDZApJZlNvjrRX9b1qR4ktP9q L6+TghBaPFqFfjsHfdFmgDGRT70RRA7Evb+xK5nHl81vUz2Eo5jf5lYgkddYH9cz17SO B8a/BOJbaE391qG1S7UDMu6c9fCMKxOtgXPvaH6n/S95qh41N+RZssULBZGc7Wh0s4Gj MhBms91WjOYve6I+AsRgzZNqmA68/IlQFCGOwIccxxJXI0ixHOP7DqvnAw1t7wd5ovl7 tceA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=MXpgIvPN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fb.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id re10si773767ejb.754.2020.12.01.14.05.28; Tue, 01 Dec 2020 14:05:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=MXpgIvPN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fb.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392304AbgLAWDD (ORCPT + 99 others); Tue, 1 Dec 2020 17:03:03 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:2342 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730318AbgLAV7w (ORCPT ); Tue, 1 Dec 2020 16:59:52 -0500 Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0B1Lo0KW027479 for ; Tue, 1 Dec 2020 13:59:11 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=vpDcEf/JJvRZxIrpS63yw45HzaRIsnPZAAMiPKovRvA=; b=MXpgIvPNTJJmgzWaLepxLa5XqAjg08WW80ShNl2jyAf8Nfuq2dnsIxE1s76CwX7WFZ0D 1ERp2LwbSFGAOXGrz20TNYKMpxrpRNmaz8UtLhGH82+Lm2rY0tlbsGJsX+q5Pd1Xsg0L sb4DbYYBbwu0jITMIvMLRu9yhGHM0qdBvII= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 355agsq2yt-12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 01 Dec 2020 13:59:11 -0800 Received: from intmgw002.41.prn1.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 1 Dec 2020 13:59:09 -0800 Received: by devvm3388.prn0.facebook.com (Postfix, from userid 111017) id 6278019702AE; Tue, 1 Dec 2020 13:59:06 -0800 (PST) From: Roman Gushchin To: CC: , , , , , , , Subject: [PATCH bpf-next v9 08/34] bpf: refine memcg-based memory accounting for arraymap maps Date: Tue, 1 Dec 2020 13:58:34 -0800 Message-ID: <20201201215900.3569844-9-guro@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20201201215900.3569844-1-guro@fb.com> References: <20201201215900.3569844-1-guro@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-12-01_11:2020-11-30,2020-12-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 malwarescore=0 phishscore=0 impostorscore=0 mlxlogscore=827 spamscore=0 adultscore=0 clxscore=1015 lowpriorityscore=0 bulkscore=0 priorityscore=1501 suspectscore=38 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012010131 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Include percpu arrays and auxiliary data into the memcg-based memory accounting. Signed-off-by: Roman Gushchin --- kernel/bpf/arraymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index c6c81eceb68f..d837e0603c89 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -34,8 +34,8 @@ static int bpf_array_alloc_percpu(struct bpf_array *arr= ay) int i; =20 for (i =3D 0; i < array->map.max_entries; i++) { - ptr =3D __alloc_percpu_gfp(array->elem_size, 8, - GFP_USER | __GFP_NOWARN); + ptr =3D bpf_map_alloc_percpu(&array->map, array->elem_size, 8, + GFP_USER | __GFP_NOWARN); if (!ptr) { bpf_array_free_percpu(array); return -ENOMEM; @@ -1018,7 +1018,7 @@ static struct bpf_map *prog_array_map_alloc(union b= pf_attr *attr) struct bpf_array_aux *aux; struct bpf_map *map; =20 - aux =3D kzalloc(sizeof(*aux), GFP_KERNEL); + aux =3D kzalloc(sizeof(*aux), GFP_KERNEL_ACCOUNT); if (!aux) return ERR_PTR(-ENOMEM); =20 --=20 2.26.2