From nobody Mon Feb 9 21:18:43 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 708F61A8F8E; Mon, 10 Feb 2025 06:00:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739167211; cv=none; b=V3b8DZLloG41RS0mjmrOx3ghsK5iRMNXkI6dMTkKaZVldjKwAYgTFOeCq748fRwcxSGQty0TKcn7fJoq0Ui+xcTqB8QnJ4ivzOTcUFaySA8A0vptMRlbS+ZY8Q1ANMdc+s3ysMhzoRgDEb49x44h0Vz73DeCUFupindFDDeEPBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739167211; c=relaxed/simple; bh=a4ECPYDwfk63dHhyrW+wHnNNRmnBF5bgFkDjFdSmp2Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=EFEF5KsCwmkOa0qNFYSQhI41bfwnvX29I62cKpcfxZpL/kDXEXeKvP5FczJ6196h4QV3CKyv8jimyHMZf4U3dUGEK/0DoqTcCBkGYIO3om8WhN7iBf8lLoyJzCiM488gEWTUDJAsRl6hmR4ms/Fu6FBrxt4nPkPw9pYiY4mG23Y= 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=KFIkO2hO; arc=none smtp.client-ip=209.85.216.50 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="KFIkO2hO" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2fa0f222530so7298451a91.0; Sun, 09 Feb 2025 22:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739167210; x=1739772010; 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=KFIkO2hOkqTlCrLq/S4dOOZnGMUrQImc93i336Ead+IAJOPImYmgGvbX7JUVNQ4i01 +0BYhbLNkeWnGhmI7NX0R3y2ex+h7o/hJKxLmuEyd3EARk1yrK0plxCL6B5H/zxlKN2Y r2tiVIaclrUeYD0iI9UC+dVY+7juvIzN+GrM+JpPp4xZ553nJf6u+SVapybvT3OXYzMJ 3FfoWt0YM3cd0yaN61PAuVkEO5+kaPRTDJYzD1Ihv4Jws/3taIqVpBFrT/uvpAzTeveq Cq4Mq1G15mup/xKsjJqhFEMjL/Tk6J7N0VIb/0DEqtQVCn08WKV1XHrRUn53bMfcimQO TBwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739167210; x=1739772010; 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=W9vl3s58DR5XjQr1R5t05lXLn/5eEsmDBEer7/YKMtP1PW6Zp+kA+zPM0ltbcdVYXj 8FCBekRQxM9i6UFODVk3o/njKKpIPix6h43wzbvruhGNjyMp+XC0OBeUJxDZeKSR8wrt xPFtmd/w0W46dpvHxU4a32esDZFbIlb9MHcgsRJyXcXrS8QoVzTwXSFFlZ4aCP+et2og MKNSniIWR94GdEQu2EXNcdsF4jiFK24Ammjr6kTeAXIiUDAyQxCBqH+m9wytDQxI4Aon nRJ/V+rKxwfKvqdLUlFrFh4h2Qvzze5DuHzwJy3NdZR9KjPdaD34ohfWeoiR8ybvl20l wA8Q== X-Forwarded-Encrypted: i=1; AJvYcCVyX+NLqf06y8PrmtHo9LT5FzjAUtAVSM6ctTY/boUVh3yiXIUbzJjifT5EggyPAWXqpjzjhGWRij90W+Q=@vger.kernel.org X-Gm-Message-State: AOJu0YyyQHRu601rvTPowy4dcT6boEFf7EcekCpBEsSlO/K2C/I3he16 JCw8dmDcbZHmfs0LCdFwIG32l2/z1zbr0dpIUB/Ltu6Mj9vrF/mZ X-Gm-Gg: ASbGncuCxdBzNnUUdVQ/gRUQDOS6lwGngWzYMfO6BIDcR3xIjnCa0RX319FS9nOwcg9 jdiFWeyj8TFHHs74L/k8vx8+XLIJzvARJXlHo4gARlcZSCQQMJLwlf/EHka3LyH1drI+XMxNGhR VikFr9jtRfxBYdJOQkCDt+0RwTUFE2TRJx+31CUE8SrjOMGg+XHpfoxL7ARbw7LZ3G964F8/aL3 NZK8RF85HcQfGUwKyJEtzQQHS/KeHTdEz5vDHn7OAgbGScAHo9RlfR+Z9Y9iApszYNNSR9PhHyQ T/s3uNmNi2XkKDkN X-Google-Smtp-Source: AGHT+IHA4z2IgOPPasPSgVPIyJo5HZe1oRWA5x5B52aNFPs0Of2D/sJuZ1ciasAmOyZjy4nTc6TxpA== X-Received: by 2002:a17:90b:510e:b0:2ee:70cb:a500 with SMTP id 98e67ed59e1d1-2fa23f563b2mr17621444a91.1.1739167209573; Sun, 09 Feb 2025 22:00:09 -0800 (PST) Received: from localhost ([111.229.209.227]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fa2716c1ecsm5872099a91.25.2025.02.09.22.00.08 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Feb 2025 22:00: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 v5 2/4] libbpf: Init fd_array when prog probe load Date: Mon, 10 Feb 2025 13:59:43 +0800 Message-Id: <20250210055945.27192-3-chen.dylane@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250210055945.27192-1-chen.dylane@gmail.com> References: <20250210055945.27192-1-chen.dylane@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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) =20 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 =3D log_buf, .log_size =3D log_buf_sz, .log_level =3D log_buf ? 1 : 0, + .fd_array =3D fd_array, + .fd_array_cnt =3D fd_array_cnt, ); int fd, err, exp_err =3D 0; const char *exp_msg =3D 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); =20 - ret =3D probe_prog_load(prog_type, insns, insn_cnt, NULL, 0); + ret =3D probe_prog_load(prog_type, insns, insn_cnt, NULL, 0, NULL, 0); return libbpf_err(ret); } =20 @@ -448,7 +451,7 @@ int libbpf_probe_bpf_helper(enum bpf_prog_type prog_typ= e, enum bpf_func_id helpe return -EOPNOTSUPP; =20 buf[0] =3D '\0'; - ret =3D probe_prog_load(prog_type, insns, insn_cnt, buf, sizeof(buf)); + ret =3D probe_prog_load(prog_type, insns, insn_cnt, NULL, 0, buf, sizeof(= buf)); if (ret < 0) return libbpf_err(ret); =20 --=20 2.43.0