From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 6D49F32F77D for ; Thu, 6 Nov 2025 13:20:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762435223; cv=none; b=js73t5IITa3JGoEWnRQhkwzKDz7D5V+DBKzgb2sqLfb2euvjgC4o0EVLRoGJyCHRet+NYIBx+1RZmSo+L/ykZQhhntCrZLJ195jRHtme/JDucZDIDVfwVv32fcjmTW94fjR97MNnbY+dAvjy8OW9hMUFn34/flKFd22NPblAkKs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762435223; c=relaxed/simple; bh=/C7lP1Yq/5ogUMjkgaXSCCkh4BcomIYuobmhyRXlXAA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GL1eud0afkqCAGxtn4qeAZ+7OQ9wadQWmeMvpitt6qm8wCXewGSjblQoaBpLADhdrHhgpwptKm/PwuSqGPeW4ae767BbLzGaiQ33vyfN3nusBnm5mtdP/V5UoCtr+zqwyVR1YPe6K1iEU+1n3S5nS46cVHJBOi8Z66sr7r7QCbA= 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=G+Yy114T; arc=none smtp.client-ip=209.85.216.41 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="G+Yy114T" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-34077439166so1062299a91.2 for ; Thu, 06 Nov 2025 05:20:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762435220; x=1763040020; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XmRxjb3TYj5YoPOI2P5uBjXYSAdjGF3zYPhjRb8AdXU=; b=G+Yy114T7D/+7G3pukGkxBhrifshlWR8Jbj0HHBo7W6BjvxNmaS6N1eyRCa4gb/wJe uwNAvIKccqQcXdzi3FxzTYlSaH9dsirxL2Cl/XK/uNHPZMmX0NaP6day0PEpjG7gAzWo 2hOgO1tKSm10O+eFJ8eOWtHgk6XJf035h5Pl0+BgbLJ0aJa5sn49AVvS8KSjhbs4HfJQ n4xSzZVX4T3mTCaWOSMHq2NCr48H5Irc3WXc0GmyhvJHgybXwWHv2opJNegxIfj2Xt9t wuBDTTscvwIJ4DQiR8h6na+Y4FNVUgfdZgepbt2sRt84oZN78tv1RevQikUPKk4G1O/D 17QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762435220; x=1763040020; h=content-transfer-encoding:mime-version: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=XmRxjb3TYj5YoPOI2P5uBjXYSAdjGF3zYPhjRb8AdXU=; b=OjPsPV+nR5VwlLqDp0vEZXuuLQxRSPRJno1TjYAYvG74vZdz6bz1o5O3MPuA9MonY8 v1dTpAOEbsdnelfmpc7rfD5gZ9liWvth3zD7T48dR1v/mhEYWpfrbzcw3Lqbw551KND3 WeXdyA15KEfK15cnB8uzaQaD0nfyxXr0nlYS9Evu8VYfOrKerYjHAvvy1EgcV5IlboG7 rU1K7YlCv2dXaq5m776ui14umCilGzf7h6WOtxys9AJRtwM2Nl24OZW9FmJ1kzZD83fa 9McxDPp5XnSq/ssjARFfmG/D1mxv7IeET/E6u78jTzjbZNMPTbMIg34lZWzciWRI8yjW Y7Qw== X-Forwarded-Encrypted: i=1; AJvYcCWYRcsKFo/QgtbvUeR6rf2op/yFhZ9r+cOUYzTMhdSwdtqF3F7yYhSFXwXh2ZyHWmUjX6E=@vger.kernel.org X-Gm-Message-State: AOJu0YxF8ph7iSoiwBCVQ2QupHJIZnVI/80v4DZ2zIb9HQ9Uu8a8huef QUCK2DCofxyDuBNjyzDUS5ZQAir+cvnWNxPHWHuFIR90PlQlPjJ3enB8 X-Gm-Gg: ASbGncsl+KDfAXiUHjsFnyaEaabQ45ixm/hxA/mLBB01W8+Sl5JXB4hi+qsifETFCYo PfNOkuWflnVOizQPMU+EjCpgz2pBCQQH1aETnYpFYVHT8eW2LO5sCw6NMFrpYJdJYojN9pF34su rXef+3TTBt/1tFC3g8S/qgyPC7YGB1GIKqK4NuiysTOJfZ3svR5u0oWJqUCiGyNJ/R8nwrThqpf wgyThU98/m2XjnEAR6Z7PKyzavaxDxwRH0eyYh0XKyGcYzRUi9jydgbnflkQ+UQ/j5hajIXmIsF E35oTv8CS87Mzpkv6fsJnYupSJsybSwQdM3j+QclnAMS9tkik9tlhRe/ysLIPMB4i3LtGGy60Kd E1dFPgJOLnm1TOoS893mjMKJOuOasZeUa2DMi2SpXcuhnEDdw19YbbZKVky1c4E3E5hqSO1h202 H9Pe+/4mlJFnZEwnv+ X-Google-Smtp-Source: AGHT+IGVdYS7PgIVP1pHCtuED1Z22PNW48lpWxrAamOrC3ebNLKDkO1COF/nQxHRmrAxURN7NQuBSQ== X-Received: by 2002:a17:90b:5250:b0:32e:38b0:15f4 with SMTP id 98e67ed59e1d1-341a6c00d22mr10400975a91.7.1762435220286; Thu, 06 Nov 2025 05:20:20 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-341d3e0b0b2sm1914869a91.21.2025.11.06.05.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 05:20:19 -0800 (PST) From: Donglin Peng To: ast@kernel.org Cc: eddyz87@gmail.com, andrii.nakryiko@gmail.com, zhangxiaoqin@xiaomi.com, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Donglin Peng , Alan Maguire , Song Liu , Donglin Peng Subject: [PATCH v5 1/7] libbpf: Extract BTF type remapping logic into helper function Date: Thu, 6 Nov 2025 21:19:50 +0800 Message-Id: <20251106131956.1222864-2-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251106131956.1222864-1-dolinux.peng@gmail.com> References: <20251106131956.1222864-1-dolinux.peng@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Donglin Peng Refactor btf_dedup_remap_types() by extracting its core logic into a new btf_remap_types() helper function. This eliminates code duplication and improves modularity while maintaining the same functionality. The new function encapsulates iteration over BTF types and BTF ext sections, accepting a callback for flexible type ID remapping. This makes the type remapping logic more maintainable and reusable. Cc: Eduard Zingerman Cc: Alexei Starovoitov Cc: Andrii Nakryiko Cc: Alan Maguire Cc: Song Liu Cc: Xiaoqin Zhang Signed-off-by: Donglin Peng Signed-off-by: Donglin Peng Reviewed-by: Eduard Zingerman --- tools/lib/bpf/btf.c | 63 +++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 18907f0fcf9f..0c1dab8a199a 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -3400,6 +3400,37 @@ int btf_ext__set_endianness(struct btf_ext *btf_ext, enum btf_endianness endian) return 0; } +static int btf_remap_types(struct btf *btf, struct btf_ext *btf_ext, + type_id_visit_fn visit, void *ctx) +{ + int i, r; + + for (i = 0; i < btf->nr_types; i++) { + struct btf_type *t = btf_type_by_id(btf, btf->start_id + i); + struct btf_field_iter it; + __u32 *type_id; + + r = btf_field_iter_init(&it, t, BTF_FIELD_ITER_IDS); + if (r) + return r; + + while ((type_id = btf_field_iter_next(&it))) { + r = visit(type_id, ctx); + if (r) + return r; + } + } + + if (!btf_ext) + return 0; + + r = btf_ext_visit_type_ids(btf_ext, visit, ctx); + if (r) + return r; + + return 0; +} + struct btf_dedup; static struct btf_dedup *btf_dedup_new(struct btf *btf, const struct btf_dedup_opts *opts); @@ -5320,37 +5351,7 @@ static int btf_dedup_remap_type_id(__u32 *type_id, void *ctx) */ static int btf_dedup_remap_types(struct btf_dedup *d) { - int i, r; - - for (i = 0; i < d->btf->nr_types; i++) { - struct btf_type *t = btf_type_by_id(d->btf, d->btf->start_id + i); - struct btf_field_iter it; - __u32 *type_id; - - r = btf_field_iter_init(&it, t, BTF_FIELD_ITER_IDS); - if (r) - return r; - - while ((type_id = btf_field_iter_next(&it))) { - __u32 resolved_id, new_id; - - resolved_id = resolve_type_id(d, *type_id); - new_id = d->hypot_map[resolved_id]; - if (new_id > BTF_MAX_NR_TYPES) - return -EINVAL; - - *type_id = new_id; - } - } - - if (!d->btf_ext) - return 0; - - r = btf_ext_visit_type_ids(d->btf_ext, btf_dedup_remap_type_id, d); - if (r) - return r; - - return 0; + return btf_remap_types(d->btf, d->btf_ext, btf_dedup_remap_type_id, d); } /* -- 2.34.1