From patchwork Sat Oct 15 11:46:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 2929 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp605783wrs; Sat, 15 Oct 2022 04:52:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7SAxLZc+UjIXGgZHJwrFmnC3nH/fqAS1ETqAtM+OZR0y9paZ+Qph6P3K+e1fW8cHEA69cj X-Received: by 2002:a63:8bc9:0:b0:45f:afa8:e686 with SMTP id j192-20020a638bc9000000b0045fafa8e686mr2293355pge.219.1665834746795; Sat, 15 Oct 2022 04:52:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665834746; cv=none; d=google.com; s=arc-20160816; b=AoO2wgeai3U0F+oeaXENhV7lkuLA+owGxrDL2b3CBv0b/MuU6CQ2/OlWXHL0N7aIJM AzbvPU3TN87liDvwcf+J1ah1Q5tnTCmdpzSlsAqeogg8+YFa8JZNHh1SkyNLjRvRHFNX ubicVMZ9uDs63atIBOm12MrE5C7NHoKdVXOVC8bpY9JyzUUWH24+T7QwAakDFdV4fIHm mK5+datrJ61Eo4HIeNbVoFO2mI2HqrgVkzELKg6OjeXRV6UtqaS5guBfAuzVe5iDeHB4 ek+tvyP/RPuA6+LocTvtOp9MW9zGVDS/BGx7EKVaS2D1+GoV9Pikcr6uvFaCM0yu10js CWjQ== 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=/yFrd2H/DXbJ4CmczSoU0BmVvhKNpZihBHzIVojIN1o=; b=szU49wnBXg55sp+QpiSSgVEmZcjZKHBhesO0Tw5VfH0bfQmJuZf+SXkFnbzi4CehKL XbyVu5tB0VLXYXNw1WTCSuvWoJerM5YtVfggxT2tEyIkUhYrfLAapahzOdwH87Gsj60A KVuwiiXPFNZBtsMA0N6H1IOGUvSfaZdzJx3CfMKm5Tur5PUjRfg46991kPDvAJ2a4hJ1 HVWgVUhkHowRK7VwzmwmwPXNfZ8MgrH9l72jpC9pzqZB+a7VpojyspjoaZlezqpR9JyO 7yTcj2Xp0seL9peSOSEMr/Ugt5bnkjqz6AcNdRRO0/lWmX8z24cwc5bxG3lUitG7Um+E RznA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OZFpcuhm; 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 j3-20020a625503000000b00542c772d478si5225297pfb.247.2022.10.15.04.52.14; Sat, 15 Oct 2022 04:52:26 -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=pass header.i=@kernel.org header.s=k20201202 header.b=OZFpcuhm; 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 S229831AbiJOLvq (ORCPT + 99 others); Sat, 15 Oct 2022 07:51:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229751AbiJOLvE (ORCPT ); Sat, 15 Oct 2022 07:51:04 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C7E0437EC; Sat, 15 Oct 2022 04:51:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0BAF9B803F1; Sat, 15 Oct 2022 11:51:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16A4CC43141; Sat, 15 Oct 2022 11:50:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665834660; bh=oLo4LwoP9GQ++MbZ72D5YQbDVqlBfgDub+AiMlYcSSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OZFpcuhmd07fYgBYAS5TwzVG8AehUdodUEadsWOOgzRKzvzuZ+WhZ+ZkaKFNEMD4c LaMoPw3UWjDmcsw1ruVEjKtStM00XBh+pYE4sPERfXlE3qrpE1jEym+BXXToagTHQC butOe4XM7YxAsDaxFsjGhvTk9xqRlMgJ3hs5TbeBZJZzGLiWLsVsV/vCUV9CSDAFje LN0CL+wxleW7fQO9UczP3OTGvx8yaJzWn+uehKcYATYfQHZ40no2TEaPMbxcngQ03c pIbXBAcxkx7RkbbKGUjxNXqp2U0Tw0nb66HD7QIwUvwKqboCNvDaSvt0UXNKBpWOge TxyGFaY2SzC6A== From: guoren@kernel.org To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com, tglx@linutronix.de, peterz@infradead.org, luto@kernel.org, conor.dooley@microchip.com, heiko@sntech.de, jszhang@kernel.org, lazyparser@gmail.com, falcon@tinylab.org, chenhuacai@kernel.org, apatel@ventanamicro.com, atishp@atishpatra.org, palmer@dabbelt.com, paul.walmsley@sifive.com, mark.rutland@arm.com, zouyipeng@huawei.com, bigeasy@linutronix.de, David.Laight@aculab.com, chenzhongjin@huawei.com, greentime.hu@sifive.com, andy.chiu@sifive.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH V7 08/12] riscv: Support HAVE_SOFTIRQ_ON_OWN_STACK Date: Sat, 15 Oct 2022 07:46:58 -0400 Message-Id: <20221015114702.3489989-9-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221015114702.3489989-1-guoren@kernel.org> References: <20221015114702.3489989-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746754335248717388?= X-GMAIL-MSGID: =?utf-8?q?1746754335248717388?= From: Guo Ren Add the HAVE_SOFTIRQ_ON_OWN_STACK feature for the IRQ_STACKS config. The irq and softirq use the same independent irq_stack of percpu by time division multiplexing. Signed-off-by: Guo Ren Signed-off-by: Guo Ren Cc: Sebastian Andrzej Siewior --- arch/riscv/Kconfig | 7 ++++--- arch/riscv/kernel/irq.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index e65a9cc0df5d..04d2d20fb0ab 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -444,12 +444,13 @@ config FPU If you don't know what to do here, say Y. config IRQ_STACKS - bool "Independent irq stacks" if EXPERT + bool "Independent irq & softirq stacks" if EXPERT default y select HAVE_IRQ_EXIT_ON_IRQ_STACK + select HAVE_SOFTIRQ_ON_OWN_STACK help - Add independent irq stacks for percpu to prevent kernel stack overflows. - We may save some memory footprint by disabling IRQ_STACKS. + Add independent irq & softirq stacks for percpu to prevent kernel stack + overflows. We may save some memory footprint by disabling IRQ_STACKS. endmenu # "Platform type" diff --git a/arch/riscv/kernel/irq.c b/arch/riscv/kernel/irq.c index 5d77f692b198..a6406da34937 100644 --- a/arch/riscv/kernel/irq.c +++ b/arch/riscv/kernel/irq.c @@ -11,6 +11,7 @@ #include #include #include +#include #ifdef CONFIG_IRQ_STACKS static DEFINE_PER_CPU(ulong *, irq_stack_ptr); @@ -38,6 +39,38 @@ static void init_irq_stacks(void) per_cpu(irq_stack_ptr, cpu) = per_cpu(irq_stack, cpu); } #endif /* CONFIG_VMAP_STACK */ + +#ifdef CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK +void do_softirq_own_stack(void) +{ +#ifdef CONFIG_IRQ_STACKS + if (on_thread_stack()) { + ulong *sp = per_cpu(irq_stack_ptr, smp_processor_id()) + + IRQ_STACK_SIZE/sizeof(ulong); + __asm__ __volatile( + "addi sp, sp, -"RISCV_SZPTR "\n" + REG_S" ra, (sp) \n" + "addi sp, sp, -"RISCV_SZPTR "\n" + REG_S" s0, (sp) \n" + "addi s0, sp, 2*"RISCV_SZPTR "\n" + "move sp, %[sp] \n" + "call __do_softirq \n" + "addi sp, s0, -2*"RISCV_SZPTR"\n" + REG_L" s0, (sp) \n" + "addi sp, sp, "RISCV_SZPTR "\n" + REG_L" ra, (sp) \n" + "addi sp, sp, "RISCV_SZPTR "\n" + : + : [sp] "r" (sp) + : "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", + "t0", "t1", "t2", "t3", "t4", "t5", "t6", + "memory"); + } else +#endif + __do_softirq(); +} +#endif /* CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK */ + #else static void init_irq_stacks(void) {} #endif /* CONFIG_IRQ_STACKS */