From patchwork Wed Sep 25 13:15:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xu Lu X-Patchwork-Id: 13812007 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6F413C7885C for ; Wed, 25 Sep 2024 13:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NJ1rYecxsaPTSJDbgKj/XZgVwLnIbnrAXt1ercJnUgw=; b=hooKOmwLtcrROZ 27A2AqUmmrkQ+b5O/wIWEr07YLFv13ij/3JCUi9hEw+Jb///Mt/uSo8Fiw3DEa9u5DYS1y4g0c983 jDJNpL0QAf23RsJ7o9kbZBLZ88C0obzbquDCAzUUj+ReAcjjpmmzOWTlGZUp9owTrtPuxdDDDE2aJ gLHgI+icLboDoNA3qwp5Rw18p7qVoAF27LkKuVFgO9OZwRMHCCVeisJIvH2D31Ie5D1JUz4nJhb+y 60tGlZtiudSY2M++JVSmxYS/uhs5scpmCK976sr40qBQb5GwYnmXd8Ahny6hTSmJlLoKCGNakBqtT As4cZMDg9xxM+U+nd03Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1stRt5-00000005KNi-1BoG; Wed, 25 Sep 2024 13:16:59 +0000 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1stRsB-00000005K9f-2vlp for linux-riscv@lists.infradead.org; Wed, 25 Sep 2024 13:16:09 +0000 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-2e06acff261so597272a91.2 for ; Wed, 25 Sep 2024 06:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1727270163; x=1727874963; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aUZr870RxrrFu6w7eKXju873kveoqn8JgQz1DEy7APc=; b=Cm+yLl4VUFTKnvKM6vfPIzd3MosxYuxQlvexSGxMce1lBfbzEYQUeooiV5X5uK1/5o uLcjrn9TJcNrsU95LTN7qvS+Wdc7ADN/xkQVqLgS4PhAd8/luDGU7NFERqpPKFxzEg9v x+p9MzLOWbLvgjSdNImQfjl5ODb2A4dlYTCYPOlW1sJunZ5C/7E3q32uvsdiMSDpDzE/ H+9gU92JjzDFHaWqs+QcJBV/A5w96if7lA3s+QUCcQroqob8faYnif81VxT8zNCSpL6F L+dmYnfojajwXEHJNgKTSazjj5/rodpeK24kYZBGssH5ZOovswasRlydeY/8YxU4qVGM t/8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727270163; x=1727874963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aUZr870RxrrFu6w7eKXju873kveoqn8JgQz1DEy7APc=; b=NARvofnxrcHkUlgFwSHyQz9Dja/Fg0ZkA5VGUbTFkTlNH1SJRTtZ/N1/9pM7wuulpo I5h3nZI+BL6PVzDHMiALOXhKQzGmlevr0PImf+9Ou+Btp+zC4+hiGqNHIHaV+pAgllxr pgAwz+vRzw+jtnlmvwgZMSOB7f6SwyIN4ir6A6If5PHN0s7IGc+anqqrYTLJKQgkkHiU PXMaA5qBqKI5yIYuQRAvAfdsbVAOzLQpXlONg82qfbVj31po1VCJC1+0j2rRuvcWUhXD A0b9N7yzYU6x97MnofxRm40FWnLRCSvI+45GYqTsPaEns3dSTvCYv2zmANv5WsexTjzz HrlQ== X-Gm-Message-State: AOJu0YwG44v8ibXXHpvNIYywbiYR4bVrcxXqJQxj+4vUp0z9AtSWWsNk IaPThM0P0UYV1UuXZ7/+gj8SpQYugnUESR4fgi9CcXNUd0U8W02uJOCurnzWYo0= X-Google-Smtp-Source: AGHT+IEhlHpjI+8wsZk7tT5ZjtXOCrHZxQOsS5bllHX66BpvT7eERAq7uAvuz0YO0YW3V4DhsSRq+g== X-Received: by 2002:a17:90b:2d8c:b0:2d8:82a2:b093 with SMTP id 98e67ed59e1d1-2e06ae4dafcmr3339715a91.13.1727270162651; Wed, 25 Sep 2024 06:16:02 -0700 (PDT) Received: from J9GPGXL7NT.bytedance.net ([61.213.176.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e06e1e09e2sm1479465a91.32.2024.09.25.06.15.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Sep 2024 06:16:02 -0700 (PDT) From: Xu Lu To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, andy.chiu@sifive.com, guoren@kernel.org, christoph.muellner@vrull.eu, ajones@ventanamicro.com Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, lihangjing@bytedance.com, dengliang.1214@bytedance.com, xieyongji@bytedance.com, chaiwen.cc@bytedance.com, Xu Lu Subject: [PATCH v3 1/2] riscv: process: Introduce idle thread using Zawrs extension Date: Wed, 25 Sep 2024 21:15:46 +0800 Message-Id: <20240925131547.42396-2-luxu.kernel@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240925131547.42396-1-luxu.kernel@bytedance.com> References: <20240925131547.42396-1-luxu.kernel@bytedance.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240925_061603_769155_4992C9B9 X-CRM114-Status: GOOD ( 16.14 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The Zawrs extension introduces a new instruction WRS.NTO, which will register a reservation set and causes the hart to temporarily stall execution in a low-power state until a store occurs to the reservation set or an interrupt is observed. This commit implements new version of idle thread for RISC-V via Zawrs extension. Signed-off-by: Xu Lu Reviewed-by: Hangjing Li Reviewed-by: Liang Deng Reviewed-by: Wen Chai --- arch/riscv/Kconfig | 10 ++++++++ arch/riscv/include/asm/cpuidle.h | 11 +------- arch/riscv/include/asm/processor.h | 18 +++++++++++++ arch/riscv/kernel/cpu.c | 5 ++++ arch/riscv/kernel/process.c | 41 +++++++++++++++++++++++++++++- 5 files changed, 74 insertions(+), 11 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 939ea7f6a228..56cf6000d286 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -23,6 +23,7 @@ config RISCV select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE select ARCH_HAS_BINFMT_FLAT + select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_CURRENT_STACK_POINTER select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEBUG_VM_PGTABLE @@ -1153,6 +1154,15 @@ endmenu # "Power management options" menu "CPU Power Management" +config RISCV_ZAWRS_IDLE + bool "Idle thread using ZAWRS extensions" + depends on RISCV_ISA_ZAWRS + default y + help + Adds support to implement idle thread using ZAWRS extension. + + If you don't know what to do here, say Y. + source "drivers/cpuidle/Kconfig" source "drivers/cpufreq/Kconfig" diff --git a/arch/riscv/include/asm/cpuidle.h b/arch/riscv/include/asm/cpuidle.h index 71fdc607d4bc..94c9ecb46571 100644 --- a/arch/riscv/include/asm/cpuidle.h +++ b/arch/riscv/include/asm/cpuidle.h @@ -10,15 +10,6 @@ #include #include -static inline void cpu_do_idle(void) -{ - /* - * Add mb() here to ensure that all - * IO/MEM accesses are completed prior - * to entering WFI. - */ - mb(); - wait_for_interrupt(); -} +void cpu_do_idle(void); #endif diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index efa1b3519b23..d0dcdb7e7392 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -12,6 +12,7 @@ #include +#include #include #define arch_get_mmap_end(addr, len, flags) \ @@ -148,6 +149,21 @@ static inline void wait_for_interrupt(void) __asm__ __volatile__ ("wfi"); } +static inline void wrs_nto(unsigned long *addr) +{ + int val; + + __asm__ __volatile__( +#ifdef CONFIG_64BIT + "lr.d %[p], %[v]\n\t" +#else + "lr.w %[p], %[v]\n\t" +#endif + ZAWRS_WRS_NTO "\n\t" + : [p] "=&r" (val), [v] "+A" (*addr) + : : "memory"); +} + extern phys_addr_t dma32_phys_limit; struct device_node; @@ -177,6 +193,8 @@ extern int set_unalign_ctl(struct task_struct *tsk, unsigned int val); #define RISCV_SET_ICACHE_FLUSH_CTX(arg1, arg2) riscv_set_icache_flush_ctx(arg1, arg2) extern int riscv_set_icache_flush_ctx(unsigned long ctx, unsigned long per_thread); +extern void select_idle_routine(void); + #endif /* __ASSEMBLY__ */ #endif /* _ASM_RISCV_PROCESSOR_H */ diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c index f6b13e9f5e6c..97a7144fa6cd 100644 --- a/arch/riscv/kernel/cpu.c +++ b/arch/riscv/kernel/cpu.c @@ -23,6 +23,11 @@ bool arch_match_cpu_phys_id(int cpu, u64 phys_id) return phys_id == cpuid_to_hartid_map(cpu); } +void __init arch_cpu_finalize_init(void) +{ + select_idle_routine(); +} + /* * Returns the hart ID of the given device tree node, or -ENODEV if the node * isn't an enabled and valid RISC-V hart node. diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index e4bc61c4e58a..77769965609e 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -35,11 +36,49 @@ EXPORT_SYMBOL(__stack_chk_guard); extern asmlinkage void ret_from_fork(void); -void noinstr arch_cpu_idle(void) +static __cpuidle void default_idle(void) +{ + /* + * Add mb() here to ensure that all + * IO/MEM accesses are completed prior + * to entering WFI. + */ + mb(); + wait_for_interrupt(); +} + +static __cpuidle void wrs_idle(void) +{ + /* + * Add mb() here to ensure that all + * IO/MEM accesses are completed prior + * to entering WRS.NTO. + */ + mb(); + wrs_nto(¤t_thread_info()->flags); +} + +DEFINE_STATIC_CALL_NULL(riscv_idle, default_idle); + +void __cpuidle cpu_do_idle(void) +{ + static_call(riscv_idle)(); +} + +void __cpuidle arch_cpu_idle(void) { cpu_do_idle(); } +void __init select_idle_routine(void) +{ + if (IS_ENABLED(CONFIG_RISCV_ZAWRS_IDLE) && + riscv_has_extension_likely(RISCV_ISA_EXT_ZAWRS)) + static_call_update(riscv_idle, wrs_idle); + else + static_call_update(riscv_idle, default_idle); +} + int set_unalign_ctl(struct task_struct *tsk, unsigned int val) { if (!unaligned_ctl_available())