Message ID | 20201112221543.3621014-10-guro@fb.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=Ki9e=ES=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0403C138B for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 12 Nov 2020 22:31:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A7D6B2085B for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 12 Nov 2020 22:31:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="EL1mF4YI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7D6B2085B Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=fb.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A287F6B005C; Thu, 12 Nov 2020 17:31:34 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9D8A76B005D; Thu, 12 Nov 2020 17:31:34 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 852B26B0068; Thu, 12 Nov 2020 17:31:34 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0021.hostedemail.com [216.40.44.21]) by kanga.kvack.org (Postfix) with ESMTP id 58A3F6B005C for <linux-mm@kvack.org>; Thu, 12 Nov 2020 17:31:34 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 043421EE6 for <linux-mm@kvack.org>; Thu, 12 Nov 2020 22:31:34 +0000 (UTC) X-FDA: 77477214108.12.boats93_350c79a2730a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id D1F4918008A20 for <linux-mm@kvack.org>; Thu, 12 Nov 2020 22:31:33 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,prvs=85855ab1a6=guro@fb.com,,RULES_HIT:30054:30064,0,RBL:67.231.145.42:@fb.com:.lbl8.mailshell.net-64.10.201.10 62.18.0.100;04yrii4prgct1fqzhmbg8o7oedkztycanjp5r6ajgjhwfhezi4wta3w84wn9fp4.zpk1xbd9dtw57xqoxqcb1urb9ue14eufdxfy6d5acufkosadsfhssy6rq49kw8r.g-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:100,LUA_SUMMARY:none X-HE-Tag: boats93_350c79a2730a X-Filterd-Recvd-Size: 3976 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf20.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Thu, 12 Nov 2020 22:31:32 +0000 (UTC) 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 0ACMNnoJ025159 for <linux-mm@kvack.org>; Thu, 12 Nov 2020 14:31:32 -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=tMQYn86M7mCJgJxwvphLPq/LNJFFW191W8A4gy995js=; b=EL1mF4YIlkvQyFWHH1Xo2MZjsOcM8sY3pXNDtCHvtjOpSzpQbITU2WSiBni+hvSaNN1E OnW3OtZc91zBCICyxMMXX8m1duz4Pe7vFMU3+9VQSeZmabOa1hFdURa5YqdfbBuxIGjQ f3EoeXDelBcftWyD7nTsMp7hzytOxSwVQIc= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 34s7getpcg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for <linux-mm@kvack.org>; Thu, 12 Nov 2020 14:31:31 -0800 Received: from intmgw002.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; Thu, 12 Nov 2020 14:31:30 -0800 Received: by devvm3388.prn0.facebook.com (Postfix, from userid 111017) id ECAACA7D1EC; Thu, 12 Nov 2020 14:16:00 -0800 (PST) From: Roman Gushchin <guro@fb.com> To: <bpf@vger.kernel.org> CC: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, <netdev@vger.kernel.org>, Andrii Nakryiko <andrii@kernel.org>, Shakeel Butt <shakeelb@google.com>, <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>, <kernel-team@fb.com>, Roman Gushchin <guro@fb.com>, Song Liu <songliubraving@fb.com> Subject: [PATCH bpf-next v5 09/34] bpf: refine memcg-based memory accounting for cpumap maps Date: Thu, 12 Nov 2020 14:15:18 -0800 Message-ID: <20201112221543.3621014-10-guro@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20201112221543.3621014-1-guro@fb.com> References: <20201112221543.3621014-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-12_14:2020-11-12,2020-11-12 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 mlxlogscore=969 adultscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=13 impostorscore=0 malwarescore=0 phishscore=0 clxscore=1015 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011120127 X-FB-Internal: deliver X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> |
Series |
bpf: switch to memcg-based memory accounting
|
expand
|
diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c index c61a23b564aa..563f96cc8a9d 100644 --- a/kernel/bpf/cpumap.c +++ b/kernel/bpf/cpumap.c @@ -97,7 +97,7 @@ static struct bpf_map *cpu_map_alloc(union bpf_attr *attr) attr->map_flags & ~BPF_F_NUMA_NODE) return ERR_PTR(-EINVAL); - cmap = kzalloc(sizeof(*cmap), GFP_USER); + cmap = kzalloc(sizeof(*cmap), GFP_USER | __GFP_ACCOUNT); if (!cmap) return ERR_PTR(-ENOMEM); @@ -415,7 +415,7 @@ static struct bpf_cpu_map_entry * __cpu_map_entry_alloc(struct bpf_cpumap_val *value, u32 cpu, int map_id) { int numa, err, i, fd = value->bpf_prog.fd; - gfp_t gfp = GFP_KERNEL | __GFP_NOWARN; + gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_NOWARN; struct bpf_cpu_map_entry *rcpu; struct xdp_bulk_queue *bq;