From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE08BCA9EC9 for ; Mon, 4 Nov 2019 22:16:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C17B4204EC for ; Mon, 4 Nov 2019 22:16:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905764; bh=dZa1QclI7nmvnRW5lxGZ749Hnz0M0rK1zGRq3RTeM6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2K53hJUeYpCWHV6s6Hfu1NS3n8i78BVOA4KLsuN4wmXjYcQGA29pQqkdpRDiI3BV6 eYRn2bksx5EEDECRNFd//sprMw6Bwbjx1KgYif92ebo+lr2D3HrGmsNU4mxyqWcgMR h7DCQWj1d6MqMykJxb2SuNFYy7mlPQlbQ5URV/mE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388384AbfKDWQA (ORCPT ); Mon, 4 Nov 2019 17:16:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:36202 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389781AbfKDWFF (ORCPT ); Mon, 4 Nov 2019 17:05:05 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AB4C6205C9; Mon, 4 Nov 2019 22:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905105; bh=dZa1QclI7nmvnRW5lxGZ749Hnz0M0rK1zGRq3RTeM6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IzUENApHlTGfHAjbOTw8C6JwbqkWqPmo9NYf7PD3xcizxFG3F+5ThewOfuZJVnix8 DHteIZqKkjOqGTUonw3z48TdRiIo+EJPPBQWh6KOpb3eFFhnlK0saho5fPqKjJo280 jtmCmuf9Ni6cS0Ft1Pa79+TZcuK5Dt/NIbEU9DEM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, James Morse , Julien Thierry , Will Deacon , Sasha Levin Subject: [PATCH 5.3 030/163] arm64: Fix incorrect irqflag restore for priority masking for compat Date: Mon, 4 Nov 2019 22:43:40 +0100 Message-Id: <20191104212142.477442421@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212140.046021995@linuxfoundation.org> References: <20191104212140.046021995@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: James Morse [ Upstream commit f46f27a576cc3b1e3d45ea50bc06287aa46b04b2 ] Commit bd82d4bd2188 ("arm64: Fix incorrect irqflag restore for priority masking") added a macro to the entry.S call paths that leave the PSTATE.I bit set. This tells the pPNMI masking logic that interrupts are masked by the CPU, not by the PMR. This value is read back by local_daif_save(). Commit bd82d4bd2188 added this call to el0_svc, as el0_svc_handler is called with interrupts masked. el0_svc_compat was missed, but should be covered in the same way as both of these paths end up in el0_svc_common(), which expects to unmask interrupts. Fixes: bd82d4bd2188 ("arm64: Fix incorrect irqflag restore for priority masking") Signed-off-by: James Morse Cc: Julien Thierry Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/entry.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 109894bd31948..239f6841a7412 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -775,6 +775,7 @@ el0_sync_compat: b.ge el0_dbg b el0_inv el0_svc_compat: + gic_prio_kentry_setup tmp=x1 mov x0, sp bl el0_svc_compat_handler b ret_to_user -- 2.20.1