Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4690066pxj; Wed, 12 May 2021 10:58:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJ6HxUcUUkjdxiljiYNXHV19Y/8GK8/nBenBw9QKIKOjBvfc+OVn+8HraCr8iAkvL/r48t X-Received: by 2002:a9d:1b62:: with SMTP id l89mr31823397otl.307.1620842303734; Wed, 12 May 2021 10:58:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620842303; cv=none; d=google.com; s=arc-20160816; b=0XNO1Cu/mayPIYY4VWwSthZoGdLYWAhFdik2HMu+rwOvtPBJX2VET/VCGUUt3XcZj5 III++OfUbW5gxxhbtlET6GtcQXoBDgpxRRBkTfd3TdOdBWAhQqfbdEN72geFNkAXuTJx fgwKP+CZEPouURQXMs/Mushl9S2c6NpSQSEEiClEsUqVlNYj367z3Zq80lYGPGfU72Dk SsXINuwBEINv1PBi/pelSt5MAfeQ2p1KvlYiuzQDO1k88KQAxaJ4KZYUp5ih2u9iHgRD ovteLyK7c6ObfCPNEze3eEjC+l3XMO0p88Uwyvy/7ngJMSEd4p0tz73J9N24r2yfSV74 606Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XefMsFCO76c7sgYAJdHjodpORg2qsjUq7YyxdPv00Ok=; b=FY4pwKEopINhWcFd01LvwDGWdCPU2eeWPB8weGlcYW7RBW58PF5cFyp4B7GzY8TAMa ExyJfYhU8LEKT+6p1rwS9mLPX/1dF0+L1L5QGfffTzR/tK76IWvupJU1jUxkHAxhTXpS MrFIX8xovCxJqCN42BHbweZZD4eB19NKeeWcistI2hyobr0PL0UT3GfRz4m9P/yA9Aym mwkF1noVbZbKBCxaY8jYkae3AnsTnuxTEVkX7f93RRxhoNiEvdjeHIkZKs9iLJgSqUZK pvAaPnE7v0mXZvfstpMi9CkItwvaxucDKAxpVdVJFA4reP1ivTl77p8bxhkOQ1ND/kLY ztuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pdz62UP8; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y82si562372oiy.160.2021.05.12.10.58.10; Wed, 12 May 2021 10:58:23 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pdz62UP8; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348322AbhELRuV (ORCPT + 99 others); Wed, 12 May 2021 13:50:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:58080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234810AbhELQTO (ORCPT ); Wed, 12 May 2021 12:19:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 77C1661C96; Wed, 12 May 2021 15:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834354; bh=xVxumDuKoX2y7VPSQXVgPc0+UUa1Q/E5qy0dnWHVHW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pdz62UP8aJenWk6nv52oFLI7vXeGQnT2N8KPGTdSWhBCTl6yM1K26C9EDqPA4LpTP r6y5Bg4msEF+/sARmX+XRfvMgVxGLZ8Hfff/ANHzTvKb16f3HOtzIn2aDNZYbUPhUc ampm7GaMyIH+UvN7DHWI7wAEtIVl33Xh7YwHdk/k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Leroy , Nicholas Piggin , Michael Ellerman , Sasha Levin Subject: [PATCH 5.11 509/601] powerpc/syscall: Change condition to check MSR_RI Date: Wed, 12 May 2021 16:49:46 +0200 Message-Id: <20210512144844.603825866@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe Leroy [ Upstream commit c01b916658150e98f00a4981750c37a3224c8735 ] 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 Reviewed-by: Nicholas Piggin Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/67820fada8dd6a8fe9d7b666f175d4cc9d8de87e.1612796617.git.christophe.leroy@csgroup.eu Signed-off-by: Sasha Levin --- 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 7c85ed04a164..f103fb9f2cfe 100644 --- a/arch/powerpc/kernel/interrupt.c +++ b/arch/powerpc/kernel/interrupt.c @@ -29,7 +29,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)); @@ -289,7 +289,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)); @@ -377,7 +377,8 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs, unsign unsigned long ret = 0; unsigned long amr; - 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.30.2