From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEF27C2D0E4 for ; Wed, 18 Nov 2020 00:46:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 075B524198 for ; Wed, 18 Nov 2020 00:46:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="qLidpKz8"; dkim=pass (1024-bit key) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="GXNVLU36" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 075B524198 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 2BC6F6B0072; Tue, 17 Nov 2020 19:46:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 26DD26B0074; Tue, 17 Nov 2020 19:46:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1322E6B0075; Tue, 17 Nov 2020 19:46:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0065.hostedemail.com [216.40.44.65]) by kanga.kvack.org (Postfix) with ESMTP id BB6726B0072 for ; Tue, 17 Nov 2020 19:46:57 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 632D71EE6 for ; Wed, 18 Nov 2020 00:46:57 +0000 (UTC) X-FDA: 77495699274.22.pear04_1802a3527336 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id 3BFF518038E6A for ; Wed, 18 Nov 2020 00:46:57 +0000 (UTC) X-HE-Tag: pear04_1802a3527336 X-Filterd-Recvd-Size: 11029 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Wed, 18 Nov 2020 00:46:56 +0000 (UTC) Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AI0hdBC030038; Tue, 17 Nov 2020 16:46:42 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=date : from : to : cc : subject : message-id : references : content-type : in-reply-to : mime-version; s=facebook; bh=05Kk6U2RWn265I7vDdvZbUiWiMU6ha4x65L8loJ3DNM=; b=qLidpKz85lmBLEFwok0E2j6I38/Rah4ZQDk7HoGanQ4txnNsQCjqDZ+EN1u1w0qZIYGB rMwuzyXRxmy6G/L/MS032hvlCz1A7eb89GcD2xDAKsdQnMcpSRx8BIBrEKWywkdYwRL/ sbJNCnVDwWWr+lBDff509O7OkpuOrJuWdb0= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 34tyxqxs6a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 17 Nov 2020 16:46:42 -0800 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (100.104.98.9) by o365-in.thefacebook.com (100.104.94.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 17 Nov 2020 16:46:41 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C8DgckQnWAjKG9SQ9drBruq9xGuY8KMZCDgVnzIbvDWD/eE52S/a707RWTCW98+8k24vHd8khDeg6hcdsQl1dEKw8U5KTwh10o4Z4b1BnzzJZZslphTEisHiXtLqTW3F5h8Tcy7CKEa+SUMim7RQFzucMUge7+BfIfH/yaaYIyfj1tU+2AMY+Ot1K5HM3nUIDuafRX/8ea3tT5gObIAkMeuyVDjYqXVFKLTRdBDH8Np2gaS7aYQv4iUHx7RqF7NRGbToNRjCnPdjPfSWkUHwXfsDrOvP0ElIdCIuSKYpt8zwaxgoiiTp7U9NIybd+5hwcyzTUyRey20BIFV3Ls0uTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=05Kk6U2RWn265I7vDdvZbUiWiMU6ha4x65L8loJ3DNM=; b=dH061z/Val8ntr9nyQBP5FaeJaQRMdpUN5j8rBV07pDfpmsl7cphEEO/R77wkT8BxKR9Xny5Np0KgDUiT5VfI0ry7I6l5bILd226582CFm9sTq6or6VO2GuyI4HTWTc4IssC/uqlVBEkIV/hlqtx6wLHvldWdnHgguPVG6ujdngy8veKImkL6xcDA34QUDS9BUyw1w1iD4ze4xe3wgoLZgXUAPBF1LuxiU1n28rnF4ofCGI8XRO41KbZqx/YW0S2ZVPfNE1J9EF0b1TEZeOlU1CSnics8m9nnFyelCgl/nzSmyocnVKqXB/UyJhL4rBHUbcd9wGF2IEpviZKRQrM+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fb.com; dmarc=pass action=none header.from=fb.com; dkim=pass header.d=fb.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector2-fb-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=05Kk6U2RWn265I7vDdvZbUiWiMU6ha4x65L8loJ3DNM=; b=GXNVLU36fsRMo5g7F11fsAQP9cWm56f4uQYVtMniQbK4FAhloCXJl8j8K2QCMgp2hFe8J7VXjVn9DCn2/im6+/NK5PGgmRD91WUwrEawyk3dLKlZenf3YZAWuifTSvdUuGbAiDnWoraTFoZMnYh5eQ+cAWPk6Yd6z0MT8vOAzh0= Authentication-Results: iogearbox.net; dkim=none (message not signed) header.d=none;iogearbox.net; dmarc=none action=none header.from=fb.com; Received: from BYAPR15MB4136.namprd15.prod.outlook.com (2603:10b6:a03:96::24) by BYAPR15MB3078.namprd15.prod.outlook.com (2603:10b6:a03:fe::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.28; Wed, 18 Nov 2020 00:46:40 +0000 Received: from BYAPR15MB4136.namprd15.prod.outlook.com ([fe80::3925:e1f9:4c6a:9396]) by BYAPR15MB4136.namprd15.prod.outlook.com ([fe80::3925:e1f9:4c6a:9396%6]) with mapi id 15.20.3564.031; Wed, 18 Nov 2020 00:46:40 +0000 Date: Tue, 17 Nov 2020 16:46:34 -0800 From: Roman Gushchin To: Daniel Borkmann CC: , , , , , , , Subject: Re: [PATCH bpf-next v6 06/34] bpf: prepare for memcg-based memory accounting for bpf maps Message-ID: <20201118004634.GA179309@carbon.dhcp.thefacebook.com> References: <20201117034108.1186569-1-guro@fb.com> <20201117034108.1186569-7-guro@fb.com> <41eb5e5b-e651-4cb3-a6ea-9ff6b8aa41fb@iogearbox.net> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <41eb5e5b-e651-4cb3-a6ea-9ff6b8aa41fb@iogearbox.net> X-Originating-IP: [2620:10d:c090:400::5:fcd7] X-ClientProxiedBy: CO2PR05CA0065.namprd05.prod.outlook.com (2603:10b6:102:2::33) To BYAPR15MB4136.namprd15.prod.outlook.com (2603:10b6:a03:96::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from carbon.dhcp.thefacebook.com (2620:10d:c090:400::5:fcd7) by CO2PR05CA0065.namprd05.prod.outlook.com (2603:10b6:102:2::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.15 via Frontend Transport; Wed, 18 Nov 2020 00:46:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 05054820-0369-4a59-554e-08d88b5b6934 X-MS-TrafficTypeDiagnostic: BYAPR15MB3078: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-FB-Source: Internal X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rrtl0+2zZhL+iBuoet4fdsGoAb3GoA6wjz4q2ly4pIo5Pw79bPuwLTUZh7Qoet211mi2L/U+D+2TtchjD8PrehQbsxY45nibwwfBseHl2GEuuidCCNsb7XKiZZKST05T3fyT+ZFusjzcERrOKsaOaoQl/HoFCRahgJ0A0JA2YxT9xZv0ZRaKATEAa1jKnuEOhJN4ppJokeUcJWV8LslXgrUaN5sNqp87oHwxyEH1aS8NNqoJuDIzEBzwltr8ChAOU/mqN9V3pa8EvdIFb3bzNlyfmuMB+N04WTNDImIeMexrv6jnTGiXqD8UzYk1rRc/UwoGIOXI+5+0ltjCHpzvwg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR15MB4136.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(346002)(136003)(39860400002)(376002)(366004)(316002)(6916009)(2906002)(186003)(33656002)(1076003)(7696005)(52116002)(53546011)(6506007)(6666004)(16526019)(5660300002)(8676002)(8936002)(66556008)(86362001)(66476007)(83380400001)(55016002)(15650500001)(66946007)(4326008)(478600001)(9686003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: d2016z6nQTLPOlL7UK/O+ywwvugMCe70sP/H22c7eDjgIQGaohksHZQh3P6H4DcShhkewKXPEeKkUs9LS4cAxL0OhQ5G6IQJlL/bBXTzx8LmFdmG5r8+vG4hlcy8zmBblyGnEIOyd2jIx7YYL7IAAS+aB4XVOhvBQ5OwgR+/y/PwdHhpVev3RVc4tKVlA11t/YsfU+Pmzs4cCmjYSvMjrf3/auVf5WF3vQVYAnlp3K4urXbvR5QFc2i44UNeI6YEw3SnRwQpiNw5PId0cpOhadkOEy6bTjjuYT2MFCbGAQqZOfjsxGe+K10bMjiInAhx1nOUjSiru2tAIk2hyGv84uEysawGtJxSeIVtnRdlIw6oE2sySK9Kxg6XYqI8z/+oMkGdO9yskY3T6XiWVCd0AT+MvSsk9bh9nwJkXc/Ec4sDWCwOgdKJFCAMvFhQUOBPyNFcYN7BjVSj8OmpKdI31LtNylDQJxGNDiCsK2Gee0UJzkPrNbhFvW9Dg4fHHc+XWe5UyrlaDQESOP6PbwrVifbCLXajR+SFWk1UCPhQL+0BLqu4WidKelnNKqQcSEbZXm/Pb/0mEMXhu5DvuXiAOYehe1rKGt8Gc7he4sETDfRf/xL+HXpfyLzOOxa5yc4A/reA8Zg4PjlM7lENhl7RNzOviTVTneDNDvmvv0grQ9s= X-MS-Exchange-CrossTenant-Network-Message-Id: 05054820-0369-4a59-554e-08d88b5b6934 X-MS-Exchange-CrossTenant-AuthSource: BYAPR15MB4136.namprd15.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 00:46:40.0285 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: U5wJcmZBlcySEUWrXlOTzMQaNwqzn4VeeiCrfIybCnG2qSM8iWARXaLEq5oqw9ze X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB3078 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-17_15:2020-11-17,2020-11-17 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 impostorscore=0 phishscore=0 spamscore=0 bulkscore=0 suspectscore=1 malwarescore=0 priorityscore=1501 adultscore=0 mlxlogscore=999 clxscore=1015 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011180001 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: On Wed, Nov 18, 2020 at 01:06:17AM +0100, Daniel Borkmann wrote: > On 11/17/20 4:40 AM, Roman Gushchin wrote: > > In the absolute majority of cases if a process is making a kernel > > allocation, it's memory cgroup is getting charged. > > > > Bpf maps can be updated from an interrupt context and in such > > case there is no process which can be charged. It makes the memory > > accounting of bpf maps non-trivial. > > > > Fortunately, after commit 4127c6504f25 ("mm: kmem: enable kernel > > memcg accounting from interrupt contexts") and b87d8cefe43c > > ("mm, memcg: rework remote charging API to support nesting") > > it's finally possible. > > > > To do it, a pointer to the memory cgroup of the process which created > > the map is saved, and this cgroup is getting charged for all > > allocations made from an interrupt context. > > > > Allocations made from a process context will be accounted in a usual way. > > > > Signed-off-by: Roman Gushchin > > Acked-by: Song Liu > [...] > > +#ifdef CONFIG_MEMCG_KMEM > > +static __always_inline int __bpf_map_update_elem(struct bpf_map *map, void *key, > > + void *value, u64 flags) > > +{ > > + struct mem_cgroup *old_memcg; > > + bool in_interrupt; > > + int ret; > > + > > + /* > > + * If update from an interrupt context results in a memory allocation, > > + * the memory cgroup to charge can't be determined from the context > > + * of the current task. Instead, we charge the memory cgroup, which > > + * contained a process created the map. > > + */ > > + in_interrupt = in_interrupt(); > > + if (in_interrupt) > > + old_memcg = set_active_memcg(map->memcg); > > + > > + ret = map->ops->map_update_elem(map, key, value, flags); > > + > > + if (in_interrupt) > > + set_active_memcg(old_memcg); > > + > > + return ret; > > Hmm, this approach here won't work, see also commit 09772d92cd5a ("bpf: avoid > retpoline for lookup/update/delete calls on maps") which removes the indirect > call, so the __bpf_map_update_elem() and therefore the set_active_memcg() is > not invoked for the vast majority of cases. I see. Well, the first option is to move these calls into map-specific update functions, but the list is relatively long: nsim_map_update_elem() cgroup_storage_update_elem() htab_map_update_elem() htab_percpu_map_update_elem() dev_map_update_elem() dev_map_hash_update_elem() trie_update_elem() cpu_map_update_elem() bpf_pid_task_storage_update_elem() bpf_fd_inode_storage_update_elem() bpf_fd_sk_storage_update_elem() sock_map_update_elem() xsk_map_update_elem() Alternatively, we can set the active memcg for the whole duration of bpf execution. It's simpler, but will add some overhead. Maybe we can somehow mark programs calling into update helpers and skip all others? What do you think? Thanks!