Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp69551pxu; Tue, 24 Nov 2020 19:06:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcivkj5dEmtjfdrLvrkiYgzTbbdArsWUtf7ennfuVcBNed8eJ7b6HvFpPUiXB4K8e+9o06 X-Received: by 2002:a17:906:b783:: with SMTP id dt3mr1356801ejb.534.1606273562754; Tue, 24 Nov 2020 19:06:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606273562; cv=none; d=google.com; s=arc-20160816; b=TlGuJjZf8nk+6th5X9tEMmwb4G1ID7UKexGI8izIA4jxUiR0XgwK6lIcrtacfMB9ke tQ0SQgJq/G3B8RTDh39N/jKkuqVfEkcp+X4DHqjvh6+qLE5QKbME6GLlLFutvlK/m0xB LVESy+SBRWRzxS9suhLeM8MUuEQeoc4lch+H+swiXQzzZmfrsevmepgVDrfOgvY/xruH 4bAAUrYMcry7tkI0SQoaEHu/xq2nPSIeVnBW6JxSNdZTD5UmBLsQ06jLEfdNrdAO83q6 fvj+QYzAYS5wzvAQ5h1VkAEVJdbl7fS6+GwiGT/xiYtUNnoyFPY2qrze/pmg8BSQe2gN XcKg== 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=i22VzsfYXFhHUbHUyBRo4SfAiYTea7Ssop+WPV0F4gA=; b=Ri1H4K3SrnU1n1A7k/4OStpMyAUngFCQDpyxq87qyJpG2eezE/PMnM5cnMmhGy+k2z Hvt1KmW2DNrRA3Y0p54MjsOcc1YbkwA6n/uPs06j44eUQ9IIEuQA/3IdiDDhMKVadCB0 2zLlq0FD6adEGNRlJO4hPC8tDHPPqokhHtG2xz8NXYQF0Ka2XiEXe0BkZftaT2OrI2Ea PuQYdl87HTnvQC8dLZxryZ8Q5GOaJCotz1zi/zZqfJmwg1b6P7ziXD/kpmwkxaulShod TNm/tfffv+Nd9we/5xc1m0I79PyFDFV5ZJC4EosO61DU6ttYZLUj5HBUrWbwUYi/lore P16A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=SJ9+4up5; 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 d15si429075edk.319.2020.11.24.19.05.40; Tue, 24 Nov 2020 19:06:02 -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=SJ9+4up5; 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 S1728138AbgKYDC0 (ORCPT + 99 others); Tue, 24 Nov 2020 22:02:26 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:3304 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727486AbgKYDBf (ORCPT ); Tue, 24 Nov 2020 22:01:35 -0500 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AP2rZcN008344 for ; Tue, 24 Nov 2020 19:01:35 -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=i22VzsfYXFhHUbHUyBRo4SfAiYTea7Ssop+WPV0F4gA=; b=SJ9+4up5ecCOv80G2UxGiriFndg5Pj5mjtJpEmolL2fpELSgwLNHWG7YGP/JVbCM4m7O tklX06rWPI9mcCPk9iuO0LD/fg67XgcdcGh6X+z3UDgr3wbPUmMz6VJAJHhfX0MmYlED Rhmz8UkQsHbYolblyPqh08r6wCaE99bK9is= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 351dspg6yr-13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 24 Nov 2020 19:01:35 -0800 Received: from intmgw002.41.prn1.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) 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:28 -0800 Received: by devvm3388.prn0.facebook.com (Postfix, from userid 111017) id 3D70416A18A5; Tue, 24 Nov 2020 19:01:22 -0800 (PST) From: Roman Gushchin To: CC: , , , , , , , Subject: [PATCH bpf-next v8 18/34] bpf: eliminate rlimit-based memory accounting for arraymap maps Date: Tue, 24 Nov 2020 19:01:03 -0800 Message-ID: <20201125030119.2864302-19-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 bulkscore=0 adultscore=0 malwarescore=0 suspectscore=38 spamscore=0 mlxscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 mlxlogscore=867 priorityscore=1501 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250018 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not use rlimit-based memory accounting for arraymap maps. It has been replaced with the memcg-based memory accounting. Signed-off-by: Roman Gushchin Acked-by: Song Liu --- kernel/bpf/arraymap.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 92b650123c22..20f751a1d993 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -81,11 +81,10 @@ int array_map_alloc_check(union bpf_attr *attr) static struct bpf_map *array_map_alloc(union bpf_attr *attr) { bool percpu =3D attr->map_type =3D=3D BPF_MAP_TYPE_PERCPU_ARRAY; - int ret, numa_node =3D bpf_map_attr_numa_node(attr); + int numa_node =3D bpf_map_attr_numa_node(attr); u32 elem_size, index_mask, max_entries; bool bypass_spec_v1 =3D bpf_bypass_spec_v1(); - u64 cost, array_size, mask64; - struct bpf_map_memory mem; + u64 array_size, mask64; struct bpf_array *array; =20 elem_size =3D round_up(attr->value_size, 8); @@ -126,44 +125,29 @@ static struct bpf_map *array_map_alloc(union bpf_at= tr *attr) } } =20 - /* make sure there is no u32 overflow later in round_up() */ - cost =3D array_size; - if (percpu) - cost +=3D (u64)attr->max_entries * elem_size * num_possible_cpus(); - - ret =3D bpf_map_charge_init(&mem, cost); - if (ret < 0) - return ERR_PTR(ret); - /* allocate all map elements and zero-initialize them */ if (attr->map_flags & BPF_F_MMAPABLE) { void *data; =20 /* kmalloc'ed memory can't be mmap'ed, use explicit vmalloc */ data =3D bpf_map_area_mmapable_alloc(array_size, numa_node); - if (!data) { - bpf_map_charge_finish(&mem); + if (!data) return ERR_PTR(-ENOMEM); - } array =3D data + PAGE_ALIGN(sizeof(struct bpf_array)) - offsetof(struct bpf_array, value); } else { array =3D bpf_map_area_alloc(array_size, numa_node); } - if (!array) { - bpf_map_charge_finish(&mem); + if (!array) return ERR_PTR(-ENOMEM); - } array->index_mask =3D index_mask; array->map.bypass_spec_v1 =3D bypass_spec_v1; =20 /* copy mandatory map attributes */ bpf_map_init_from_attr(&array->map, attr); - bpf_map_charge_move(&array->map.memory, &mem); array->elem_size =3D elem_size; =20 if (percpu && bpf_array_alloc_percpu(array)) { - bpf_map_charge_finish(&array->map.memory); bpf_map_area_free(array); return ERR_PTR(-ENOMEM); } --=20 2.26.2