Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp70729pxu; Tue, 24 Nov 2020 19:08:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAkjiZRQbhUfLojYSkak10YxtVNmNaTjv9Dgc4xDniBuqnUEIPHMUr04fb8XEpYJZwcltv X-Received: by 2002:a17:906:f286:: with SMTP id gu6mr1445296ejb.182.1606273723144; Tue, 24 Nov 2020 19:08:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606273723; cv=none; d=google.com; s=arc-20160816; b=E3LO4DSGozZeMDSw9DRJtuBIR1S1Oj1FN7oqppUK0P/oqqsjW4iDre7LO9kXbm704F AZE9h46E4BnyJ0T7eJiwKkaqrUXyVUmPhVSOkENxOY0y5Erd3XWaVavkAR4IacXwsHPV g0S15WJthnk02JLOJTJp3iQOsHDfruHOL1sQzRCX/4qT6gX7dLWvbAmS8LZUvl+aV0Xs VGkCooDWg6BmpFjLmSI9Vr7mqpsTC3byjy3yqy70kkrt/XZzkKcmWVOAxoaaZjw98xm5 ejZJcVocXkNKeiDgRSVht9g9qtiA0+rcrPs2zIbOD3HEErZ7Z4H7Z2o1Pu8OvEu54Xxl gq8Q== 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=th+CKi28MlGZAnT3YwU2SbBmrPkQrrRTwPpc7M09M30=; b=ufhYVamLbqepYX+FqvI0sbRnKuOUUxIvZ3YK4PUwMFSLoq/MMPLqxeeQ2pqRPtriVi gnM8I5YlERLXLmDsVDYhx+9W9SjFqRckvxOQVpQzDYddJbOin1BewkmEwZSZI26lFxro ZaYzLDHTPtgmsjK6COoyQ3l79pzGZalHyzOpTPSapieYiBLI+XGPucZjW/55jejpEPcT OH2p/XhDv7ja3ix++uB7lZM8sr1VtnnGqV1yxHHshfPJDou18FLjIjcOlyBGvrJAYEZy vY5fk7NRvyNiEKPywxgvyHEimXhmjvSym6dnrzkQXMtpUOxtD6mKWQnwMBNJW2+pDqVI y3rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b="J0s14A/a"; 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 um17si520273ejb.701.2020.11.24.19.08.20; Tue, 24 Nov 2020 19:08:43 -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="J0s14A/a"; 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 S1728597AbgKYDDr (ORCPT + 99 others); Tue, 24 Nov 2020 22:03:47 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:7896 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727329AbgKYDB3 (ORCPT ); Tue, 24 Nov 2020 22:01:29 -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 0AP2sIOR020791 for ; Tue, 24 Nov 2020 19:01:28 -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=th+CKi28MlGZAnT3YwU2SbBmrPkQrrRTwPpc7M09M30=; b=J0s14A/abR7S3ij/5bwDSI6P1VvpxG7aEYtohkJF82E9DrwRGS6dj2pBEZKxZ9P7s3kh rDOqAihSLAkonDKsGV5ZUmN8JLp/uoZMh6BDejXDNy5aEfhuOBSuj8ChwRQ6nVKix+VF ww5+UorNU2/xr7HZiuEPg8gj+28MJax3AC8= Received: from maileast.thefacebook.com ([163.114.130.16]) by m0001303.ppops.net with ESMTP id 34yx1t31xv-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 24 Nov 2020 19:01:28 -0800 Received: from intmgw001.41.prn1.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, 24 Nov 2020 19:01:26 -0800 Received: by devvm3388.prn0.facebook.com (Postfix, from userid 111017) id 1C3F416A1897; Tue, 24 Nov 2020 19:01:22 -0800 (PST) From: Roman Gushchin To: CC: , , , , , , , Subject: [PATCH bpf-next v8 11/34] bpf: refine memcg-based memory accounting for devmap maps Date: Tue, 24 Nov 2020 19:00:56 -0800 Message-ID: <20201125030119.2864302-12-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 impostorscore=0 lowpriorityscore=0 priorityscore=1501 malwarescore=0 mlxscore=0 phishscore=0 adultscore=0 bulkscore=0 suspectscore=13 spamscore=0 mlxlogscore=857 clxscore=1015 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 Include map metadata and the node size (struct bpf_dtab_netdev) into the accounting. Signed-off-by: Roman Gushchin --- kernel/bpf/devmap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index 2b5ca93c17de..a4dfe544946f 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c @@ -175,7 +175,7 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *= attr) if (!capable(CAP_NET_ADMIN)) return ERR_PTR(-EPERM); =20 - dtab =3D kzalloc(sizeof(*dtab), GFP_USER); + dtab =3D kzalloc(sizeof(*dtab), GFP_USER | __GFP_ACCOUNT); if (!dtab) return ERR_PTR(-ENOMEM); =20 @@ -602,8 +602,9 @@ static struct bpf_dtab_netdev *__dev_map_alloc_node(s= truct net *net, struct bpf_prog *prog =3D NULL; struct bpf_dtab_netdev *dev; =20 - dev =3D kmalloc_node(sizeof(*dev), GFP_ATOMIC | __GFP_NOWARN, - dtab->map.numa_node); + dev =3D bpf_map_kmalloc_node(&dtab->map, sizeof(*dev), + GFP_ATOMIC | __GFP_NOWARN | __GFP_ACCOUNT, + dtab->map.numa_node); if (!dev) return ERR_PTR(-ENOMEM); =20 --=20 2.26.2