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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48F51C54EBE for ; Thu, 12 Jan 2023 19:57:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35D16900003; Thu, 12 Jan 2023 14:57:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F0C6900002; Thu, 12 Jan 2023 14:57:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFA628E0007; Thu, 12 Jan 2023 14:57:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 58AC0900003 for ; Thu, 12 Jan 2023 14:57:26 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 32E8980560 for ; Thu, 12 Jan 2023 19:57:26 +0000 (UTC) X-FDA: 80347206492.06.9258CA4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id 7055C100013 for ; Thu, 12 Jan 2023 19:57:23 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Kp80SUD6; dmarc=none; spf=none (imf05.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673553443; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:references:dkim-signature; bh=2eFs7p2/0chzp9jyFOBFOnUwzOwJX/uRLls14aFVgag=; b=V9VeQgS4fcd7JIQguc8nc8YQov/+Z+mCJv/Wbt5hfCJM6aCQ/Owc/Plwe/bUuAciZ5e3T7 9nggjhihKQji14yryiVmunQQ4Q4S0uazYBrDLWmtTWFmPn+O9Sv0z39oPoehqm2yfwwBhD zLhFYt+o0MALlU32Eoi6WpxkGU16If0= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Kp80SUD6; dmarc=none; spf=none (imf05.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673553444; a=rsa-sha256; cv=none; b=1RRjjooC4gefyM/tkjAhZJs5M2RmydE9jdShfWsXW3/zFwvD27jjxoEyRLr+2U/lcPU9GH JEvx2v1x4hT4QeIFiGoG76IVpJeboIXwQKlCYTjqu4eftF5HDX/qDZ8YlZ0TNEwxO6662d 4cFJ8QFF6nWmeju9/4vLTbaU5D+wQXk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=2eFs7p2/0chzp9jyFOBFOnUwzOwJX/uRLls14aFVgag=; b=Kp80SUD68uogQ7CF0VPz5WgdMT 0FS6rzZ+zEzxTiJoRY9jEMzKGVydp7aYWC3sRUUnILWIxAyd96CWyQ9T7UE6DShorpZaQ9mDk6KVK YpusfV5GbadFKS+Prc3I7me87VXj83zKX6LVewrKS1W6U1Y1Z1aNLoF8uW0CHwlh75MpxatpBfUgL QEy9WXc5DqqL3xIvlWnY+8NvGltRlD2i0A3ODa3Wy0R4rtWnWuaU1J2E2ZFUqVfxtvRA0m/3Gl5ri UpkOH+MJ9X8S5rPQvY9RK8BcUr7Tgb39GbSPZixfN6QDQ8AJi/5iNjoQt1kg6s3BOQoUGB+jZedZX ffni6LxA==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pG3ha-005Odx-NL; Thu, 12 Jan 2023 19:57:30 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 64649303429; Thu, 12 Jan 2023 20:57:13 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 020F62CCF1F7B; Thu, 12 Jan 2023 20:57:07 +0100 (CET) Message-ID: <20230112195540.618076436@infradead.org> User-Agent: quilt/0.66 Date: Thu, 12 Jan 2023 20:43:35 +0100 From: Peter Zijlstra To: peterz@infradead.org Cc: richard.henderson@linaro.org, ink@jurassic.park.msu.ru, mattst88@gmail.com, vgupta@kernel.org, linux@armlinux.org.uk, nsekhar@ti.com, brgl@bgdev.pl, ulli.kroll@googlemail.com, linus.walleij@linaro.org, shawnguo@kernel.org, Sascha Hauer , kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, tony@atomide.com, khilman@kernel.org, krzysztof.kozlowski@linaro.org, alim.akhtar@samsung.com, catalin.marinas@arm.com, will@kernel.org, guoren@kernel.org, bcain@quicinc.com, chenhuacai@kernel.org, kernel@xen0n.name, geert@linux-m68k.org, sammy@sammy.net, monstr@monstr.eu, tsbogend@alpha.franken.de, dinguyen@kernel.org, jonas@southpole.se, stefan.kristiansson@saunalahti.fi, shorne@gmail.com, James.Bottomley@HansenPartnership.com, deller@gmx.de, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, ysato@users.sourceforge.jp, dalias@libc.org, davem@davemloft.net, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, acme@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, namhyung@kernel.org, jgross@suse.com, srivatsa@csail.mit.edu, amakhalov@vmware.com, pv-drivers@vmware.com, boris.ostrovsky@oracle.com, chris@zankel.net, jcmvbkbc@gmail.com, rafael@kernel.org, lenb@kernel.org, pavel@ucw.cz, gregkh@linuxfoundation.org, mturquette@baylibre.com, sboyd@kernel.org, daniel.lezcano@linaro.org, lpieralisi@kernel.org, sudeep.holla@arm.com, agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, anup@brainfault.org, thierry.reding@gmail.com, jonathanh@nvidia.com, jacob.jun.pan@linux.intel.com, atishp@atishpatra.org, Arnd Bergmann , yury.norov@gmail.com, andriy.shevchenko@linux.intel.com, linux@rasmusvillemoes.dk, dennis@kernel.org, tj@kernel.org, cl@linux.com, rostedt@goodmis.org, mhiramat@kernel.org, frederic@kernel.org, paulmck@kernel.org, pmladek@suse.com, senozhatsky@chromium.org, john.ogness@linutronix.de, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, Andrew Morton , jpoimboe@kernel.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-perf-users@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-xtensa@linux-xtensa.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, kasan-dev@googlegroups.com, "Gautham R. Shenoy" , "Rafael J. Wysocki" , Ulf Hansson Subject: [PATCH v3 21/51] arch/idle: Change arch_cpu_idle() IRQ behaviour References: <20230112194314.845371875@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Rspamd-Queue-Id: 7055C100013 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: rc7jmuemjw54gjmtxw4eabne8jmo866j X-HE-Tag: 1673553443-7371 X-HE-Meta: U2FsdGVkX19rlJEOZVt/52Z1QihWyBiYfR8XOKe5xDYUP6XzNd6JhZrKF5BhzTziipFPFB/ud4jwJNgVVvx5fk1LWgP5merRYbXCBhIUuxvjtmt6ncHfYth4d1LKxmmo81n23qTEF9g0iD7eva31d4gXw/1iQw1mgWK2w63Sz8eZAmOIZpFB1W73fzJATzPykKfGwb0cj52NClLJPrk2mq1+OlsQQPQArZzg3ggTsj3fvwh5Pxk/jxTQ9Rijf88GWi99H6ZZrgLwezoFRS25irCY3jz7vuiLHBhgLqLnIjgj6VAntk/RtXCYEdvNAQ5D5yLvadmHzUrbcjCYtuVTD/O8JuBwZTPjKQKcPQZ2LdyhBDN+ygcHVfcZJJouhuA8dL6cTP1FWK7DaeD5GXP9iEawLRtrsMLbRWe2Uxi4i9OnWHAXgD31ihBnqQBEqzIUiw38VYuDGYpfawvZXf0gvnO1fsO8JQ+EvIj+A8kheZj8Oh/shpgXU7gia3EZdbm/qPGwEO2mb1uPz7lKVN+/Am78jvvKUm4ehmojjWZH5NhM2JhKXqI4uk/nOVRePPOlboQsK9LKQxtFbQTb3MiLN4wkV9Qd+oAVDYTmOkBDk/U7+sZ3WSnsF/OODcTZHOqALeNBs85LH8FJrEpDT6AG85uKKVjiH5e9whufTsT4SdwDS7pctimIKr/WHcOPyxN0DKDYAnUXptdpexZCKfnI9TgCl9wC5JGE/QReg2CY9BWutbqHGCtzgMIqQ1a1W1DVr7a47vQGYn1MxUxlsgxqeUWa1ncfDrzUxFZFG/7rkTiDH80vPS0Hxr+6PVWTuPl6MVHtDK9WbjmfJoGAtazd8OYPSmRkeJnyGcKxUYPAvV2lnm66osu3X3bs404s7cBrwMv+S2f3LTRWyuFAOuqNI+3txrbPi9XG7GHYKY6GpY4qLJ2ZnMBua+8Fbt90lF1RQ7+VNDYrWFpa02AY791 EzchAJ0U NeD4gnLTd/DBXSE+iIXzBZyPc+pw4JlEoLLL5hOOO5Mxkd1pPmMMcu0f8stxU3ZX9wL0dkw5Irie/wcAnMv48eY0CCqR956ciEiTT4pjeE+bKvMCxJCuSHbqxy/fBCGiy51HANB3iqEoHjnf93gU/KQA+r/oiNui2nraWUsIqvIlkth5DAxhiBasKEFRrtdVbvUBOvR/lLb1p3T8PqTqmCCa6JNYcVL2ySeMsCwRMp16Pq9+ztyAyPtxZI94twcoODyjXCuV+OcnzA3j2OJpWMYV4kTdeow2E4NiPCnL+w+y9Ma8qAC2yueCb7yw63ZyE8bL47wAIsPhGhuFJisQkp3sJAL7dulsxDi7nISEFbBtoT/zt2BMRSmRlx7nmFThtkOy0VCHzT9vTlXm0X9WM2eVFd5qivZao0yFt7PuuQPM7PHoJxwCcSSkIuhLx0j0bfwVvBQM6B6GA2GO4JEhDMWekgCYgUFmXQvoBgKQWdklBkdrxiR2eONqYNtnxYg09se1rWePvdgQFuuRnnJYMhwxfTPonNJrvmDRn7IK5uisNwC+0eag/4NtM9rBw8cModQkH2Vh1FFg16+eYTvuqeB2MCLcIN83YFnGG81c0kDKKsBejoEdAYDq5mGFFsMUM3evgEnwiYUCuqX28fGLm5BF1vXz7J00oJ7N8tTkhcFnA8v/vPKSjELN5xZG+e6PdcwxpUQAKbsZwT8l2J36A9/EYdkNrzmKHIvOjlwVvBBPZ4KfahkiH1sd/u0BujgMPLsiFyfta8WKWrRGyt3rSLJ9BqzKsogcBuf5GQyXcpBUqdKsRW/Wrp48myzGO3SiyFK3HBu6IMdYsriM/ngX3boWrkTARQ8MWIsduEeTFmVDckXFePa9SRZ887VfDQMRzU8d9pfqgVxNjDP4P6ecWTVXYo252YkpADnmDszyQAZiOjlafsH76SHvNmt4zhLMIqmHL8iIhQREC8j21QwRQZYJDnzOB qbIPvc3X J/ozrCqV0is2sbupDbQcAfd9dodrbf3/2Wnm9yHKTuakqap/x5am85+WbghwUULjkT784dXtcFrGLlznFre2dJI/ojcOQEoU9knvXSVJY0GHdsW7feLNSVxs49F3wzdCLHcLv+LWQUNGLn0M5rSPHkjP7kaNTAG4Q7bWHulBCPN2OQKNsWmg/zJTB0uyre0rJTiwX/IjzYJPhR5ZHya/0OH5+6R15+EIGXdLohL37yF/WEWFfWj3szJVsGR3n1npV4luCtcwAYd/EsUnOGdzzujszd4x6lLeygBKdXMFtaqME8yXRU5LkhRmQiyAcWqHqcLcJA4oPSloeieViJpLABphbldr/jR3TVotOUGWWcNccDIX6Js/KP1a7CEN8t8/DqREefapmNoetT+77DjZm6z2hcPz3YYLa2CB0w/dgxqCe13djoXyVn/BeQfA2ENcI1HBpFlnXG6JY+myfcsROcZ3b9DH0I2O/bNYF3y4cpkw51MvrlwY2HGokqfU8nyALoDA+IUpfMuh7XZ+fbT/xIoNP75t0A34ApSD/jAFw/C/HwueNOeiiWXxdX5phvFlPsu8WisArYKD5VliBT/9D6k/cBfiT94SK4K+DhCO4UNGLjc8jS/K8Ge3BxD8FQogCXaXMI1ty0Lq7L/OO/L+YStdKBJ51Zacm2F1Rk3RIWiyGC0Bc/iXCtLFyNnv1pg3i/jTDVYbnF/nmH9QCn8voECSwDczTBVH3GKuJwvOS04FrJE7zGYTiN+beabEKrHVQ6G+GeZW+ehW3MYgl2nwaJkvzDY3wUp5GKrz1YHy/Z3evL8i+GGJlReElpmeK4P2AJdSUHdhFzI5qIr3BrSHBedp6zXBNb+0iiPLuUq/dmsyt722/+tIyVXbuE3NGFhNljygBuD/Pe2nRRPbre0eELNscfHtGlErnarNwoQWQtr5yecnpwzpBFZbuRXidHZcK9hgVPp5LWchLu8GNJPXrfvg1aFjv FmIZX4jd 026csaBjK1iMSptY+tnHp26I/Zx14L7O3cARzGeUZXtf2uGNP6Eulb1PaApaJV8j0cp/nOVL4qM7mKfeu7j3lK/zuGL4GTs0uX+b1eOVM2ghhdAkUFy7tktgzPhk1DM+r2ebebYjUGMVW5uCfleuYKwbIHK+ccbrQvIkgDgP3WQUSwbu/4noj6KpcKBEmids+29tNWbFrZy8rwJ20Ywa9OIJ1nXPe4mMPubac0tRhzzWz1jOrpIrC0//V4tMvNfO7QAeermie2zrpx0ShQBVBnibYxr31gOpcm0OQUqboLFoIFKOQ5AQ+vZ9H1ZscSqCSz21CTg/dJJHykdGLFqzPbtq/b6mRo4ldZyAYfhe46R0CJFjiYQH9XRsoXTkYEFyN8Y0OTbSacyie6Wqd0bYboIWKMay+UehrrZVzmYnEKOIQHp5d5emVkaUgN/oEBeQd9NT6ELDVeqE1bXNSNGuyGDle1eLzsP8oBPoXJfHp9YuwmltvL+17NO0Nj+Q+toSDgNVax1kc9XRbDySds/iDo6Y4ZMDN+9vJTssv19FHjMn7n16VSUJ0tAAQS4NXvZgyQBq6WPAOVoUNcBdyHNO3inovlvtgzGF1ApyrX0wMJ7PWBx3WtwQReHhZDt/y9mseI+g7VDH8lX/cNyoLbeHbDu9AIdcl8tBVbk1/bJOVp27XQApG6dR1RbcBWaFZwHP4LO5b4K0o2qmvo1NOKE1GKe7guKot6/L5MjiiP1Yc3IhKt3K3mGOSeNa2J64I7vqw80p67vRpDvgfQ2ABrbLamI/Im11VBEJB1JGZLGUs267Ig1KQk+mHFvp/wuXca1NFECOCEyqDNGrHbGvfW9F6DnJ7MnEbVsgSGvD1X04AEcPaCOOwEfbx4NcdCMPELmj7EHMEZsEP2yT9kTulJQzHv4+j6QohKBqdl7mBeULJqJp9HQ3SnRM81SZdIihaaz0MElKPVt5+62hCDxhB6AAzODE9VG8Y EyIR+Ca2 ydbObzuuWWWXPkbeJJHOTwsYsEANq2pWWbIuLf80qjB3WIBNm5MWztK0keQ2EN6w/kxF8go1qzRahI+C2uc8dzRExgrprzAdRptv96A3BgsNEUYYlNYPdc4kd2yCo0z+WERIr7E/X0Z3aDto9lU+DH X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Current arch_cpu_idle() is called with IRQs disabled, but will return with IRQs enabled. However, the very first thing the generic code does after calling arch_cpu_idle() is raw_local_irq_disable(). This means that architectures that can idle with IRQs disabled end up doing a pointless 'enable-disable' dance. Therefore, push this IRQ disabling into the idle function, meaning that those architectures can avoid the pointless IRQ state flipping. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Gautham R. Shenoy Acked-by: Mark Rutland [arm64] Acked-by: Rafael J. Wysocki Acked-by: Guo Ren Acked-by: Frederic Weisbecker Tested-by: Tony Lindgren Tested-by: Ulf Hansson --- arch/alpha/kernel/process.c | 1 - arch/arc/kernel/process.c | 3 +++ arch/arm/kernel/process.c | 1 - arch/arm/mach-gemini/board-dt.c | 3 ++- arch/arm64/kernel/idle.c | 1 - arch/csky/kernel/process.c | 1 - arch/csky/kernel/smp.c | 2 +- arch/hexagon/kernel/process.c | 1 - arch/ia64/kernel/process.c | 1 + arch/loongarch/kernel/idle.c | 1 + arch/microblaze/kernel/process.c | 1 - arch/mips/kernel/idle.c | 8 +++----- arch/nios2/kernel/process.c | 1 - arch/openrisc/kernel/process.c | 1 + arch/parisc/kernel/process.c | 2 -- arch/powerpc/kernel/idle.c | 5 ++--- arch/riscv/kernel/process.c | 1 - arch/s390/kernel/idle.c | 1 - arch/sh/kernel/idle.c | 1 + arch/sparc/kernel/leon_pmc.c | 4 ++++ arch/sparc/kernel/process_32.c | 1 - arch/sparc/kernel/process_64.c | 3 ++- arch/um/kernel/process.c | 1 - arch/x86/coco/tdx/tdx.c | 3 +++ arch/x86/kernel/process.c | 15 ++++----------- arch/xtensa/kernel/process.c | 1 + kernel/sched/idle.c | 2 -- 27 files changed, 29 insertions(+), 37 deletions(-) --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c @@ -57,7 +57,6 @@ EXPORT_SYMBOL(pm_power_off); void arch_cpu_idle(void) { wtint(0); - raw_local_irq_enable(); } void arch_cpu_idle_dead(void) --- a/arch/arc/kernel/process.c +++ b/arch/arc/kernel/process.c @@ -114,6 +114,8 @@ void arch_cpu_idle(void) "sleep %0 \n" : :"I"(arg)); /* can't be "r" has to be embedded const */ + + raw_local_irq_disable(); } #else /* ARC700 */ @@ -122,6 +124,7 @@ void arch_cpu_idle(void) { /* sleep, but enable both set E1/E2 (levels of interrupts) before committing */ __asm__ __volatile__("sleep 0x3 \n"); + raw_local_irq_disable(); } #endif --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -78,7 +78,6 @@ void arch_cpu_idle(void) arm_pm_idle(); else cpu_do_idle(); - raw_local_irq_enable(); } void arch_cpu_idle_prepare(void) --- a/arch/arm/mach-gemini/board-dt.c +++ b/arch/arm/mach-gemini/board-dt.c @@ -42,8 +42,9 @@ static void gemini_idle(void) */ /* FIXME: Enabling interrupts here is racy! */ - local_irq_enable(); + raw_local_irq_enable(); cpu_do_idle(); + raw_local_irq_disable(); } static void __init gemini_init_machine(void) --- a/arch/arm64/kernel/idle.c +++ b/arch/arm64/kernel/idle.c @@ -42,5 +42,4 @@ void noinstr arch_cpu_idle(void) * tricks */ cpu_do_idle(); - raw_local_irq_enable(); } --- a/arch/csky/kernel/process.c +++ b/arch/csky/kernel/process.c @@ -100,6 +100,5 @@ void arch_cpu_idle(void) #ifdef CONFIG_CPU_PM_STOP asm volatile("stop\n"); #endif - raw_local_irq_enable(); } #endif --- a/arch/csky/kernel/smp.c +++ b/arch/csky/kernel/smp.c @@ -309,7 +309,7 @@ void arch_cpu_idle_dead(void) while (!secondary_stack) arch_cpu_idle(); - local_irq_disable(); + raw_local_irq_disable(); asm volatile( "mov sp, %0\n" --- a/arch/hexagon/kernel/process.c +++ b/arch/hexagon/kernel/process.c @@ -44,7 +44,6 @@ void arch_cpu_idle(void) { __vmwait(); /* interrupts wake us up, but irqs are still disabled */ - raw_local_irq_enable(); } /* --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -242,6 +242,7 @@ void arch_cpu_idle(void) (*mark_idle)(1); raw_safe_halt(); + raw_local_irq_disable(); if (mark_idle) (*mark_idle)(0); --- a/arch/loongarch/kernel/idle.c +++ b/arch/loongarch/kernel/idle.c @@ -13,4 +13,5 @@ void __cpuidle arch_cpu_idle(void) { raw_local_irq_enable(); __arch_cpu_idle(); /* idle instruction needs irq enabled */ + raw_local_irq_disable(); } --- a/arch/microblaze/kernel/process.c +++ b/arch/microblaze/kernel/process.c @@ -140,5 +140,4 @@ int dump_fpu(struct pt_regs *regs, elf_f void arch_cpu_idle(void) { - raw_local_irq_enable(); } --- a/arch/mips/kernel/idle.c +++ b/arch/mips/kernel/idle.c @@ -33,13 +33,13 @@ static void __cpuidle r3081_wait(void) { unsigned long cfg = read_c0_conf(); write_c0_conf(cfg | R30XX_CONF_HALT); - raw_local_irq_enable(); } void __cpuidle r4k_wait(void) { raw_local_irq_enable(); __r4k_wait(); + raw_local_irq_disable(); } /* @@ -57,7 +57,6 @@ void __cpuidle r4k_wait_irqoff(void) " .set arch=r4000 \n" " wait \n" " .set pop \n"); - raw_local_irq_enable(); } /* @@ -77,7 +76,6 @@ static void __cpuidle rm7k_wait_irqoff(v " wait \n" " mtc0 $1, $12 # stalls until W stage \n" " .set pop \n"); - raw_local_irq_enable(); } /* @@ -103,6 +101,8 @@ static void __cpuidle au1k_wait(void) " nop \n" " .set pop \n" : : "r" (au1k_wait), "r" (c0status)); + + raw_local_irq_disable(); } static int __initdata nowait; @@ -245,8 +245,6 @@ void arch_cpu_idle(void) { if (cpu_wait) cpu_wait(); - else - raw_local_irq_enable(); } #ifdef CONFIG_CPU_IDLE --- a/arch/nios2/kernel/process.c +++ b/arch/nios2/kernel/process.c @@ -33,7 +33,6 @@ EXPORT_SYMBOL(pm_power_off); void arch_cpu_idle(void) { - raw_local_irq_enable(); } /* --- a/arch/openrisc/kernel/process.c +++ b/arch/openrisc/kernel/process.c @@ -102,6 +102,7 @@ void arch_cpu_idle(void) raw_local_irq_enable(); if (mfspr(SPR_UPR) & SPR_UPR_PMP) mtspr(SPR_PMR, mfspr(SPR_PMR) | SPR_PMR_DME); + raw_local_irq_disable(); } void (*pm_power_off)(void) = NULL; --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -187,8 +187,6 @@ void arch_cpu_idle_dead(void) void __cpuidle arch_cpu_idle(void) { - raw_local_irq_enable(); - /* nop on real hardware, qemu will idle sleep. */ asm volatile("or %%r10,%%r10,%%r10\n":::); } --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c @@ -51,10 +51,9 @@ void arch_cpu_idle(void) * Some power_save functions return with * interrupts enabled, some don't. */ - if (irqs_disabled()) - raw_local_irq_enable(); + if (!irqs_disabled()) + raw_local_irq_disable(); } else { - raw_local_irq_enable(); /* * Go into low thread priority and possibly * low power mode. --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -39,7 +39,6 @@ extern asmlinkage void ret_from_kernel_t void arch_cpu_idle(void) { cpu_do_idle(); - raw_local_irq_enable(); } void __show_regs(struct pt_regs *regs) --- a/arch/s390/kernel/idle.c +++ b/arch/s390/kernel/idle.c @@ -66,7 +66,6 @@ void arch_cpu_idle(void) idle->idle_count++; account_idle_time(cputime_to_nsecs(idle_time)); raw_write_seqcount_end(&idle->seqcount); - raw_local_irq_enable(); } static ssize_t show_idle_count(struct device *dev, --- a/arch/sh/kernel/idle.c +++ b/arch/sh/kernel/idle.c @@ -25,6 +25,7 @@ void default_idle(void) raw_local_irq_enable(); /* Isn't this racy ? */ cpu_sleep(); + raw_local_irq_disable(); clear_bl_bit(); } --- a/arch/sparc/kernel/leon_pmc.c +++ b/arch/sparc/kernel/leon_pmc.c @@ -57,6 +57,8 @@ static void pmc_leon_idle_fixup(void) "lda [%0] %1, %%g0\n" : : "r"(address), "i"(ASI_LEON_BYPASS)); + + raw_local_irq_disable(); } /* @@ -70,6 +72,8 @@ static void pmc_leon_idle(void) /* For systems without power-down, this will be no-op */ __asm__ __volatile__ ("wr %g0, %asr19\n\t"); + + raw_local_irq_disable(); } /* Install LEON Power Down function */ --- a/arch/sparc/kernel/process_32.c +++ b/arch/sparc/kernel/process_32.c @@ -71,7 +71,6 @@ void arch_cpu_idle(void) { if (sparc_idle) (*sparc_idle)(); - raw_local_irq_enable(); } /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */ --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c @@ -59,7 +59,6 @@ void arch_cpu_idle(void) { if (tlb_type != hypervisor) { touch_nmi_watchdog(); - raw_local_irq_enable(); } else { unsigned long pstate; @@ -90,6 +89,8 @@ void arch_cpu_idle(void) "wrpr %0, %%g0, %%pstate" : "=&r" (pstate) : "i" (PSTATE_IE)); + + raw_local_irq_disable(); } } --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -217,7 +217,6 @@ void arch_cpu_idle(void) { cpu_tasks[current_thread_info()->cpu].pid = os_getpid(); um_idle_sleep(); - raw_local_irq_enable(); } int __cant_sleep(void) { --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -223,6 +223,9 @@ void __cpuidle tdx_safe_halt(void) */ if (__halt(irq_disabled, do_sti)) WARN_ONCE(1, "HLT instruction emulation failed\n"); + + /* XXX I can't make sense of what @do_sti actually does */ + raw_local_irq_disable(); } static int read_msr(struct pt_regs *regs, struct ve_info *ve) --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -701,6 +701,7 @@ EXPORT_SYMBOL(boot_option_idle_override) void __cpuidle default_idle(void) { raw_safe_halt(); + raw_local_irq_disable(); } #if defined(CONFIG_APM_MODULE) || defined(CONFIG_HALTPOLL_CPUIDLE_MODULE) EXPORT_SYMBOL(default_idle); @@ -806,13 +807,7 @@ static void amd_e400_idle(void) default_idle(); - /* - * The switch back from broadcast mode needs to be called with - * interrupts disabled. - */ - raw_local_irq_disable(); tick_broadcast_exit(); - raw_local_irq_enable(); } /* @@ -870,12 +865,10 @@ static __cpuidle void mwait_idle(void) } __monitor((void *)¤t_thread_info()->flags, 0, 0); - if (!need_resched()) + if (!need_resched()) { __sti_mwait(0, 0); - else - raw_local_irq_enable(); - } else { - raw_local_irq_enable(); + raw_local_irq_disable(); + } } __current_clr_polling(); } --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c @@ -183,6 +183,7 @@ void coprocessor_flush_release_all(struc void arch_cpu_idle(void) { platform_idle(); + raw_local_irq_disable(); } /* --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -79,7 +79,6 @@ void __weak arch_cpu_idle_dead(void) { } void __weak arch_cpu_idle(void) { cpu_idle_force_poll = 1; - raw_local_irq_enable(); } /** @@ -96,7 +95,6 @@ void __cpuidle default_idle_call(void) ct_cpuidle_enter(); arch_cpu_idle(); - raw_local_irq_disable(); ct_cpuidle_exit(); start_critical_timings();