Message ID | 20230811170049.308866-5-frederic@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1253380vqi; Fri, 11 Aug 2023 10:38:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEyGTW5MyKcBquMy4+Pf8Dab6/SqXchteFDp7hbfXH1vO3qhY4HMZxG3XZkJ8zPQpi2i2zv X-Received: by 2002:a05:6a00:2d0e:b0:67e:4313:811e with SMTP id fa14-20020a056a002d0e00b0067e4313811emr2822633pfb.0.1691775526928; Fri, 11 Aug 2023 10:38:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691775526; cv=none; d=google.com; s=arc-20160816; b=uICeXAgkTJkcXnRU03vt5bu1GwVIlUsVBofI2ekRocuaoY3K56N8/HfuZB3xe55ik6 GWbrZyx8tEYOsMcCrROkqnbJ+BpkVJIIS6T0AT1U7LxTYX9mJgoEDFjqlN68+Pp8Yupo 1//OKPZRojjpcILmebI0eTugKMLCFCkcwncam7kT8YljYGayppNI/YNgEkCPKnjjye3A X1Ev5js3nEU3SViVCwhC9whmGjY5Yg2Xz0SadO/2YHf5Xv3eFVnfHe/aW9iQSGQIprPV cbocavSNEuho9xkOtgIKjO4HsvFliQcI5ZNG7joq6at/vNwmdkuruDTw7MVLQBUJaA7V sRgA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PlGrn91imjXECzlK+h2P5cuDm5pXjV5ugTgupuKWM14=; fh=/j17CRxNYWm50Nf0CjWkmHmtCvvs/7IroindgguQRCc=; b=wu1O1+gjEDepkPSu3k3vYM3RWao9mhmGANuu7AURUURmGh18t2k2td1evoYeqd4M64 iB5Ihm/bdyzZdMSYtOd6fxHYKf8LruwP/JaRXqXGgeOCV65WC69wnECY8B0YMCcpJ8rr VjibPyOAooMPvOd1EAEyXj5BOoz7AWYztY7hEYA1hatB0YZiDw+8uwKw7Ed7BmuOYdt6 YP+2Gu0bI0txfRbqSLLVDHDQuzpqdVVYqOEPEBwEi5HM+SLCQ6CexxJUt0H/1SbwdHoF ebqcOLGbfgXj6T1DjhXOcEDx1M6ruMLTHlR2xkqOwdKTcRdOdd6TWZ+WFlKGH7LIRyop 2WbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=SvV+gp5g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q27-20020a056a0002bb00b0068781a6993bsi3554119pfs.276.2023.08.11.10.38.32; Fri, 11 Aug 2023 10:38:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=SvV+gp5g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236153AbjHKRBV (ORCPT <rfc822;lanlanxiyiji@gmail.com> + 99 others); Fri, 11 Aug 2023 13:01:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236192AbjHKRBM (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 11 Aug 2023 13:01:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BC4730F8 for <linux-kernel@vger.kernel.org>; Fri, 11 Aug 2023 10:01:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0C08267762 for <linux-kernel@vger.kernel.org>; Fri, 11 Aug 2023 17:01:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5125AC433C7; Fri, 11 Aug 2023 17:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691773264; bh=avuix5bG15MMoG/1/mFgPThQIvzwkN7p3FXy26I7Giw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SvV+gp5g5gzELLIxJzVjWBy9jH4Dr1dph56JxNHJDLbhjtbBPcfgWx0fDvwBMR8JJ MFdvd12oxGLPVAL1BUDpG4jC4IM2ohaqHWnv/6dfM/2rhE1kGmdk7bUHTRNTo4PGBS TH/3EkVf3lwQIgRieERTjBvL/JCtKKilmJ27qqWlNevT0W38UOdZOcL0dS6iZu+ijL rbTuO2gtnRwuiWmqYHvryTQgFj19MKL4UZ0q72ZgZkGhv53ssZ1hxogu7li5d80XSL r+P44pFqvg3cG1DSuwaVBnGRNq6v5NbRGeEu3UHQEe5S2vCO2ZqcF8OWUNtjEFcOuy N0lLJgBOpbUUw== From: Frederic Weisbecker <frederic@kernel.org> To: LKML <linux-kernel@vger.kernel.org> Cc: Peter Zijlstra <peterz@infradead.org>, Frederic Weisbecker <frederic@kernel.org>, "Rafael J . Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Thomas Gleixner <tglx@linutronix.de>, Anna-Maria Behnsen <anna-maria@linutronix.de>, Bibo Mao <maobibo@loongson.cn>, WANG Xuerui <kernel@xen0n.name>, Bibo@vger.kernel.org Subject: [PATCH 04/10] loongson: Fix idle VS timer enqueue Date: Fri, 11 Aug 2023 19:00:43 +0200 Message-Id: <20230811170049.308866-5-frederic@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230811170049.308866-1-frederic@kernel.org> References: <20230811170049.308866-1-frederic@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773955215308312517 X-GMAIL-MSGID: 1773955215308312517 |
Series |
timers/cpuidle: Fixes and cleanups
|
|
Commit Message
Frederic Weisbecker
Aug. 11, 2023, 5 p.m. UTC
From: Peter Zijlstra <peterz@infradead.org> Loongson re-enables interrupts on its idle routine and performs a TIF_NEED_RESCHED check afterwards before putting the CPU to sleep. The IRQs firing between the check and the idling instruction may set the TIF_NEED_RESCHED flag. In order to deal with the such a race, IRQs interrupting __arch_cpu_idle() rollback their return address to the beginning of __arch_cpu_idle() so that TIF_NEED_RESCHED is checked again before going back to sleep. However idle IRQs can also queue timers that may require a tick reprogramming through a new generic idle loop iteration but those timers would go unnoticed here because __arch_cpu_idle() only checks TIF_NEED_RESCHED. It doesn't check for pending timers. Fix this with fast-forwarding idle IRQs return value to the end of the idle routine instead of the beginning, so that the generic idle loop handles both TIF_NEED_RESCHED and pending timers. Fixes: 0603839b18f4 (LoongArch: Add exception/interrupt handling) Tested-by: Bibo, Mao <maobibo@loongson.cn> Not-yet-signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: WANG Xuerui <kernel@xen0n.name> Signed-off-by: Frederic Weisbecker <frederic@kernel.org> --- arch/loongarch/kernel/genex.S | 32 ++++++++++++++++++-------------- arch/loongarch/kernel/idle.c | 1 - 2 files changed, 18 insertions(+), 15 deletions(-)
Comments
+Add huacai asm instruction move should be replaced with li.w, the other looks good to me. diff --git a/arch/loongarch/kernel/genex.S b/arch/loongarch/kernel/genex.S index 359d693f112e..8a98023ecafd 100644 --- a/arch/loongarch/kernel/genex.S +++ b/arch/loongarch/kernel/genex.S @@ -19,7 +19,7 @@ .align 5 SYM_FUNC_START(__arch_cpu_idle) /* start of idle interrupt region */ - move t0, CSR_CRMD_IE + li.w t0, CSR_CRMD_IE csrxchg t0, t0, LOONGARCH_CSR_CRMD /* * If an interrupt lands here; between enabling interrupts above and By the way __arch_cpu_idle is called by machine_halt/machine_power_off etc, irq will be enabled with new patch. Need we add something like this? diff --git a/arch/loongarch/kernel/reset.c b/arch/loongarch/kernel/reset.c index 1ef8c6383535..9ecd42c0c804 100644 --- a/arch/loongarch/kernel/reset.c +++ b/arch/loongarch/kernel/reset.c @@ -20,6 +20,11 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); +static __always_inline void native_halt(void) +{ + asm volatile("idle 0": : :"memory"); +} + void machine_halt(void) { #ifdef CONFIG_SMP @@ -32,9 +37,9 @@ void machine_halt(void) pr_notice("\n\n** You can safely turn off the power now **\n\n"); console_flush_on_panic(CONSOLE_FLUSH_PENDING); - while (true) { - __arch_cpu_idle(); - } + while (1) { + native_halt(); + }; } void machine_power_off(void) @@ -52,9 +57,9 @@ void machine_power_off(void) efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL); #endif - while (true) { - __arch_cpu_idle(); - } + while (1) { + native_halt(); + }; } void machine_restart(char *command) @@ -73,7 +78,7 @@ void machine_restart(char *command) if (!acpi_disabled) acpi_reboot(); - while (true) { - __arch_cpu_idle(); - } + while (1) { + native_halt(); + }; } Regards Bibo Mao 在 2023/8/12 01:00, Frederic Weisbecker 写道: > From: Peter Zijlstra <peterz@infradead.org> > > Loongson re-enables interrupts on its idle routine and performs a > TIF_NEED_RESCHED check afterwards before putting the CPU to sleep. > > The IRQs firing between the check and the idling instruction may set the > TIF_NEED_RESCHED flag. In order to deal with the such a race, IRQs > interrupting __arch_cpu_idle() rollback their return address to the > beginning of __arch_cpu_idle() so that TIF_NEED_RESCHED is checked > again before going back to sleep. > > However idle IRQs can also queue timers that may require a tick > reprogramming through a new generic idle loop iteration but those timers > would go unnoticed here because __arch_cpu_idle() only checks > TIF_NEED_RESCHED. It doesn't check for pending timers. > > Fix this with fast-forwarding idle IRQs return value to the end of the > idle routine instead of the beginning, so that the generic idle loop > handles both TIF_NEED_RESCHED and pending timers. > > Fixes: 0603839b18f4 (LoongArch: Add exception/interrupt handling) > Tested-by: Bibo, Mao <maobibo@loongson.cn> > Not-yet-signed-off-by: Peter Zijlstra <peterz@infradead.org> > Cc: WANG Xuerui <kernel@xen0n.name> > Signed-off-by: Frederic Weisbecker <frederic@kernel.org> > --- > arch/loongarch/kernel/genex.S | 32 ++++++++++++++++++-------------- > arch/loongarch/kernel/idle.c | 1 - > 2 files changed, 18 insertions(+), 15 deletions(-) > > diff --git a/arch/loongarch/kernel/genex.S b/arch/loongarch/kernel/genex.S > index 78f066384657..359d693f112e 100644 > --- a/arch/loongarch/kernel/genex.S > +++ b/arch/loongarch/kernel/genex.S > @@ -18,27 +18,31 @@ > > .align 5 > SYM_FUNC_START(__arch_cpu_idle) > - /* start of rollback region */ > - LONG_L t0, tp, TI_FLAGS > - nop > - andi t0, t0, _TIF_NEED_RESCHED > - bnez t0, 1f > - nop > - nop > - nop > + /* start of idle interrupt region */ > + move t0, CSR_CRMD_IE > + csrxchg t0, t0, LOONGARCH_CSR_CRMD > + /* > + * If an interrupt lands here; between enabling interrupts above and > + * going idle on the next instruction, we must *NOT* go idle since the > + * interrupt could have set TIF_NEED_RESCHED or caused an timer to need > + * reprogramming. Fall through -- see handle_vint() below -- and have > + * the idle loop take care of things. > + */ > idle 0 > - /* end of rollback region */ > -1: jr ra > + nop > + /* end of idle interrupt region */ > +SYM_INNER_LABEL(__arch_cpu_idle_exit, SYM_L_LOCAL) > + jr ra > SYM_FUNC_END(__arch_cpu_idle) > > SYM_FUNC_START(handle_vint) > BACKUP_T0T1 > SAVE_ALL > - la_abs t1, __arch_cpu_idle > + la_abs t1, __arch_cpu_idle_exit > LONG_L t0, sp, PT_ERA > - /* 32 byte rollback region */ > - ori t0, t0, 0x1f > - xori t0, t0, 0x1f > + /* 16 byte idle interrupt region */ > + ori t0, t0, 0x0f > + addi.d t0, t0, 1 > bne t0, t1, 1f > LONG_S t0, sp, PT_ERA > 1: move a0, sp > diff --git a/arch/loongarch/kernel/idle.c b/arch/loongarch/kernel/idle.c > index 0b5dd2faeb90..5ba72d229920 100644 > --- a/arch/loongarch/kernel/idle.c > +++ b/arch/loongarch/kernel/idle.c > @@ -11,7 +11,6 @@ > > void __cpuidle arch_cpu_idle(void) > { > - raw_local_irq_enable(); > __arch_cpu_idle(); /* idle instruction needs irq enabled */ > raw_local_irq_disable(); > }
diff --git a/arch/loongarch/kernel/genex.S b/arch/loongarch/kernel/genex.S index 78f066384657..359d693f112e 100644 --- a/arch/loongarch/kernel/genex.S +++ b/arch/loongarch/kernel/genex.S @@ -18,27 +18,31 @@ .align 5 SYM_FUNC_START(__arch_cpu_idle) - /* start of rollback region */ - LONG_L t0, tp, TI_FLAGS - nop - andi t0, t0, _TIF_NEED_RESCHED - bnez t0, 1f - nop - nop - nop + /* start of idle interrupt region */ + move t0, CSR_CRMD_IE + csrxchg t0, t0, LOONGARCH_CSR_CRMD + /* + * If an interrupt lands here; between enabling interrupts above and + * going idle on the next instruction, we must *NOT* go idle since the + * interrupt could have set TIF_NEED_RESCHED or caused an timer to need + * reprogramming. Fall through -- see handle_vint() below -- and have + * the idle loop take care of things. + */ idle 0 - /* end of rollback region */ -1: jr ra + nop + /* end of idle interrupt region */ +SYM_INNER_LABEL(__arch_cpu_idle_exit, SYM_L_LOCAL) + jr ra SYM_FUNC_END(__arch_cpu_idle) SYM_FUNC_START(handle_vint) BACKUP_T0T1 SAVE_ALL - la_abs t1, __arch_cpu_idle + la_abs t1, __arch_cpu_idle_exit LONG_L t0, sp, PT_ERA - /* 32 byte rollback region */ - ori t0, t0, 0x1f - xori t0, t0, 0x1f + /* 16 byte idle interrupt region */ + ori t0, t0, 0x0f + addi.d t0, t0, 1 bne t0, t1, 1f LONG_S t0, sp, PT_ERA 1: move a0, sp diff --git a/arch/loongarch/kernel/idle.c b/arch/loongarch/kernel/idle.c index 0b5dd2faeb90..5ba72d229920 100644 --- a/arch/loongarch/kernel/idle.c +++ b/arch/loongarch/kernel/idle.c @@ -11,7 +11,6 @@ void __cpuidle arch_cpu_idle(void) { - raw_local_irq_enable(); __arch_cpu_idle(); /* idle instruction needs irq enabled */ raw_local_irq_disable(); }