From patchwork Tue Feb 11 11:18:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13969492 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 A80B91F8BB0; Tue, 11 Feb 2025 11:19:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739272749; cv=none; b=LeXPtNOTr9mqW/eHBMgaEhFQF7UFGkGcWfahobYgtUNl25v6aR+GtglO4OgsTmCH0yhOapd4DvF5teldE/vziB4axRJMAZGQonteFYqxe3mtv52txg0PuOYDLM01NiS+0ykqg/Ybha8Qv52j1QVDWhdcZTJoOCUXoit3RMSy4DI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739272749; c=relaxed/simple; bh=gCSkhghV4FSQv8s+RD3+Va+foCnFjyb66eHvLgkiuWw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=Hx7LsADR+F0YcnpKH48VduY7nmGC3hSc4sY329l2RWvHK0cCKa3+Khs9ztMIntuzfhSxo030VlY7PYg2xEuuxDXEDQdjMLPtzjwoqiQqwubObUok6Oyr7NM9FMIK07upMP3MuWVpm7XFy9V0SlZyDkXLTGjsJqh/QNNbk2DLyUM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UPg+GKGh; arc=none smtp.client-ip=209.85.214.169 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="UPg+GKGh" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21f48ab13d5so88106965ad.0; Tue, 11 Feb 2025 03:19:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739272747; x=1739877547; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=3SRCkrYu/UmXO72yLMKra7PMrlLBZ+7UhvcccuRgDqg=; b=UPg+GKGh719LyRpa4SQpnVKZgO3x2IeOrJdgcvGqeNaq1oTV3P+jjg0iFOuPh76Wjc 2DXxhuM53+J1Y3XDOaYDucW0U9rgZvp8lQ0XtD78el8ThMGkwgIxMT6GCeyHgYR+IX7O O297IWqHNFhxhD0CAym+yi3r61zHkZ5KW+4K0fZkN/alIEouNmyAAz+baX3vO3NFFOCJ gT2doIWvtxmdJVo+U5O1lbffIbyfO2bfiTOI1u3Oi5GGJrhk7SiGX9DFJgylMbBp2OP+ acYl8dzKK/Up6QrouaIGMPDJBzDDPRGFMgARWgk87XLxsns6SdsY1RFWsDc3D2sMMIZw eksw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739272747; x=1739877547; h=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=3SRCkrYu/UmXO72yLMKra7PMrlLBZ+7UhvcccuRgDqg=; b=COWdmaZshTPdRfpv8R3mO7QvDASgxJjZvr3zGUT3YoM3ZBIBjJUsxbZVoE6rDkh44b vt/IgxvLadkIlQmwfRMOct9RwoDY/z6Fy0meTLsibFEnTXX1n84jQM9kenw47Rxa/BH6 5leSROKRpQbvF/TI7CVwdMb+tW63UMiMsOx1lvXn3tLbHnyrHqb/pSk7Ov5epSoHL/JD LcVul9H5IuKiBBRlLN4oh+2vKgwqr4Oa9M9+SA95iMWHSAUOLA/I2W4+f4IvEeuVsenv MnueBY5gWKXjBPoRh+wH2pHx6fyaj+TDe13u2m7Gal9eKBXuKwCpGD6pX/vchpDFBu7g MKvQ== X-Forwarded-Encrypted: i=1; AJvYcCW7J8KthWIDK20N/5N5TsuspVzBcTFNp0etm76n4UGQZQvhcqouN+wzwzM8Jk1v5IpKuD+ao8X85UycPQs=@vger.kernel.org X-Gm-Message-State: AOJu0YyhRp7Gb4gdFI/c9f2NfGo/RXURyDAggghSbotQWFZnFy5chPR2 A6/1IpIC15VyOpaEuPFLkIPmUpco/NqdC0tGGphHulwL0AzLkgrqttCpUw== X-Gm-Gg: ASbGncu8tQrukNic08giaCKSvqjDuPZrxdR0qHUTg9Pz8wZHjduuWIKNzxkR/pCMC84 yocjld+gvwNO4eGt1+dxO5RmLjIZI5rrlZbSGjWesJQVXO3FgxxxQhjITMQJzv2v6659AK1cvY4 G3Z4ui8P+mutt+b01gtYxjHFih0UeoSNvf6bp7N+BuiGMVDPqHtEgQXV4I/7r7qtNJma4ULJxML 5DzceTshzWZe+I8ZuBfR9ketwAA6oKatpre2lsYyZsdH+t2UeHwamtgRUH6bGNOJREtFSRNVqpT BUFzCK+CwXGK/rCk X-Google-Smtp-Source: AGHT+IFXhoTlIoHXmMzobJotR7aBVRNPcGpCrw35HZLZvwdW4hmBcdiTCXeN5GkhSYrEE09urKBSAQ== X-Received: by 2002:a17:902:ea0d:b0:21d:dae6:d956 with SMTP id d9443c01a7336-21f4e6e1eb8mr285806775ad.24.1739272746717; Tue, 11 Feb 2025 03:19:06 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fa09b3ee47sm10406298a91.39.2025.02.11.03.19.05 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Feb 2025 03:19:06 -0800 (PST) From: Tao Chen To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, haoluo@google.com, jolsa@kernel.org, qmo@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, chen.dylane@gmail.com Subject: [PATCH bpf-next v6 1/4] libbpf: Extract prog load type check from libbpf_probe_bpf_helper Date: Tue, 11 Feb 2025 19:18:56 +0800 Message-Id: <20250211111859.6029-2-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250211111859.6029-1-chen.dylane@gmail.com> References: <20250211111859.6029-1-chen.dylane@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-Patchwork-Delegate: bpf@iogearbox.net Extract prog load type check part from libbpf_probe_bpf_helper suggested by Andrii, which will be used in both libbpf_probe_bpf_{helper, kfunc}. Signed-off-by: Tao Chen --- tools/lib/bpf/libbpf_probes.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/lib/bpf/libbpf_probes.c b/tools/lib/bpf/libbpf_probes.c index 9dfbe7750f56..aeb4fd97d801 100644 --- a/tools/lib/bpf/libbpf_probes.c +++ b/tools/lib/bpf/libbpf_probes.c @@ -413,6 +413,23 @@ int libbpf_probe_bpf_map_type(enum bpf_map_type map_type, const void *opts) return libbpf_err(ret); } +static bool can_probe_prog_type(enum bpf_prog_type prog_type) +{ + /* we can't successfully load all prog types to check for BPF helper + * and kfunc support. + */ + switch (prog_type) { + case BPF_PROG_TYPE_TRACING: + case BPF_PROG_TYPE_EXT: + case BPF_PROG_TYPE_LSM: + case BPF_PROG_TYPE_STRUCT_OPS: + return false; + default: + break; + } + return true; +} + int libbpf_probe_bpf_helper(enum bpf_prog_type prog_type, enum bpf_func_id helper_id, const void *opts) { @@ -427,18 +444,8 @@ int libbpf_probe_bpf_helper(enum bpf_prog_type prog_type, enum bpf_func_id helpe if (opts) return libbpf_err(-EINVAL); - /* we can't successfully load all prog types to check for BPF helper - * support, so bail out with -EOPNOTSUPP error - */ - switch (prog_type) { - case BPF_PROG_TYPE_TRACING: - case BPF_PROG_TYPE_EXT: - case BPF_PROG_TYPE_LSM: - case BPF_PROG_TYPE_STRUCT_OPS: + if (!can_probe_prog_type(prog_type)) return -EOPNOTSUPP; - default: - break; - } buf[0] = '\0'; ret = probe_prog_load(prog_type, insns, insn_cnt, buf, sizeof(buf)); From patchwork Tue Feb 11 11:18:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13969493 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 083631C9EAA; Tue, 11 Feb 2025 11:19:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739272754; cv=none; b=mHrNb5ktIJlICAGLfCk71EJoYg5HF9hxeQVvErDCxyEjCuOO9KcPZAlcpsod5IyvnlYsrZNRL/hF9xn6WrTgj9RxlYVklLdGTOuy/Qbg3Meu38+/FiNGBLoiXB1J5EoXMhG5DEPNGdY2EHRKuG3TdrcBh69GxD1CyVzURFa/LE8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739272754; c=relaxed/simple; bh=/C3eTdAxvH+wSCUbMTRcH633vPf5d+21de5byk4rQPk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=frSWg7rVdBK+KWNg7SOev9qI9a7khrjfaEWusK+Ti2c8pMTzkY37pi9CKfjP73jjMHcn+Yb9W9GdAeG3W17yvIAfqa1aweiiXhD90wZwmkeiiN3w+4NfJa8gNd1+BqcBq1P3Ogluj23eHSRiUECT/U0bRKGpWdhLSmQbxSuugfM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Xv3B/HCP; arc=none smtp.client-ip=209.85.216.47 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="Xv3B/HCP" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2fa51743d80so3976110a91.2; Tue, 11 Feb 2025 03:19:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739272752; x=1739877552; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=NTDAzLZXBwCjKofiWgwOedMDKJqLuPnTW2TFWpLCguc=; b=Xv3B/HCPTsYurlpJADYHuJguHzlpWqXuvbqtR6kXmcQCCFXrjrlt1XnhRSjYi4dThF edpg/JWL5KpWrbkiqvcrtHO+sX+rBRxv9w5QuLNcQcvZXKiV8ZBlFJo3yK4gsZ7EQp41 obeh8jkyX2XPsv0hkQvpaMqtBJ9yoLaccZry36RpgFCrdM9SJK934hZUdGoBXkqMDrT/ bTf9PEwn0BzTTTC05I8PrNRgCxA2x0rKIBr0AnBAoWBBwDriNvZtsp698GOD8L6Lyr82 f3Nbyti0fq0BvJzzs+PpKVl8wHaQQG1O4AVQj1miJT3X34/yiZ1kWc6Z4xfMlCGZC2aP /ECA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739272752; x=1739877552; h=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=NTDAzLZXBwCjKofiWgwOedMDKJqLuPnTW2TFWpLCguc=; b=pxrJCXMoI3SGAZwPuPEN6Q3CfJD34p4Z1JdZtg1tpCl89vKFiMrncsyR1jsTs6/FyQ 5wwLWJlw55e8LTmaKLCx+I0P4GjyeYfgy/e2xr/iqF1916AR88LGDKhYlaWfx83uvlYX wiBp7zwXH425KaJLSMKdytkaklVRu7aZEzD8cioz61TxshttBKEAASewJ2gSYElW+IsQ PMFhXaDXpJVF9uW4fs8UZ4qq1AE4wfKnfprkzno0IiAOJTjkdHJEwAUvBSgLM/6Ur7vW z1yjRMZZYrrSmorts9iknFX2BrtSHMdvygdlfaqkM38VqdZ/VURHQs3ULcbkUcBXksjt Y9xA== X-Forwarded-Encrypted: i=1; AJvYcCWMNjIH5Qp6tFSySO2+aHovGafgnX0XQfhCQ47Y7JcBz/afOs5aRsEoVzj0Yk9V7SkPG38Ndybgzbmf8WI=@vger.kernel.org X-Gm-Message-State: AOJu0YxPQW4OtTOIXsRS8putoR9wj7fzr5napfgU3s30RkQCC9j0Gkp4 +cQFvBvESP+yN6lS9VTRgSrbbHmXLQywpMI5PCCkYpdNq2zG4lCs X-Gm-Gg: ASbGncsvFyfj+DTUh8iArP8MVgANkp7MOH5qXWgAALihYzI/hsDsT1fbFZNaduB/rW1 R+U7s+MIcrPGoWSF8TzTDGqFibkltThy11ucR0elcOJ603JxDj/Y4n9lddsAybgxR9Gd/jq37IY kytblwTlKWcCU8ZZsPCdtWKSqD6CpZ/7OaKtU+mndZg9NNlodqVOCm6Dz+bO9yLBIJE8Jq64Wqq ms4qdHU+HWNJ7praHgtaIXcJJ062pB56JcARFJ7geIJCpZw9pplmjvITfwF2S9dmHpvGECUeTC9 PMTD9Sf1CM7fCjJ9 X-Google-Smtp-Source: AGHT+IGjFNrmi7UMgu/44yDEfF1ZW51HqTWuDurr/WmQMThCc7ld3503PXol/LogeG6aJRPCN87jUA== X-Received: by 2002:a17:90b:4a4c:b0:2ee:ee5e:42fb with SMTP id 98e67ed59e1d1-2fa240634e1mr25196994a91.13.1739272749646; Tue, 11 Feb 2025 03:19:09 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fa09a16e53sm10186726a91.11.2025.02.11.03.19.08 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Feb 2025 03:19:09 -0800 (PST) From: Tao Chen To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, haoluo@google.com, jolsa@kernel.org, qmo@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, chen.dylane@gmail.com Subject: [PATCH bpf-next v6 2/4] libbpf: Init fd_array when prog probe load Date: Tue, 11 Feb 2025 19:18:57 +0800 Message-Id: <20250211111859.6029-3-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250211111859.6029-1-chen.dylane@gmail.com> References: <20250211111859.6029-1-chen.dylane@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-Patchwork-Delegate: bpf@iogearbox.net fd_array used to store module btf fd, which will be used for kfunc probe in module btf. Signed-off-by: Tao Chen --- tools/lib/bpf/libbpf_probes.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/lib/bpf/libbpf_probes.c b/tools/lib/bpf/libbpf_probes.c index aeb4fd97d801..8ed92ea922b3 100644 --- a/tools/lib/bpf/libbpf_probes.c +++ b/tools/lib/bpf/libbpf_probes.c @@ -102,12 +102,13 @@ __u32 get_kernel_version(void) static int probe_prog_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns, size_t insns_cnt, - char *log_buf, size_t log_buf_sz) + int *fd_array, char *log_buf, size_t log_buf_sz) { LIBBPF_OPTS(bpf_prog_load_opts, opts, .log_buf = log_buf, .log_size = log_buf_sz, .log_level = log_buf ? 1 : 0, + .fd_array = fd_array, ); int fd, err, exp_err = 0; const char *exp_msg = NULL; @@ -214,7 +215,7 @@ int libbpf_probe_bpf_prog_type(enum bpf_prog_type prog_type, const void *opts) if (opts) return libbpf_err(-EINVAL); - ret = probe_prog_load(prog_type, insns, insn_cnt, NULL, 0); + ret = probe_prog_load(prog_type, insns, insn_cnt, NULL, NULL, 0); return libbpf_err(ret); } @@ -448,7 +449,7 @@ int libbpf_probe_bpf_helper(enum bpf_prog_type prog_type, enum bpf_func_id helpe return -EOPNOTSUPP; buf[0] = '\0'; - ret = probe_prog_load(prog_type, insns, insn_cnt, buf, sizeof(buf)); + ret = probe_prog_load(prog_type, insns, insn_cnt, NULL, buf, sizeof(buf)); if (ret < 0) return libbpf_err(ret); From patchwork Tue Feb 11 11:18:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13969494 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 794FC1B86F7; Tue, 11 Feb 2025 11:19:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739272755; cv=none; b=p5/QP0BVhlyQcvOEOHAJTvhLsACNvr5TngLvfW5zXGHD0BSELa9Wn//lu8dNCUf5h+1+4aSN5OnHjIe1Hw4xOuMQxe/f1dH6gXfSpOgVZvJTDp/LnNmBk+LDGoF1FR6v5U5hoXomwPPjI3XrZ+fEuxhumn46RTD0C1xESFjGMl4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739272755; c=relaxed/simple; bh=y8ELDPuckWJAamg8YXHf5rEE5nKBYaZTu4XtGqS++/U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=LL82xoHJc+EFl0zQa50v+KQPALdZOFYY7m6J/uUiQ4sBs5isvvQPjt5pVd+iwqU+8Bh8EpGqIzj0TJBZioaZcD0EFyC8nJtcI+BZVOJTi4HeRt18RJJ2oW97kaIQr1h5cwWFN4WO0LcFMiY09mewOds4CD2DQ56hQvg/sXI992M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=N893Nvpl; arc=none smtp.client-ip=209.85.214.171 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="N893Nvpl" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21f4a4fbb35so72363245ad.0; Tue, 11 Feb 2025 03:19:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739272753; x=1739877553; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=C9qqVJUNRDLguHfLkaPdkiYrBVSWgx5xHm1O/LOeWjk=; b=N893NvplQo4HtmPyYNlZegZyI8fkj+wn11qdrnOKVknZoekC5Ost9JVAb7JNFZskO5 XJXmFROTRvtcpJHjWiQSTUqIjZhG7rRx6wzC/vNk1UwopoN/0gqRXgfJ1n55JmxQ9kYO yjRPUyjq7nX8VseIdr+YzUzj1t/WHGjiVSA1VlY9me3mBOMSw/7h4MFlgvr/aAp3JOD4 WQOIzJD9qKZacq5yre9gENp41jjpBrVh4jEwMpqHEK+Ej13hl7MQMqd6AOMlFTEHDkRw ynzJbY9Y3PR3xBCvOBgAGJw5ThSIGXBO1s7C+q1M6FlVXaIgia11fKiHscBHWfLN/HoW 7q3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739272753; x=1739877553; h=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=C9qqVJUNRDLguHfLkaPdkiYrBVSWgx5xHm1O/LOeWjk=; b=DJpRt79mWiGVURy6Et4bah7vdW8PKncDEGw2m+xwpxq9tipExR359O0ZHex7X8udeJ Y8N7G1buHaXpmUX1xXndDAe7eyU4+lfQKCRDlYxJlGHVVETNsyvvUdMtCzUxskl1tDe5 zo45AxwTq2nEySeBF42OCXlaOeVcDFAMnoQ1k0LlICxVOnqREmYRT1wtiP3IQmBF9fos c7QrgPjJ6bMWEWV83IAmiT09gwLjQPcObnys4BAMJAjazkbsocscLQlUUqtGyZ2hfMQY hu5mTs8VzgeWfwJQLnijTUu8zGz8LtnvXDoQf88TerMyJqwZ6N2OLZAQp3zl3Ezoj6J4 8QVw== X-Forwarded-Encrypted: i=1; AJvYcCUCE4MkNS6MQ7EbMjrywq/KMZTqLLtPO6DzRV0RFXMmY6HSBGvscpVtAHUnc4C03jf8SUrmh4+c38thVlU=@vger.kernel.org X-Gm-Message-State: AOJu0Yxk0K3VsVlWxZnfZlwochgB9kDa3QOI38T8YZhfrKxRiXgsbvqQ Yq9u5DHhxfGwzcRpsfqo3ddW+KwHzEkG57/pt5fAo4zmuHkozwIq X-Gm-Gg: ASbGncunogOOE6TLwR9MmgUi/8Z44XShb+5GcJYk4YdAHKmuz+SKHfp4MNQ3lqDWhKT RNYoAJZ2x1Rh9i0VHwS/hzG09Atrus4MjrTjqID94AZD2NB5eQljBz6YqvxJ8ty2R9Zl0uHW/By J65aSzZXrCCHfEUJaav96a81pp6T/TKxQYxQ9LF0ioZt08FaFwMs+IRfa1kLgF/32Sj7OPxgO22 BnwBCE3NN0noXfp2a17hUb7FHSy8+HlytL+Jd/Hgkeq8UotZBmfGXjy1i78zukMGMH0TCMbn4Hk /4GPel/hNjo9l1R8 X-Google-Smtp-Source: AGHT+IHYlJbaE2N1s6X9zSdFY8flgxe0tilzwqRxJmPHS4O107BNxDVHWjeVJDD0JzTMWrtXXLbRJw== X-Received: by 2002:a17:902:f544:b0:21f:3352:8f64 with SMTP id d9443c01a7336-21fb6f4c598mr40345675ad.26.1739272752558; Tue, 11 Feb 2025 03:19:12 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f7f33dd79sm45783795ad.114.2025.02.11.03.19.11 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Feb 2025 03:19:12 -0800 (PST) From: Tao Chen To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, haoluo@google.com, jolsa@kernel.org, qmo@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, chen.dylane@gmail.com, Tao Chen Subject: [PATCH bpf-next v6 3/4] libbpf: Add libbpf_probe_bpf_kfunc API Date: Tue, 11 Feb 2025 19:18:58 +0800 Message-Id: <20250211111859.6029-4-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250211111859.6029-1-chen.dylane@gmail.com> References: <20250211111859.6029-1-chen.dylane@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-Patchwork-Delegate: bpf@iogearbox.net Similarly to libbpf_probe_bpf_helper, the libbpf_probe_bpf_kfunc used to test the availability of the different eBPF kfuncs on the current system. Cc: Tao Chen Signed-off-by: Tao Chen Reviewed-by: Jiri Olsa --- tools/lib/bpf/libbpf.h | 19 +++++++++++++- tools/lib/bpf/libbpf.map | 1 + tools/lib/bpf/libbpf_probes.c | 48 +++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 3020ee45303a..e796e38cf255 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -1680,7 +1680,24 @@ LIBBPF_API int libbpf_probe_bpf_map_type(enum bpf_map_type map_type, const void */ LIBBPF_API int libbpf_probe_bpf_helper(enum bpf_prog_type prog_type, enum bpf_func_id helper_id, const void *opts); - +/** + * @brief **libbpf_probe_bpf_kfunc()** detects if host kernel supports the + * use of a given BPF kfunc from specified BPF program type. + * @param prog_type BPF program type used to check the support of BPF kfunc + * @param kfunc_id The btf ID of BPF kfunc to check support for + * @param btf_fd The module BTF FD, if kfunc is defined in kernel module, + * btf_fd is used to point to module's BTF, which is >= 0, and -1 means kfunc + * defined in vmlinux. + * @param opts reserved for future extensibility, should be NULL + * @return 1, if given combination of program type and kfunc is supported; 0, + * if the combination is not supported; negative error code if feature + * detection for provided input arguments failed or can't be performed + * + * Make sure the process has required set of CAP_* permissions (or runs as + * root) when performing feature checking. + */ +LIBBPF_API int libbpf_probe_bpf_kfunc(enum bpf_prog_type prog_type, + int kfunc_id, int btf_fd, const void *opts); /** * @brief **libbpf_num_possible_cpus()** is a helper function to get the * number of possible CPUs that the host kernel supports and expects. diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index b5a838de6f47..3bbfe13aeb6a 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -438,4 +438,5 @@ LIBBPF_1.6.0 { bpf_linker__new_fd; btf__add_decl_attr; btf__add_type_attr; + libbpf_probe_bpf_kfunc; } LIBBPF_1.5.0; diff --git a/tools/lib/bpf/libbpf_probes.c b/tools/lib/bpf/libbpf_probes.c index 8ed92ea922b3..ab5591c385de 100644 --- a/tools/lib/bpf/libbpf_probes.c +++ b/tools/lib/bpf/libbpf_probes.c @@ -431,6 +431,54 @@ static bool can_probe_prog_type(enum bpf_prog_type prog_type) return true; } +int libbpf_probe_bpf_kfunc(enum bpf_prog_type prog_type, int kfunc_id, int btf_fd, + const void *opts) +{ + struct bpf_insn insns[] = { + BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, BPF_PSEUDO_KFUNC_CALL, 1, kfunc_id), + BPF_EXIT_INSN(), + }; + const size_t insn_cnt = ARRAY_SIZE(insns); + char buf[4096]; + int fd_array[2] = {-1}; + int ret; + + if (opts) + return libbpf_err(-EINVAL); + + if (!can_probe_prog_type(prog_type)) + return -EOPNOTSUPP; + + if (btf_fd >= 0) { + fd_array[1] = btf_fd; + } else if (btf_fd == -1) { + /* insn.off = 0, means vmlinux btf */ + insns[0].off = 0; + } else { + return libbpf_err(-EINVAL); + } + + buf[0] = '\0'; + ret = probe_prog_load(prog_type, insns, insn_cnt, btf_fd >= 0 ? fd_array : NULL, + buf, sizeof(buf)); + if (ret < 0) + return libbpf_err(ret); + + /* If BPF verifier recognizes BPF kfunc but it's not supported for + * given BPF program type, it will emit "calling kernel function + * bpf_cpumask_create is not allowed", if the kfunc id is invalid, + * it will emit "kernel btf_id 4294967295 is not a function". If btf fd + * invalid in module btf, it will emit "invalid module BTF fd specified" or + * "negative offset disallowed for kernel module function call" + */ + if (ret == 0 && (strstr(buf, "not allowed") || strstr(buf, "not a function") || + (strstr(buf, "invalid module BTF fd")) || + (strstr(buf, "negative offset disallowed")))) + return 0; + + return 1; /* assume supported */ +} + int libbpf_probe_bpf_helper(enum bpf_prog_type prog_type, enum bpf_func_id helper_id, const void *opts) { From patchwork Tue Feb 11 11:18:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13969495 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 8419A1C9EAA; Tue, 11 Feb 2025 11:19:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739272759; cv=none; b=MuIacikkVKUNZHJX4PFKSc+ChLRuSg7CRSQQjRMjCTvRtpBFRLytBlF7F6J0ks+6ikJX42gBy7UoZXI3A04SZ+/sO2JxTzYCWSV4+y0lKmpHDHcyDHQ+T7jdvK84VqhM1uFslOFRvkgmM0xxGjazUtxPc3wsp4ELXpgHCNPXg1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739272759; c=relaxed/simple; bh=E7SZXQq5YlFZ6fUQ6IuGV0KL/zucE+o2sgmwFMcqVpM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=BcbyaZ7DHs3W57wlPqnWpVlTxlEs63hiE1l+/QBkuRTT8dwp/JFk9otgAkt1qSrbjQB1BKMId8tdRzMxdnob+wb5cxos6qybCWeZGq+T5nndyFJBMK7RAjHGy0m8m5boDpteu9+uSt3MFT0/2ZZMOjh67GG464esbCWNaXBcmkY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YtZ1w82h; arc=none smtp.client-ip=209.85.214.173 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="YtZ1w82h" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21f7f1e1194so63881275ad.2; Tue, 11 Feb 2025 03:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739272757; x=1739877557; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=tU3r4r0E6nNNQO3DTHrSmmHGy21FgVrpejWGxdhhNPo=; b=YtZ1w82hgN9nJzyO/1fEMBmJ5o+c5/+0Y0JNKbawpigM09Kbl7gksWypT3YU8fdFOK RBGbN6nAFbpkrjFxDGyfvK3O1ag/pl5GR9hvgN/QPIkWwLL+g/cYmmns+VjMRgIF9Tn1 A0gE/WFJaSIKuFGjbikEQuSQaK1jRck37X0Sp8fmrDQ4gXtubtJoedCcGqSgdIufTYNy JrXDxhpINYtQGwq+lkOuNxCPfTYxow7v1xQl58ktcl9ryaed6SL+cEj9TmKslzLX65o3 jDq3dcve2GpSdJTbJaPoqSIoEzOLMy6aiU4jOlLhM5nUmI8pl26FYgaQw66w45kBmyJ6 JNmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739272757; x=1739877557; h=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=tU3r4r0E6nNNQO3DTHrSmmHGy21FgVrpejWGxdhhNPo=; b=inhn1Vx5cl3kvPNj04/EOdRn9SDLrRYF4etK6q3DreC1cMXM0SW6h6vMw9dt0GMRxW m6NoTGscaW2t74PAjuJCeWw/IyaXVBT7r+WeJHYav+49Lz/GHazag5gMKgGVwFTZi0q5 7kwPYHDgx+Zjd64TKSjmfrL1/LVUvW9IQ7qrOeUn0LcKNzN31aFvAMGSJJwS4si8ih1I BWbl6mufQAAjyJmArEyrKIRrfzXwXuN8pPQeKRmp6fzMYLRJV3TYiE31u+7PbNVSBYb3 EpGjSjn0uxhkJ7dJ/J3cXu+mm/hfDZ2td6dVzkveOb+NEspZfkxI6AFcDnkT5p7PYjEo ih+g== X-Forwarded-Encrypted: i=1; AJvYcCUVrEWaAm/YAqVruihxhk3lXew/IjKrYNEtE7yAIvY91QGCfDvUpk7aAC4/VQ62mbR35y0yPTMvpXuMMTw=@vger.kernel.org X-Gm-Message-State: AOJu0Yza2Mt6G7GM1pismtkE+zP/KBLGFjL4IxL0W8c0/6U7Axhfqai+ rxNnvJbw5llzu8TEhN130dN/te3UM80YnkbiTU7JG1p5Qjt9kfgF7GiH6Q== X-Gm-Gg: ASbGncsdyni0lgN5gznoLPFCUtCIKM1EaIQh3Dkv/M81yPRoYo/pFFnm/X9Mq47XDei 8aPglQAQOGMbUv/vyPLrthM/L4Evuxg5TkhZRjU3EnONE02ngJbjrpn+QpU4jb1M/eZ+K4vuLvR a6/LeHPPj2km/EX02ipGWykywKldipl54jqoxJOkkIYfppELyOquUGEWYJFewdZn3y3hEWBAdfR cNl2cVA4ULwRxr4TtechtFHdpsuK4puUIB9102ZeB9/jX1QlrsQMf9Fy0u+hj7PaDA0tKKZCaO5 zWJEuLZCHozSnTcF X-Google-Smtp-Source: AGHT+IFhOki/rd+yezkWNKwxrO2Edf/DThIs4v+8qzJy3UrvtlKb6441PGHb71zPDlZiAJRtzlnI5g== X-Received: by 2002:a05:6a00:2916:b0:732:1eb2:7bf3 with SMTP id d2e1a72fcca58-7321eb27dcbmr3005173b3a.21.1739272756735; Tue, 11 Feb 2025 03:19:16 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73048adb158sm9411906b3a.65.2025.02.11.03.19.14 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Feb 2025 03:19:16 -0800 (PST) From: Tao Chen To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, haoluo@google.com, jolsa@kernel.org, qmo@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, chen.dylane@gmail.com Subject: [PATCH bpf-next v6 4/4] selftests/bpf: Add libbpf_probe_bpf_kfunc API selftests Date: Tue, 11 Feb 2025 19:18:59 +0800 Message-Id: <20250211111859.6029-5-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250211111859.6029-1-chen.dylane@gmail.com> References: <20250211111859.6029-1-chen.dylane@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-Patchwork-Delegate: bpf@iogearbox.net Add selftests for prog_kfunc feature probing. ./test_progs -t libbpf_probe_kfuncs #153 libbpf_probe_kfuncs:OK Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED Signed-off-by: Tao Chen --- .../selftests/bpf/prog_tests/libbpf_probes.c | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/libbpf_probes.c b/tools/testing/selftests/bpf/prog_tests/libbpf_probes.c index 4ed46ed58a7b..96352fb657e5 100644 --- a/tools/testing/selftests/bpf/prog_tests/libbpf_probes.c +++ b/tools/testing/selftests/bpf/prog_tests/libbpf_probes.c @@ -126,3 +126,114 @@ void test_libbpf_probe_helpers(void) ASSERT_EQ(res, d->supported, buf); } } + +static int module_btf_fd(char *module) +{ + int fd, err; + __u32 id = 0, len; + struct bpf_btf_info info; + char name[64]; + + while (true) { + err = bpf_btf_get_next_id(id, &id); + if (err) + return -1; + + fd = bpf_btf_get_fd_by_id(id); + if (fd < 0) { + if (errno == ENOENT) + continue; + return -1; + } + len = sizeof(info); + memset(&info, 0, sizeof(info)); + info.name = ptr_to_u64(name); + info.name_len = sizeof(name); + err = bpf_btf_get_info_by_fd(fd, &info, &len); + if (err) { + close(fd); + return -1; + } + /* find target module btf */ + if (!strcmp(name, module)) + break; + + close(fd); + } + + return fd; +} + +void test_libbpf_probe_kfuncs(void) +{ + int ret, kfunc_id, fd; + char *kfunc = "bpf_cpumask_create"; + struct btf *vmlinux_btf = NULL; + struct btf *module_btf = NULL; + + vmlinux_btf = btf__parse("/sys/kernel/btf/vmlinux", NULL); + if (!ASSERT_OK_PTR(vmlinux_btf, "btf_parse")) + return; + + kfunc_id = btf__find_by_name_kind(vmlinux_btf, kfunc, BTF_KIND_FUNC); + if (!ASSERT_GT(kfunc_id, 0, kfunc)) + goto cleanup; + + /* prog BPF_PROG_TYPE_SYSCALL supports kfunc bpf_cpumask_create */ + ret = libbpf_probe_bpf_kfunc(BPF_PROG_TYPE_SYSCALL, kfunc_id, -1, NULL); + if (!ASSERT_EQ(ret, 1, "kfunc in vmlinux support")) + goto cleanup; + + /* prog BPF_PROG_TYPE_KPROBE does not support kfunc bpf_cpumask_create */ + ret = libbpf_probe_bpf_kfunc(BPF_PROG_TYPE_KPROBE, kfunc_id, -1, NULL); + if (!ASSERT_EQ(ret, 0, "kfunc in vmlinux not suuport")) + goto cleanup; + + ret = libbpf_probe_bpf_kfunc(BPF_PROG_TYPE_KPROBE, -1, -1, NULL); + if (!ASSERT_EQ(ret, 0, "invalid kfunc id:-1")) + goto cleanup; + + ret = libbpf_probe_bpf_kfunc(100000, kfunc_id, -1, NULL); + if (!ASSERT_ERR(ret, "invalid prog type:100000")) + goto cleanup; + + if (!env.has_testmod) + goto cleanup; + + module_btf = btf__load_module_btf("bpf_testmod", vmlinux_btf); + if (!ASSERT_OK_PTR(module_btf, "load module BTF")) + goto cleanup; + + kfunc_id = btf__find_by_name(module_btf, "bpf_kfunc_call_test1"); + if (!ASSERT_GT(kfunc_id, 0, "func not found")) + goto cleanup; + + fd = module_btf_fd("bpf_testmod"); + if (!ASSERT_GE(fd, 0, "module btf fd")) + goto cleanup; + + /* prog BPF_PROG_TYPE_SYSCALL supports kfunc bpf_kfunc_call_test1 in bpf_testmod */ + ret = libbpf_probe_bpf_kfunc(BPF_PROG_TYPE_SYSCALL, kfunc_id, fd, NULL); + if (!ASSERT_EQ(ret, 1, "kfunc in module btf support")) + goto cleanup_fd; + + /* prog BPF_PROG_TYPE_KPROBE does not support kfunc bpf_kfunc_call_test1 + * in bpf_testmod + */ + ret = libbpf_probe_bpf_kfunc(BPF_PROG_TYPE_KPROBE, kfunc_id, fd, NULL); + if (!ASSERT_EQ(ret, 0, "kfunc in module btf not support")) + goto cleanup_fd; + + ret = libbpf_probe_bpf_kfunc(BPF_PROG_TYPE_SYSCALL, -1, fd, NULL); + if (!ASSERT_EQ(ret, 0, "invalid kfunc id in module btf")) + goto cleanup_fd; + + ret = libbpf_probe_bpf_kfunc(BPF_PROG_TYPE_SYSCALL, kfunc_id, 100, NULL); + ASSERT_EQ(ret, 0, "invalid btf fd in module btf"); + +cleanup_fd: + close(fd); +cleanup: + btf__free(vmlinux_btf); + btf__free(module_btf); +}