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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 547C3C433F5 for ; Sat, 19 Mar 2022 19:31:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231279AbiCSTcm (ORCPT ); Sat, 19 Mar 2022 15:32:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235161AbiCSTcm (ORCPT ); Sat, 19 Mar 2022 15:32:42 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ED4626240B for ; Sat, 19 Mar 2022 12:31:20 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id w8so9574141pll.10 for ; Sat, 19 Mar 2022 12:31:20 -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=TXrIxDayeW1EPJAFxLZjqNiV2ZLO/SpjqjSIJJemtw8=; b=WUSnXrE1n2KB/SXeqBEsbE9W0UQX8dFRvxStdNPC4CHIwUuB1yJ1jiHdwVY+VXd1cP ddVZpQ9uCSvRNV2CzdSM1azI4MGkVuXXHJqeO0knC3KnydpJC5prVXKaL3TGYNYXkH// O+GZ4dHB+0Vdwvk8t7B3d6Y7ZEELS3HRMqOBB3OyS6hL7f2gl6Wxk95S24xlVLGsWE6a NsipS9Ax5rUNGotTTZ07b5nrgzPs6iNDMzhZQA05FNfKL0y8WIjJ6o3Riw/mFEQlkwKw j51c2IIP+lBAx78xs1OwPniQJ7Rct0Yo18jTMJsPr66eH1h9ICMSmF16E9thOCaOwSJy 8yaA== 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=TXrIxDayeW1EPJAFxLZjqNiV2ZLO/SpjqjSIJJemtw8=; b=SLPIq2aLEv5mQaCdVk7t0TJ3F2gMgdVet1la/IiW4hYbQOribt2NgsUTSkpDU8wH8X HBlttf2cogvMNZwfQT2YMZou3qtfATn0dhUkY4BMjYLWKmfz257ML0lZ6sGdmFelGrj5 drU09EE/lQjZHoRLoPenMZneknqcbkNOet2JGs4gatDGebF/yE4gKstJRNAMrvVNkT1t jx1gfiJnajFbHL8YMCZKDloD4ViFnmqVQNn73+UqCeydaJeDcTmyQUe5xSZW8qG7b13n 3CKz/PXu1iFs15qhD+AxrCmAjK22HnGaVh0E5yw6xabjR03uruZTWtLaOYxa81Y/Kh7g 5ErA== X-Gm-Message-State: AOAM532qPWm0sHM+BnsSS69mGMAESCcYCdXHjbgbPGrtnbTZ8Ag9J473 Fi+02X4+7YE8VY+kzPcJdiGW6JyTV6w= X-Google-Smtp-Source: ABdhPJwSEO/MUtsQqFUqbIt4NT/bX6lWkz9LyUuY/YPCfV6iXEBOYNPhf5PXCR62K5j0pafMDrCN/g== X-Received: by 2002:a17:90b:1b4f:b0:1c6:d91b:9d0 with SMTP id nv15-20020a17090b1b4f00b001c6d91b09d0mr4101217pjb.72.1647718279924; Sat, 19 Mar 2022 12:31:19 -0700 (PDT) Received: from localhost ([14.139.187.71]) by smtp.gmail.com with ESMTPSA id o5-20020a655bc5000000b00372f7ecfcecsm10331376pgr.37.2022.03.19.12.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Mar 2022 12:31:19 -0700 (PDT) Date: Sun, 20 Mar 2022 01:01:16 +0530 From: Kumar Kartikeya Dwivedi To: Alexei Starovoitov Cc: bpf@vger.kernel.org, Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= , Jesper Dangaard Brouer Subject: Re: [PATCH bpf-next v2 02/15] bpf: Make btf_find_field more generic Message-ID: <20220319193116.dwvhgxls4p6lapov@apollo> References: <20220317115957.3193097-1-memxor@gmail.com> <20220317115957.3193097-3-memxor@gmail.com> <20220319175534.blttnx6vexrctych@ast-mbp.dhcp.thefacebook.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220319175534.blttnx6vexrctych@ast-mbp.dhcp.thefacebook.com> Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Sat, Mar 19, 2022 at 11:25:34PM IST, Alexei Starovoitov wrote: > On Thu, Mar 17, 2022 at 05:29:44PM +0530, Kumar Kartikeya Dwivedi wrote: > > Next commit's field type will not be struct, but pointer, and it will > > not be limited to one offset, but multiple ones. Make existing > > btf_find_struct_field and btf_find_datasec_var functions amenable to use > > for finding BTF ID pointers in map value, by taking a moving spin_lock > > and timer specific checks into their own function. > > > > The alignment, and name are checked before the function is called, so it > > is the last point where we can skip field or return an error before the > > next loop iteration happens. This is important, because we'll be > > potentially reallocating memory inside this function in next commit, so > > being able to do that when everything else is in order is going to be > > more convenient. > > > > The name parameter is now optional, and only checked if it is not NULL. > > > > The size must be checked in the function, because in case of PTR it will > > instead point to the underlying BTF ID it is pointing to (or modifiers), > > so the check becomes wrong to do outside of function, and the base type > > has to be obtained by removing modifiers. > > > > Signed-off-by: Kumar Kartikeya Dwivedi > > --- > > kernel/bpf/btf.c | 120 +++++++++++++++++++++++++++++++++-------------- > > 1 file changed, 86 insertions(+), 34 deletions(-) > > > > diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c > > index 17b9adcd88d3..5b2824332880 100644 > > --- a/kernel/bpf/btf.c > > +++ b/kernel/bpf/btf.c > > @@ -3161,71 +3161,109 @@ static void btf_struct_log(struct btf_verifier_env *env, > > btf_verifier_log(env, "size=%u vlen=%u", t->size, btf_type_vlen(t)); > > } > > > > +enum { > > + BTF_FIELD_SPIN_LOCK, > > + BTF_FIELD_TIMER, > > +}; > > + > > +struct btf_field_info { > > + u32 off; > > +}; > > + > > +static int btf_find_field_struct(const struct btf *btf, const struct btf_type *t, > > + u32 off, int sz, struct btf_field_info *info) > > +{ > > + if (!__btf_type_is_struct(t)) > > + return 0; > > + if (t->size != sz) > > + return 0; > > + if (info->off != -ENOENT) > > + /* only one such field is allowed */ > > + return -E2BIG; > > + info->off = off; > > + return 0; > > +} > > + > > static int btf_find_struct_field(const struct btf *btf, const struct btf_type *t, > > - const char *name, int sz, int align) > > + const char *name, int sz, int align, int field_type, > > + struct btf_field_info *info) > > { > > const struct btf_member *member; > > - u32 i, off = -ENOENT; > > + u32 i, off; > > + int ret; > > > > for_each_member(i, t, member) { > > const struct btf_type *member_type = btf_type_by_id(btf, > > member->type); > > - if (!__btf_type_is_struct(member_type)) > > - continue; > > - if (member_type->size != sz) > > - continue; > > - if (strcmp(__btf_name_by_offset(btf, member_type->name_off), name)) > > - continue; > > - if (off != -ENOENT) > > - /* only one such field is allowed */ > > - return -E2BIG; > > + > > off = __btf_member_bit_offset(t, member); > > + > > + if (name && strcmp(__btf_name_by_offset(btf, member_type->name_off), name)) > > + continue; > > if (off % 8) > > /* valid C code cannot generate such BTF */ > > return -EINVAL; > > off /= 8; > > if (off % align) > > return -EINVAL; > > + > > + switch (field_type) { > > + case BTF_FIELD_SPIN_LOCK: > > + case BTF_FIELD_TIMER: > > Since spin_lock vs timer is passed into btf_find_struct_field() as field_type > argument there is no need to pass name, sz, align from the caller. > Pls make btf_find_spin_lock() to pass BTF_FIELD_SPIN_LOCK only > and in the above code do something like: > switch (field_type) { > case BTF_FIELD_SPIN_LOCK: > name = "bpf_spin_lock"; > sz = ... > break; > case BTF_FIELD_TIMER: > name = "bpf_timer"; > sz = ... > break; > } Would doing this in btf_find_field be better? Then we set these once instead of doing it twice in btf_find_struct_field, and btf_find_datasec_var. > switch (field_type) { > case BTF_FIELD_SPIN_LOCK: > case BTF_FIELD_TIMER: > if (!__btf_type_is_struct(member_type)) > continue; > if (strcmp(__btf_name_by_offset(btf, member_type->name_off), name)) > ... > btf_find_field_struct(btf, member_type, off, sz, info); > } > > It will cleanup the later patch which passes NULL, sizeof(u64), alignof(u64) > only to pass something into the function. > With above suggestion it wouldn't need to pass dummy args. BTF_FIELD_KPTR will be enough. > > > + ret = btf_find_field_struct(btf, member_type, off, sz, info); > > + if (ret < 0) > > + return ret; > > + break; > > + default: > > + return -EFAULT; > > + } > > } > > - return off; > > + return 0; > > } > > > > static int btf_find_datasec_var(const struct btf *btf, const struct btf_type *t, > > - const char *name, int sz, int align) > > + const char *name, int sz, int align, int field_type, > > + struct btf_field_info *info) > > { > > const struct btf_var_secinfo *vsi; > > - u32 i, off = -ENOENT; > > + u32 i, off; > > + int ret; > > > > for_each_vsi(i, t, vsi) { > > const struct btf_type *var = btf_type_by_id(btf, vsi->type); > > const struct btf_type *var_type = btf_type_by_id(btf, var->type); > > > > - if (!__btf_type_is_struct(var_type)) > > - continue; > > - if (var_type->size != sz) > > + off = vsi->offset; > > + > > + if (name && strcmp(__btf_name_by_offset(btf, var_type->name_off), name)) > > continue; > > if (vsi->size != sz) > > continue; > > - if (strcmp(__btf_name_by_offset(btf, var_type->name_off), name)) > > - continue; > > - if (off != -ENOENT) > > - /* only one such field is allowed */ > > - return -E2BIG; > > - off = vsi->offset; > > if (off % align) > > return -EINVAL; > > + > > + switch (field_type) { > > + case BTF_FIELD_SPIN_LOCK: > > + case BTF_FIELD_TIMER: > > + ret = btf_find_field_struct(btf, var_type, off, sz, info); > > + if (ret < 0) > > + return ret; > > + break; > > + default: > > + return -EFAULT; > > + } > > } > > - return off; > > + return 0; > > } > > > > static int btf_find_field(const struct btf *btf, const struct btf_type *t, > > - const char *name, int sz, int align) > > + const char *name, int sz, int align, int field_type, > > + struct btf_field_info *info) > > { > > - > > if (__btf_type_is_struct(t)) > > - return btf_find_struct_field(btf, t, name, sz, align); > > + return btf_find_struct_field(btf, t, name, sz, align, field_type, info); > > else if (btf_type_is_datasec(t)) > > - return btf_find_datasec_var(btf, t, name, sz, align); > > + return btf_find_datasec_var(btf, t, name, sz, align, field_type, info); > > return -EINVAL; > > } > > > > @@ -3235,16 +3273,30 @@ static int btf_find_field(const struct btf *btf, const struct btf_type *t, > > */ > > int btf_find_spin_lock(const struct btf *btf, const struct btf_type *t) > > { > > - return btf_find_field(btf, t, "bpf_spin_lock", > > - sizeof(struct bpf_spin_lock), > > - __alignof__(struct bpf_spin_lock)); > > + struct btf_field_info info = { .off = -ENOENT }; > > + int ret; > > + > > + ret = btf_find_field(btf, t, "bpf_spin_lock", > > + sizeof(struct bpf_spin_lock), > > + __alignof__(struct bpf_spin_lock), > > + BTF_FIELD_SPIN_LOCK, &info); > > + if (ret < 0) > > + return ret; > > + return info.off; > > } > > > > int btf_find_timer(const struct btf *btf, const struct btf_type *t) > > { > > - return btf_find_field(btf, t, "bpf_timer", > > - sizeof(struct bpf_timer), > > - __alignof__(struct bpf_timer)); > > + struct btf_field_info info = { .off = -ENOENT }; > > + int ret; > > + > > + ret = btf_find_field(btf, t, "bpf_timer", > > + sizeof(struct bpf_timer), > > + __alignof__(struct bpf_timer), > > + BTF_FIELD_TIMER, &info); > > + if (ret < 0) > > + return ret; > > + return info.off; > > } > > > > static void __btf_struct_show(const struct btf *btf, const struct btf_type *t, > > -- > > 2.35.1 > > > > -- -- Kartikeya