Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp2499591imm; Mon, 24 Sep 2018 05:31:21 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaTUih3IjQimvtgJfpVWaFZ5zJSZC5MfRhys0LjulnVVGKbqllTPwqtjkJRXJzNo2IwuOwv X-Received: by 2002:aa7:8118:: with SMTP id b24-v6mr10235758pfi.78.1537792281393; Mon, 24 Sep 2018 05:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537792281; cv=none; d=google.com; s=arc-20160816; b=DOmHeAcUGQqOgFtgClvFti+56Qe4tc1lkTovMvo3FT/aq4OU8aA3F+5+UQd7ly3NTn xWtln8GfsrLDChpfk3TTF0TyhTkQrTVbEOeodFgX+TLQ79iqLatwaC/O3myPW0MA4V3F 1gbCxyXy7ZTbx5Qp7+enXAVA9KUAcOI8t0kiWCLRP+VSo/VMi5+cxaJO9NO2Oa5F1fJZ hN+pJd9IKrGRt/3ftPg1t/+9orr5vR9fqI8QdK5696EPM0Xm+RrGvVv1wq6YT66HVdYZ +ZKiu8+h8SIlS20bRNt7WLhPtmwsO0Psinn6I8gCxbdiv4XayW2CAzzsZkaGXhSASM7m R2lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from; bh=te9c9Oaix8+6awexZrVu9malyVdpOaQFxe4tIyG3Tkg=; b=tqqTae4HjjKNKg7t+cWGvTfa+lV0VnpA57RXy1I3pfMXnLv0dAR5cliXlVgRPotY27 gsgHfykiP/pLU6yKA8my+fq0LRZ42ViKCZwXkTmluc7H3sJBQKFiTV/qJFHZvDy5LVPY YBdUk6eNBgtdPQ/DETbCCBBVRreuAFMV95UHFU/oYEDmRACTMMOh4mNPPqTPrg1ldu3y V+LVS1zF/kv2wTzKW5Stn/tGt3pk3TgPp9MgA/gbf4DZl2FOt+RtS8M6hg3tyuD1D8/Q 8ar0I/Wq45bURKPw9GELA19RKCP9lNgEHfjKiScRHJSv+Ptf8E95i3FVtIx/qWNu3jat jwvw== ARC-Authentication-Results: i=1; mx.google.com; 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 j9-v6si1543176plt.442.2018.09.24.05.31.05; Mon, 24 Sep 2018 05:31:21 -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; 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 S2387793AbeIXSbo (ORCPT + 99 others); Mon, 24 Sep 2018 14:31:44 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:57698 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733082AbeIXSbn (ORCPT ); Mon, 24 Sep 2018 14:31:43 -0400 Received: from localhost (ip-213-127-77-73.ip.prioritytelecom.net [213.127.77.73]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 207AB1099; Mon, 24 Sep 2018 12:29:48 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ravi Bangoria , Sandipan Das , Jiri Olsa , Maynard Johnson , "Naveen N. Rao" , Ravi Bangoria , Sukadev Bhattiprolu , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 4.18 055/235] perf powerpc: Fix callchain ip filtering when return address is in a register Date: Mon, 24 Sep 2018 13:50:41 +0200 Message-Id: <20180924113110.601961298@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180924113103.999624566@linuxfoundation.org> References: <20180924113103.999624566@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sandipan Das [ Upstream commit 9068533e4f470daf2b0f29c71d865990acd8826e ] For powerpc64, perf will filter out the second entry in the callchain, i.e. the LR value, if the return address of the function corresponding to the probed location has already been saved on its caller's stack. The state of the return address is determined using debug information. At any point within a function, if the return address is already saved somewhere, a DWARF expression can tell us about its location. If the return address in still in LR only, no DWARF expression would exist. Typically, the instructions in a function's prologue first copy the LR value to R0 and then pushes R0 on to the stack. If LR has already been copied to R0 but R0 is yet to be pushed to the stack, we can still get a DWARF expression that says that the return address is in R0. This is indicating that getting a DWARF expression for the return address does not guarantee the fact that it has already been saved on the stack. This can be observed on a powerpc64le system running Fedora 27 as shown below. # objdump -d /usr/lib64/libc-2.26.so | less ... 000000000015af20 : 15af20: 0b 00 4c 3c addis r2,r12,11 15af24: e0 c1 42 38 addi r2,r2,-15904 15af28: a6 02 08 7c mflr r0 15af2c: f0 ff c1 fb std r30,-16(r1) 15af30: f8 ff e1 fb std r31,-8(r1) 15af34: 78 1b 7f 7c mr r31,r3 15af38: 78 23 83 7c mr r3,r4 15af3c: 78 2b be 7c mr r30,r5 15af40: 10 00 01 f8 std r0,16(r1) 15af44: c1 ff 21 f8 stdu r1,-64(r1) 15af48: 28 00 81 f8 std r4,40(r1) ... # readelf --debug-dump=frames-interp /usr/lib64/libc-2.26.so | less ... 00027024 0000000000000024 00027028 FDE cie=00000000 pc=000000000015af20..000000000015af88 LOC CFA r30 r31 ra 000000000015af20 r1+0 u u u 000000000015af34 r1+0 c-16 c-8 r0 000000000015af48 r1+64 c-16 c-8 c+16 000000000015af5c r1+0 c-16 c-8 c+16 000000000015af78 r1+0 u u ... # perf probe -x /usr/lib64/libc-2.26.so -a inet_pton+0x18 # perf record -e probe_libc:inet_pton -g ping -6 -c 1 ::1 # perf script Before: ping 2829 [005] 512917.460174: probe_libc:inet_pton: (7fff7e2baf38) 7fff7e2baf38 __GI___inet_pton+0x18 (/usr/lib64/libc-2.26.so) 7fff7e2705b4 getaddrinfo+0x164 (/usr/lib64/libc-2.26.so) 12f152d70 _init+0xbfc (/usr/bin/ping) 7fff7e1836a0 generic_start_main.isra.0+0x140 (/usr/lib64/libc-2.26.so) 7fff7e183898 __libc_start_main+0xb8 (/usr/lib64/libc-2.26.so) 0 [unknown] ([unknown]) After: ping 2829 [005] 512917.460174: probe_libc:inet_pton: (7fff7e2baf38) 7fff7e2baf38 __GI___inet_pton+0x18 (/usr/lib64/libc-2.26.so) 7fff7e26fa54 gaih_inet.constprop.7+0xf44 (/usr/lib64/libc-2.26.so) 7fff7e2705b4 getaddrinfo+0x164 (/usr/lib64/libc-2.26.so) 12f152d70 _init+0xbfc (/usr/bin/ping) 7fff7e1836a0 generic_start_main.isra.0+0x140 (/usr/lib64/libc-2.26.so) 7fff7e183898 __libc_start_main+0xb8 (/usr/lib64/libc-2.26.so) 0 [unknown] ([unknown]) Reported-by: Ravi Bangoria Signed-off-by: Sandipan Das Cc: Jiri Olsa Cc: Maynard Johnson Cc: Naveen N. Rao Cc: Ravi Bangoria Cc: Sukadev Bhattiprolu Link: http://lkml.kernel.org/r/66e848a7bdf2d43b39210a705ff6d828a0865661.1530724939.git.sandipan@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/tools/perf/arch/powerpc/util/skip-callchain-idx.c +++ b/tools/perf/arch/powerpc/util/skip-callchain-idx.c @@ -58,9 +58,13 @@ static int check_return_reg(int ra_regno } /* - * Check if return address is on the stack. + * Check if return address is on the stack. If return address + * is in a register (typically R0), it is yet to be saved on + * the stack. */ - if (nops != 0 || ops != NULL) + if ((nops != 0 || ops != NULL) && + !(nops == 1 && ops[0].atom == DW_OP_regx && + ops[0].number2 == 0 && ops[0].offset == 0)) return 0; /*