Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp392371pxu; Tue, 1 Dec 2020 14:04:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCvBNm1R7Zu4lmhYtmleKMguKNu/GBkEBhnVxeqh80cymJbwmEaXVYmBnwh1VZppYtqWJN X-Received: by 2002:a50:bf4a:: with SMTP id g10mr5226454edk.288.1606860246938; Tue, 01 Dec 2020 14:04:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606860246; cv=none; d=google.com; s=arc-20160816; b=IvDLDhvfbpvlI7asfw1cj7DnJp1nlObMaRrilHCo3bBpp3f6OhGEJI24FB0GxOWCgw m0pxlJIQ1Wmp1lil/UKkVoif7cgtVo4wbvhnXzOHIQM/FSuZpIZU7UzpeuBYuAyFyUvS 67pvR0GKhxvilH24+9Unfjv+q9p4KjBrp1EI0cir7bKzyNpDu3W4mo7+Wb2EcdRbz05F jacpZqxqhp32rE6arnZ3V11gViBsGHTayEcO+laqKcaerUQY+g3UChAa6/Fhm6kXbK5v DExkJdK4Ewrc4WrSSr6S/u5ndxp0X3ZgzIW4/wr+3S6ednFd2LD8KZj+oIfIkBjMwZhv zocg== 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=UKxkxvAAuhNaKc9s1NfBxBtqwOSjGHpQevUyr/TJeOA=; b=EffI4W08th7XBFMdiSqWLm1M99ouHbbNAEHE22RxVyxKbQryhxfuDop6fxfBodYfrL qP460ipybR4IyPa6E5573pdwRW5aJ370dDwS7Gsanak9ZCcwCB5k5pL6zytUwqZFJy/O 41cvufWCoZ3OkzvjcfFfT36OHmWYEkSmNBAl/q7x66IFdBpg9TuYteo82JcSyYRZSRcE ltAqIDR73mXIFgt8B9Y7/KUZ2pNHE2pOWAvvhUJVrX7qw7eEzx89aDUHHwbHJ+8jatqm nxefZCS86AQZwiNenCPDYcL+MoPC3wtvKkiwIDBHJIIRWEqiSokqhDo5CE3uYQNZZEh/ K7xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=DIpvRqTq; 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 h13si741240edv.588.2020.12.01.14.03.44; Tue, 01 Dec 2020 14:04:06 -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=DIpvRqTq; 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 S2390510AbgLAWBP (ORCPT + 99 others); Tue, 1 Dec 2020 17:01:15 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:33176 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390516AbgLAV76 (ORCPT ); Tue, 1 Dec 2020 16:59:58 -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 0B1Lnqxo027031 for ; Tue, 1 Dec 2020 13:59:17 -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=UKxkxvAAuhNaKc9s1NfBxBtqwOSjGHpQevUyr/TJeOA=; b=DIpvRqTq/FRoi920kkeCA9/iZjvwqUd5Gss9j4Ic4SUj3S1QM/3yugWdm5EgfT4qaRrf 4a4VcNNrovXmRcEPJzcweQwTuhkcgrf4/i4m8STE/jKiuUxDBdBUkRjRD8ig3/o5IOw6 aYFKCpwRJjePtv7tZYXIo5TVCONlTvy/agA= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 355vfk0t9y-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 01 Dec 2020 13:59:17 -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 7B04A19702B8; Tue, 1 Dec 2020 13:59:06 -0800 (PST) From: Roman Gushchin To: CC: , , , , , , , Subject: [PATCH bpf-next v9 13/34] bpf: memcg-based memory accounting for lpm_trie maps Date: Tue, 1 Dec 2020 13:58:39 -0800 Message-ID: <20201201215900.3569844-14-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=765 malwarescore=0 spamscore=0 suspectscore=13 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 lpm trie and lpm trie node objects into the memcg-based memory accounting. Signed-off-by: Roman Gushchin --- kernel/bpf/lpm_trie.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c index 00e32f2ec3e6..1a6981203d7f 100644 --- a/kernel/bpf/lpm_trie.c +++ b/kernel/bpf/lpm_trie.c @@ -282,8 +282,8 @@ static struct lpm_trie_node *lpm_trie_node_alloc(cons= t struct lpm_trie *trie, if (value) size +=3D trie->map.value_size; =20 - node =3D kmalloc_node(size, GFP_ATOMIC | __GFP_NOWARN, - trie->map.numa_node); + node =3D bpf_map_kmalloc_node(&trie->map, size, GFP_ATOMIC | __GFP_NOWA= RN, + trie->map.numa_node); if (!node) return NULL; =20 @@ -557,7 +557,7 @@ static struct bpf_map *trie_alloc(union bpf_attr *att= r) attr->value_size > LPM_VAL_SIZE_MAX) return ERR_PTR(-EINVAL); =20 - trie =3D kzalloc(sizeof(*trie), GFP_USER | __GFP_NOWARN); + trie =3D kzalloc(sizeof(*trie), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT= ); if (!trie) return ERR_PTR(-ENOMEM); =20 --=20 2.26.2