[5.4,45/50] libbpf: Fix readelf output parsing for Fedora

Message ID	20200508123049.261521656@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=PqvE=6W=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Justin Forbes <jmforbes@linuxtx.org>, Thadeu Lima de Souza Cascardo <cascardo@canonical.com>, Alexei Starovoitov <ast@kernel.org>, Andrii Nakryiko <andriin@fb.com>, Aurelien Jarno <aurelien@aurel32.net> Subject: [PATCH 5.4 45/50] libbpf: Fix readelf output parsing for Fedora Date: Fri, 8 May 2020 14:35:51 +0200 Message-Id: <20200508123049.261521656@linuxfoundation.org> In-Reply-To: <20200508123043.085296641@linuxfoundation.org> References: <20200508123043.085296641@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,02/50] drm/bridge: analogix_dp: Split bind() into probe() and real bind() [5.4,03/50] ASoC: topology: Check return value of soc_tplg_create_tlv [5.4,05/50] ASoC: topology: Check soc_tplg_add_route return value [5.4,08/50] selftests/ipc: Fix test failure seen after initial test run [5.4,12/50] ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode [5.4,13/50] ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode [5.4,14/50] ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry [5.4,16/50] drm/amdgpu: Correctly initialize thermal controller for GPUs with Powerplay table v0 ... [5.4,20/50] ASoC: rsnd: Dont treat master SSI in multi SSI setup as parent [5.4,22/50] cifs: protect updating server->dstaddr with a spinlock [5.4,23/50] scripts/config: allow colons in option strings for sed [5.4,29/50] net: systemport: suppress warnings on failed Rx SKB allocations [5.4,31/50] sctp: Fix SHUTDOWN CTSN Ack in the peer restart case [5.4,33/50] Revert "software node: Simplify software_node_release() function" [5.4,34/50] lib: devres: add a helper function for ioremap_uc [5.4,35/50] mfd: intel-lpss: Use devm_ioremap_uc for MMIO [5.4,36/50] hexagon: clean up ioremap [5.4,37/50] hexagon: define ioremap_uc [5.4,41/50] platform/x86: GPD pocket fan: Fix error message when temp-limits are out of range [5.4,43/50] mac80211: add ieee80211_is_any_nullfunc() [5.4,44/50] cgroup, netclassid: remove double cond_resched [5.4,45/50] libbpf: Fix readelf output parsing for Fedora [5.4,47/50] Revert "drm/amd/display: setting the DIG_MODE to the correct value." [5.4,50/50] PM / devfreq: Add missing locking while setting suspend_freq

Message ID

20200508123049.261521656@linuxfoundation.org

State

Superseded

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Justin Forbes <jmforbes@linuxtx.org>,
	Thadeu Lima de Souza Cascardo <cascardo@canonical.com>,
	Alexei Starovoitov <ast@kernel.org>, Andrii Nakryiko <andriin@fb.com>,
	Aurelien Jarno <aurelien@aurel32.net>
Subject: [PATCH 5.4 45/50] libbpf: Fix readelf output parsing for Fedora
Date: Fri,  8 May 2020 14:35:51 +0200
Message-Id: <20200508123049.261521656@linuxfoundation.org>
In-Reply-To: <20200508123043.085296641@linuxfoundation.org>
References: <20200508123043.085296641@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Greg KH May 8, 2020, 12:35 p.m. UTC

From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

commit aa915931ac3e53ccf371308e6750da510e3591dd upstream.

Fedora binutils has been patched to show "other info" for a symbol at the
end of the line. This was done in order to support unmaintained scripts
that would break with the extra info. [1]

[1] https://src.fedoraproject.org/rpms/binutils/c/b8265c46f7ddae23a792ee8306fbaaeacba83bf8

This in turn has been done to fix the build of ruby, because of checksec.
[2] Thanks Michael Ellerman for the pointer.

[2] https://bugzilla.redhat.com/show_bug.cgi?id=1479302

As libbpf Makefile is not unmaintained, we can simply deal with either
output format, by just removing the "other info" field, as it always comes
inside brackets.

Fixes: 3464afdf11f9 (libbpf: Fix readelf output parsing on powerpc with recent binutils)
Reported-by: Justin Forbes <jmforbes@linuxtx.org>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Link: https://lore.kernel.org/bpf/20191213101114.GA3986@calabresa
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 tools/lib/bpf/Makefile |    2 ++
 1 file changed, 2 insertions(+)

--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -145,6 +145,7 @@  PC_FILE		:= $(addprefix $(OUTPUT),$(PC_F
 
 GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \
 			   cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
+			   sed 's/\[.*\]//' | \
 			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
 			   sort -u | wc -l)
 VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \
@@ -217,6 +218,7 @@  check_abi: $(OUTPUT)libbpf.so
 		     "versioned in $(VERSION_SCRIPT)." >&2;		 \
 		readelf -s --wide $(BPF_IN_SHARED) |			 \
 		    cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' |	 \
+		    sed 's/\[.*\]//' |					 \
 		    awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'|  \
 		    sort -u > $(OUTPUT)libbpf_global_syms.tmp;		 \
 		readelf -s --wide $(OUTPUT)libbpf.so |			 \

[5.4,45/50] libbpf: Fix readelf output parsing for Fedora

Commit Message

Patch