From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61E5C14A8B for ; Mon, 1 Jun 2026 10:38:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780310296; cv=none; b=IfTek/8yAglTvAlTzOUfe3K5ncreu8vmSSv/2sJVDMmb0OOIZSnlAVSYH3HxY7iMDS3REM37qNkzq1Xl+QWdHOQez7eXP1kHfXVXX3vmopJ/TbSlCgiNkvCaj4anD/8MCdjEDMbskpJCjlVKnvVzeCdYQ0xfgklfOUKl+KPUWjk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780310296; c=relaxed/simple; bh=9zTKLOrBaBfb7rXDrouZjbdJh1GWx+t84YmyF01xAak=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RwGxpR0cWa9COZrsPR+3yrk8jlByAqv1j10oPMpbNGHIjId0unVC35WVpve87u6OWlNJgE+ibSd+AOqxrrkrIUt/YH9rUJ4J3WryoClQTpDeoajcRODsmdt0ffdeaBXqdB9owDEUmsObUhGVlskawsYnimnYaBrpY55zwOzdlWg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=DuSpsJXY; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="DuSpsJXY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Qk zF3FH14JuFuqxvp4oNTnJ+JC7maDG1wh1WF8cGG5M=; b=DuSpsJXYr9aupMtUpT Ottl3whOzNmHk16wXLLtPDVwL0Uo9qi8QkN8gazMggilVeaPLCRxFtydFf8bOue9 FM8+7Dc/EaNvCvdRehC43+0YEQTSpk8N3TOtEWo5jYvsshH5dZDpkOPIkLvplMzn BpHTgvefSKlxrcHTYj7YY2vvY= Received: from localhost.localdomain (unknown []) by gzsmtp2 (Coremail) with SMTP id PSgvCgDnb0EAYR1qVFYYHQ--.59767S4; Mon, 01 Jun 2026 18:37:55 +0800 (CST) From: Cao Ruichuang To: Steven Rostedt Cc: linux-trace-devel@vger.kernel.org, Tzvetomir Stoyanov , Emil Thorsoe , Cao Ruichuang Subject: [PATCH 2/2] libtraceevent utest: Avoid host-specific getname_flags output Date: Mon, 1 Jun 2026 18:37:50 +0800 Message-Id: <20260601103750.68805-3-create0818@163.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260601103750.68805-1-create0818@163.com> References: <20260601103750.68805-1-create0818@163.com> Precedence: bulk X-Mailing-List: linux-trace-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:PSgvCgDnb0EAYR1qVFYYHQ--.59767S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFWrXFyDWw13XrW3ZryDAwb_yoW5JFWfpF navF13KF4DJF43Xw43Cr1akr4ay3yvyFy2y3s3XayF9FWYgry7trs5uFyYvr4rGFZ5uasx Aa4j9r4rCF1xXFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zMFApUUUUUU= X-CM-SenderInfo: pfuht3jhqyimi6rwjhhfrp/xtbC5wM6c2odYQMTFAAA3- test_btf_read() loads /sys/kernel/btf/vmlinux and expects getname_flags() to print exactly two arguments: getname_flags(filename=0x7ffe7d33f3d0, flags=0) That prototype is not stable across kernels. On a Rocky Linux 9.7 system, the kernel BTF for getname_flags() has a third parameter named empty, and tep_btf_print_args() correctly prints it. Keep the exact output check for hosts that match the expected prototype. For hosts that append extra getname_flags() BTF parameters after the expected arguments, treat that host-specific suffix as an acceptable variant only if the output still has the expected argument prefix and a complete closing suffix. Fixes: 0294b73f17e9 ("libtraceevent utest: Add simple test to test BTF parsing") Assisted-by: Codex:gpt-5.5 Signed-off-by: Cao Ruichuang --- utest/traceevent-utest.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/utest/traceevent-utest.c b/utest/traceevent-utest.c index b93d686..04f6726 100644 --- a/utest/traceevent-utest.c +++ b/utest/traceevent-utest.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -529,10 +530,21 @@ static int read_full(int fd, void *buf, size_t size) return 0; } +static bool output_has_extra_args(const char *output, const char *prefix) +{ + size_t len = strlen(output); + size_t plen = strlen(prefix); + + return len > plen + 3 && strncmp(output, prefix, plen) == 0 && + output[plen] == ',' && strcmp(output + len - 2, ")\n") == 0; +} + static void test_btf_read(void) { uint64_t args[] = {0x7ffe7d33f3d0, 0, 0, 0, 0, 0}; const char *func = "getname_flags"; + const char *expected = "getname_flags(filename=0x7ffe7d33f3d0, flags=0)\n"; + const char *expected_prefix = "getname_flags(filename=0x7ffe7d33f3d0, flags=0"; struct trace_seq *s = test_seq; struct stat st; void *buf; @@ -582,7 +594,13 @@ static void test_btf_read(void) trace_seq_puts(s, ")\n"); trace_seq_terminate(s); - CU_TEST(strcmp(s->buffer, "getname_flags(filename=0x7ffe7d33f3d0, flags=0)\n") == 0); + if (strcmp(s->buffer, expected) != 0 && + output_has_extra_args(s->buffer, expected_prefix)) { + printf("[KERNEL BTF HAS EXTRA getname_flags ARGS] ..."); + return; + } + + CU_TEST(strcmp(s->buffer, expected) == 0); } static int test_suite_destroy(void) -- 2.39.5 (Apple Git-154)