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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4355C00140 for ; Tue, 2 Aug 2022 04:58:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F21E68E0001; Tue, 2 Aug 2022 00:58:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED1F16B0072; Tue, 2 Aug 2022 00:58:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D72128E0001; Tue, 2 Aug 2022 00:58:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C77136B0071 for ; Tue, 2 Aug 2022 00:58:37 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 97F1A12076F for ; Tue, 2 Aug 2022 04:58:37 +0000 (UTC) X-FDA: 79753447074.22.7DB566C Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf27.hostedemail.com (Postfix) with ESMTP id 345FC4010B for ; Tue, 2 Aug 2022 04:58:37 +0000 (UTC) Received: by mail-pf1-f176.google.com with SMTP id f28so4281215pfk.1 for ; Mon, 01 Aug 2022 21:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=DyhaeTW9f5GhYzErI4fBnQUAn6U1BD6Waal2X1wlIWI=; b=GzGtHUHQ1BP1in16d7bw7qQU6eCUeOZ/9m9lb4K1GIvcEXYEMCaMJLOkRYnLUZkzXq e5HZi6x1AUE/NiBdCAaiTJ9MlaBRT6+DFWyCxH2oXmv2rBPswVqbG1dKbi7TYwWhYjWV zn/ITHoNbRYuxw/3LciM+RvA/oFoqLVvIhAWjZUJUqehxISW5KL3mRpYb59Rw17HpjZH rjYlDQywscRleUrgMNnWeQBdNMJBO9MXB42gdtfPmleSeYoBsqBjwlWwVe8GtszH7lIe nCb4EpMM7kr/2aUoE23jRviyHoNSzI3N/YmuL/oeDAuAtYXcmC7y3E5YZx6E+Y8nBogu NY/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=DyhaeTW9f5GhYzErI4fBnQUAn6U1BD6Waal2X1wlIWI=; b=YAg65APVzzAjgVLrvpR9i+C0PUGOc9nyOc8Svay4BqbRbRlMgXm9Hl406e9QCzv/V2 +5ojADSzFOLtNXRyp/0FL+O1x4J0aY+suIz8xN4Ix48Vkss+c3kH7SLntShjoWXU3oyb cSggUzoYCZR1olUPWQuzFgeMT8y1KDOfMG+xBZUQi446Dnyo43XMwv8idkuFJ+9xbIci VDMNNf4nP+hoLtzPcZrTRDvWrplacFppzz/OxfXGTSCLYQAs1VvCEvmwDo8x32pgmtd8 P/ExU5a9LYe1oVop0QNGe4VyC+1dcJM4ngGJeZei8nHncrNbDvLeXeVW42QwlPaPZdzV FoRw== X-Gm-Message-State: AJIora86TboGM0cCQqOjPh4lLg4tVJOMyV0SCyBDO2tE4yVtiD7wjHYV 2YsGpdUadVfCQr6xrHfo9WqC12wSNtY= X-Google-Smtp-Source: AGRyM1tLzYwvaGNFxnzUI4wHKeMIi2r2mPIFVQgRez5sy9rQtLdF35p6pqm9Y6GrlIaAEGbW7T9jlQ== X-Received: by 2002:a63:f446:0:b0:41a:d6cb:5296 with SMTP id p6-20020a63f446000000b0041ad6cb5296mr15572370pgk.426.1659416316071; Mon, 01 Aug 2022 21:58:36 -0700 (PDT) Received: from macbook-pro-3.dhcp.thefacebook.com ([2620:10d:c090:400::5:f128]) by smtp.gmail.com with ESMTPSA id u12-20020a62790c000000b005252a06750esm5341861pfc.182.2022.08.01.21.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Aug 2022 21:58:35 -0700 (PDT) Date: Mon, 1 Aug 2022 21:58:32 -0700 From: Alexei Starovoitov To: Yafang Shao Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, songmuchun@bytedance.com, akpm@linux-foundation.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-mm@kvack.org Subject: Re: [RFC PATCH bpf-next 05/15] bpf: Introduce helpers for container of struct bpf_map Message-ID: <20220802045832.fcgzvkenet7cmvy7@macbook-pro-3.dhcp.thefacebook.com> References: <20220729152316.58205-1-laoar.shao@gmail.com> <20220729152316.58205-6-laoar.shao@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220729152316.58205-6-laoar.shao@gmail.com> ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=GzGtHUHQ; spf=pass (imf27.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659416317; a=rsa-sha256; cv=none; b=0wo3hdN4ftfC36eTUY6ez9BkNR+3Evq8VfDZ6z5IToTm22zoN7lVRyzybmadtW4loVStW4 KfoAcBCysoihnUkzB1BH8Q9m8ZIPsdUfseHVWFnCD5NVBVngW1+kAK/696MsXGYYLwuBsP vCc+25jvpGyOtIohfeiQ9jtMtlfin7w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659416317; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=DyhaeTW9f5GhYzErI4fBnQUAn6U1BD6Waal2X1wlIWI=; b=DFd5KTi0XTgI0FHg6vMmP4vpcvUHXy/wwqxC+FtbOcNcBtZHKWOlZSgPwhVieenHJpgRdK W5n4ROnb//snEPWdfotxQnOGkKrOQULArJpfDAwxJafW9/BrSUt46Jk/fbZumXVG0T5Q3P k+4dcjxssoH+kHVIkxYeCnaMJinDRhs= X-Stat-Signature: g7rj6zffkk4th4ieqjkqtasjntofkyj4 X-Rspamd-Queue-Id: 345FC4010B Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=GzGtHUHQ; spf=pass (imf27.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1659416317-79693 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 Fri, Jul 29, 2022 at 03:23:06PM +0000, Yafang Shao wrote: > Currently bpf_map_area_alloc() is used to allocate a container of struct > bpf_map or members in this container. To distinguish the map creation > and other members, let split it into two different helpers, > - bpf_map_container_alloc() > Used to allocate a container of struct bpf_map, the container is as > follows, > struct bpf_map_container { > struct bpf_map map; // the map must be the first member > .... > }; > Pls. note that the struct bpf_map_contianer is a abstract one, which > can be struct bpf_array, struct bpf_bloom_filter and etc. > > In this helper, it will call bpf_map_save_memcg() to init memcg > relevant data in the bpf map. And these data will be cleared in > bpf_map_container_free(). > > - bpf_map_area_alloc() > Now it is used to allocate the members in a contianer only. > > Signed-off-by: Yafang Shao > --- > include/linux/bpf.h | 4 ++++ > kernel/bpf/syscall.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 60 insertions(+) > > diff --git a/include/linux/bpf.h b/include/linux/bpf.h > index 20c26aed7896..2d971b0eb24b 100644 > --- a/include/linux/bpf.h > +++ b/include/linux/bpf.h > @@ -1634,9 +1634,13 @@ void bpf_map_inc_with_uref(struct bpf_map *map); > struct bpf_map * __must_check bpf_map_inc_not_zero(struct bpf_map *map); > void bpf_map_put_with_uref(struct bpf_map *map); > void bpf_map_put(struct bpf_map *map); > +void *bpf_map_container_alloc(u64 size, int numa_node); > +void *bpf_map_container_mmapable_alloc(u64 size, int numa_node, > + u32 align, u32 offset); > void *bpf_map_area_alloc(u64 size, int numa_node); > void *bpf_map_area_mmapable_alloc(u64 size, int numa_node); > void bpf_map_area_free(void *base); > +void bpf_map_container_free(void *base); > bool bpf_map_write_active(const struct bpf_map *map); > void bpf_map_init_from_attr(struct bpf_map *map, union bpf_attr *attr); > int generic_map_lookup_batch(struct bpf_map *map, > diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c > index 83c7136c5788..1a1a81a11b37 100644 > --- a/kernel/bpf/syscall.c > +++ b/kernel/bpf/syscall.c > @@ -495,6 +495,62 @@ static void bpf_map_release_memcg(struct bpf_map *map) > } > #endif > > +/* > + * The return pointer is a bpf_map container, as follow, > + * struct bpf_map_container { > + * struct bpf_map map; > + * ... > + * }; > + * > + * It is used in map creation path. > + */ > +void *bpf_map_container_alloc(u64 size, int numa_node) > +{ > + struct bpf_map *map; > + void *container; > + > + container = __bpf_map_area_alloc(size, numa_node, false); > + if (!container) > + return NULL; > + > + map = (struct bpf_map *)container; > + bpf_map_save_memcg(map); > + > + return container; > +} > + > +void *bpf_map_container_mmapable_alloc(u64 size, int numa_node, u32 align, > + u32 offset) > +{ > + struct bpf_map *map; > + void *container; > + void *ptr; > + > + /* kmalloc'ed memory can't be mmap'ed, use explicit vmalloc */ > + ptr = __bpf_map_area_alloc(size, numa_node, true); > + if (!ptr) > + return NULL; > + > + container = ptr + align - offset; > + map = (struct bpf_map *)container; > + bpf_map_save_memcg(map); This is very error prone. I don't think the container concept is necessary. bpf_map_area_alloc() can just take extra memcg_fd argument. > + > + return ptr; > +} > + > +void bpf_map_container_free(void *container) > +{ > + struct bpf_map *map; > + > + if (!container) > + return; > + > + map = (struct bpf_map *)container; > + bpf_map_release_memcg(map); > + > + kvfree(container); > +} > + > static int bpf_map_kptr_off_cmp(const void *a, const void *b) > { > const struct bpf_map_value_off_desc *off_desc1 = a, *off_desc2 = b; > -- > 2.17.1 >