Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp3242521ybk; Mon, 18 May 2020 22:54:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPZLyUq2Nu9eJ/hxR0fd2U0H9KZi6BpJ883HCIIbyzDUyeugCBgZqQco6R7wFHd/NP+l3Y X-Received: by 2002:aa7:cf11:: with SMTP id a17mr3056928edy.172.1589867676599; Mon, 18 May 2020 22:54:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589867676; cv=none; d=google.com; s=arc-20160816; b=MZVmzxbiNTzt8h0jDsp7IKNOnCzLTgtucMfc2flxiaaXVLNHiZmJB11urIjE6XpWew bIVW0Rlcn0MDu+90avpIVSOHTgkDMyrIZWfxzSjc2NvGm+VRdcwTKqm9kSIrjwrg9owH m1gu7ww04zgV4U1im+5ROjSSG48cdA5SAy94IHhhdtq+tMOZFzs3NiamkYLTU+FLb2uP UvofXJEX8unRWafBDfu9Qak+x03tsKFsPGZ5M1Bm+zx4pgI7UOw4QzQJCKbq/xDafqCr P/MkOTA7Zib8fKPJqtv9PQDi14/j75v1j6SB4l6O2Ft3ti6XlEUjBFGN/3Mq70s+hhns uZ1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id; bh=HQn3jgcP2fUcwbkrzosKR0An576fK0rmJmOu4ys0IZg=; b=CuBgqOFvg9WWO6iz7hB9DhFyT8R912ArwPbuM4WllEBkojcqYIFRTaJOha+OgsW7PH 6b+52BReE0+WLZIIeE7ldrsXg5g4rF5wsUrDZxiR0KGioQCpDKmGAGhIwt0G1NfSBonZ shDucMkV3b9A5LaA5RRXVsxbDpxKR62vVF+LbrvjgAqzGy3YnotJzOorwupQT8zCaphy Ku0xkXnXMnPufH1fIpfnGbM3Nix5bRWnfyYMdRq8Pv0pTwDGjY5VhOcGDLc8tlsULTKO 1fu2QotobikCEDplG+kZ9DHYL9svBJVqrVBw1Rd8m7UpwXAMThlTnsvF8VZ6D5zojpVN ZKPg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ov7si7881548ejb.409.2020.05.18.22.54.14; Mon, 18 May 2020 22:54:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728854AbgESFuR (ORCPT + 99 others); Tue, 19 May 2020 01:50:17 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:45572 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728651AbgESFtV (ORCPT ); Tue, 19 May 2020 01:49:21 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 49R4hG1gzHz9txly; Tue, 19 May 2020 07:49:18 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id K419qQJ-dUau; Tue, 19 May 2020 07:49:18 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 49R4hG0yJxz9txlx; Tue, 19 May 2020 07:49:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 2A2148B7A7; Tue, 19 May 2020 07:49:19 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 14iIh73uBkWd; Tue, 19 May 2020 07:49:19 +0200 (CEST) Received: from pc16570vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id EFD8A8B767; Tue, 19 May 2020 07:49:18 +0200 (CEST) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id C008465A4A; Tue, 19 May 2020 05:49:18 +0000 (UTC) Message-Id: <97f48cc1a2ea6b895bfac0752cbe59deaf2eecda.1589866984.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v4 35/45] powerpc/8xx: Move DTLB perf handling closer. To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 19 May 2020 05:49:18 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that space have been freed next to the DTLB miss handler, it's associated DTLB perf handling can be brought back in the same place. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_8xx.S | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index fb5d17187772..9f3f7f3d03a7 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -344,6 +344,17 @@ DataStoreTLBMiss: rfi patch_site 0b, patch__dtlbmiss_exit_1 +#ifdef CONFIG_PERF_EVENTS + patch_site 0f, patch__dtlbmiss_perf +0: lwz r10, (dtlb_miss_counter - PAGE_OFFSET)@l(0) + addi r10, r10, 1 + stw r10, (dtlb_miss_counter - PAGE_OFFSET)@l(0) + mfspr r10, SPRN_DAR + mtspr SPRN_DAR, r11 /* Tag DAR */ + mfspr r11, SPRN_M_TW + rfi +#endif + /* This is an instruction TLB error on the MPC8xx. This could be due * to many reasons, such as executing guarded memory or illegal instruction * addresses. There is nothing to do but handle a big time error fault. @@ -390,18 +401,6 @@ DARFixed:/* Return from dcbx instruction bug workaround */ /* 0x300 is DataAccess exception, needed by bad_page_fault() */ EXC_XFER_LITE(0x300, handle_page_fault) -/* Called from DataStoreTLBMiss when perf TLB misses events are activated */ -#ifdef CONFIG_PERF_EVENTS - patch_site 0f, patch__dtlbmiss_perf -0: lwz r10, (dtlb_miss_counter - PAGE_OFFSET)@l(0) - addi r10, r10, 1 - stw r10, (dtlb_miss_counter - PAGE_OFFSET)@l(0) - mfspr r10, SPRN_DAR - mtspr SPRN_DAR, r11 /* Tag DAR */ - mfspr r11, SPRN_M_TW - rfi -#endif - stack_overflow: vmap_stack_overflow_exception -- 2.25.0