From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELvNcLbR7R5yqTP3Qiv9NC7PH2thGK50DHteBb8pKtzcavhmIjVC9NCXOXKs2VEBKATNzxfb ARC-Seal: i=1; a=rsa-sha256; t=1521141384; cv=none; d=google.com; s=arc-20160816; b=DEowR2gtvpqfBIMXoJKRGyctnA7E79P1SffMEUE8IF+aw43Tyx9hd5+ZdOmcyv+rHX tVp4PDppQtbdrjmUCbv9QTFmjMWBsL2sWhfQG+kj1FQuMIBXvo3hNLojyrrQF4nNIcDX 0waXP2umKgXosTG0yJr5vHqsEuc9Jrkem+6+5PKGNHvecd4rbRUYOyxio52TC7RNXrTc Qii1GJ4kw+PNsvRqRiTvUQtTTpjCV6KvnQrJ7uaN57hfS96Y03+9Yl22nlZ6mB3pa7ft dLvLTxV+nt2XtZdlfef4YXtlVhMzFlSFDZDV7wG6fzhxZJ+Ei5muFiSaOs5UJ4vgeuCb ld3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=qW8AeD6kDGKwWr8ly3e0aQrtosgHOGyFvl9sbHVbNUs=; b=P+xWzBzdC9Isp9639gBrRaNt+NNi1Nvr0O2lIDJs15RENUqnOqsVWHmG7A1ZDTJExy F1RXfvnAooeR30V5AhXejBOzohgKRCpMMfk450CBRlpZktWXnaqDpSu3xu8XoIGj4TT7 TCCJnxwbMWzko+C4DxTUx4A5bmbvUzJ2bFQzblUovipXxO/qh3mn/xmbWBRvmoUEqPcE GEgeB3fmIbJhm0QLm9+4ahuYgfmqHa86UI/4G+6h4QwLl2YfDAy9AjAnkZUE+vBzwp8v CAeXHd6fBy6Y6LyOGoAIdGDlIKlSdMNl3c3jwU1A29WyEQGq9uerB78S6aDqfw6QLhzd +P5w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of msuchanek@suse.de designates 195.135.220.15 as permitted sender) smtp.mailfrom=msuchanek@suse.de Authentication-Results: mx.google.com; spf=pass (google.com: domain of msuchanek@suse.de designates 195.135.220.15 as permitted sender) smtp.mailfrom=msuchanek@suse.de X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Michal Suchanek To: linuxppc-dev@lists.ozlabs.org Cc: Kate Stewart , Madhavan Srinivasan , Paul Mackerras , Michael Neuling , "Bryant G. Ly" , Mahesh Salgaonkar , "Naveen N. Rao" , Daniel Axtens , Nicholas Piggin , Al Viro , David Gibson , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Sergey Senozhatsky , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Masami Hiramatsu , Andrew Donnellan , Philippe Ombredanne , Joe Perches , Oliver O'Halloran , Andrew Morton , "Tobin C. Harding" , Michal Suchanek Subject: [PATCH RFC rebase 4/9] powerpc/64s: Use barrier_nospec in RFI_FLUSH_SLOT Date: Thu, 15 Mar 2018 20:15:53 +0100 Message-Id: <89e52fff32b76d01d5c0c961f6558dade0676f7a.1521141122.git.msuchanek@suse.de> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: <20180313200108.GA4082@hirez.programming.kicks-ass.net> In-Reply-To: References: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1595032348533164532?= X-GMAIL-MSGID: =?utf-8?q?1595032348533164532?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: The RFI flush support patches the speculation barrier into RFI_FLUSH_SLOT as part of the RFI flush. Use separate barrier_nospec instead. Signed-off-by: Michal Suchanek --- arch/powerpc/include/asm/exception-64s.h | 2 +- arch/powerpc/lib/feature-fixups.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h index 471b2274fbeb..bb5a3052b29b 100644 --- a/arch/powerpc/include/asm/exception-64s.h +++ b/arch/powerpc/include/asm/exception-64s.h @@ -81,9 +81,9 @@ * L1-D cache when returning to userspace or a guest. */ #define RFI_FLUSH_SLOT \ + barrier_nospec_asm; \ RFI_FLUSH_FIXUP_SECTION; \ nop; \ - nop; \ nop #define RFI_TO_KERNEL \ diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c index 35f80ab7cbd8..4cc2f0c5c863 100644 --- a/arch/powerpc/lib/feature-fixups.c +++ b/arch/powerpc/lib/feature-fixups.c @@ -119,7 +119,7 @@ void do_feature_fixups(unsigned long value, void *fixup_start, void *fixup_end) #ifdef CONFIG_PPC_BOOK3S_64 void do_rfi_flush_fixups(enum l1d_flush_type types) { - unsigned int instrs[3], *dest; + unsigned int instrs[2], *dest; long *start, *end; int i; @@ -128,15 +128,13 @@ void do_rfi_flush_fixups(enum l1d_flush_type types) instrs[0] = 0x60000000; /* nop */ instrs[1] = 0x60000000; /* nop */ - instrs[2] = 0x60000000; /* nop */ if (types & L1D_FLUSH_FALLBACK) - /* b .+16 to fallback flush */ - instrs[0] = 0x48000010; + /* b .+12 to fallback flush */ + instrs[0] = 0x4800000c; i = 0; if (types & L1D_FLUSH_ORI) { - instrs[i++] = 0x63ff0000; /* ori 31,31,0 speculation barrier */ instrs[i++] = 0x63de0000; /* ori 30,30,0 L1d flush*/ } @@ -150,7 +148,6 @@ void do_rfi_flush_fixups(enum l1d_flush_type types) patch_instruction(dest, instrs[0]); patch_instruction(dest + 1, instrs[1]); - patch_instruction(dest + 2, instrs[2]); } printk(KERN_DEBUG "rfi-flush: patched %d locations (%s flush)\n", i, -- 2.13.6