From patchwork Wed Feb 12 15:28:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13971936 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 75A3E212F89; Wed, 12 Feb 2025 15:28:26 +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=1739374107; cv=none; b=oV/4gY0s3e7CBUXKXEvTeimD/ShXqyaUwR2QoJuQdqtUeT6HaHi4gDzsyHhi3ZNKmVkMYyLeNkR/Zzi+v5cGlZDP2Nb2ZXuriNvr/2HJvOyOh+IBcNa398LgC0OAY4+G9vUq5el0Sfe7rx+m8sJubgGF9yKtOkUYQBSWzsTe3jc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739374107; c=relaxed/simple; bh=gLL6cpzIFJVIxqPRHnNpi8sbyg8IQoOBomtsQRhVUVU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=YaGdS0mCySvYOF5OIDSt+Re1apw6jprQMHqMp+855nRV4pelMPztaFEjOI8Qrn5ThsfDGuzLHuUIrqY9YzUy/qIvEfnUIViWF5TUiZdNQUhDUwWqctc03avuh+GSdDmZmoVxpXXfaGYQQlxJe14H1pzB07/B59eaCdMcgx+Duso= 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=VyAnq2X0; 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="VyAnq2X0" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21f40deb941so152855025ad.2; Wed, 12 Feb 2025 07:28:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739374106; x=1739978906; 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=Jomb4wbCL0aIqDd/8vp4O87PbPEncfEiumc5w8RJl5s=; b=VyAnq2X0SlVP40oWCMpl/+fLF7YixFIjyE39AgPkLi8DNgAsYEispgToRfHYCERovB PbQ90ijVEuy4tZ8GHAHoDrl0DmTuuICdPI48y0MjeFlQVL4plq4KSf+Ck1QT6soR0gdL EAtpfxl6lcg7w2DSWB1X5G2nnsD3RjfGmyn/XwRLMobhl7OjIzNcP5XPbmTuR/EhAWPV 0ccclYWtXVQGGPAitCY7HGYInMd4gtvKthpa9OqSA0H1hKz8f5QiqJzFsL0qd0cAzl8E qszsnu0UJ8OPV0U4oB1x/MJ+Dfcnpgm0fUnTYU/0H7JUEG/32eLDZNh9q4xKZFOQL0LX l0Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739374106; x=1739978906; 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=Jomb4wbCL0aIqDd/8vp4O87PbPEncfEiumc5w8RJl5s=; b=oRL12yTfR5Nqeq20ddoFqJjvzquhau48dk2Cygf1unQpfJ5KyXsaLBZwA01XFtApsJ vOS/pUZ3NDChAT6RXQsMA/k5/kak3TPlAbfl3ieGndp5aMDaHU4EjFspo2sjP263a/2o mbVf7a4a79Fx01HvyAqRiEapN0dEsYu9ff8Hehu2aP0AjmPrNuJpJ0NSBbDHipUdiCy8 7JEm2g75o23GPpsIHvZGuH2qiKgjWJGz0yWYi2p7czijd8X/zduqkkIppZaPLUAwqpcm Q07L4xyN8+kPeW5Mkxr0VJjOtVPfIzJTE8he+hxZ+k7j88EXE9ankzSugoiMvuXpZKGB 2ziQ== X-Forwarded-Encrypted: i=1; AJvYcCUb8abFhw8Nqf9sfdbaJOWcaRtbKq9lBwlDyvn/pxKqYe/U9NOCCnwqzS4kfXNurK0waNrhWUEwZloRshQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yy89IG8UFTEtTUzIaIc30Abce/7iw2gAVfBSYTeipQHu8P7bMlP bpyoeWdvYAo92z6oDLPEdUBX5SP9wPotWdM9spYQI+8aPqd4wOzYF+u1QA== X-Gm-Gg: ASbGncsOexnVa3/qXwkgetCzSTKcpGUwuAYqsdl6h26jL9tXJS791ziwOpCTju2rrj3 pyfa2P6rsUwn64P9IQzx7jCeYDa9tJRSWcipB6svJ5p7nRWmDmzWvzeefUff+hRj8xLkO4ROn4W bySSyVacUMNF1MLbsQ5VYEo6oJIRJJ9YcsUy3Z++oRXzOANbL1E1+7Vm2xbGsAdW9JoeFtoxHw4 5wWDOPoQZ6qLiLeeej/SOiIDFwbcoOk/pi10W9cENMDHpLhuyBzPC0kS3/9fa6K2n37bOFU1dPP xRzVFBk5NeaA3oyJ X-Google-Smtp-Source: AGHT+IFQfgv6uXsnkEnIadjynJGLMCuOLTKPpteafRNKBPHJqVl7S8uzYOsVxGC/xA/OrfP3vVVWsA== X-Received: by 2002:a17:903:1790:b0:21f:1bd:efcb with SMTP id d9443c01a7336-220bbab3b89mr47548055ad.7.1739374105613; Wed, 12 Feb 2025 07:28:25 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2faa4ae549asm955547a91.0.2025.02.12.07.28.24 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Feb 2025 07:28:25 -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 v7 1/4] libbpf: Extract prog load type check from libbpf_probe_bpf_helper Date: Wed, 12 Feb 2025 23:28:13 +0800 Message-Id: <20250212152816.18836-2-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250212152816.18836-1-chen.dylane@gmail.com> References: <20250212152816.18836-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}. Cc: Tao Chen Reviewed-by: Jiri Olsa Signed-off-by: Tao Chen --- tools/lib/bpf/libbpf_probes.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/tools/lib/bpf/libbpf_probes.c b/tools/lib/bpf/libbpf_probes.c index 9dfbe7750f56..a48a557314f6 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: - return -EOPNOTSUPP; - default: - break; - } + if (!can_probe_prog_type(prog_type)) + return libbpf_err(-EOPNOTSUPP); buf[0] = '\0'; ret = probe_prog_load(prog_type, insns, insn_cnt, buf, sizeof(buf)); From patchwork Wed Feb 12 15:28:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13971937 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 6176C21480C; Wed, 12 Feb 2025 15:28:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739374110; cv=none; b=Un8HxbPWuY5HybfLYHXDzXO/iHfg1Dan/T7CpBnVS+8MYgWZxTbZwXggMzOKRP+uVbxiRjFfaCh0hXGi6z2Nd7nmLvTDGpceJ6tmpVaIKg461oJ3ORogu19uk6pAhMiCkONwzek3jTeh7aJBID1Hk/PfNtoLrflThgf1s4b6Tm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739374110; c=relaxed/simple; bh=GXHrpcBGYYSxfi1bUkNZ3mqnK2UL/YlYnu1roKqXTXE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=tbagEe/gLiXCxSF0CdEOhS+qFIwUNSAfX7M2dDFFr2OT9oxkd7w/8w7uaxYPYSRl6C1xxIK0L5ICSrNAhFHxOMlo92ho2GNN2sEf/+xnP3k3F2LgUSozXS8uJwH8eFXawuZkMcSVhnM4ErGGyflTrj8dDUOvP5gZ6E4YwTdFhIE= 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=HU7d0V3g; arc=none smtp.client-ip=209.85.216.42 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="HU7d0V3g" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2fa8ac56891so5047673a91.2; Wed, 12 Feb 2025 07:28:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739374108; x=1739978908; 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=oZRBusg5nwul/y+QfaedcB8PtE5Z6y1mNX2a6kofVKs=; b=HU7d0V3g1NNNPtWSS51/6jVvvhAbVPNk3YbgqWiYxGBmPUd+Zl6KeWOI2DcOzRplMP A6yQLk+ZFl4zG4eL5TqtPX4UT5xeCcjpy/bViMPSFEMC5/7CT3qnYMPR2B9YCBg4B1Zc 8Wwcg4G3klzv++4bWbdIpKEZ14w4ypxbPNEFowlassrzbc8455lTIpEcDBl+5PGf+LRf q7EGQBdojgFtldEyJv3J2zfXfKUCTne9NPENjDgB/Q5wbZHOgU8rYYcHrYhIMAg1v9Nh vzLcI4kuO+WsE8ZAtFXao9+5BhwUef7WDgpxGYfyGc4V1XkwcL17HTjz6Csen1WagzfW e3Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739374108; x=1739978908; 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=oZRBusg5nwul/y+QfaedcB8PtE5Z6y1mNX2a6kofVKs=; b=O1a5nRI2C+F3TPzAu6bqE3aEY0R50eHpWX19GBaAna9Pa0ErINczaWtBcQ3soFwCH6 1Ur7Cu8Lao4FRZ6sH8EfKz5J+5BJQv6uuFrQeKoYurx1wvHOhDkoYmEqg/kEJOBTfYK6 k+9lAMQaPeuicvQaJkwqsbEI7OwzIgN/hCzcCw2SnN0C1O4HpwQS15KSojoMrAJ/cBB/ gm5fGWx2j2hyFfGpIBK947A4ERxC8aq4i2pVcA0qP7/497hy+BTyhmKdTAkBtWl0/rUZ l12envWdgMuUpvtb7W1plpYqI+Iiq13SiyobqcNBwVvsQ3XqQAx96FIGiqAXSj+Y11fA UIgA== X-Forwarded-Encrypted: i=1; AJvYcCVnpDvoKF0jvYduBmTSqk1LnP/SNuqWCsfKMFn9pUH3ZXWlDiAqVl85kNVSTEvA65WL6Td96Ny2rOGzyyg=@vger.kernel.org X-Gm-Message-State: AOJu0YwwUgChHKMtXzqYV4kgl635fspcux2sM54nvsc1JLO5gmcgCrJL t4HxW1m2NSqlOIEA7XDAVbhski12korCPov44FI6vG4+/Y3CFHIB X-Gm-Gg: ASbGnct+6moRAaIwOXrekYqP83w9Gl71et0A8/2BWjakYyL9v2mYFY6FcjfvnoOsUPH +A62kfElVLsxj8VdehDWHU2ixo8a3rmFRNeKlYIf4mRi4JVBmXrfTbArxd6Ii5ib22WK8PAB7/O demZzVSLik79U1iN9mL5N/vCTGT8le4XfvUNHSx3mu+VUWeDKOLIgZClHothdgXN4aKG6C5ibSD UMxqjNR0Mc3+Ul6BmC+LsWkfQcdObULaHl9KgEpznhZ20Msa2OorbQn1gAVHEPLHDAMcuEF0RI5 5N6K2hdB3LMSI/Pa X-Google-Smtp-Source: AGHT+IHV2VCsmSW2Vya40DeA/6X3s5Jh2PwDfpve7vkbYj+GlAzNknA9Z1XM8L1fdpQdJG7j1fflEA== X-Received: by 2002:a17:90b:5203:b0:2ee:f22a:61dd with SMTP id 98e67ed59e1d1-2fbf5c6ac86mr5031836a91.32.1739374108479; Wed, 12 Feb 2025 07:28:28 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fbf98b7b20sm1766627a91.17.2025.02.12.07.28.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Feb 2025 07:28: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, Tao Chen Subject: [PATCH bpf-next v7 2/4] libbpf: Init fd_array when prog probe load Date: Wed, 12 Feb 2025 23:28:14 +0800 Message-Id: <20250212152816.18836-3-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250212152816.18836-1-chen.dylane@gmail.com> References: <20250212152816.18836-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. Cc: Tao Chen Reviewed-by: Jiri Olsa 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 a48a557314f6..de2b1205b436 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 libbpf_err(-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 Wed Feb 12 15:28:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13971938 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 33BE621420D; Wed, 12 Feb 2025 15:28:31 +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=1739374113; cv=none; b=F8jrfOOX4jD6/8XlrsqjNF6bsmOuBR6S1ym48/XHwyeAtpwT9zJ2V+uyj0wTLy/c40X4HfaC34yzTjjzpurRate4s2QSO/9IbV0m9WzGkxEz+oWPLpygFmc2L46YWfdO+VLpQT3IVbNCu0amxeiALhfsWAa3JyKfdSwM5I0mDC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739374113; c=relaxed/simple; bh=SAlGx2iFfKFLV+6jqVb8YsK0T0SSuWkKjvfLNn3A74w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=kP7aGYlO5TPgzNjX0zvBMjeUaWGHjXdNOnQ1hfbXBO7Bc147C0eGnGlyeOQH7HgelkTH4cIZ/0gm6Kdk5Y1ebZTnWr2kAx/9u6+A+I8vlMw/LjCJ4erQVcxbfkpzWtAHaS64WBC+aqqBRwOObuNBzjmvNfbH2XLSzEdt/Kden1g= 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=R4SNJdsA; 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="R4SNJdsA" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21f7f03d856so75724515ad.1; Wed, 12 Feb 2025 07:28:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739374111; x=1739978911; 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=BMwtErlgo9xeVFzj4w9zN8R+1ggkY6ZchTiZDGPxOh8=; b=R4SNJdsAGG2h1tdtwxtkyQ5DFCSIJng80DXWzsQFaLZ49LZC83ScCG6dobyJNQhylG 8VoJ3sWm1BPkilLmBTqM7b9nz2mriuW6zyPy18joxM2Na6mAIBtn5sbYkQBoE+Nyw7G/ BOWVc49zinO4b+H52mj5MX0zutZPG/dXISDEr7RzitTUvebuWv/3mquuZw0DLYNCUTnK FFGx/3m/v8EUYSNXtQU6c/oVEORd6272RfehR9+TXVBVBia2Del9Ntn4bLvGKG0DlcrB RyHl/uta/HyimmUYA4rQVNKDlX36DuGyH+1CjUdL9+3MPCFMhje0ZcZgGZ2OVUSboUnp ASlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739374111; x=1739978911; 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=BMwtErlgo9xeVFzj4w9zN8R+1ggkY6ZchTiZDGPxOh8=; b=lMOljty/a5ZaC+cNEIYAo6f2YhUpLvHjiyB3otuRm27COkLgsng6iVdUvQ+ThTOSSP zHHxc7/qYtFMFl7mTNon9zeGBSK33s6RuPseJ7qNArRxGnmSvZsDp5bJbw7LqDgyGBj6 cj3kR63vHe++P1yeDykt8mSvc6/IKtCda7pnQ7PVm7KHrTTUpJ8xk74Pv4vGFTH1Af1w u+2I4pKM55g1R62oraAxdEwnmouYKcAJ58/Z/+QGTwNIZ+RNYF0KPlJ5MYfaaavogBT4 SXCBlzORQDqAaNkFmGgtjgHY1FL96Mt/9la9bj2SAQXhraUTdF/1ewqEa2DhfGu/9ju4 /pUg== X-Forwarded-Encrypted: i=1; AJvYcCWs414/dFPyiJvS2ottdehhMAs5OXtcwu2BZjbuq1EL6dJmQvLcQk+e4Chdr6+KrDYMGKUjjIn1jbfv8+0=@vger.kernel.org X-Gm-Message-State: AOJu0YwLwFtmK+7eic2yXHvmIN+1KrFDCR2/xR3ufSoM/zny0ephxGEt zsrrgYIJ+7XqjST2KcoD8UjBjhSe9tm1av/crx0YEKjxrYpGxd0K X-Gm-Gg: ASbGnctPIOC8Xk2ZoGSt8nuFlyXyus9U3cYsV9aGdmY0pQoehrJOesNEXEbCKiP9T53 FIUYN0nIE3ODxppNyLjCOaEBcVwdA5VexMlKKfLWHzCtHKds+Ht4FDSHAlSj6Uu8wBLrp2XxNlj 6qlsvJtYWpJ59rcWeIqDx3fFUOJUXI50QARHOrFZuG8Awm183u922b9To6h+cqY5Z+k0IVgFc1z 7XxJfVLFBexFEzcm9tWsgKVLs6xUcz5Zd6Z8jxADtaPt+79umkV+55GTII+n7MsQF5O/1j08xLn pC/xIw5/1BB2kbIi X-Google-Smtp-Source: AGHT+IFsWymtupYXq0NtoFvAPPvj/Vr/yPiT5QaMGZWGu4ZnDAZ2KfxfLAWQ7yJTIPbmI72Fp6vNFQ== X-Received: by 2002:a17:902:e545:b0:215:72aa:693f with SMTP id d9443c01a7336-220bbab37aemr58456405ad.9.1739374111283; Wed, 12 Feb 2025 07:28:31 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220cb6aeefasm2792705ad.63.2025.02.12.07.28.30 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Feb 2025 07:28:30 -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 v7 3/4] libbpf: Add libbpf_probe_bpf_kfunc API Date: Wed, 12 Feb 2025 23:28:15 +0800 Message-Id: <20250212152816.18836-4-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250212152816.18836-1-chen.dylane@gmail.com> References: <20250212152816.18836-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 Reviewed-by: Jiri Olsa Signed-off-by: Tao Chen --- 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..c79b4475b956 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 < 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 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 de2b1205b436..49e520cc99b4 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 libbpf_err(-EOPNOTSUPP); + + if (btf_fd >= 0) + fd_array[1] = btf_fd; + else + /* insn.off = 0, means vmlinux btf */ + insns[0].off = 0; + + 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 (ret > 0) + return 1; /* assume supported */ + + /* If BPF verifier recognizes BPF kfunc but it's not supported for + * given BPF program type, it will emit "calling kernel function + * is not allowed", if the kfunc id is invalid, + * it will emit "kernel btf_id 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 (strstr(buf, "not allowed") || strstr(buf, "not a function") || + (strstr(buf, "invalid module BTF fd")) || + (strstr(buf, "negative offset disallowed"))) + return 0; + + return 1; +} + int libbpf_probe_bpf_helper(enum bpf_prog_type prog_type, enum bpf_func_id helper_id, const void *opts) { From patchwork Wed Feb 12 15:28:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Chen X-Patchwork-Id: 13971939 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 00ACE24C679; Wed, 12 Feb 2025 15:28:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739374116; cv=none; b=qa8uBB7qk2LtOAB6i7qIidKyTKeHN5WFdHEOHK6Rvr6WX2OOtUHZgx6F/n87gtmMsIXqUTnagihmkiqPu7fwercRGvuigIkMtnpfmlIqU6XShCyTMNVbtBJ8WC4bgnc1fif4zV4t7OfphVYhdMzddznrfutTaegpAJH+d/8udBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739374116; c=relaxed/simple; bh=YsiNlyiHQ9d6W2tDHYhJHKwP2PsIzM6e+uSXKvMPjI4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=PKzR0P/9EXwsb6cqcg0KUZoJbTC8Ia+g5QCkZYu20RWYkSJEal2J2BHK/bYV5QNwfd8VVYCkW9JYn7V+h9KH5b/RAHnSwT+mLgpszUOdqgWBLwasREPuwl3+A6MwesNQ6qoyGXaO3ER6bOFnXOxiu5ePVBnMGZhdrqQfOFpXO5I= 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=hy3ARH4x; arc=none smtp.client-ip=209.85.214.176 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="hy3ARH4x" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-219f8263ae0so125186735ad.0; Wed, 12 Feb 2025 07:28:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739374114; x=1739978914; 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=j+dEqt7IhqX28nFJ8Lafm8We0lyyX8DlOy63dc5352Q=; b=hy3ARH4xPO2rioGw4YSuI90+zjwCSZTXgKbLjCNgmvon1OoiishBMke5jpwajegzn6 pfzNZW26s9pgLCKZKp+GU6w0No87G1qfka0yrtJqaHEaLK1Yn9Jl0GOxF+yONDTA4D+w d8IRV77ejmA6vCDiLvLBoaiFSjatYHTaNP/RaupkrDWk4U4yoI3KNHdUjTes1wXpc3RF ktQQnwC5XPzd2CdeiVToML2Bcy8lNVEKDwiFf1Zaib0zIkAD92/e2t47ppsknrWF49EV QJbY/22BDkaJtP2kus/I73fNTpz6h+L8ZluhlLaPJTgichF5awoPOPKmuRHNKLHFPA2S 9Osw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739374114; x=1739978914; 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=j+dEqt7IhqX28nFJ8Lafm8We0lyyX8DlOy63dc5352Q=; b=rYrsYqmh3fRqtkiyP8QAnudV2zx2dc6wIRpSgcdZh3L7FfMjN1IB2MFEbPdZ3HcZQk qvWlLbYEsTHRvkTnO4e+IF3Vw1hOSA0PFJ6sRqazoAc9vo55VUiHj2C7A5p+KiMoC1lR gusDzkWzi0usS3QAGGoBvtynSE4nzlLOigVpMi5oH+HdpR2gFNrghDPkMsDsu512Fg0n Z65I/WTyHZfKcdI5UsuTLgGDPgGxLksOP02OaH0jB1anqBG8pvJGdvqIoJRPSMwyLty9 XOdH45jL+cSy+mVcPL18Uo4cXF496zA5LhrWJMCOkfTa9xeukGkP50j8nc9MbSJ6LMT6 e2QQ== X-Forwarded-Encrypted: i=1; AJvYcCXOTEmBEPlINYgULYwMLPrlMvERCsQRPxZZvtBhk0QOX+gj6obwZkL2D/MoBlg2L8BNp016D7v2ecFCtpk=@vger.kernel.org X-Gm-Message-State: AOJu0YyKVVb8ecrqg0ThvQqtvf6TELpKxP5XS2LgxXMk0Eq+VbfWOfdK MVwoQoeGqYgNBfdbcM6gjwJoWVbS3fI52gBsSuR3Tfc0MDrZngjR X-Gm-Gg: ASbGnctEsjXG1Z0nNdkSuyVtxiqoouysjIRKg4yX1MEQcFU191El89gYWqjEoXvU5Gp en5xEp02oshAukCBbSxxOiX95oKR7UfNs0MeigvLvjSyQMKL0U784XvhxGLPW6ltBin71jNwAMf VPmiBz0mnQ+NyYf36Q0F/JobRz5lffNfO7cZxvWtrODNg081d7vhA2YiUwp3AS9CCBZKfg/WX5x L6scLCWlKkYmn6iSrQ7/8UvcJk1Xtc92OOyFkCyojQz2/lqpkicBOoTMiRFKHilOMLV9CMHhNJz RfqeN4xE/McM58fA X-Google-Smtp-Source: AGHT+IFRQAKpLCs4B5ITEvW85jYEiiaO7YsbKMAHs0d1bJXhm//DqA/UV9+RoOaZAMiTNt05J2jr+A== X-Received: by 2002:a17:902:d512:b0:215:bb50:6a05 with SMTP id d9443c01a7336-220bbab103bmr46847975ad.9.1739374114082; Wed, 12 Feb 2025 07:28:34 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f36511237sm114878525ad.2.2025.02.12.07.28.33 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Feb 2025 07:28:33 -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 v7 4/4] selftests/bpf: Add libbpf_probe_bpf_kfunc API selftests Date: Wed, 12 Feb 2025 23:28:16 +0800 Message-Id: <20250212152816.18836-5-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250212152816.18836-1-chen.dylane@gmail.com> References: <20250212152816.18836-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 Cc: Tao Chen Reviewed-by: Jiri Olsa 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..d8f5475a94ce 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); +}