From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DA70C2D0CE for ; Sun, 29 Dec 2019 18:06:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1B1C20722 for ; Sun, 29 Dec 2019 18:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642790; bh=pY5RMKT8cgvlRPtL4xg+luLIwlAVdWKVgAjk5DNaUYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mzTbIxdtm6nhNPMTPepuHVphMcJ6avPK0GSze6tHX9/whO7rpJYqcNe+M5paMyThZ GCQZdJ1GIFAZ/Io+DoRFAjgarrC7lPEbUB8fQKNeYHL7SC3AbkjduLLbkxMAGOU2gy mqZw3Yc61CdnuFLZohclrcS6BmUvvbGyIUEVuCIs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731703AbfL2Rtr (ORCPT ); Sun, 29 Dec 2019 12:49:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:33726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731699AbfL2Rtp (ORCPT ); Sun, 29 Dec 2019 12:49:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 926F1206A4; Sun, 29 Dec 2019 17:49:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641785; bh=pY5RMKT8cgvlRPtL4xg+luLIwlAVdWKVgAjk5DNaUYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bgnyl2QiF72bnma+jwfGkhU3JZQsx4A3vVoN6hI2XncgXwcUeYmd7urIPGP4ehIN9 cPZp/ta5jiLQVo+qgAvV7+By58cT+e8azpNNdATi+TmdLfTv79mxH3t5tm7ZIqz8DH cO5polCKxFQDniAfPyk6aDLPlvgI1+pvaWeVXBQo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Leoshkevich , Vasily Gorbik , Sasha Levin Subject: [PATCH 5.4 210/434] s390: add error handling to perf_callchain_kernel Date: Sun, 29 Dec 2019 18:24:23 +0100 Message-Id: <20191229172715.778459235@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@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 List-ID: X-Mailing-List: stable@vger.kernel.org From: Ilya Leoshkevich [ Upstream commit effb83ccc83a97dbbe5214f4c443522719f05f3a ] perf_callchain_kernel stops neither when it encounters a garbage address, nor when it runs out of space. Fix both issues using x86 version as an inspiration. Signed-off-by: Ilya Leoshkevich Signed-off-by: Vasily Gorbik Signed-off-by: Sasha Levin --- arch/s390/kernel/perf_event.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/s390/kernel/perf_event.c b/arch/s390/kernel/perf_event.c index fcb6c2e92b07..1e75cc983546 100644 --- a/arch/s390/kernel/perf_event.c +++ b/arch/s390/kernel/perf_event.c @@ -224,9 +224,13 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) { struct unwind_state state; + unsigned long addr; - unwind_for_each_frame(&state, current, regs, 0) - perf_callchain_store(entry, state.ip); + unwind_for_each_frame(&state, current, regs, 0) { + addr = unwind_get_return_address(&state); + if (!addr || perf_callchain_store(entry, addr)) + return; + } } /* Perf definitions for PMU event attributes in sysfs */ -- 2.20.1