From patchwork Thu Feb 6 05:15:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13962194 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 1E0FB22258C; Thu, 6 Feb 2025 05:18:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738819098; cv=none; b=r9ZiJp9OXvHB9RFeSz9TyR4fXInzsfzvuFmztLAif7cGmlu8Xolqf9G/2LXpB3KLIRPyFj5hef7SeQ5VOfAoOKyK112UxgFQDd7tcYOxtLIssph9Xvj0RlCuKWy9VTF+QVYvyPQJq+YbxwffhYB32uo+V5dzLoUktKT3veTROiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738819098; c=relaxed/simple; bh=gCSkhghV4FSQv8s+RD3+Va+foCnFjyb66eHvLgkiuWw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=dGbd9IgEPaU/eP5e9cVQ6pVtn5QCBFWGwAlWnRn5lEQ4pX9mEzp1eoATha8+NGlTySTh4tFsGGylBhNNoO0V930/Uee0cUbsrjp3Jix4RlMGeVVus4LcgRWEKtQ9wM0A+5ODLnMgDfhK2VJ0n5yWN/fmSugpBPXkqcX1w8RjGeI= 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=lTlr0o1A; arc=none smtp.client-ip=209.85.214.178 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="lTlr0o1A" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2166651f752so11783965ad.3; Wed, 05 Feb 2025 21:18:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738819096; x=1739423896; 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=lTlr0o1AZ8r8s59mNiX7jseGXArn7tluJpXPpoeWeWUuAgEeZO39DrtaHJMLnbgEU2 Emf0UX2mDbAViLZAArjeRqpyj6iHk53N1dDqGpWi/JMPcjE1PEZ5mW1DIduJaJlR18rP g+hjxSd4amSoXvyLG5VJs99Ka4iRT4WoZqXB8jU1dZIgZTvxm5I7BUhhpBDuROaNcotI VIv916hUtEIExI0VKHpkDFepQGWuGlIH3Xc7KcQ5S/n1hK28SWIYi7VI1M0/H9gWf2t1 Uxl/KUJvH+rOVwcibGw0XAseF7DbbOPRxpP8Ka7Nb0AKE5sJlZhGGIfpPdGdSlLrtZcQ S/Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738819096; x=1739423896; 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=sczml82kga0ehQ0Yt1uxes4Z2utNVRInMAdCMpvacGvqKp1eNkoMrP8CKnKaMT/3dv Oztxl3AlRG0NUhkqz2lo/wIOjIchoksKci8so0ovU9woYQJYgs924mkdSBPRLpswrD9E GeXAOJIO88Dmkz1bu3SUyCHBUhHNvGqCxBJZm0ASk7jTr5cs//VU0rKZVt+5AMzSJd4j W+FRG/fBvIJZY6Wxpw+Mzke7nCe0cZfKmzyP8+qFk4Yx70B/7KTQJObYrD2S5Ph1Y+JA C7Oq7wOjn8ukVAlIi5J6Z0AbwDq2SGAAs1GW8tL8BlVAN5s2bT5BVMsMvDu7taMmm3gn m3ww== X-Forwarded-Encrypted: i=1; AJvYcCXzfzzwYU2b8Q1WCnXkbyZNUSdnDF/HJKD8Qrxw/FKRbCQOlZq4d0F1mS9ptvu57B3DYwteCiFPS4p2NSc=@vger.kernel.org X-Gm-Message-State: AOJu0YzC1V+iv4cSzfCaoxgqOezPa1IvPeezfNYysjhlex5BZEcyEE65 bdsywzC4a8CcHuIiiNXwrdE8HG4AmwCpcWxkOVKOCMJ+3p7XhZn+klMsTQ== X-Gm-Gg: ASbGncsmZVnB8r2A4dKl1N3fQG4FEYSXLTr+HhOUPY0dCK6HLJ4Ky2DE37GlFGd3Y9k cxZ9OKbyBPG6d9DsaLL9558LCIBCwxDE0HUeyM4UuqHsvp/lkRrhfLWzSbW0zpzePhLWauQt6GY jjfCuHeT2O51qEHPprzSKqFFlVfUfep4+1aDWZ8BH+D8VJyd3K7jyKjH8V1ZDQYTmgEUnc/1S+U WxM1uOJTVUVEJ8PZ4jFkWE8n828zYprLGKTX90pN2RiN++nwq4PZsgYtEsT6jbvOMQMPU+s3S6X L/PSdpA04OS1b1xY X-Google-Smtp-Source: AGHT+IG718WaHI/zyVKjFrVcEcSmpN2DRdpWXZQJJcpkenwFSpphzFwiQVBsUkUYk0c4Qhuccfrciw== X-Received: by 2002:a17:902:ce86:b0:21f:55e:ed58 with SMTP id d9443c01a7336-21f17dde8b7mr95825255ad.11.1738819096203; Wed, 05 Feb 2025 21:18:16 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f36560ee5sm3295015ad.96.2025.02.05.21.18.15 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Feb 2025 21:18:15 -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 v4 1/4] libbpf: Extract prog load type check from libbpf_probe_bpf_helper Date: Thu, 6 Feb 2025 13:15:54 +0800 Message-Id: <20250206051557.27913-2-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250206051557.27913-1-chen.dylane@gmail.com> References: <20250206051557.27913-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 Thu Feb 6 05:15:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13962195 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 3D76320B1E8; Thu, 6 Feb 2025 05:18:22 +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=1738819104; cv=none; b=LD4Uwvi6ZG/uNxQJp86E+h1V2Qa7vixQBTUStRqJo2tcvH77H5bcpTnUUgSrlTXu7uHiFBO+Wv2kSwFcDSnm2FvEXHVdCeMjx52ZEU7AAPkXyMoO6mGEHVRWMDlDS9YYuep9Wi8M62iXsu1aghvBgkAW9k/N1oXjBv0OoUAxLnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738819104; c=relaxed/simple; bh=a4ECPYDwfk63dHhyrW+wHnNNRmnBF5bgFkDjFdSmp2Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=X+PbarAxQPv0dvtmJZPGORqrCxJc4+s2X5nj58HioCs9eoFR2LBggTVqc03F3XxfTapZUE0e7ZO8XkWihziXElfyt37biP89NgqcZZ940fupvqGwoMl6dRzw1LVFG65rOPxh8Wsi4+CwEtGN2Jdwew4VSQ1FKeRLnfm6hXqYWag= 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=mBvSO+Xd; 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="mBvSO+Xd" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21670dce0a7so12598855ad.1; Wed, 05 Feb 2025 21:18:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738819102; x=1739423902; 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=K/Fl6jr3f6WWgFY+GTM3oxPBToNoP/PIu+n5lwCsix8=; b=mBvSO+XdaWJWfCJvRbAiNTVhKY5a2e/TIQjNxEphwaoASAJp5vgzH/cJFhociut3fW uEcoi/1fWADRewXX6YLfEy0+hw6Su8cH8fcSEZQL+TdxdUVwF4j2GW+cHljpi40BhWEy 8Q1Mo/VMe53EwJMTfJuGqRHj96OnlAC0AOzgz2cYStw/z4QlkwlGXFthdRr8CcjdmAqh 9GZjD9ZtbC09HyykLb/eE8LiN6tIDqoYr9zP4cNaUdVIgZYKA+Xigw98OmpAJqZalqLT J7RvMAjqB+uC6i1gcRB5qMTWp9jd/z2OC5jWgPq5Wpx3q4UACfzhwWCLEknjA4CcwhS2 Rrrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738819102; x=1739423902; 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=K/Fl6jr3f6WWgFY+GTM3oxPBToNoP/PIu+n5lwCsix8=; b=PaRFMSfHVg8pLJ4lHDzzBdyLgHVOUbWp9UzG4712gi5akH1Piqp/bMEBrT7n3uc7cC AOrCW5//GNH/bhbtzYuKDa1ht0l+KN0pkkqSFf+NaPWtDaf21ylHeGi3zZ3s+XrGTKzP regmtvydQkQRwwAmhLwg7ZrWxwyRtX49ymWyEOnW8L44P0jwDx9IwTkPXt+KopGRur/0 FmzVKpJmDeN7w2uUg9fD3iCoJODUc0GqK9rFZb/W9kB1qbYwK5yF04yHbGBuDdTgDRql /EsA2sJMmMMdzBsYWTHOYeTSOSxcUO5vndCTx4L7bQRgfk1V9zjbTuMOEO5BX17gs8UX b/JA== X-Forwarded-Encrypted: i=1; AJvYcCVPiene1C4GehGM1naP9XKaZyzmzPfl7PErDZZRHOFROKJgXZg9caImR6JyBlj1hQVxG2/k5W03tKQPmL8=@vger.kernel.org X-Gm-Message-State: AOJu0YyWvoQIHaLRB7IqcGrpbJkuIEryYyksIHfkgOtLHnM0W6IyWqIc DCMPA7qTrYeTnsdxS62ye5BI8bqQLuvDkR15PvpPFZ2m8bDArsci X-Gm-Gg: ASbGncs2ut4RxTEw1+eE7QAZ1OKrmq/k7RBDLovI2KViBOTyHgFNOdsKxYYxLy1sK46 Ot6xJBFAsLPDJbQgssigGM+YRcF+82HaLCDQHjyFRQAXhMTKbkTbRxKJk3dbb+kuBmNbJHoEjeT +TwdQurYjJD6HYBUK3Dt9KHkPxCBrmXhJ7DpRHoxgeDIAZZgWbtnFJNUbbT0oh56uAEC9L1zvqM RX8XI1FZXhsbBR4JFxPlq23NvYGiT8BuP9kCYkQHG8kRKHJcpJlhW6kKPrfomZi296TvoKtVuli OtOIp9IPJgdrPhpZ X-Google-Smtp-Source: AGHT+IEBYCYZOCuffiu5N/+ExDF5yVg0V0Em0xXZikU5xRdhVmpNizklaZghEC3SsWGVtImGiuFd4w== X-Received: by 2002:a17:902:f64f:b0:21d:3bd7:afdd with SMTP id d9443c01a7336-21f17d114a9mr106222235ad.0.1738819102390; Wed, 05 Feb 2025 21:18:22 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fa09b5ad4esm362074a91.41.2025.02.05.21.18.21 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Feb 2025 21:18:21 -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 v4 2/4] libbpf: Init fd_array when prog probe load Date: Thu, 6 Feb 2025 13:15:55 +0800 Message-Id: <20250206051557.27913-3-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250206051557.27913-1-chen.dylane@gmail.com> References: <20250206051557.27913-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, 5 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/libbpf_probes.c b/tools/lib/bpf/libbpf_probes.c index aeb4fd97d801..e142130cb83c 100644 --- a/tools/lib/bpf/libbpf_probes.c +++ b/tools/lib/bpf/libbpf_probes.c @@ -102,12 +102,15 @@ __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, + int *fd_array, size_t fd_array_cnt, 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, + .fd_array_cnt = fd_array_cnt, ); int fd, err, exp_err = 0; const char *exp_msg = NULL; @@ -214,7 +217,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, 0, NULL, 0); return libbpf_err(ret); } @@ -448,7 +451,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, 0, buf, sizeof(buf)); if (ret < 0) return libbpf_err(ret); From patchwork Thu Feb 6 05:15: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: 13962196 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 066F522332E; Thu, 6 Feb 2025 05:18:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738819107; cv=none; b=soNKuPnPeOyzLEXgpC2v4Ks/CW+ENNl6PkK8qQLXOYwBCsQijrXxN7QWqQ6mlXA6U2Y3dGlraXlCXI6EQr3PT71XqPsXjW8UWFIC0bJewgx+3/yJJSUnP1v2YSLamyT6jFZexePdJSXNbqwSYwoQf9VCGGijxyXd4vfIByDOwF8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738819107; c=relaxed/simple; bh=9EkRjWheMAy8mekC0cJzarLMSq5koURKLbcnOPxpgsA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=MNGPlghWQUlb+NnNteixvfEVTktUarZt+XM1aXgRMCVUCtUUrZ77Q++sa/1NMxYtxxOIXp69XlPNbWd95e4hPda3ZWQOkOHUMazTOkKMuyGnSbrcBbM3VmTJpnSHRdYX/Bo5sOTPEN9LfO5kkp297KvzuisXQgBtD/OCnm2YEFg= 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=hIipaidH; arc=none smtp.client-ip=209.85.214.172 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="hIipaidH" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21f2339dcfdso7197285ad.1; Wed, 05 Feb 2025 21:18:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738819105; x=1739423905; 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=/W8fmlJWAbVBO0MEo0VBT59psNgtM7REfYVBIAPFhJE=; b=hIipaidHU7UAfGGFFhDYFVgYDcRS4ChVHt8PysxENt+uFdlFpCvrMucK3XRpgzSaVM 5d+v592i6zU0MUCxMkp7FWs9jI/rOcPERdJgwfAAKOlfBbOgSc0yWwHJzfqBG42rcY0y AmZRNh5X3IJcGuhAOV/wZHBK8GBCN20JxeXtkuUWbgfFsfkWUl38RapReMn2s3d4T6yK T74+OrNPkchpc8XP2C1UsIuAdArIZfBzvOf0nP2f13f0NRE5+xutlMaWaI33vgvxcSyv btpd9cBXDz/Ve1fPAhL2ufrMtLUCmRDfR7cPX5BFpZyxet81OFqAdcp5r0NaBnzOneGx 7W9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738819105; x=1739423905; 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=/W8fmlJWAbVBO0MEo0VBT59psNgtM7REfYVBIAPFhJE=; b=CLcFw/ChfY4aK+HougeyY6/AgebaT5KzoV/xoXFUHqISzBjwjPszgGadZiJ0e5GQ7H bpOd51I92jBfYuhfuZA3JD4VzRrNY8dilT2K2VhqhVANMJ30Tm9HYAfYe+hcNQpMTzNr lkktQFnqZTd/ITGs20px+///75j8g03695yXBBfuB8eg2ZEI1hRaNwKchdbqqpm1fIWd cFbSOF4BHGKgv3xo1kpysZeFKH82kZ1tqmBV1J+THAFEw/CX3k8VOn2F0dbsEYyJmkwk fOvNpiKirRZkXH93BrLi/w1s2MEwWDaAtUxNbRVTJ2zwuhsK4JJNiJKjXi6GnyPpQUfj CAIg== X-Forwarded-Encrypted: i=1; AJvYcCXRxS0SXtqJcvr9/BGUUqa3BOA8ha50pxMNOyWnlswzx40Z7FSkR9pViWF4zfnF3ClVLfKY95WCF2M+ARw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0Ib1olS+9MxI0VG91YYxdM8BSkc5sr9u/uZEOMEk/nH1/dq5Y Ow9a/i2+vcgFG6g3NmbiZmNH7bmzc7BIjW8jRGejvBbTTqfVwEuC X-Gm-Gg: ASbGncszDKmckUt2XNkG7IrzRvi7DQqHnh+ArzjiUVqtooIlezOqfaFUXltKPu0GA5X wcnMCavMP6IqvV7abxsX25rGKvyjP4pv7DOgeH9sQcwBYIs5E5GPGiR1sKQuprkyaNu/5w/ace8 ccPTfMEn803r4TNpDRNSjWKzIzwuMUxzQWwdmcf7+sS00bturDm5iITsgp+5oU1HmKEjWhk2sgd TNABUVXMtHG5xFlqh9EZ531LFs1SSCFBsNKK9opNU8g17oggN2bFzppMH+HRTDVcmIsL9E+cYFO vQn3yPA/lPz8gzOH X-Google-Smtp-Source: AGHT+IGYkjN6YW+I9sjJjoH/i/IRj6N+2DMvrbCwMqqpTOmlbOHkNv3ZV5SYE3inhLMMg6yJNycpfw== X-Received: by 2002:a17:902:db02:b0:216:4676:dfb5 with SMTP id d9443c01a7336-21f2f1b9572mr41080315ad.21.1738819105125; Wed, 05 Feb 2025 21:18:25 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f36516d7esm3285165ad.13.2025.02.05.21.18.24 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Feb 2025 21:18:24 -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 v4 3/4] libbpf: Add libbpf_probe_bpf_kfunc API Date: Thu, 6 Feb 2025 13:15:56 +0800 Message-Id: <20250206051557.27913-4-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250206051557.27913-1-chen.dylane@gmail.com> References: <20250206051557.27913-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. Signed-off-by: Tao Chen --- tools/lib/bpf/libbpf.h | 18 +++++++++++- tools/lib/bpf/libbpf.map | 1 + tools/lib/bpf/libbpf_probes.c | 55 +++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 3020ee45303a..596b27f58c58 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -1680,7 +1680,23 @@ 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, 0 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 a8b2936a1646..e93fae101efd 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -436,4 +436,5 @@ LIBBPF_1.6.0 { bpf_linker__add_buf; bpf_linker__add_fd; bpf_linker__new_fd; + 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 e142130cb83c..c7f2b2dfbcf1 100644 --- a/tools/lib/bpf/libbpf_probes.c +++ b/tools/lib/bpf/libbpf_probes.c @@ -433,6 +433,61 @@ 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, btf_fd, kfunc_id), + BPF_EXIT_INSN(), + }; + const size_t insn_cnt = ARRAY_SIZE(insns); + char buf[4096]; + int *fd_array = NULL; + size_t fd_array_cnt = 0, fd_array_cap = fd_array_cnt; + int ret; + + if (opts) + return libbpf_err(-EINVAL); + + if (!can_probe_prog_type(prog_type)) + return -EOPNOTSUPP; + + if (btf_fd) { + ret = libbpf_ensure_mem((void **)&fd_array, &fd_array_cap, + sizeof(int), fd_array_cnt + btf_fd); + if (ret) + return ret; + + /* In kernel, obtain the btf fd by means of the offset of + * the fd_array, and the offset is the btf fd. + */ + fd_array[btf_fd] = btf_fd; + } + + buf[0] = '\0'; + ret = probe_prog_load(prog_type, insns, insn_cnt, fd_array, + fd_array_cnt, buf, sizeof(buf)); + if (ret < 0) { + free(fd_array); + return libbpf_err(ret); + } + + free(fd_array); + /* 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 Thu Feb 6 05:15: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: 13962197 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 645302236F0; Thu, 6 Feb 2025 05:18:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738819110; cv=none; b=taKWdb38cbl3c1WkntvwMwHkrCkaXp/wDVQQJ0GZT/thHO6jB1du/xDb8vy3KaQxo21PXHEzupo2kS7W4U5D3JTXHw6XK11u+zUgSmVpeJPHn0Zdup/DcZ6SVpk2UqOCa/bqrnpOb+WG+2bLaa+FQhft6TDANxde5Kt7E0dZaC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738819110; c=relaxed/simple; bh=5UNsqffCMdMGGL5yDqg/97mtD3zI0y0ZIN93jMf2U7s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=uDmVekcS4TgJJgCsvD/JjuQtDv0GhQyBDE+8Ebi01kgT7Zp3qcoFVrBsWla7yBlgOyWP1uxgISycnH0Zm5eA536mORYwHktlCLm6OEPnWCc0OUe2L8BQu8hV4j9ZYX8Fi004P8msr2HBze+59Ki6JDsL+ZUSv5PJpdTuSSZVgVQ= 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=GO3WAayp; arc=none smtp.client-ip=209.85.214.181 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="GO3WAayp" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21f08b44937so7866705ad.1; Wed, 05 Feb 2025 21:18:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738819108; x=1739423908; 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=RNV+3WZEEZipZbsxDZaU3uaX0wsZtbiLD9o/9Y+Y6vM=; b=GO3WAaypcihIc/lwz8Xf7n/ojv9MdaQAzW3/CUXe+ZWs87azTzD1u/T++SDsOIK9cT AQ8sJOqN0z4RhdIz9d9XwO3f8sC8nR05JZ4MECPCr21Kg/CE9fhDzx/aVrrHqiBSAqsy bAwqBiv3iyVQpIx0ZpY4U+roip8GaL+KOQdEYk62JiQRZGT24bpwMwLzWV2sbEwXofBF uKMtPuraUV53Ltq35JGJy+A0AnnBR3HPWAZVvwHw2LvWhPiTkR18oyYCjZSF8FrhPBDP asSTEmfrFJ488OSlFz/Svuai2ZKPApIlvPOgRO+xNMP5Rkzye7bUNyCuz9ermjZm+tPq rL1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738819108; x=1739423908; 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=RNV+3WZEEZipZbsxDZaU3uaX0wsZtbiLD9o/9Y+Y6vM=; b=f1cIwsmHOTQW/+WUdjCcoyBTtu40DwARQi3QubLfeDptkA40tm/qZ4dZZkynz99eyu qCPeciMkXU4BhCFhsNE1HF3Q4THSVJA5s9W3pKXOEQazxQcpfwanJRnB+BKF6IEDYHL6 lrw9UsIGnr4FAdfEEx7DcRV6FtDdOYs03VLYFdKb4//ZGDoUoWmNCN3tYlrhsb8sNx0Y 2D0nVcUM8JS3RERy0eikAOQnUYyR+xVYQfqgVNiypuFgKsdTp61pDN5dvYGq2V3BrCqF Rxn3FvINOclMyg74GYwqJXS5qqUECV14eYrMsz+lv6ECLjNx1IzcmEpiTAKTrsZVTkAx h88w== X-Forwarded-Encrypted: i=1; AJvYcCXlP0Jo4N2zho2xrM2TtdYlyHEy9xX9n2GORgiLcUFl7fUjpIR3m6RhH2JRFxxNDzS0n5jq2hrunW5CxrE=@vger.kernel.org X-Gm-Message-State: AOJu0YzEFjaNx1eEcXXLROeAeCcaX67kr/YobN+JC9gwol+Wc7p+HugE vtUtXESLdOcwR8qMyncHoYxRlByAWKI+Ds+nSROhvYixtYKqBZZj X-Gm-Gg: ASbGnct0CAiLZIKZfNuBIP8Isi6mxKtgUmL+3LOjjHtiqGpmhPmMJXxLqqE4iMdal4u RIJaOrdUQjOCr8gnOKfvJmq8vNep8bwyNUV44rz/25mh/8Dl1qdD0Nvhd+z7z64Ry5OT6vJzuIT YICdDufUGlhHwiBFra4ulZUvSkdWZfKLA2LfRaRvZN5zXlSH4Bvpw71O3rqqCP6lNBUeA+P5aot 3kHrKeNyyOTzyeEewtF7eev9jgVrtcegahFeJkj3IEvOs/HHYXrKfZYcBPP9f2JQ3KFx9Of3Xnu 8o5IJPi3+mCUmwp2 X-Google-Smtp-Source: AGHT+IHvqq7pbk9T2ef28zGLGCHwloX0OLnOTGXvTJTPciVkWsXkGAA1qRfvrsa7txbJH6ji8vrZiQ== X-Received: by 2002:a05:6a20:158a:b0:1db:ddba:8795 with SMTP id adf61e73a8af0-1ede88cac85mr9528445637.36.1738819108461; Wed, 05 Feb 2025 21:18:28 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73048ad29f3sm394519b3a.53.2025.02.05.21.18.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Feb 2025 21:18:28 -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 v4 4/4] selftests/bpf: Add libbpf_probe_bpf_kfunc API selftests Date: Thu, 6 Feb 2025 13:15:57 +0800 Message-Id: <20250206051557.27913-5-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250206051557.27913-1-chen.dylane@gmail.com> References: <20250206051557.27913-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 | 118 ++++++++++++++++++ 1 file changed, 118 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..8f249ca7d5d7 100644 --- a/tools/testing/selftests/bpf/prog_tests/libbpf_probes.c +++ b/tools/testing/selftests/bpf/prog_tests/libbpf_probes.c @@ -126,3 +126,121 @@ 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 && (errno == ENOENT || errno == EPERM)) + return 0; + if (err) { + err = -errno; + return err; + } + fd = bpf_btf_get_fd_by_id(id); + if (fd < 0) { + if (errno == ENOENT) + continue; + err = -errno; + return err; + } + 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) { + err = -errno; + goto err_out; + } + /* find target module btf */ + if (!strcmp(name, module)) + break; + + close(fd); + } + + return fd; +err_out: + close(fd); + return err; +} + +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, 0, 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, 0, NULL); + if (!ASSERT_EQ(ret, 0, "kfunc in vmlinux not suuport")) + goto cleanup; + + ret = libbpf_probe_bpf_kfunc(BPF_PROG_TYPE_KPROBE, -1, 0, NULL); + if (!ASSERT_EQ(ret, 0, "invalid kfunc id:-1")) + goto cleanup; + + ret = libbpf_probe_bpf_kfunc(100000, kfunc_id, 0, 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_GT(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); +}