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 188BDC6379F for ; Tue, 17 Nov 2020 02:58:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CCE5B24694 for ; Tue, 17 Nov 2020 02:58:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="By/YMBdY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727981AbgKQC6P (ORCPT ); Mon, 16 Nov 2020 21:58:15 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:55396 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726869AbgKQCzl (ORCPT ); Mon, 16 Nov 2020 21:55:41 -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 0AH2qYVe013016 for ; Mon, 16 Nov 2020 18:55:40 -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=4ruiu0cQHiQu17ZNHmCVD88zt1VwoKjdlDDSgnzPfpg=; b=By/YMBdYUAbV9IA2jgc8ALqXef/nRIiRS7VzfyrPJsbp8AuZTQgYE5qpnyrEvEdg4rxh 4ytmfLhzZRYA9HkDLpfhm2YImbvLypRWs5Z3qrRod/J7Yar54xNbBV44lqSyQ4sbRdle Gwl1RdZM/YtQWzCqIUvZkuAiUvbTumMDd1M= Received: from maileast.thefacebook.com ([163.114.130.16]) by m0001303.ppops.net with ESMTP id 34tbssbnsb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 16 Nov 2020 18:55:40 -0800 Received: from intmgw003.06.prn3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::d) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Mon, 16 Nov 2020 18:55:39 -0800 Received: by devvm3388.prn0.facebook.com (Postfix, from userid 111017) id 46D38C5F7FC; Mon, 16 Nov 2020 18:55:34 -0800 (PST) From: Roman Gushchin To: CC: , , , , , , , Subject: [PATCH v6 30/34] bpf: eliminate rlimit-based memory accounting for xskmap maps Date: Mon, 16 Nov 2020 18:55:25 -0800 Message-ID: <20201117025529.1034387-31-guro@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20201117025529.1034387-1-guro@fb.com> References: <20201117025529.1034387-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-16_13:2020-11-13,2020-11-16 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 suspectscore=13 impostorscore=0 adultscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 mlxlogscore=819 malwarescore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011170023 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not use rlimit-based memory accounting for xskmap maps. It has been replaced with the memcg-based memory accounting. Signed-off-by: Roman Gushchin Acked-by: Song Liu --- net/xdp/xskmap.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/net/xdp/xskmap.c b/net/xdp/xskmap.c index 5d11d60d7b0f..7dc110b40ba0 100644 --- a/net/xdp/xskmap.c +++ b/net/xdp/xskmap.c @@ -74,9 +74,8 @@ static void xsk_map_sock_delete(struct xdp_sock *xs, =20 static struct bpf_map *xsk_map_alloc(union bpf_attr *attr) { - struct bpf_map_memory mem; - int err, numa_node; struct xsk_map *m; + int numa_node; u64 size; =20 if (!capable(CAP_NET_ADMIN)) @@ -90,18 +89,11 @@ static struct bpf_map *xsk_map_alloc(union bpf_attr *= attr) numa_node =3D bpf_map_attr_numa_node(attr); size =3D struct_size(m, xsk_map, attr->max_entries); =20 - err =3D bpf_map_charge_init(&mem, size); - if (err < 0) - return ERR_PTR(err); - m =3D bpf_map_area_alloc(size, numa_node); - if (!m) { - bpf_map_charge_finish(&mem); + if (!m) return ERR_PTR(-ENOMEM); - } =20 bpf_map_init_from_attr(&m->map, attr); - bpf_map_charge_move(&m->map.memory, &mem); spin_lock_init(&m->lock); =20 return &m->map; --=20 2.26.2