Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4122711pxb; Mon, 8 Feb 2021 08:28:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzqHI7sm1OfUNW9e9d/rzKbgR8I7JepKcGxeWQrQd6egxyOA+ndKBeczFtGGQtNq7k3/8yy X-Received: by 2002:a17:906:63c2:: with SMTP id u2mr10524874ejk.346.1612801707575; Mon, 08 Feb 2021 08:28:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612801707; cv=none; d=google.com; s=arc-20160816; b=CHM/iK7Els5PB3R0ZKT9E9SOrBEaE8K2MEs0Jf7OHqLtUIjQXoSVg4Uv+sf0N9p+YT Ui2ePOIWnaNCrr3iZKPAW3cClU0Nicar1suHvR7XOuEHnSgEw5sAVnyU5i/RfCZLlzVQ sfSzj4Hh+f6Jgny0SdgZcmmfYM3bXpZBiwLLe2zOhyCko/sXQbx5MLKW903zqw9oeBkV lV9Cz0fw0CMlbHJVfF9FZlPK9thzTsQy4gvKG5+ecxJb7yspDPiFFgQqyLtnDQUzj8iv K2jZAeYg85/nC4nmDnw2XoFQyWHDO/3ERuVEti+UMOyD1mPKX6I5NiOQ6611c2Qre/4X ADQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=az/g2heemYhukccEPcUvsZ2HX5zi08DAJaFvJSyTD+4=; b=VX+6UP6AXH9zHnB/LOenTzkK977yZBa3rLUSx1ybI0vJ5O9iWQfbnigddlZacVMaa1 4gzJhXwNyBjFsGNlKvPbW1eMt+fF6fxXvTNKEAELN24QTejUVMs6NTyPqGQNXKcywxqQ PgdDyKgpZyRkVaG+hWeUu58yWp1AWx60hGyBePzwI+PfXFwekprYFRCOjAr8DkQ9Xfw8 XdSwMsnmtM3C+S3dMP3wY1inm6K2vYOiVf7QILEngZC2ndOGPG+R+AUBSlvMC1NxaNuM gVbRZZzPtVL+NxSBZgnvCPx/9xLnCvRU3ZEDzIcAfl8qtbUfnqtGOxKbPWk8+9GfxOct hF9w== 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 j1si11382350eja.96.2021.02.08.08.28.03; Mon, 08 Feb 2021 08:28:27 -0800 (PST) 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 S234388AbhBHQY5 (ORCPT + 99 others); Mon, 8 Feb 2021 11:24:57 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:3583 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233366AbhBHPMy (ORCPT ); Mon, 8 Feb 2021 10:12:54 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DZ8bR1nTyzB09ZD; Mon, 8 Feb 2021 16:10:27 +0100 (CET) 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 4cwNbu17HKuW; Mon, 8 Feb 2021 16:10:27 +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 4DZ8bR128pzB09ZC; Mon, 8 Feb 2021 16:10:27 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 73EE28B7C0; Mon, 8 Feb 2021 16:10:32 +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 jWipu8pVH-qT; Mon, 8 Feb 2021 16:10:32 +0100 (CET) Received: from po16121vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.230.103]) by messagerie.si.c-s.fr (Postfix) with ESMTP id DCDE08B7BA; Mon, 8 Feb 2021 16:10:31 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id BDF626733E; Mon, 8 Feb 2021 15:10:31 +0000 (UTC) Message-Id: <67820fada8dd6a8fe9d7b666f175d4cc9d8de87e.1612796617.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v5 12/22] powerpc/syscall: Change condition to check MSR_RI To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com, msuchanek@suse.de Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 8 Feb 2021 15:10:31 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In system_call_exception(), MSR_RI also needs to be checked on 8xx. Only booke and 40x doesn't have MSR_RI. Signed-off-by: Christophe Leroy --- v5: Also in interrupt exit prepare --- arch/powerpc/kernel/interrupt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c index 1a2dec49f811..107ec39f05cb 100644 --- a/arch/powerpc/kernel/interrupt.c +++ b/arch/powerpc/kernel/interrupt.c @@ -39,7 +39,7 @@ notrace long system_call_exception(long r3, long r4, long r5, trace_hardirqs_off(); /* finish reconciling */ - if (IS_ENABLED(CONFIG_PPC_BOOK3S)) + if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x)) BUG_ON(!(regs->msr & MSR_RI)); BUG_ON(!(regs->msr & MSR_PR)); BUG_ON(!FULL_REGS(regs)); @@ -338,7 +338,7 @@ notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs, unsigned unsigned long flags; unsigned long ret = 0; - if (IS_ENABLED(CONFIG_PPC_BOOK3S)) + if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x)) BUG_ON(!(regs->msr & MSR_RI)); BUG_ON(!(regs->msr & MSR_PR)); BUG_ON(!FULL_REGS(regs)); @@ -436,7 +436,8 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs, unsign unsigned long amr; #endif - if (IS_ENABLED(CONFIG_PPC_BOOK3S) && unlikely(!(regs->msr & MSR_RI))) + if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x) && + unlikely(!(regs->msr & MSR_RI))) unrecoverable_exception(regs); BUG_ON(regs->msr & MSR_PR); BUG_ON(!FULL_REGS(regs)); -- 2.25.0