Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp394127pxu; Tue, 1 Dec 2020 14:06:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwMz5lztiGV2fSLZHn+95CWcvUF+gAGb/zOCWkF9hYsOhv2d0hgAwFyjme2yNsBDXaFWdvk X-Received: by 2002:a17:907:d1f:: with SMTP id gn31mr5302023ejc.192.1606860399643; Tue, 01 Dec 2020 14:06:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606860399; cv=none; d=google.com; s=arc-20160816; b=n9FWrIt7aPvGKicJ0+PcEExl0XjQ//i82n0rodECD523o2gacMv5n64fs2s3Iuh0+A QhsHLMZpAadaG7Zy3UorCQ/31k9GES5s7PIfkhc6cOE1YK0mO0fA2ffhArifmO6sDbGj nOGQ99k8qmY3dkKfOfCRJVRpGOVPcMxcyKbGfa+aJpQ0R//+39KO9U/eMXR4L5kjSywh 8wZf8OMT2B/E/3V8bQJBzfQyq0cel0XNcMvjT/u4wz31VZCeFNHU5WwMjG+veE2qzyDU lld2n4mBhM1IvemP1wSxM26KlYlzpgEDIC3lA0pjM1W1KSh2VmMM7+QKXm/nMTiOBbWo rXBA== 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=aUxDr9vXwVIRYb58TUOfA1eGmm/KQJyaXGG8Oo9BCxk=; b=XcZNuq+xFjC2BOY67WP/YCOflsav1JYH/hRbZfOdyIMJWiAk99SQ3XWLSbECmAnHtV pxP52l+e+MN3iwr/Nz6qJ/cjQriFb67WZK/QCHl7Z0OK9Teo83kR00M3hy11BvXFFDtP Nqc7AiDZ01GZXNUIz8Fs3OczGkmfJ0GAw3Xv1FdAx9n8V4G7eluYn9Dbz56s5qoljzx3 HNi1S+gj/X6BGHn3vZsBVZvxG+bB/a1wzHk3EFYKDgEyo44sl/YBbMXofW/BziRXhxwW 5juCJ3zZeoB0rMa3M/efbAeXpIT7gxVCk2j0WPMvB50e5rD9fp1SArTghLCei3yFAY4A wmXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b="OwV7/NEr"; 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 bl4si773983ejb.642.2020.12.01.14.06.15; Tue, 01 Dec 2020 14:06:39 -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="OwV7/NEr"; 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 S1730448AbgLAWBf (ORCPT + 99 others); Tue, 1 Dec 2020 17:01:35 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:59602 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390406AbgLAV75 (ORCPT ); Tue, 1 Dec 2020 16:59:57 -0500 Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0B1Lnqxm027031 for ; Tue, 1 Dec 2020 13:59:16 -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=aUxDr9vXwVIRYb58TUOfA1eGmm/KQJyaXGG8Oo9BCxk=; b=OwV7/NEr5wCS7s759kSO2Omsi8xNOuimiFUcE9z7XC4mv0FMqwjTEuZwFVjtEc2/YtL8 ++wQiSOUTNPLCS/DLtymKKbMoO6jITrAHd1NMRS4B1+EhocDgrXCB5tN2Rf2ykuSpe75 v6oNAYIikxcnzdmeO162ioxNKbuBx/oinpY= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 355vfk0t9y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 01 Dec 2020 13:59:16 -0800 Received: from intmgw004.06.prn3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) 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:15 -0800 Received: by devvm3388.prn0.facebook.com (Postfix, from userid 111017) id 7645B19702B6; Tue, 1 Dec 2020 13:59:06 -0800 (PST) From: Roman Gushchin To: CC: , , , , , , , Subject: [PATCH bpf-next v9 12/34] bpf: refine memcg-based memory accounting for hashtab maps Date: Tue, 1 Dec 2020 13:58:38 -0800 Message-ID: <20201201215900.3569844-13-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 phishscore=0 adultscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 bulkscore=0 lowpriorityscore=0 mlxlogscore=835 malwarescore=0 spamscore=0 suspectscore=38 impostorscore=0 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 objects and the size of map metadata into the accounting. Signed-off-by: Roman Gushchin --- kernel/bpf/hashtab.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index ec46266aaf1c..bf70fb3ed9c1 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -292,7 +292,8 @@ static int prealloc_init(struct bpf_htab *htab) u32 size =3D round_up(htab->map.value_size, 8); void __percpu *pptr; =20 - pptr =3D __alloc_percpu_gfp(size, 8, GFP_USER | __GFP_NOWARN); + pptr =3D bpf_map_alloc_percpu(&htab->map, size, 8, + GFP_USER | __GFP_NOWARN); if (!pptr) goto free_elems; htab_elem_set_ptr(get_htab_elem(htab, i), htab->map.key_size, @@ -346,8 +347,8 @@ static int alloc_extra_elems(struct bpf_htab *htab) struct pcpu_freelist_node *l; int cpu; =20 - pptr =3D __alloc_percpu_gfp(sizeof(struct htab_elem *), 8, - GFP_USER | __GFP_NOWARN); + pptr =3D bpf_map_alloc_percpu(&htab->map, sizeof(struct htab_elem *), 8= , + GFP_USER | __GFP_NOWARN); if (!pptr) return -ENOMEM; =20 @@ -444,7 +445,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr = *attr) int err, i; u64 cost; =20 - htab =3D kzalloc(sizeof(*htab), GFP_USER); + htab =3D kzalloc(sizeof(*htab), GFP_USER | __GFP_ACCOUNT); if (!htab) return ERR_PTR(-ENOMEM); =20 @@ -502,8 +503,10 @@ static struct bpf_map *htab_map_alloc(union bpf_attr= *attr) goto free_charge; =20 for (i =3D 0; i < HASHTAB_MAP_LOCK_COUNT; i++) { - htab->map_locked[i] =3D __alloc_percpu_gfp(sizeof(int), - sizeof(int), GFP_USER); + htab->map_locked[i] =3D bpf_map_alloc_percpu(&htab->map, + sizeof(int), + sizeof(int), + GFP_USER); if (!htab->map_locked[i]) goto free_map_locked; } @@ -925,8 +928,9 @@ static struct htab_elem *alloc_htab_elem(struct bpf_h= tab *htab, void *key, l_new =3D ERR_PTR(-E2BIG); goto dec_count; } - l_new =3D kmalloc_node(htab->elem_size, GFP_ATOMIC | __GFP_NOWARN, - htab->map.numa_node); + l_new =3D bpf_map_kmalloc_node(&htab->map, htab->elem_size, + GFP_ATOMIC | __GFP_NOWARN, + htab->map.numa_node); if (!l_new) { l_new =3D ERR_PTR(-ENOMEM); goto dec_count; @@ -942,8 +946,8 @@ static struct htab_elem *alloc_htab_elem(struct bpf_h= tab *htab, void *key, pptr =3D htab_elem_get_ptr(l_new, key_size); } else { /* alloc_percpu zero-fills */ - pptr =3D __alloc_percpu_gfp(size, 8, - GFP_ATOMIC | __GFP_NOWARN); + pptr =3D bpf_map_alloc_percpu(&htab->map, size, 8, + GFP_ATOMIC | __GFP_NOWARN); if (!pptr) { kfree(l_new); l_new =3D ERR_PTR(-ENOMEM); --=20 2.26.2