Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp148103ybe; Thu, 5 Sep 2019 19:19:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqxRRotthz2tF0khnc8njDhyz0R9B2tABsWZz0kVdwx6oSUdqSwrQ1+VnnnV/E1oMUA8acNv X-Received: by 2002:aa7:8498:: with SMTP id u24mr7877399pfn.61.1567736350329; Thu, 05 Sep 2019 19:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567736350; cv=none; d=google.com; s=arc-20160816; b=LykGZX+LeCOwkTj632+zQrrWzNUf/I35aFdonWcXezqt6Wsnpu52YLSU9VDQJEZKbh oFtfT7pHmFGvRVSO/OaitXQ7RTnxpZiXQQYpje30nCtW7lKq/ySrc7VjFRVPsqCcxssc cxPbkxtu9ar6tbzwB/5uVw9pp2+rS0JoJiEqoYl43OgOTfKrCT+m0VcwTEakM/d7QbFG PLSbaHIvOqZaybwQ9tuwnGhCCZAqROqYtPy+oHPTd+Z7P1DOAjFUpUSVFPhW6DYXvfSe wy1JuzCtZ2cSJQ3hC0Vl7vnOyz1TbMZyV6IsZEgQQ8bywv/b9euC91x6wf6ENjGyg/VQ lmQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :mime-version:references:in-reply-to:date:subject:cc:to:from; bh=FtbQ17+ox6SvQkg9rgDw3DXv3qsRaZFRAAzkrGpl5gg=; b=DmO09eph9v48Q6rVrOHw6sAI1NA8odi4H4YAcSWIPs3YtSQBAfXekpwWcNTkWzwyZ8 mr1Kb+1IcOmxX6WH99Imah1pVCE26yCb3GqYQp8lqSUoDnMk5tCl9w/DTo1zyTdPVc6J oaC7MDZ7wygJwhZh7vgubfb63gNj7T2ll3TxK6saAQsfrS1OfX1QbABU2IL7wSe84oET w6pMONtJE0Wj39T3jBxjgAA1lidxqbas1bZI13MGFK85XY3ClMSvGkD1r/OgSc3P/nbP 1imtpjflaOiSo1wCcUsw5IfjGl7W1OlEU/W0VZ5sxoEVOIvDwq9/ingDTx/RoH1d5eVG 4Mng== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 60si3554470plb.16.2019.09.05.19.18.54; Thu, 05 Sep 2019 19:19:10 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391236AbfIESU6 (ORCPT + 99 others); Thu, 5 Sep 2019 14:20:58 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:27256 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730926AbfIESU6 (ORCPT ); Thu, 5 Sep 2019 14:20:58 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x85ICeEW063266 for ; Thu, 5 Sep 2019 14:20:56 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 2uu59vn9y3-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 05 Sep 2019 14:20:56 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 5 Sep 2019 19:20:54 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 5 Sep 2019 19:20:52 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x85IKpo95242894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 5 Sep 2019 18:20:52 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D0603AE051; Thu, 5 Sep 2019 18:20:51 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B877AE045; Thu, 5 Sep 2019 18:20:50 +0000 (GMT) Received: from naverao1-tp.ibmuc.com (unknown [9.85.95.49]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 5 Sep 2019 18:20:49 +0000 (GMT) From: "Naveen N. Rao" To: Michael Ellerman , Steven Rostedt Cc: Nicholas Piggin , , Subject: [PATCH 1/3] ftrace: Look up the address of return_to_handler() using helpers Date: Thu, 5 Sep 2019 23:50:28 +0530 X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 19090518-0012-0000-0000-0000034725C9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19090518-0013-0000-0000-000021817D18 Message-Id: <8f6f14d192a994008ac370ce14036bbe67224c7d.1567707399.git.naveen.n.rao@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-09-05_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=881 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1909050172 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This ensures that we use the right address on architectures that use function descriptors. Signed-off-by: Naveen N. Rao --- kernel/trace/fgraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 8dfd5021b933..7950a0356042 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -276,7 +276,7 @@ unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx, int index = task->curr_ret_stack; int i; - if (ret != (unsigned long)return_to_handler) + if (ret != (unsigned long)dereference_kernel_function_descriptor(return_to_handler)) return ret; if (index < 0) @@ -294,7 +294,7 @@ unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx, { int task_idx; - if (ret != (unsigned long)return_to_handler) + if (ret != (unsigned long)dereference_kernel_function_descriptor(return_to_handler)) return ret; task_idx = task->curr_ret_stack; -- 2.23.0