From patchwork Thu Sep 12 20:51:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13802674 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1D107EEE262 for ; Thu, 12 Sep 2024 20:56:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2R8Y3DFBOrXpT6Dp+2pnByuz3JsPwrzU4P/6bkl9CfA=; b=zvrfjb6M7+0TuzJ7yNcglbueEA sOUVtSo9WEbyToWUk273NymdH1sFjQWfSjDlRKtWAHOq5vHgn3HHVsAzOSoUkjfxwk+I525E9pJ+H Jq2oYoTtb62tFlOGNyQXsu85laTzThtPUBXnSV3hKdeWFEkYzc9DrKOLdIm59jbGVmfHTWDq0n9Hu oKAgS2nE4EvrVAFfIuPQr1bfWeYE7Kt08JsdYs2SaPjdffpOyuxkxsEvEfWGWFpR/3DdZ5B7KnubO gwp5vPdt03q3UU/mzWixmawo0BNckB590kmiFaKDCFs14ELPbqj7ain5j+iUJAVaCL2qIf8kUvlzC 56i31XKw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1soqrA-0000000EE7n-3JlT; Thu, 12 Sep 2024 20:56:00 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1soqmy-0000000EDB5-2sEt for linux-arm-kernel@lists.infradead.org; Thu, 12 Sep 2024 20:51:42 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-6cf78470a56so31624507b3.3 for ; Thu, 12 Sep 2024 13:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726174299; x=1726779099; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=2R8Y3DFBOrXpT6Dp+2pnByuz3JsPwrzU4P/6bkl9CfA=; b=fGzyA0muGa2SNvv97uib7vewMIbJDB9sPihi+uqCTbkIWOpRh9hYZGdk+e8XeNbdSe mGVT7NzY/DTb4dthHDmv0Z2niLmz8Cg+PNpSS5Oz78Eos1STpI3rRIKGc1r/eTtdATy5 jNnEODvpBf/ckVXxt0xNGrhtveXfKnwRPIDNE/mBeZ+GBTqKpeHwMc6nxfBlic0veR4d kEDri6w5Dl6dI7Co75zCc3D8M8HC4jLv8e/CbjmZDyaJS411CDl8wu3StFx/wHcJdr1z 9ttcROE2wy8vuR75aJ5QNg5bTQc+HADJrWWxJi9D/3eu/fus0K72UzJGxNCAQlXhX2NI d5Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726174299; x=1726779099; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2R8Y3DFBOrXpT6Dp+2pnByuz3JsPwrzU4P/6bkl9CfA=; b=i7ec4VgtFFiE02wIU2/KFS9KXv8sJAodRX9VTlLkUaWBgJlN+QbDNEETDls7Oidoeu whiXF5S5gIAwbIsH2xRgcch71KNbL7bCSNhscVCI92bHwgDdf+f9AGxBT4x6wmzs3AmZ 7rlVzx9FtCk0AAlroicdQ/cBPfB2QK2AtNZ40851S/O85pvPnzF8oousHV9LW5TxQMtF aqflWbiwbHnDdczi/mNOHzgXPsvKpuzHgPqhkuLdZ3rXhXNsMN6QX+u/PQPXa/tad2ql xltcyMoTFJFSJYrOQ6fJveTZtlZ/h3tVo4Tm6EUPdXIALnoqMu8gbKe1cPxnnVqrFfru wcmQ== X-Forwarded-Encrypted: i=1; AJvYcCWYMV4yjFp7Lf5A1fkAcJAwdfRe92N7pK4hJNptRtn3FJyL16MKp7Z7BobqrxYLMlanvBGrDbBGMAOmZ54OWcQb@lists.infradead.org X-Gm-Message-State: AOJu0Ywt3lW+dHXm6sKkAV1KC5q3MNuYYVzpdmQwosyTa3V4HCsUWRnS FAzfwAa12Ngdwarnf2Z3IuGtNH6mEDYf8h1TkgTJYVVR8/DAabdPVUKjDtS+TBQ6Wyt+Qe3D/ao Yhk/IoIVP9TtAT3Clm7zbbw== X-Google-Smtp-Source: AGHT+IFV1m07CCTdDWX2FOgecLasTDjDmm3XH/XZUgTEGDR6/YrsS27OTSnLSt+SciKeVBgsQCat9dX1tnl2/VgIOw== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:11b:3898:ac11:fa18]) (user=coltonlewis job=sendgmr) by 2002:a05:6902:1743:b0:e03:3cfa:1aa7 with SMTP id 3f1490d57ef6-e1d9db9e1b8mr5314276.1.1726174299130; Thu, 12 Sep 2024 13:51:39 -0700 (PDT) Date: Thu, 12 Sep 2024 20:51:31 +0000 In-Reply-To: <20240912205133.4171576-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20240912205133.4171576-1-coltonlewis@google.com> X-Mailer: git-send-email 2.46.0.662.g92d0881bb0-goog Message-ID: <20240912205133.4171576-4-coltonlewis@google.com> Subject: [PATCH v3 3/5] powerpc: perf: Use perf_arch_instruction_pointer() From: Colton Lewis To: kvm@vger.kernel.org Cc: Oliver Upton , Sean Christopherson , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Will Deacon , Russell King , Catalin Marinas , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H . Peter Anvin" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Colton Lewis X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240912_135140_807400_2FE4CE5C X-CRM114-Status: GOOD ( 14.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Make sure powerpc uses the arch-specific function now that those have been reorganized. Signed-off-by: Colton Lewis --- arch/powerpc/perf/callchain.c | 2 +- arch/powerpc/perf/callchain_32.c | 2 +- arch/powerpc/perf/callchain_64.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c index 6b4434dd0ff3..26aa26482c9a 100644 --- a/arch/powerpc/perf/callchain.c +++ b/arch/powerpc/perf/callchain.c @@ -51,7 +51,7 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re lr = regs->link; sp = regs->gpr[1]; - perf_callchain_store(entry, perf_instruction_pointer(regs)); + perf_callchain_store(entry, perf_arch_instruction_pointer(regs)); if (!validate_sp(sp, current)) return; diff --git a/arch/powerpc/perf/callchain_32.c b/arch/powerpc/perf/callchain_32.c index ea8cfe3806dc..ddcc2d8aa64a 100644 --- a/arch/powerpc/perf/callchain_32.c +++ b/arch/powerpc/perf/callchain_32.c @@ -139,7 +139,7 @@ void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, long level = 0; unsigned int __user *fp, *uregs; - next_ip = perf_instruction_pointer(regs); + next_ip = perf_arch_instruction_pointer(regs); lr = regs->link; sp = regs->gpr[1]; perf_callchain_store(entry, next_ip); diff --git a/arch/powerpc/perf/callchain_64.c b/arch/powerpc/perf/callchain_64.c index 488e8a21a11e..115d1c105e8a 100644 --- a/arch/powerpc/perf/callchain_64.c +++ b/arch/powerpc/perf/callchain_64.c @@ -74,7 +74,7 @@ void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry, struct signal_frame_64 __user *sigframe; unsigned long __user *fp, *uregs; - next_ip = perf_instruction_pointer(regs); + next_ip = perf_arch_instruction_pointer(regs); lr = regs->link; sp = regs->gpr[1]; perf_callchain_store(entry, next_ip);