Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp70039pxu; Tue, 24 Nov 2020 19:07:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzMekypH1ucJDn3bo6ohQw/2OuQL39JbL6cxN/rXH+khC76nh+ilIm+vdOrVLcVEdpBiQcS X-Received: by 2002:a17:906:314f:: with SMTP id e15mr1326517eje.496.1606273628369; Tue, 24 Nov 2020 19:07:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606273628; cv=none; d=google.com; s=arc-20160816; b=HDthPggnhoAUTitDdI8kyW3oWGEdEIKdmjYFe1+h7grmI+CaTVHotzhEQ4I+XR7gdS W1Ec1mwARMie+BsMPNstKHBvZ11w5EQPhZkz/JajCbVMQDKOTh0HosuVnMWguYKO6z41 a4kvGIuvPS7vdv2BQb9GwjqAo79rVEWqfvpDf6Fn8j70lLau8XVYDduImG5KZ64DRYCL TpHnp6P/RvSMgEqaEZbXO2VG87L97u4uGup0AOuozIKPfikBQ4KbeyLML3qdcSUL0EHl sZ6j+VN1RnzKqK+YbXNS2c26k/Hk7T8h5ZM/QdqOHjHAUrCNhJrECtMHNMNk4cGKCRmK z5PQ== 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=fShRlN12PteWYDnw3TVdgXGeGVHnDgFpbsGeNZoyKzs=; b=k1V6aI1007alVrj0wKK0dGddolaGEs7/zqXkS6nKGKchAuWKjVPND2NDV66q6UGkzP 4bHnMun0CLqhHdmAGjq1EGlhDJO5uNGZTqhZq71VzVNMklJy2Y3ZmZHWOITlxnyoPdGL 9URd2Bn0/ASQ2Yh2agS0nNEO2s0INKq/MZEs+Zbwg2NUIK+Bqtch6URfKzbLhus+th09 3ivMe3d+q7OOG0Xohuk8/5F1PVQ4QSoCxba09ev487fsKgqy7Vu0H72+4bFc8BpBrTGs zHCt4DFXMx26YafAOPkD0Lj12RBk8lG7yLaL0haFHnm/CSJP+63uGTXoc5eoY3rmSlt0 j2FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b="f0fNu2/D"; 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 cx24si417000edb.419.2020.11.24.19.06.45; Tue, 24 Nov 2020 19:07:08 -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="f0fNu2/D"; 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 S1727402AbgKYDBb (ORCPT + 99 others); Tue, 24 Nov 2020 22:01:31 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:27678 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727222AbgKYDB2 (ORCPT ); Tue, 24 Nov 2020 22:01:28 -0500 Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AP30VsQ002315 for ; Tue, 24 Nov 2020 19:01:27 -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=fShRlN12PteWYDnw3TVdgXGeGVHnDgFpbsGeNZoyKzs=; b=f0fNu2/D7ZcrZ6ZLmlNoD4qXf3OYZ5W7r5xru/YXdzwt73+YaBmXnHxuYt7TfwtxKYqM Q6RikTTbQlCNGDhTb8NshmxVz1EiPZJ+4Kgz2WJLACEYgoKZTIni3U8Le174/W9yhlt+ 8T66UnTqFP2GYHEnZrdKPMbOxhcWjqrlaXM= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 34yk904r0x-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 24 Nov 2020 19:01:27 -0800 Received: from intmgw002.41.prn1.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 24 Nov 2020 19:01:25 -0800 Received: by devvm3388.prn0.facebook.com (Postfix, from userid 111017) id 0E29A16A1891; Tue, 24 Nov 2020 19:01:22 -0800 (PST) From: Roman Gushchin To: CC: , , , , , , , Subject: [PATCH bpf-next v8 08/34] bpf: refine memcg-based memory accounting for arraymap maps Date: Tue, 24 Nov 2020 19:00:53 -0800 Message-ID: <20201125030119.2864302-9-guro@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20201125030119.2864302-1-guro@fb.com> References: <20201125030119.2864302-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-11-24_11:2020-11-24,2020-11-24 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 phishscore=0 bulkscore=0 suspectscore=38 malwarescore=0 mlxlogscore=921 spamscore=0 priorityscore=1501 clxscore=1015 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250019 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 Acked-by: Song Liu --- 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..92b650123c22 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -30,12 +30,12 @@ static void bpf_array_free_percpu(struct bpf_array *a= rray) =20 static int bpf_array_alloc_percpu(struct bpf_array *array) { + const gfp_t gfp =3D GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT; void __percpu *ptr; 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 __alloc_percpu_gfp(array->elem_size, 8, gfp); 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