From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 484264B5D9 for ; Wed, 20 Dec 2023 22:27:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NiQVLYOx" Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-5c85e8fdd2dso2205087b3.2 for ; Wed, 20 Dec 2023 14:27:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703111226; x=1703716026; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OvirHOCZ+/vZmlvegKgxkHFOpvn+WC9SUYMEagXgqBk=; b=NiQVLYOxUGNXTqlccUlvOjOdaIXfd937qws5xArMtqpIlS7vPsq5Gpn1ae9QoWVR+G Uy6qGzFQgIZVVLHHNuPAPuLSNMUKxs9b5Tb7sbewWqyDVZWbB4aXKQDuoai3GjtyJxEW vzCBDgq8j1i3oDvDsyxp3+DwQSVJHjxBtmtWCdF6DY0Q2I+oFGX0r4yQoLyyjYzrmDIX tsDFoxhIpf3GhV2b5x6Rk/v89l+EdiV6bN5KVbf1O9rwOd96XkjMk1x4jvTD9AtoqlnJ ds/sGQbDZxxDolFuyoIr9jFZNfYp9XJsxuVprcCgBh9nJwwq9G3h6hym6zkqCnZ8LhLD SiRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703111226; x=1703716026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OvirHOCZ+/vZmlvegKgxkHFOpvn+WC9SUYMEagXgqBk=; b=KgCLT/DwI4R56wvOStEKgWGCBjIi/DTCkiAPIIygwjx+NsEp+4TzMCVAkeky+8eaW9 f1aOOfSmzkzbOkww//Q3OfFq1AE4NpqJlG9upZ4uOqCutqrqB4ZbLqY7DfYZ9VYlTOPX UoQX1DiSRJQqlHF5Uk303KvgixwL/rOIxcb32ohDHts8YMQXyQKuxJk+trScCmeOcDsg ld5F/1jlirNlJ/KbkmgWPy2bpjFBK22Gt6CLmQ3XnvH3jYcmPI/souXBD0YJKqi1pX/D DkpDwo5mEjU7RtzaSOfMKrhC0yqp28QYFffKvh1MKfohixvAbf5wHn+ie2Pt6Yu8bPSF RXHg== X-Gm-Message-State: AOJu0YxpqC+QP1cVWqUpmHUIxCN9MeB+y4/LHlFJ5eooPVQBuqJ/N2A1 h9oFF7ULnTB5jfw6Fqnbsv90RM1O1h8= X-Google-Smtp-Source: AGHT+IHagyUkPbF4BfwPu09kuJ28tuZ9qdLWv24pJ7U4l35V7aCrbxzL1WyvBJeXmlqfIJe57LtOCw== X-Received: by 2002:a81:54d7:0:b0:5d7:1940:dd86 with SMTP id i206-20020a8154d7000000b005d71940dd86mr363887ywb.92.1703111225935; Wed, 20 Dec 2023 14:27:05 -0800 (PST) Received: from kickker.attlocal.net ([2600:1700:6cf8:1240:8cc1:afcb:3651:3dad]) by smtp.gmail.com with ESMTPSA id m125-20020a0dfc83000000b005ca4e49bb54sm284304ywf.142.2023.12.20.14.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:27:05 -0800 (PST) From: thinker.li@gmail.com To: bpf@vger.kernel.org, ast@kernel.org, martin.lau@linux.dev, song@kernel.org, kernel-team@meta.com, andrii@kernel.org, drosen@google.com Cc: sinquersw@gmail.com, kuifeng@meta.com, Kui-Feng Lee Subject: [PATCH bpf-next v15 07/14] bpf: lookup struct_ops types from a given module BTF. Date: Wed, 20 Dec 2023 14:26:47 -0800 Message-Id: <20231220222654.1435895-8-thinker.li@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231220222654.1435895-1-thinker.li@gmail.com> References: <20231220222654.1435895-1-thinker.li@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kui-Feng Lee This is a preparation for searching for struct_ops types from a specified module. BTF is always btf_vmlinux now. This patch passes a pointer of BTF to bpf_struct_ops_find_value() and bpf_struct_ops_find(). Once the new registration API of struct_ops types is used, other BTFs besides btf_vmlinux can also be passed to them. Signed-off-by: Kui-Feng Lee --- include/linux/bpf.h | 4 ++-- kernel/bpf/bpf_struct_ops.c | 11 ++++++----- kernel/bpf/verifier.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 240885fffa19..2e2463bcff76 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1688,7 +1688,7 @@ struct bpf_struct_ops_desc { #if defined(CONFIG_BPF_JIT) && defined(CONFIG_BPF_SYSCALL) #define BPF_MODULE_OWNER ((void *)((0xeB9FUL << 2) + POISON_POINTER_DELTA)) -const struct bpf_struct_ops_desc *bpf_struct_ops_find(u32 type_id); +const struct bpf_struct_ops_desc *bpf_struct_ops_find(struct btf *btf, u32 type_id); void bpf_struct_ops_init(struct btf *btf, struct bpf_verifier_log *log); bool bpf_struct_ops_get(const void *kdata); void bpf_struct_ops_put(const void *kdata); @@ -1733,7 +1733,7 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr, #endif void bpf_map_struct_ops_info_fill(struct bpf_map_info *info, struct bpf_map *map); #else -static inline const struct bpf_struct_ops_desc *bpf_struct_ops_find(u32 type_id) +static inline const struct bpf_struct_ops_desc *bpf_struct_ops_find(struct btf *btf, u32 type_id) { return NULL; } diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c index 5e98af4fc2e2..7505f515aac3 100644 --- a/kernel/bpf/bpf_struct_ops.c +++ b/kernel/bpf/bpf_struct_ops.c @@ -221,11 +221,11 @@ void bpf_struct_ops_init(struct btf *btf, struct bpf_verifier_log *log) extern struct btf *btf_vmlinux; static const struct bpf_struct_ops_desc * -bpf_struct_ops_find_value(u32 value_id) +bpf_struct_ops_find_value(struct btf *btf, u32 value_id) { unsigned int i; - if (!value_id || !btf_vmlinux) + if (!value_id || !btf) return NULL; for (i = 0; i < ARRAY_SIZE(bpf_struct_ops); i++) { @@ -236,11 +236,12 @@ bpf_struct_ops_find_value(u32 value_id) return NULL; } -const struct bpf_struct_ops_desc *bpf_struct_ops_find(u32 type_id) +const struct bpf_struct_ops_desc * +bpf_struct_ops_find(struct btf *btf, u32 type_id) { unsigned int i; - if (!type_id || !btf_vmlinux) + if (!type_id || !btf) return NULL; for (i = 0; i < ARRAY_SIZE(bpf_struct_ops); i++) { @@ -682,7 +683,7 @@ static struct bpf_map *bpf_struct_ops_map_alloc(union bpf_attr *attr) struct bpf_map *map; int ret; - st_ops_desc = bpf_struct_ops_find_value(attr->btf_vmlinux_value_type_id); + st_ops_desc = bpf_struct_ops_find_value(btf_vmlinux, attr->btf_vmlinux_value_type_id); if (!st_ops_desc) return ERR_PTR(-ENOTSUPP); diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index b93973a0e82e..dafcd34be56b 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -20227,7 +20227,7 @@ static int check_struct_ops_btf_id(struct bpf_verifier_env *env) } btf_id = prog->aux->attach_btf_id; - st_ops_desc = bpf_struct_ops_find(btf_id); + st_ops_desc = bpf_struct_ops_find(btf_vmlinux, btf_id); if (!st_ops_desc) { verbose(env, "attach_btf_id %u is not a supported struct\n", btf_id); -- 2.34.1