From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFDE11EF0B1 for ; Tue, 7 Jan 2025 09:41:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736242916; cv=none; b=XuO5JorvdLfF/YkL6fFo8qjDR7K+bTIvF4dloU9q9tKM8CNaRHkcDlE4h0XgS1FV9M5iWRyJadnDSiOularSquMNbgOrT5MADLF/N4PSFYxc5nPp4DrvfCvl89V2zvAeWlvlPisBz9fV8LU5GySKrpmUmr7dx9sUfoUOhMa9vo8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736242916; c=relaxed/simple; bh=p4wSJygNTXp3Tzgup79BPTp7k5Xg7mdNPtEcrLYPI+8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OefAFuUw6yotT34mKtzHgZyNtN04hV6eYCA8dk9EkGN66Iwji95SsH/HbWy0hiO6JO8aR9uLmzjaGRjpMN9OxglcxlMoz4ebIuih+fRKQowyY2//He9cPH/1PuArxNYQb3oiPkll7flhaRG23XULUKeNJZzaL2WCcI1IRFagyRo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=uCn+w4hk; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="uCn+w4hk" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-aaeec07b705so1750830466b.2 for ; Tue, 07 Jan 2025 01:41:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736242912; x=1736847712; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tm8Sr1+K14orzlSuTAQl0kAeE85JLIYVrwIxTxn0xos=; b=uCn+w4hkAhjTX4KG7Gcx+vh0VM3ElUq7S/lK7CZhxL/1u0wJFQ0qg1cdu5zUN/k1X8 7FgMMvD0szjs8QNM4og+V7jcyZGk0Wm9MPe96/r5tWlrHqOyk5XrrS/BH8pQGZe3mZ2l 57cOt0ILqs0a4fjYuS5I9EezIKy4QW8ebhONwgla/lCUiUuYRNXg6IHmqlopmx1oVVku tIYgnFRNSjRqasWhCWnBl+kxORTDpwuHX3Oj0gt3mNh65RR8vVaF4gmOUcSk9e9qqnyp +zY8Xo00LSGzVoaB+Lqj4+UWbUyN2FcGZw7i9xoJSshqvHXS/+67TkupS8951hbR3IOh N3lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736242912; x=1736847712; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tm8Sr1+K14orzlSuTAQl0kAeE85JLIYVrwIxTxn0xos=; b=DwCOdClWRI7mSIFoCP05AXbgG9km1HRP40uDglHvX99UMerfLoCQEnHP3mAmiYmY3I oWC18gLuYddCMCJxiHLq2B6Jo4/m4pEhLAmNYrlaK2BFhZFocHy0bdCmiTjdF6smenTk 4LzQKQKMGYNGnnE2n9S1ZIvDSZL/qZaptFVcjHw4Lgf2q6EgHtKijKVvB7HTUbXF0RsL DR8CBv5U1/+703N2GBqfsbTookoaK8wjkSsQR0yDT/C+H+lq0PkYx6/Ot9IR7kQETzhc WeLC0Y1H6EkPa+TTh7kI6udNFBlcD5OVG0nnMqj4txg3+0cvH1Aq1Xn+r3CQgLd7YNuj 7YeA== X-Forwarded-Encrypted: i=1; AJvYcCXqSOFieGw/IVgGUEeYpJppuovrIISG5oLE982dJAHkAOAbsBV9T4gytVKgiZ1wlssZUe+n1FKagelQVeM=@vger.kernel.org X-Gm-Message-State: AOJu0YxapegUQBGYoLedJIxWY3q8ToJ1pvb3OBA7Qaz1f+Q1XjlHJPsu 3hO2w2mvf6T8D5AUle/h5CJ7i+yQLiOWmDH/QMcc3R2AGBWa/S7tAVT+asx6v9o= X-Gm-Gg: ASbGnct1cc6zHgnHQYztJNmIMmNL0vrq5YGDSPT6fCPZ+htUSiY1RuAlKQCB2XqqEZH XhC0NbcX/Iwa2ZHk//yRTMbPBvmimX5nNgt3R9Z2bbAApLxSZH3xwD0o9ldVWfIKXCiEcoPVbym vGpbAKsV5tSNc+I6y5Tw84iJS8oXGjLB1qfOyMkOlO5Pe2pQtiuPnBURI02lgE8aTD8UeJ47V0r 2zDo4HBoSlcK/Tf9K3ssf8jw8AFgRH6vqdaHmfWuDa6Pc53V4yeXzBP6mF6lFt1Hpw= X-Google-Smtp-Source: AGHT+IEoUYCHmiu2LtqOgL3Sk5UkLCViigDDsF2BzL3K9BciTMZDokF+kh6Ppu7b80wGUY1bqQWgoQ== X-Received: by 2002:a17:907:3e1c:b0:aa5:2575:e75d with SMTP id a640c23a62f3a-aac270369b4mr5485696266b.2.1736242912197; Tue, 07 Jan 2025 01:41:52 -0800 (PST) Received: from [192.168.1.140] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f012229sm2356901166b.133.2025.01.07.01.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2025 01:41:51 -0800 (PST) From: Linus Walleij Date: Tue, 07 Jan 2025 10:41:35 +0100 Subject: [PATCH RFC v3 19/30] ARM: entry: Remove fast and offset register restore Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250107-arm-generic-entry-v3-19-4e5f3c15db2d@linaro.org> References: <20250107-arm-generic-entry-v3-0-4e5f3c15db2d@linaro.org> In-Reply-To: <20250107-arm-generic-entry-v3-0-4e5f3c15db2d@linaro.org> To: Dmitry Vyukov , Oleg Nesterov , Russell King , Kees Cook , Andy Lutomirski , Will Drewry , Frederic Weisbecker , "Paul E. McKenney" , Jinjie Ruan , Arnd Bergmann , Ard Biesheuvel , Al Viro Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij X-Mailer: b4 0.14.2 Now all remaining invocations of restore_user_regs has fast = 0 and offset = 0 set, so drop these parameters to the macro. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-armv.S | 2 +- arch/arm/kernel/entry-common.S | 2 +- arch/arm/kernel/entry-header.S | 29 +++++++++-------------------- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 460aa92c3c1f50de905550acf363c58f509bfe0a..3cd5a80b47758867d1db6c3971030370bca1551a 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -497,7 +497,7 @@ __fiq_usr: mov r0, sp @ struct pt_regs *regs bl handle_fiq_as_nmi get_thread_info tsk - restore_user_regs fast = 0, offset = 0 + restore_user_regs UNWIND(.fnend ) ENDPROC(__fiq_usr) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index dddbd6ba1eb9fcbc2c0d81f24e1a9b3231558d7f..d27e34d7e97a079d62e7b778cf7cf97c302e4763 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -81,7 +81,7 @@ no_work_pending: #ifdef CONFIG_GCC_PLUGIN_STACKLEAK bl stackleak_erase_on_task_stack #endif - restore_user_regs fast = 0, offset = 0 + restore_user_regs ENDPROC(ret_to_user_from_irq) ENDPROC(ret_to_user) diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index 50c0b55adc7421e7be123c9d00f94b1ebb93ff9e..51c7f93c1ded1db56f173c7aaed8094ef011ff5a 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -290,7 +290,7 @@ .endm - .macro restore_user_regs, fast = 0, offset = 0 + .macro restore_user_regs #if defined(CONFIG_CPU_32v6K) && \ (!defined(CONFIG_CPU_V6) || defined(CONFIG_SMP)) #ifdef CONFIG_CPU_V6 @@ -309,8 +309,8 @@ ALT_UP_B(.L1_\@) #ifndef CONFIG_THUMB2_KERNEL @ ARM mode restore mov r2, sp - ldr r1, [r2, #\offset + S_PSR] @ get calling cpsr - ldr lr, [r2, #\offset + S_PC]! @ get pc + ldr r1, [r2, S_PSR] @ get calling cpsr + ldr lr, [r2, S_PC]! @ get pc tst r1, #PSR_I_BIT | 0x0f bne 1f msr spsr_cxsf, r1 @ save in spsr_svc @@ -318,31 +318,24 @@ ALT_UP_B(.L1_\@) @ We must avoid clrex due to Cortex-A15 erratum #830321 strex r1, r2, [r2] @ clear the exclusive monitor #endif - .if \fast - ldmdb r2, {r1 - lr}^ @ get calling r1 - lr - .else ldmdb r2, {r0 - lr}^ @ get calling r0 - lr - .endif mov r0, r0 @ ARMv5T and earlier require a nop @ after ldm {}^ - add sp, sp, #\offset + PT_REGS_SIZE + add sp, sp, #PT_REGS_SIZE movs pc, lr @ return & move spsr_svc into cpsr 1: bug "Returning to usermode but unexpected PSR bits set?", \@ #elif defined(CONFIG_CPU_V7M) @ V7M restore. @ Note that we don't need to do clrex here as clearing the local @ monitor is part of the exception entry and exit sequence. - .if \offset - add sp, #\offset - .endif - v7m_exception_slow_exit ret_r0 = \fast + v7m_exception_slow_exit ret_r0 = 0 #else @ Thumb mode restore mov r2, sp - load_user_sp_lr r2, r3, \offset + S_SP @ calling sp, lr - ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr - ldr lr, [sp, #\offset + S_PC] @ get pc - add sp, sp, #\offset + S_SP + load_user_sp_lr r2, r3, S_SP @ calling sp, lr + ldr r1, [sp, S_PSR] @ get calling cpsr + ldr lr, [sp, S_PC] @ get pc + add sp, sp, S_SP tst r1, #PSR_I_BIT | 0x0f bne 1f msr spsr_cxsf, r1 @ save in spsr_svc @@ -350,11 +343,7 @@ ALT_UP_B(.L1_\@) @ We must avoid clrex due to Cortex-A15 erratum #830321 strex r1, r2, [sp] @ clear the exclusive monitor - .if \fast - ldmdb sp, {r1 - r12} @ get calling r1 - r12 - .else ldmdb sp, {r0 - r12} @ get calling r0 - r12 - .endif add sp, sp, #PT_REGS_SIZE - S_SP movs pc, lr @ return & move spsr_svc into cpsr 1: bug "Returning to usermode but unexpected PSR bits set?", \@ -- 2.47.1