Received: by 2002:a17:90b:8d0:0:0:0:0 with SMTP id ds16csp5080278pjb; Mon, 27 Jul 2020 12:24:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwr/S4rc3qIIsZCtiBt7TrReJfTUz9T2aK4MqE8VgpUW/7m5T+qw6Nu2kZNFSQciycZB1uC X-Received: by 2002:aa7:c6ce:: with SMTP id b14mr7686967eds.208.1595877888136; Mon, 27 Jul 2020 12:24:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595877888; cv=none; d=google.com; s=arc-20160816; b=ROwF9WflR9G3jynNJDmBv1s9pjEEi0W0y0CbqDhbpvmOv0VUMbi+C4NUUIHz+tugnh /H0PPt1Ct9nKN7zNKA+7NlkSf1/dX5s0cFJcHkFBQubXsOZ8whwsDIR8z3bmgrmSi+ol M9m+6NuVt28XjCHgClrJei+D8sF6i1bNjAi07l9nKufs+wpnHVyC9Zai6xbKTJTiihIz M+WsMmOlqX6dHje2P971AB3pVtSPZHl0JxSnTqeVA1usP89XdHlQqBXuAP+1Knn5O3CF QGkvHySpmzpmWZvT5FMoMKLBwYTjhW81dUePD1ixV66PFjnaFJeRyMjrQgSpJd/a/KFX vKrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:smtp-origin-cluster :cc:to:smtp-origin-hostname:from:smtp-origin-hostprefix :dkim-signature; bh=VdNVeo/r7n5BeWPKriNc/78VSdoV1W6Zt7B5MFzVu6Y=; b=ZrfXoW73iioQjnMtHRtMyh0i+EqfZHSvXBd85+Pd4JMMpFQrxWxnQRxwyWlqiE36X3 Tkb3aeadSFmezwN2GFhXkYysm/taNnG4Pk2Elc6eeP4bng+5iRwtYWZ1Et2VXw7JxJXA VkTcgOGdbYQOs4Bfz8v4iZ7T1l9MTBAqcdoPDU5bHpfKBXUj+QtIRlhiAXWmj6XXH4Zz oWPJHUmxXhOut+V+LPE/oZUPz2eOLHvkE2d7fsuQF8FdwJfB4WksNIF52qtdG0Z9Iajf bu6tKOdhPzawzxi2yKV186cEpSZXva0TztAK+/AEQ3jcXlcqhEq3ztP+YW3PSjq9MKyq O4fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=ks0aDrag; 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 v21si6534705ejg.127.2020.07.27.12.24.25; Mon, 27 Jul 2020 12:24:48 -0700 (PDT) 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=ks0aDrag; 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 S1730755AbgG0SrV (ORCPT + 99 others); Mon, 27 Jul 2020 14:47:21 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:39564 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728895AbgG0Spr (ORCPT ); Mon, 27 Jul 2020 14:45:47 -0400 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06RIjgeQ027206 for ; Mon, 27 Jul 2020 11:45:47 -0700 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=VdNVeo/r7n5BeWPKriNc/78VSdoV1W6Zt7B5MFzVu6Y=; b=ks0aDragbunp1jFR4LkwXzfvVYUpTQp4nc/AoSW2plq1JSxK4q9yoIXJ9f0zHHGk/liw 6BtGiV0nrvuJMK98kM6kDr6+9BheTBFI+A2a1OSaZlaBhDRvqyTZNfWdDabMojLfHWhT W94ZToazeUvfa31LAb5R00ohYhb3T6bVnmo= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 32h50vnsxk-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 27 Jul 2020 11:45:47 -0700 Received: from intmgw001.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; Mon, 27 Jul 2020 11:45:16 -0700 Received: by devvm1096.prn0.facebook.com (Postfix, from userid 111017) id C506C1DAFE89; Mon, 27 Jul 2020 11:45:10 -0700 (PDT) Smtp-Origin-Hostprefix: devvm From: Roman Gushchin Smtp-Origin-Hostname: devvm1096.prn0.facebook.com To: CC: , Alexei Starovoitov , Daniel Borkmann , , , Roman Gushchin Smtp-Origin-Cluster: prn0c01 Subject: [PATCH bpf-next v2 12/35] bpf: refine memcg-based memory accounting for xskmap maps Date: Mon, 27 Jul 2020 11:44:43 -0700 Message-ID: <20200727184506.2279656-13-guro@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200727184506.2279656-1-guro@fb.com> References: <20200727184506.2279656-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.235,18.0.687 definitions=2020-07-27_13:2020-07-27,2020-07-27 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 suspectscore=13 phishscore=0 mlxscore=0 lowpriorityscore=0 spamscore=0 impostorscore=0 malwarescore=0 bulkscore=0 mlxlogscore=810 priorityscore=1501 adultscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007270127 X-FB-Internal: deliver Sender: linux-kernel-owner@vger.kernel.org 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 8367adbbe9df..e574b22defe5 100644 --- a/net/xdp/xskmap.c +++ b/net/xdp/xskmap.c @@ -28,7 +28,8 @@ static struct xsk_map_node *xsk_map_node_alloc(struct x= sk_map *map, struct xsk_map_node *node; int err; =20 - node =3D kzalloc(sizeof(*node), GFP_ATOMIC | __GFP_NOWARN); + node =3D kzalloc(sizeof(*node), + GFP_ATOMIC | __GFP_NOWARN | __GFP_ACCOUNT); if (!node) return ERR_PTR(-ENOMEM); =20 --=20 2.26.2