Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2434088imm; Mon, 28 May 2018 08:02:29 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrltp/o5sb809SaJWwUdgLmnyFBn2jhdEJcEtT3wVPO0MoTaSo5lEUpNov5e80n+6HMksLO X-Received: by 2002:a17:902:a986:: with SMTP id bh6-v6mr14223432plb.245.1527519749223; Mon, 28 May 2018 08:02:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527519749; cv=none; d=google.com; s=arc-20160816; b=NoypT2X3fwXjxGRHe4kUmSZfk5R00AlwX0KK5Y5nYjavGCbkvNWFlUdgxSpylweadR K7hc62HyPz6JmVKHZoxTXX4qF2M5Q+jbYqlpzdAh5EYGHlWkoMCBfdgN8wRn1EBMw+9w r86tkHUHzZAdwgNsdw15TsAmMKpz0UGZ+u9Bvapb9LAionk1/nOfuuH7nXcvNgCcPLYO oIwr9IWTm3Ay571p3A1fVw9MHHsv8N74IefM5IXlc6fm5R9GiudPaePFYclI57gpGH2q N2CIP7Gao579jmRcMLaCLKlngxJzcgbLJYXDBMJtBVDaGAcCTVZeKnip7pz3Splc4flY /tow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=9IGbq/0TbBILz8NvEhBH6ruJ0YDqMOyPLaTw7+4gDIM=; b=R5ssCUQ+zpqt35G5ayY5qxOqJnHH1U9IqCdN2XPhB2tYWyMEFq5qaonEdvoyd1ph+D CSGKNxSiQQ/xxqJMrR9E+4C6VANVfh13c+uZ2mg650/gv8jf57OSasVaOvY5WHeBBNR0 aheLrDNfLOEBqqImJPb1ypKnMvg9r2OnaZsVqh25rp2hSQ/MX/E4+/Qc+xT3AxBUFpTH NjyWw9R4snWJzLZVUWItXfSXDl2A6/zVsmNdWNlhpna2YupW1s/AxBHnrcvZMl3dH2Lx 4gVPXb1a3BL/fFjL8Se8kfBmBRm40c80og6h9fIjhwKbDpT9dcTKUJ6gyO8sXIt41Q0x Ae2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VKzi+2Ry; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a12-v6si30392108plp.225.2018.05.28.08.02.05; Mon, 28 May 2018 08:02:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VKzi+2Ry; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939534AbeE1O7z (ORCPT + 99 others); Mon, 28 May 2018 10:59:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:45744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1034143AbeE1K0Y (ORCPT ); Mon, 28 May 2018 06:26:24 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8D0C220843; Mon, 28 May 2018 10:26:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527503183; bh=WxTgUTQKmV+4CULtcL6sFxHPEpgb8EQ1+UYAv6Envcs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VKzi+2RyFg090fc65PLMHDRQZk14VqnY8SaZv+UMl9qmrrrAaFl4kEwMtuGfHgWa9 0Fi07eCTJqbCmqhR8Dgv5gwW5VccCNYtCSrdQrXyiLDbzoGr+7oqNugnjrYTmXlcuX vJ5cttcZ7R+JUDmPz0mzOJL5qIS2UfwBztoOhxy0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Olsa , "Naveen N. Rao" , Alexander Shishkin , David Ahern , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 4.4 257/268] perf tests: Use arch__compare_symbol_names to compare symbols Date: Mon, 28 May 2018 12:03:51 +0200 Message-Id: <20180528100232.119293158@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100202.045206534@linuxfoundation.org> References: <20180528100202.045206534@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiri Olsa [ Upstream commit ab6e9a99345131cd8e54268d1d0dc04a33f7ed11 ] The symbol search called by machine__find_kernel_symbol_by_name is using internally arch__compare_symbol_names function to compare 2 symbol names, because different archs have different ways of comparing symbols. Mostly for skipping '.' prefixes and similar. In test 1 when we try to find matching symbols in kallsyms and vmlinux, by address and by symbol name. When either is found we compare the pair symbol names by simple strcmp, which is not good enough for reasons explained in previous paragraph. On powerpc this can cause lockup, because even thought we found the pair, the compared names are different and don't match simple strcmp. Following code path is executed, that leads to lockup: - we find the pair in kallsyms by sym->start next_pair: - we compare the names and it fails - we find the pair by sym->name - the pair addresses match so we call goto next_pair because we assume the names match in this case Signed-off-by: Jiri Olsa Tested-by: Naveen N. Rao Acked-by: Naveen N. Rao Cc: Alexander Shishkin Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Fixes: 031b84c407c3 ("perf probe ppc: Enable matching against dot symbols automatically") Link: http://lkml.kernel.org/r/20180215122635.24029-10-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/perf/tests/vmlinux-kallsyms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/perf/tests/vmlinux-kallsyms.c +++ b/tools/perf/tests/vmlinux-kallsyms.c @@ -126,7 +126,7 @@ int test__vmlinux_matches_kallsyms(void) if (pair && UM(pair->start) == mem_start) { next_pair: - if (strcmp(sym->name, pair->name) == 0) { + if (arch__compare_symbol_names(sym->name, pair->name) == 0) { /* * kallsyms don't have the symbol end, so we * set that by using the next symbol start - 1,