From patchwork Fri Sep 20 17:47:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13808692 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 3F012CF9C60 for ; Fri, 20 Sep 2024 17:54:58 +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=i5Qt5np/Ap8e8S56AX/TaOyn++MQC/aFN8Qv/OewSh4=; b=evYnQtjrT+TJQaTirQN5yJB9+e yh6xAKOcUwChsdsyzSSCFHxiCmetXas5GQWrPnd9AX1unA3mrFKVBt+Mjs9F8jPIGTZeOiyb7oWM0 5a8qlTr9tL8XWZilEv4m7mfrtxpV36RX7n118zftEIabTmJus2lFMQz8HSwGrhp8uxyzvjUa+f1mg qmfo2iSpxxuwdB0OkioOd9sD8sVFhVzf/NaPl/jO/9XRWFDdTRGwPJelQNuokjEsA+CiNYyDvm4R9 MuxdOqmkP+/S4ajQkiLLIcSplSsxIEyp09IeRYFZZCdEWv78svgst4FewFXeehT19pBXoSAPkJk6m 6J8lPQBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1srhqC-0000000ClXS-2M8R; Fri, 20 Sep 2024 17:54:48 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1srhjR-0000000CkO5-08WK for linux-arm-kernel@lists.infradead.org; Fri, 20 Sep 2024 17:47:50 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-690404fd230so37672647b3.3 for ; Fri, 20 Sep 2024 10:47:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726854467; x=1727459267; 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=i5Qt5np/Ap8e8S56AX/TaOyn++MQC/aFN8Qv/OewSh4=; b=f9+1trfbakhgD3ZEyXv7svBaYuZcUOPW0vg2d5LRjI3t63AcY6kcY4RD/o3RW4Ntnf D8G534+9csdHe1vR1g8J/0/aeEV03p7mtPxY2UJ+5wTI1AgjUQC/iD2kVib1bwmD6GK3 fJxY3phqH/4Kj4yPWMvIY+GulcZBZFeo4dWfnsFNEMGpyAeSN7vyWd/TlBNlxOksNlDi oV+evNlNCOmctdqKO+FhHUKflCft7kn5SdNivHdHzbP4Us9+eEr8vWA1D8rfL/aXIDsn Cc47d8xbFAU+2BfTKp1qJhf495tMi6dwWsl+uGHqe3YvQk4YMiGzp1iqEemkmJkChSHV pfqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726854467; x=1727459267; 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=i5Qt5np/Ap8e8S56AX/TaOyn++MQC/aFN8Qv/OewSh4=; b=kgM03ggXgvdeNhyQkzG/jWfcSVlpkm1RTrJRWdkY4dP+ZMKho3pi5Uq+kVBeDHCr27 P8/Zj/2HW77ma8Fdhvyh0mh+fQntuTso9iDHafOMT6qJ3ejAg2ZXGLSnoGiZNjTlXTt1 PmZhz1PeegyPSsXI+TEaWDK0dvFN8aId47BxHqAsvRK641543GAQXZoniJpEcX91OK0C Exgmp5cfha9F1GL+Vg01HCIXv6cf4saOzxyKgBe/2iDDPL11soTV2h89fYaZPRm/AYfU /u2Ae1bdtMBLLIoMmgSrDgWn8U6esW2nzNXDtwEKW49svTmk0hbaCZ7y3SXD7DASjfjO Nk9g== X-Forwarded-Encrypted: i=1; AJvYcCU3/QKDjoXqM9Wy33OFb3MHMa5YdqiM5wgNXMYLkWYpj4hWbC4HCuscwd8IAi3mzsHao4YhZqjFIL1WwTwpkbcg@lists.infradead.org X-Gm-Message-State: AOJu0YxIMteCi7w2LiehOhpxVkpz+vdwEz41iXs9BYrdnksbapUJawSB omu1uMHjUOsPD5+uiTl5UMlk0CEQ+mA7EvP231GvtMeekBQkACsVG0fWZONymwdNPiCg/SLc3Hr BWMGbWtxyA2Y7OTf/EvzqfA== X-Google-Smtp-Source: AGHT+IHbJ+HRIEkO5u3cDhpGgKAhQ1szUZlm5tAMnmYkXHJJtXJeplzJtZCUnHcEvMXwbAUs2nrn0eCuaSMxzmED7g== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:11b:3898:ac11:fa18]) (user=coltonlewis job=sendgmr) by 2002:a81:c803:0:b0:6dc:97eb:ac51 with SMTP id 00721157ae682-6dfeeece207mr233927b3.3.1726854467532; Fri, 20 Sep 2024 10:47:47 -0700 (PDT) Date: Fri, 20 Sep 2024 17:47:38 +0000 In-Reply-To: <20240920174740.781614-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20240920174740.781614-1-coltonlewis@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Message-ID: <20240920174740.781614-4-coltonlewis@google.com> Subject: [PATCH v5 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-20240920_104749_129575_056C4BBE X-CRM114-Status: GOOD ( 13.38 ) 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 Acked-by: Madhavan Srinivasan --- 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);