From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=91.218.175.213 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794233355; b=vHO1J872yZwJ4mGTXyFydGLuaIwGevADVTBuSDnLSo/hdeBZita+k9PrKhCEdvrFNdF0 UGj87K9zwJMJwhksdrUF/R+nkYlallNwqIuN6xABgoQfD0iD1RBirrJueyh/5VX7L0C5l m9YhWv09bUU0d21LMz8X8I+CCL5JMw1+MAF2hAUXMnL6Eg/6VdkD1Yia1bpjL0k2a8cmd GFcHspJ/4uVg6e4cqm/tgaiojchIIk6X41bG265uDVw0OkRNSIy6olT9FqJbcAE1+CBOy 2d8geAUlHcn8fvdwO8JaR5hos56DNYWK+Lbud99YMiJjhNsR2hVnjYDH9PxFBLxBncA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794233355; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=iQ50Z8GrZdVWvlWB3gtz0AyrON7bR4KOzGZo59Q0ECI=; b=N8DWBd08l1uNobTyPC6fIdJVNiTwyR/HLO1T8yyXtq03mc81x8zU1YB7ieFy4ARqAhYq 1EMqx4iD5wnvS/YuFmvGyWN22Dg4oNzcH0zdnaZBZGstms5JFIl2E8ocCDJcMDL9S+wUy qUgsIgu4zR3JqQHtfHJi2V68lrpg8cnEdRAwiWNYEN35th8psV11zvdq7Dr2cj2gmN3xP Wlzm9kAPMixJTIX0sWbKQe+2o7SkkrcWjIPCk8+epfBRsyKAo0vr3wVHr6/ZEgCzhoUR3 +MDyitcRgY2n4ukMeANHgjbV+JogiK81FBo1DaJqjU0C4o945MAgCRh/5rAR47Va2Sg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=U7FEH9b3; arc=none smtp.remote-ip=91.218.175.213 Received: from mta0.migadu.com (out-213.mta0.migadu.com [91.218.175.213]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4408B606A33B for ; Mon, 9 Nov 2026 14:09:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4408B606A33B Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=U7FEH9b3 X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=eInuAVUPIVJ9rBRgFXv1dy5BH1QgCtuQ2/F9w6eAqww=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1794233353; v=1; x=1794838153; b=U7FEH9b3omA+VvEanH6hiqgA/eWVuZVRl3XkFcaEhHle9eK0HYCaoSs/98ZjFShLw+5kX5/u bDxKBHbJzayUfBzGxCun3Fa8bPqnHN3rNfh1JgTBNhk5BFwQz9kmJ0AWa4BYCy0qXS/Jz+KNW5g SxtazHX3mzWy9GSb08uzNnbA= X-Envelope-To: linux-kernel@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 7db8cf0a1ec2ca8c; Mon, 09 Nov 2026 14:09:13 +0000 X-Mizu-Trace-ID: 7db8cf0a1ec2ca8c X-Migadu-Flow: FLOW_OUT From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , John Fastabend , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , KP Singh , Matt Bobrowski , Shuah Khan , Leon Hwang , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH bpf-next 5/9] libbpf: Add log_opts support for BPF_TRACE_ITER Date: Mon, 9 Nov 2026 22:08:12 +0800 Message-ID: <20261109140816.5196-6-leon.hwang@linux.dev> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261109140816.5196-1-leon.hwang@linux.dev> References: <20261109140816.5196-1-leon.hwang@linux.dev> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add iter.info and iter.len to pass iterator information separately from log_opts. Keep the existing iter_info and iter_info_len fields working for callers that do not request logs. Thereafter, log_opts can work for iter link_create. Signed-off-by: Leon Hwang --- tools/lib/bpf/bpf.c | 17 +++++++++++------ tools/lib/bpf/bpf.h | 8 ++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 38dcb31e8c0e..174a8bfaf663 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -808,11 +808,6 @@ int bpf_link_create(int prog_fd, int target_fd, if (iter_info_len && attach_type != BPF_TRACE_ITER) return libbpf_err(-EINVAL); - if (iter_info_len) - iter_info = OPTS_GET(opts, iter_info, (void *)0); - else - log_opts = OPTS_GET(opts, log_opts, (void *)0); - /* validate we don't have unexpected combinations of non-zero fields */ if (iter_info_len || target_btf_id) { if (iter_info_len && target_btf_id) @@ -821,6 +816,16 @@ int bpf_link_create(int prog_fd, int target_fd, return libbpf_err(-EINVAL); } + if (iter_info_len) { + if (OPTS_GET(opts, iter.len, 0)) + return libbpf_err(-EINVAL); + iter_info = OPTS_GET(opts, iter_info, (void *)0); + } else { + log_opts = OPTS_GET(opts, log_opts, (void *)0); + iter_info = OPTS_GET(opts, iter.info, (void *)0); + iter_info_len = OPTS_GET(opts, iter.len, 0); + } + memset(&attr, 0, attr_sz); attr.link_create.prog_fd = prog_fd; attr.link_create.target_fd = target_fd; @@ -970,7 +975,7 @@ int bpf_link_create(int prog_fd, int target_fd, return libbpf_err(-EINVAL); break; default: - if (!OPTS_ZEROED(opts, iter_info_len)) + if (!OPTS_ZEROED(opts, log_opts)) return libbpf_err(-EINVAL); break; } diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index fe3b7fd8512b..2ac143fd1102 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -422,6 +422,10 @@ union bpf_iter_link_info; /* defined in up-to-date linux/bpf.h */ struct bpf_link_create_opts { size_t sz; /* size of this struct for forward/backward compatibility */ __u32 flags; + /* + * iter_info and iter_info_len are deprecated, use iter.info and + * iter.len instead. + */ union { union bpf_iter_link_info *iter_info; struct bpf_log_opts *log_opts; @@ -478,6 +482,10 @@ struct bpf_link_create_opts { const __u64 *cookies; __u32 cnt; } tracing_multi; + struct { + union bpf_iter_link_info *info; + __u32 len; + } iter; }; size_t :0; }; -- 2.55.0