Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1174825pxb; Fri, 20 Nov 2020 03:10:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxwBWkBHdq3PWdtpHsNHywxQZMDgCizdcgobhxzTva0sa9sQAspUOq8A9pR4sv9H5HJFaN X-Received: by 2002:a17:906:13d0:: with SMTP id g16mr31627998ejc.327.1605870601338; Fri, 20 Nov 2020 03:10:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605870601; cv=none; d=google.com; s=arc-20160816; b=ncTzCUGkBmjW3JH2FyWbEVUv/YpOfL5xdHZqmuK9O/faA3dHsEfLh0S8HqP68gBixu z37zOqjF4omC2alIlF5v5pBKNlVEc8EIhikd98YBH2D+MUAnJoSgYN6EhKbv1PXy6vp4 H10veUhtoceYnj/b4YuOOFK6VtsXfCHzudcGkPkxRj1RxftANzWGyo8/KoilFJBkP1wN DuhU7upcDdOrc8x7CQ9TGpSBdb+CEHozVPhRp1uNNvXe1Trv0Jcq9akZPdo0V6czJ2Lv IPo+H2oymgpRIUgf5zmj65gmIqLMLwSmbH3STvU80t8XQLJ5kYAdvIAbGKRT14rz9wp3 AfRQ== 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=v83cUws/24kFuUhlFRkMUNdkdpazmdzXWaCTxWfnwjs=; b=YAM3AaysYIeWC/zTxox0zpwsbqH0kazPyUqq0opS4iwjup0LUFtsx/EEBe2FML5WFY wOL0XyOuIDECSG78WqvqH5oADfgnWFQoQ/XzsiCm5eG/ALv+ZvS7VOU85/9On1SxzNKS AhnbKwShDc45xfEjUdjxc1VWj+vL7oG3j3mHBG5yNI6MVxjZnDYGBhCcPQEY0d58SfOG xDkdts9OVR/LE9F/ElIQQ9ggAYexCgKaNyUO9Al+VM8EdfeHMPEDGxhUHFEx4zRGiovS bw9newDO9PnGRk/cUUF5XckNJ3PzXlRcnvd9p6VKCt3cs1fPpoIIfmEm82jIJCx1IwpO N2LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hgvEFzWr; 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 a23si1639141edn.292.2020.11.20.03.09.38; Fri, 20 Nov 2020 03:10:01 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hgvEFzWr; 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 S1728307AbgKTLFz (ORCPT + 99 others); Fri, 20 Nov 2020 06:05:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:53398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728277AbgKTLFu (ORCPT ); Fri, 20 Nov 2020 06:05:50 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 DCD562222F; Fri, 20 Nov 2020 11:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1605870349; bh=7m3KdUpxnN5HpYqUTGTQGG1efZ8kux1WhR/sLK4GHf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hgvEFzWrpM/SC0DFdovuoXwqq6JGHMgz44p9xjx7+X0aoajF6NewuYglsss1QXue2 uPselL7++RzZNDn3k01iiSRoW80qruV1gVqyOPCIZGUDz9vsRnR3qqIKEVVxYUYslU hRfvT0wF77ivr56WGq9RVPqDMM6tzQ5NtUF4tGqA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , dja@axtens.net Subject: [PATCH 4.19 01/14] powerpc/64s: move some exception handlers out of line Date: Fri, 20 Nov 2020 12:03:22 +0100 Message-Id: <20201120104539.886483987@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201120104539.806156260@linuxfoundation.org> References: <20201120104539.806156260@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore 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: Daniel Axtens (backport only) We're about to grow the exception handlers, which will make a bunch of them no longer fit within the space available. We move them out of line. This is a fiddly and error-prone business, so in the interests of reviewability I haven't merged this in with the addition of the entry flush. Signed-off-by: Daniel Axtens Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/exceptions-64s.S | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -572,13 +572,16 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TY EXC_REAL_BEGIN(data_access_slb, 0x380, 0x80) SET_SCRATCH0(r13) EXCEPTION_PROLOG_0(PACA_EXSLB) + b tramp_data_access_slb +EXC_REAL_END(data_access_slb, 0x380, 0x80) + +TRAMP_REAL_BEGIN(tramp_data_access_slb) EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST_PR, 0x380) mr r12,r3 /* save r3 */ mfspr r3,SPRN_DAR mfspr r11,SPRN_SRR1 crset 4*cr6+eq BRANCH_TO_COMMON(r10, slb_miss_common) -EXC_REAL_END(data_access_slb, 0x380, 0x80) EXC_VIRT_BEGIN(data_access_slb, 0x4380, 0x80) SET_SCRATCH0(r13) @@ -616,13 +619,16 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TY EXC_REAL_BEGIN(instruction_access_slb, 0x480, 0x80) SET_SCRATCH0(r13) EXCEPTION_PROLOG_0(PACA_EXSLB) + b tramp_instruction_access_slb +EXC_REAL_END(instruction_access_slb, 0x480, 0x80) + +TRAMP_REAL_BEGIN(tramp_instruction_access_slb) EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST_PR, 0x480) mr r12,r3 /* save r3 */ mfspr r3,SPRN_SRR0 /* SRR0 is faulting address */ mfspr r11,SPRN_SRR1 crclr 4*cr6+eq BRANCH_TO_COMMON(r10, slb_miss_common) -EXC_REAL_END(instruction_access_slb, 0x480, 0x80) EXC_VIRT_BEGIN(instruction_access_slb, 0x4480, 0x80) SET_SCRATCH0(r13)