Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp393352pxu; Tue, 1 Dec 2020 14:05:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyENKbZIffCNTYEOWlak7MS8INHs5lNL/9XtRCSvnTXBxsan0FUJGeca/XRrADmQWo6X3J X-Received: by 2002:aa7:d41a:: with SMTP id z26mr5163826edq.267.1606860331601; Tue, 01 Dec 2020 14:05:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606860331; cv=none; d=google.com; s=arc-20160816; b=gfIICZ23FNQYVN7xQnXoZFAH525rCjiT337Gr7ZFPxHAR926JYRk2J7gVOGf0hM5XC 2AmkSSmJGcagfqwx5aXkM+rnVDcwi7OqnaxBtWW/rQtD7sARm94qsAshLlAWI2eay8NP bE02lw4iE3LRiBeKDIfyrIzYdc82xSvtYOb1pj+XuBO8w0EX/J9I0VwHjBo/JiLYHJmf rHo8FChCU6wM6IQEqJQPWZx86XTwQJAB2DtYZQq+CYbAhe/8ArKn7FH1tZvkWgqGwzwL jASqBInKxRi8Le8RC9xfk8u618iEOc6oU99m2cfCgTkKdLSnGsLYDCpwq7nEAWOU+lw5 c24Q== 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=hkpfF67xQ6U1ZlIknKfbnaBnXqBUdqcL6K2akhLDsUE=; b=lu7nKLxtxCD06NbC9/ji4fMixlISTYvQT7zW3fhxu5oCX/hfmdu4xjIh+iEwtIntIs EPki3CosBmlFMmDmtnio0AoXtoo5w5WLOOd8Q9jg1DdOPiTJcNrwisVyp46ipjtCcUq3 3TGkZuiX0ij28osWpfUiyOiu1flVfaDe+XdmxZGB9esLXe8zsr6N4gZLQ2ivpORZWUMr 2hBLpbvs+hvAyo7/FEAIP/MTDiUqEnLsDh2ZQvxncAYcFPfTfOnkyghS9WXoBsNN2b6m bNrtehxKYmrOp21EonYskl4E9dQp9Yl9v/rQqP6ORlvdoP40NZ/BsA1xDT64nhIXyyF8 EnOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=bzUE2q9D; 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 mb18si861593ejb.284.2020.12.01.14.05.09; Tue, 01 Dec 2020 14:05:31 -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=bzUE2q9D; 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 S2392297AbgLAWCo (ORCPT + 99 others); Tue, 1 Dec 2020 17:02:44 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:45132 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387935AbgLAV7w (ORCPT ); Tue, 1 Dec 2020 16:59:52 -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 0B1Lml29007436 for ; Tue, 1 Dec 2020 13:59:12 -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=hkpfF67xQ6U1ZlIknKfbnaBnXqBUdqcL6K2akhLDsUE=; b=bzUE2q9DD1cdMLZugy/nJMVAX9G4Lot1NWzr6jqPDVx/fzqt80NCE/YwEDqPzYRX3OSZ 0dfb7muouut41fP797LE0GvyKYdKsn1SmX5+5iPnQ4Q8NrEDlglTdjpZSLyNMGWAKGzf C8g4y54m37m9/gOAXPUSZrSrN0wOr3UA3SY= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 3547psq7s5-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 01 Dec 2020 13:59:12 -0800 Received: from intmgw002.06.prn3.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:11d::7) 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:11 -0800 Received: by devvm3388.prn0.facebook.com (Postfix, from userid 111017) id 8DE2A19702C0; Tue, 1 Dec 2020 13:59:06 -0800 (PST) From: Roman Gushchin To: CC: , , , , , , , Subject: [PATCH bpf-next v9 17/34] bpf: refine memcg-based memory accounting for xskmap maps Date: Tue, 1 Dec 2020 13:58:43 -0800 Message-ID: <20201201215900.3569844-18-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 impostorscore=0 mlxscore=0 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 mlxlogscore=736 adultscore=0 suspectscore=13 lowpriorityscore=0 phishscore=0 clxscore=1015 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 Extend xskmap memory accounting to include the memory taken by the xsk_map_node structure. Signed-off-by: Roman Gushchin --- net/xdp/xskmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/xdp/xskmap.c b/net/xdp/xskmap.c index 66231ba6c348..9fff1e6dc9cd 100644 --- a/net/xdp/xskmap.c +++ b/net/xdp/xskmap.c @@ -16,7 +16,8 @@ static struct xsk_map_node *xsk_map_node_alloc(struct x= sk_map *map, { struct xsk_map_node *node; =20 - node =3D kzalloc(sizeof(*node), GFP_ATOMIC | __GFP_NOWARN); + node =3D bpf_map_kzalloc(&map->map, sizeof(*node), + GFP_ATOMIC | __GFP_NOWARN); if (!node) return ERR_PTR(-ENOMEM); =20 --=20 2.26.2