| Message ID | 5bd5ce84265711f7611b028edbca7f0fe9565499.1574771541.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show
Return-Path: <SRS0=taI3=ZS=kvack.org=owner-linux-mm@kernel.org>
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
[172.30.200.123])
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B6E7F14ED
for <patchwork-linux-mm@patchwork.kernel.org>;
Tue, 26 Nov 2019 12:36:44 +0000 (UTC)
Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17])
by mail.kernel.org (Postfix) with ESMTP id 84B082071E
for <patchwork-linux-mm@patchwork.kernel.org>;
Tue, 26 Nov 2019 12:36:44 +0000 (UTC)
Authentication-Results: mail.kernel.org;
dkim=pass (1024-bit key) header.d=c-s.fr header.i=@c-s.fr header.b="vKnVWwi1"
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84B082071E
Authentication-Results: mail.kernel.org;
dmarc=none (p=none dis=none) header.from=c-s.fr
Authentication-Results: mail.kernel.org;
spf=pass smtp.mailfrom=owner-linux-mm@kvack.org
Received: by kanga.kvack.org (Postfix)
id B730E6B02FE; Tue, 26 Nov 2019 07:36:21 -0500 (EST)
Delivered-To: linux-mm-outgoing@kvack.org
Received: by kanga.kvack.org (Postfix, from userid 40)
id B25526B02FF; Tue, 26 Nov 2019 07:36:21 -0500 (EST)
X-Original-To: int-list-linux-mm@kvack.org
X-Delivered-To: int-list-linux-mm@kvack.org
Received: by kanga.kvack.org (Postfix, from userid 63042)
id A12466B0300; Tue, 26 Nov 2019 07:36:21 -0500 (EST)
X-Original-To: linux-mm@kvack.org
X-Delivered-To: linux-mm@kvack.org
Received: from forelay.hostedemail.com (smtprelay0137.hostedemail.com
[216.40.44.137])
by kanga.kvack.org (Postfix) with ESMTP id 8B68E6B02FE
for <linux-mm@kvack.org>; Tue, 26 Nov 2019 07:36:21 -0500 (EST)
Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com
[10.5.19.251])
by forelay04.hostedemail.com (Postfix) with SMTP id 4EE9B52D6
for <linux-mm@kvack.org>; Tue, 26 Nov 2019 12:36:21 +0000 (UTC)
X-FDA: 76198376562.01.pig17_71a7afc037b07
X-Spam-Summary:
2,0,0,554bfa420a6fd264,d41d8cd98f00b204,christophe.leroy@c-s.fr,:benh@kernel.crashing.org:paulus@samba.org:mpe@ellerman.id.au:linux-kernel@vger.kernel.org:linuxppc-dev@lists.ozlabs.org:,RULES_HIT:41:355:379:800:960:988:989:1260:1261:1345:1359:1437:1534:1541:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2731:3138:3139:3140:3141:3142:3353:3865:3867:3868:3870:3874:4250:4321:4605:5007:6117:6261:6653:7903:8634:10004:11026:11473:11658:11914:12043:12296:12297:12438:12555:12740:12895:12986:13069:13161:13229:13255:13311:13357:14181:14384:14394:14721:21080:21451:21627:30054,0,RBL:93.17.236.30:@c-s.fr:.lbl8.mailshell.net-62.2.5.100
64.100.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not
bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:1,LUA_SUMMARY:none
X-HE-Tag: pig17_71a7afc037b07
X-Filterd-Recvd-Size: 4228
Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30])
by imf04.hostedemail.com (Postfix) with ESMTP
for <linux-mm@kvack.org>; Tue, 26 Nov 2019 12:36:20 +0000 (UTC)
Received: from localhost (mailhub1-ext [192.168.12.233])
by localhost (Postfix) with ESMTP id 47Mk0f4kSJz9v0GG;
Tue, 26 Nov 2019 13:36:18 +0100 (CET)
Authentication-Results: localhost; dkim=pass
reason="1024-bit key; insecure key"
header.d=c-s.fr header.i=@c-s.fr header.b=vKnVWwi1; dkim-adsp=pass;
dkim-atps=neutral
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 j7cYA0H7ljob; Tue, 26 Nov 2019 13:36:18 +0100 (CET)
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 47Mk0f3dZ2z9v0G3;
Tue, 26 Nov 2019 13:36:18 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail;
t=1574771778; bh=s9tlncPBPF5ltYj2UYw1kqY6LrypIxcWu7hdOtJZAuk=;
h=In-Reply-To:References:From:Subject:To:Cc:Date:From;
b=vKnVWwi1CrMDc8/rLU1b2ZgDialXDeZSsBw8fiQ2N6GB0pNMhFx1AXe4EE1t9VJXi
X737itTGvdYlBTb0kVaTZfjBoIgo2i8wWzQdELUJLaRqN+USUz8E7I1d8uCdo5OIj6
wBSmoDmVo9D4OClqOZR8uadiXOPuN65ygCZZtyRc=
Received: from localhost (localhost [127.0.0.1])
by messagerie.si.c-s.fr (Postfix) with ESMTP id CF7B08B7FC;
Tue, 26 Nov 2019 13:36:19 +0100 (CET)
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 tuGdE3dHxdTA; Tue, 26 Nov 2019 13:36:19 +0100 (CET)
Received: from po16098vm.idsi0.si.c-s.fr (unknown [192.168.4.90])
by messagerie.si.c-s.fr (Postfix) with ESMTP id 9C3C48B771;
Tue, 26 Nov 2019 13:36:19 +0100 (CET)
Received: by po16098vm.idsi0.si.c-s.fr (Postfix, from userid 0)
id 673AB6B76A; Tue, 26 Nov 2019 12:36:19 +0000 (UTC)
Message-Id:
<5bd5ce84265711f7611b028edbca7f0fe9565499.1574771541.git.christophe.leroy@c-s.fr>
In-Reply-To: <cover.1574771539.git.christophe.leroy@c-s.fr>
References: <cover.1574771539.git.christophe.leroy@c-s.fr>
From: Christophe Leroy <christophe.leroy@c-s.fr>
Subject: [PATCH v4 15/16] powerpc/32s: avoid crossing page boundary while
changing SRR0/1.
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-mm@kvack.org
Date: Tue, 26 Nov 2019 12:36:19 +0000 (UTC)
X-Bogosity: Ham, tests=bogofilter, spamicity=0.000201, version=1.2.4
Sender: owner-linux-mm@kvack.org
Precedence: bulk
X-Loop: owner-majordomo@kvack.org
List-ID: <linux-mm.kvack.org>
|
| Series |
Enable CONFIG_VMAP_STACK on PPC32
|
expand
|
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index 7ec780858299..90ef355e958b 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -917,6 +917,8 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE) ori r4,r4,2f@l tophys(r4,r4) li r3,MSR_KERNEL & ~(MSR_IR|MSR_DR) + + .align 4 mtspr SPRN_SRR0,r4 mtspr SPRN_SRR1,r3 SYNC @@ -1058,6 +1060,8 @@ _ENTRY(update_bats) rlwinm r0, r6, 0, ~MSR_RI rlwinm r0, r0, 0, ~MSR_EE mtmsr r0 + + .align 4 mtspr SPRN_SRR0, r4 mtspr SPRN_SRR1, r3 SYNC @@ -1097,6 +1101,8 @@ mmu_off: andi. r0,r3,MSR_DR|MSR_IR /* MMU enabled? */ beqlr andc r3,r3,r0 + + .align 4 mtspr SPRN_SRR0,r4 mtspr SPRN_SRR1,r3 sync
Trying VMAP_STACK with KVM, vmlinux was not starting. This was due to SRR0 and SRR1 clobbered by an ISI due to the rfi being in a different page than the mtsrr0/1: c0003fe0 <mmu_off>: c0003fe0: 38 83 00 54 addi r4,r3,84 c0003fe4: 7c 60 00 a6 mfmsr r3 c0003fe8: 70 60 00 30 andi. r0,r3,48 c0003fec: 4d 82 00 20 beqlr c0003ff0: 7c 63 00 78 andc r3,r3,r0 c0003ff4: 7c 9a 03 a6 mtsrr0 r4 c0003ff8: 7c 7b 03 a6 mtsrr1 r3 c0003ffc: 7c 00 04 ac hwsync c0004000: 4c 00 00 64 rfi Align the 4 instruction block used to deactivate MMU to order 4, so that the block never crosses a page boundary. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/powerpc/kernel/head_32.S | 6 ++++++ 1 file changed, 6 insertions(+)