From patchwork Sun Dec 4 21:14:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 16382 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF3A5C4332F for ; Sun, 4 Dec 2022 21:14:48 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.138978.1670188482740131149 for ; Sun, 04 Dec 2022 13:14:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=CcTLAtQH; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: reatmon@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2B4LEehY012172; Sun, 4 Dec 2022 15:14:40 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1670188480; bh=tNN2I2Z+CCaULPw/FaXQUHL/8c9YQvlQSJCzf4CUDL0=; h=From:To:Subject:Date; b=CcTLAtQHHUgZN/yjB4xRt3bxpD/UqDsI8+gcUv0dz+ma01+hVvNzCW9LkN3sIvBW1 KsTbV8w6AttO4UJOZ3B2aDET953FFLiCVpJtaHCGe98VV1GbuVYIeXZxCfyDaDe+C0 NFiTLruBS2hvKHMJeQJ/t8LM1jg/HksWcwyK8V74= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2B4LEdkd077050 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Sun, 4 Dec 2022 15:14:40 -0600 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Sun, 4 Dec 2022 15:14:39 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Sun, 4 Dec 2022 15:14:39 -0600 Received: from uda0214219 (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2B4LEdXV070641; Sun, 4 Dec 2022 15:14:39 -0600 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1p1wJr-0002QF-Fk; Sun, 04 Dec 2022 15:14:39 -0600 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][master][PATCH] linux-ti-staging: Clean up init_disassemble_info() patch Date: Sun, 4 Dec 2022 15:14:39 -0600 Message-ID: <20221204211439.9271-1-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 04 Dec 2022 21:14:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15402 There were fuzz errors with the patch that needed to be cleaned up, and for some reason a v2 that was supposed to move the duplicate patches in files/ was not pushed properly before merging. Signed-off-by: Ryan Eatmon --- ...ture-changes-causes-compile-failures.patch | 8 +- ...ture-changes-causes-compile-failures.patch | 109 ------------------ ...ture-changes-causes-compile-failures.patch | 109 ------------------ 3 files changed, 4 insertions(+), 222 deletions(-) rename meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-5.10 => files}/init_disassemble_info-signature-changes-causes-compile-failures.patch (92%) delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch b/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch similarity index 92% rename from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch rename to meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch index a8054125..33dee03a 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch +++ b/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch @@ -75,7 +75,7 @@ diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 308189454788..6573d2b07548 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c -@@ -1685,6 +1685,18 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil +@@ -1685,6 +1685,18 @@ #include #include @@ -92,7 +92,7 @@ index 308189454788..6573d2b07548 100644 +} + static int symbol__disassemble_bpf(struct symbol *sym, - struct annotate_args *args) + struct annotate_args *args) { @@ -1727,7 +1739,8 @@ static int symbol__disassemble_bpf(struct symbol *sym, goto out; @@ -102,8 +102,8 @@ index 308189454788..6573d2b07548 100644 + (fprintf_ftype) fprintf, + fprintf_styled); - info.arch = bfd_get_arch(bfdf); - info.mach = bfd_get_mach(bfdf); + info.arch = bfd_get_arch(bfdf); + info.mach = bfd_get_mach(bfdf); -- 2.17.1 diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch deleted file mode 100644 index a8054125..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch +++ /dev/null @@ -1,109 +0,0 @@ - -Adaption of a patch [A] applied to meta-arm for the kernel. But since TI has it's own -kernel we have to "adjust" the patch to match our files. - -[A] https://patchwork.yoctoproject.org/project/arm/patch/20220824025819.4888-1-jon.mason@arm.com/#5104 - -Signed-off-by: Ryan Eatmon - - - -From 1b2013986271de39360cf79e62ed9b7d2cc59f9b Mon Sep 17 00:00:00 2001 -From: Andres Freund -Date: Wed, 22 Jun 2022 11:19:18 -0700 -Subject: [PATCH] init_disassemble_info() signature changes causes compile - failures -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Hi, - -binutils changed the signature of init_disassemble_info(), which now causes -perf and bpftool to fail to compile (e.g. on debian unstable). - -Relevant binutils commit: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac - -util/annotate.c: In function ?symbol__disassemble_bpf?: -util/annotate.c:1765:9: error: too few arguments to function ?init_disassemble_info? - 1765 | init_disassemble_info(&info, s, - | ^~~~~~~~~~~~~~~~~~~~~ -In file included from util/annotate.c:1718: -/usr/include/dis-asm.h:472:13: note: declared here - 472 | extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream, - | ^~~~~~~~~~~~~~~~~~~~~ - -with equivalent failures in - -tools/bpf/bpf_jit_disasm.c -tools/bpf/bpftool/jit_disasm.c - -The fix is easy enough, add a wrapper around fprintf() that conforms to the -new signature. - -However I assume the necessary feature test and wrapper should only be added -once? I don't know the kernel stuff well enough to choose the right structure -here. - -Attached is my local fix for perf. Obviously would need work to be a real -solution. - -Greetings, - -Andres Freund ---- - -binutils 2.39 changed the signature of init_disassemble_info(), -which now causes perf and bpftool to fail to compile. - -Relevant binutils commit: [1] - -There is a proper fix in development upstream[2]. -This is a work-around for older kernels. - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac -[2] https://patchwork.kernel.org/project/netdevbpf/cover/20220801013834.156015-1-andres@anarazel.de/ - -Upstream-Status: Pending -Signed-off-by: Anton Antonov - - - tools/perf/util/annotate.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c -index 308189454788..6573d2b07548 100644 ---- a/tools/perf/util/annotate.c -+++ b/tools/perf/util/annotate.c -@@ -1685,6 +1685,18 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil - #include - #include - -+static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) -+{ -+ va_list args; -+ int r; -+ -+ va_start(args, fmt); -+ r = vprintf(fmt, args); -+ va_end(args); -+ -+ return r; -+} -+ - static int symbol__disassemble_bpf(struct symbol *sym, - struct annotate_args *args) - { -@@ -1727,7 +1739,8 @@ static int symbol__disassemble_bpf(struct symbol *sym, - goto out; - } - init_disassemble_info(&info, s, -- (fprintf_ftype) fprintf); -+ (fprintf_ftype) fprintf, -+ fprintf_styled); - - info.arch = bfd_get_arch(bfdf); - info.mach = bfd_get_mach(bfdf); --- -2.17.1 - diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch deleted file mode 100644 index a8054125..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/init_disassemble_info-signature-changes-causes-compile-failures.patch +++ /dev/null @@ -1,109 +0,0 @@ - -Adaption of a patch [A] applied to meta-arm for the kernel. But since TI has it's own -kernel we have to "adjust" the patch to match our files. - -[A] https://patchwork.yoctoproject.org/project/arm/patch/20220824025819.4888-1-jon.mason@arm.com/#5104 - -Signed-off-by: Ryan Eatmon - - - -From 1b2013986271de39360cf79e62ed9b7d2cc59f9b Mon Sep 17 00:00:00 2001 -From: Andres Freund -Date: Wed, 22 Jun 2022 11:19:18 -0700 -Subject: [PATCH] init_disassemble_info() signature changes causes compile - failures -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Hi, - -binutils changed the signature of init_disassemble_info(), which now causes -perf and bpftool to fail to compile (e.g. on debian unstable). - -Relevant binutils commit: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac - -util/annotate.c: In function ?symbol__disassemble_bpf?: -util/annotate.c:1765:9: error: too few arguments to function ?init_disassemble_info? - 1765 | init_disassemble_info(&info, s, - | ^~~~~~~~~~~~~~~~~~~~~ -In file included from util/annotate.c:1718: -/usr/include/dis-asm.h:472:13: note: declared here - 472 | extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream, - | ^~~~~~~~~~~~~~~~~~~~~ - -with equivalent failures in - -tools/bpf/bpf_jit_disasm.c -tools/bpf/bpftool/jit_disasm.c - -The fix is easy enough, add a wrapper around fprintf() that conforms to the -new signature. - -However I assume the necessary feature test and wrapper should only be added -once? I don't know the kernel stuff well enough to choose the right structure -here. - -Attached is my local fix for perf. Obviously would need work to be a real -solution. - -Greetings, - -Andres Freund ---- - -binutils 2.39 changed the signature of init_disassemble_info(), -which now causes perf and bpftool to fail to compile. - -Relevant binutils commit: [1] - -There is a proper fix in development upstream[2]. -This is a work-around for older kernels. - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac -[2] https://patchwork.kernel.org/project/netdevbpf/cover/20220801013834.156015-1-andres@anarazel.de/ - -Upstream-Status: Pending -Signed-off-by: Anton Antonov - - - tools/perf/util/annotate.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c -index 308189454788..6573d2b07548 100644 ---- a/tools/perf/util/annotate.c -+++ b/tools/perf/util/annotate.c -@@ -1685,6 +1685,18 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil - #include - #include - -+static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) -+{ -+ va_list args; -+ int r; -+ -+ va_start(args, fmt); -+ r = vprintf(fmt, args); -+ va_end(args); -+ -+ return r; -+} -+ - static int symbol__disassemble_bpf(struct symbol *sym, - struct annotate_args *args) - { -@@ -1727,7 +1739,8 @@ static int symbol__disassemble_bpf(struct symbol *sym, - goto out; - } - init_disassemble_info(&info, s, -- (fprintf_ftype) fprintf); -+ (fprintf_ftype) fprintf, -+ fprintf_styled); - - info.arch = bfd_get_arch(bfdf); - info.mach = bfd_get_mach(bfdf); --- -2.17.1 -