From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DA65C388F7 for ; Thu, 12 Nov 2020 22:37:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB23C22227 for ; Thu, 12 Nov 2020 22:37:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="eFXyWfgC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727778AbgKLWh3 (ORCPT ); Thu, 12 Nov 2020 17:37:29 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:61474 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727740AbgKLWgd (ORCPT ); Thu, 12 Nov 2020 17:36:33 -0500 Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.0.42/8.16.0.42) with SMTP id 0ACMOArH007594 for ; Thu, 12 Nov 2020 14:36:32 -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=uqv6mme8aMf+HezQuraxNkyFKqHuywHg9PjpCinYQhM=; b=eFXyWfgCPAW3HmXm6Wt7vbUgxsjSAkV4Hxil20Mj/ZXwB9PXtgI9AcEeuabRCx8vGVYH o4YCtZ0Z0wCjeql8PzQGndDm69bsjOo6B1ZkgbBE//+2FnRSZjxxxGOQK43Wt7+1dYGw llvID8eLzqEvt774abc4K9HKOU/KnTQBOfU= Received: from maileast.thefacebook.com ([163.114.130.16]) by m0001303.ppops.net with ESMTP id 34rva9drhy-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 12 Nov 2020 14:36:32 -0800 Received: from intmgw003.06.prn3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::e) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 12 Nov 2020 14:36:30 -0800 Received: by devvm3388.prn0.facebook.com (Postfix, from userid 111017) id 18806A7D207; Thu, 12 Nov 2020 14:16:01 -0800 (PST) From: Roman Gushchin To: CC: Alexei Starovoitov , Daniel Borkmann , , Andrii Nakryiko , Shakeel Butt , , , , Roman Gushchin Subject: [PATCH bpf-next v5 15/34] bpf: memcg-based memory accounting for bpf local storage maps Date: Thu, 12 Nov 2020 14:15:24 -0800 Message-ID: <20201112221543.3621014-16-guro@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20201112221543.3621014-1-guro@fb.com> References: <20201112221543.3621014-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-12_14:2020-11-12,2020-11-12 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxlogscore=903 malwarescore=0 clxscore=1015 spamscore=0 priorityscore=1501 suspectscore=13 phishscore=0 adultscore=0 impostorscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011120127 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Account memory used by bpf local storage maps: per-socket and per-inode storages. Signed-off-by: Roman Gushchin --- kernel/bpf/bpf_local_storage.c | 7 ++++--- net/core/bpf_sk_storage.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/bpf/bpf_local_storage.c b/kernel/bpf/bpf_local_storag= e.c index 5d3a7af9ba9b..fd4f9ac1d042 100644 --- a/kernel/bpf/bpf_local_storage.c +++ b/kernel/bpf/bpf_local_storage.c @@ -67,7 +67,8 @@ bpf_selem_alloc(struct bpf_local_storage_map *smap, voi= d *owner, if (charge_mem && mem_charge(smap, owner, smap->elem_size)) return NULL; =20 - selem =3D kzalloc(smap->elem_size, GFP_ATOMIC | __GFP_NOWARN); + selem =3D kzalloc(smap->elem_size, GFP_ATOMIC | __GFP_NOWARN | + __GFP_ACCOUNT); if (selem) { if (value) memcpy(SDATA(selem)->data, value, smap->map.value_size); @@ -546,7 +547,7 @@ struct bpf_local_storage_map *bpf_local_storage_map_a= lloc(union bpf_attr *attr) u64 cost; int ret; =20 - smap =3D kzalloc(sizeof(*smap), GFP_USER | __GFP_NOWARN); + smap =3D kzalloc(sizeof(*smap), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT= ); if (!smap) return ERR_PTR(-ENOMEM); bpf_map_init_from_attr(&smap->map, attr); @@ -564,7 +565,7 @@ struct bpf_local_storage_map *bpf_local_storage_map_a= lloc(union bpf_attr *attr) } =20 smap->buckets =3D kvcalloc(sizeof(*smap->buckets), nbuckets, - GFP_USER | __GFP_NOWARN); + GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT); if (!smap->buckets) { bpf_map_charge_finish(&smap->map.memory); kfree(smap); diff --git a/net/core/bpf_sk_storage.c b/net/core/bpf_sk_storage.c index c907f0dc7f87..1d9704bb2eca 100644 --- a/net/core/bpf_sk_storage.c +++ b/net/core/bpf_sk_storage.c @@ -453,7 +453,7 @@ bpf_sk_storage_diag_alloc(const struct nlattr *nla_st= gs) } =20 diag =3D kzalloc(sizeof(*diag) + sizeof(diag->maps[0]) * nr_maps, - GFP_KERNEL); + GFP_KERNEL_ACCOUNT); if (!diag) return ERR_PTR(-ENOMEM); =20 --=20 2.26.2