From patchwork Sun Jul 16 00:15:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 120859 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp403955vqt; Sat, 15 Jul 2023 18:19:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlGIICMuhzCDqoHYC97nhJ1oIZKY2Ae8iN9Z1BGjgKPRkW9lvSxtv9WSvZyozi4Pj0+EmSVN X-Received: by 2002:a17:902:c40c:b0:1b9:f7dc:b4f6 with SMTP id k12-20020a170902c40c00b001b9f7dcb4f6mr9116292plk.44.1689470351747; Sat, 15 Jul 2023 18:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689470351; cv=none; d=google.com; s=arc-20160816; b=YgBbr7CyPfLwcnku9jyIW+OoBqnKiFuV4oa/oFOXl1W1Gxnzb21Q5EPgF5Axi4gWsi mNYG9O15Pz24mMjGhv5CLxwd8tJ12ltBgh0+M0iAsRdoSJV3+w1brbRS3IRpYwo2y+W/ vjaLxvC3K5xJ8mbaDjybBzwz6VUZ+lDQdlp9NmUOrobVqNV3+6qps1lc6jR9G99IRITl dbJcrZxIPlKaWvHcJk0K95MEVmQR6ZhWlVaESySXoZnPU5z6f3eIKX+Z49eckMj+2BTe fFKqFbhrQVC85AmK38Gp1tTVb6Nk+E0GjgudTZNApzaP40nG4oYSXR8C3sM9eiBCJH0U AQjw== 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=8myGXcqkbORwcbgUbE/jv2KRvcvCuR/L+BZsZkLDe/I=; fh=uKQNkDNGEjgoOgJohgoIcWSeHNL9bR/V2EX+gA7xVIA=; b=xNKYffUvvF5MCXYpKwBybDyZGdyM7cLd3j9xj5UhT7MyZGLosGl+3W2f0PzBs3r+Xa jtT5JBYcootrA74mmpitk6jyPLdPM9EoHZLTHA2dHFwZ5R9XPFlZ3YMbfnMnACjAiqEP Z8aGkPRiXdSEP6Zd7neSu0kDgtNilE5WxQRj/bctc69+Ppigl7MPRZLbDDJ/cz/JIzjz 8WBtYLDAQwXYX1bCUBdnrKyJGDfRGYOQOKVOSQ6xFpVPM6NTVFqNY2L+M3nOExRGBJF5 6xhm71XxSB0wB3+Nazp2vFtBXedCkFgebBO2bV75LUIzpzg2laaQ3Mf2F+/K8akrVDaL /7DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ADnjw515; 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 kl12-20020a170903074c00b001b7fa1a9a36si9086411plb.67.2023.07.15.18.18.55; Sat, 15 Jul 2023 18:19:11 -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=ADnjw515; 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 S229865AbjGPAPX (ORCPT + 99 others); Sat, 15 Jul 2023 20:15:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229819AbjGPAPS (ORCPT ); Sat, 15 Jul 2023 20:15:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A18D212E; Sat, 15 Jul 2023 17:15:17 -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 17C6460B9B; Sun, 16 Jul 2023 00:15:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 505A3C433C8; Sun, 16 Jul 2023 00:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689466516; bh=0yILc+bANh026I06UBWabz1Zup8MksYUpsntgobli2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ADnjw515pP16FV2I8lpnFC4dPNwxJnjxawWW2RJhS0BtI5ZRTMZllmD7yXzN4VKzp qtKiRpQ2iS/p2Td7bOzS+gDfGXZp2tNIPbkBfQpQoVgqlmsBMmH7ivEymtyQxhjo3N h/au2xs9HvGh2XUujZUC1hpYljDrdAYDm+e+OBigu+JgYbifOXbY5ozwg33xq2miOH hB1d2XJATM6/TW/eVtDcOO4x9IqTpzs75bsGlf0dJrMY3/g2/m5PxTCCygre0wLexf 1xMstyE4xarLBYldCA2GduHG22sby3niDx9Z4qWThaO3FrhbCnm4IbnXtY0mP2ghJQ w6A1WCUepkXEQ== From: guoren@kernel.org To: guoren@kernel.org, palmer@rivosinc.com, paul.walmsley@sifive.com, falcon@tinylab.org, bjorn@kernel.org, conor.dooley@microchip.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, stable@vger.kernel.org, Guo Ren Subject: [PATCH V2 1/2] riscv: stack: Fixup independent irq stack for CONFIG_FRAME_POINTER=n Date: Sat, 15 Jul 2023 20:15:05 -0400 Message-Id: <20230716001506.3506041-2-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230716001506.3506041-1-guoren@kernel.org> References: <20230716001506.3506041-1-guoren@kernel.org> MIME-Version: 1.0 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,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771538063323717744 X-GMAIL-MSGID: 1771538063323717744 From: Guo Ren The independent irq stack uses s0 to save & restore sp, but s0 would be corrupted when CONFIG_FRAME_POINTER=n. So add s0 in the clobber list to fix the problem. Fixes: 163e76cc6ef4 ("riscv: stack: Support HAVE_IRQ_EXIT_ON_IRQ_STACK") Cc: stable@vger.kernel.org Reported-by: Zhangjin Wu Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/kernel/traps.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index f910dfccbf5d..927347a19847 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -372,6 +372,9 @@ asmlinkage void noinstr do_irq(struct pt_regs *regs) : [sp] "r" (sp), [regs] "r" (regs) : "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "t0", "t1", "t2", "t3", "t4", "t5", "t6", +#ifndef CONFIG_FRAME_POINTER + "s0", +#endif "memory"); } else #endif From patchwork Sun Jul 16 00:15:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 120858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp401921vqt; Sat, 15 Jul 2023 18:10:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlFKaMjrtvskmefdBwGNRfA61LlrQVHopn0ubPZGf2PqNnp6LXxl+uXTaqqV83A7MGY6e1Hr X-Received: by 2002:a17:906:c:b0:993:f611:7c95 with SMTP id 12-20020a170906000c00b00993f6117c95mr8585580eja.39.1689469819520; Sat, 15 Jul 2023 18:10:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689469819; cv=none; d=google.com; s=arc-20160816; b=T0kKyHJGEqRGQFvOADrJyobqXeIvPjTSCzkUQtQbwQERxWCPLc8eq9j1TYIscCI95C MMuLCy8EWogQ+aq0+Etulc3Ss0vRWb83T87UjT4y+D9LpKqigd4xq2poGchCNVFfwbxJ QgnxXmaET6GI901Y0Gw6Dek9LC7CoC29Y5XcpBI2YrBZb0KTM5U0P0RZt2bEvSxpZKVY k/lvo4Z1HXjXBXa9E8or8XkqC1UD+MXE2w38Z1rKh/zr1ZftrvS0n6NgxmzJNcRuZp0l Xink7GeWQwy4M6s3toGpaiflBDWdTLFLkMXdroQusIE33wV3s6fMfvmduUS9kFattcvl ArGg== 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=M3tKxTvnz0N5X2iE3F0zJ9yvUVU2Gdn40cnQ3q3Oeto=; fh=uKQNkDNGEjgoOgJohgoIcWSeHNL9bR/V2EX+gA7xVIA=; b=ilVJNzRXbAgyVLFXkHSuxkfoNMeA7JOjS+1thr5SYe04Odja2nn6nmU8DqA45UB5/4 4e9cWd6v3Wjg9pgkc7izgWeJD7W6TGzKMZGdeiw1qDgIvuPZyjJq8ydNA8fnAlI0QRdc TjK5sTI/732e/Ldj9OYKcDBQbCOguaLxCk/uTswM7fQc9bSwoOlUdIw1AggADL8IaAsy zCX+pTUVGIlwyp1qDTEqiDKHaVWqmXsBLpDd7936jY1VdwcDD6XfLw/2VzVOTSfpkH6C fUq2IRt0q29VxKqSKoptENOj96S4tqZN+F0h+rAoyqJTp1LaXjldml9ep4QgEsnroEC5 FklQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cXkVAhKO; 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 n1-20020a170906088100b0098da8d0ce54si11684456eje.834.2023.07.15.18.09.56; Sat, 15 Jul 2023 18:10:19 -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=cXkVAhKO; 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 S229906AbjGPAP0 (ORCPT + 99 others); Sat, 15 Jul 2023 20:15:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbjGPAPV (ORCPT ); Sat, 15 Jul 2023 20:15:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BB612690; Sat, 15 Jul 2023 17:15:20 -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 AAB0060B9B; Sun, 16 Jul 2023 00:15:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB014C433CB; Sun, 16 Jul 2023 00:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689466519; bh=E/jFfO+retDoLdPOyJc5wmE7Q3RkrIB4bLkvlh5cMyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cXkVAhKOvak//vq4NvrYl/XxauhW+hxgcoEqlbfIhk5u6YsST3l0Y8/WwnaiRBB+N zoUDoiPMG1GzOnlMYnAdvJWdXPUCS9ewLprgn1W6oDd+rd9fFeZVgBkRaJioYAx7Gu aRNjFMp4gmIM3r7wtXqJbKfMMUFuvq9Kn8c7MaZmEbVgRZTzKfT3UMQemGnUKIPQ35 oiGi/2zjVxCy2JI8oSa90MiJENKU83yZAPbcZSWUiKdhTRnJzt+WM6Kv83e73bmMB0 s1UjLKbcd1E+cb4Qt502xDb7nhaYkeGEpdCnY5BOnLU3VGklJpW9TPMFUBa3ZRxHwK Su5ONNJ3QNw3w== From: guoren@kernel.org To: guoren@kernel.org, palmer@rivosinc.com, paul.walmsley@sifive.com, falcon@tinylab.org, bjorn@kernel.org, conor.dooley@microchip.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, stable@vger.kernel.org, Guo Ren Subject: [PATCH V2 2/2] riscv: stack: Fixup independent softirq stack for CONFIG_FRAME_POINTER=n Date: Sat, 15 Jul 2023 20:15:06 -0400 Message-Id: <20230716001506.3506041-3-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230716001506.3506041-1-guoren@kernel.org> References: <20230716001506.3506041-1-guoren@kernel.org> MIME-Version: 1.0 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,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771537505670455143 X-GMAIL-MSGID: 1771537505670455143 From: Guo Ren The independent softirq stack uses s0 to save & restore sp, but s0 would be corrupted when CONFIG_FRAME_POINTER=n. So add s0 in the clobber list to fix the problem. Fixes: dd69d07a5a6c ("riscv: stack: Support HAVE_SOFTIRQ_ON_OWN_STACK") Cc: stable@vger.kernel.org Reported-by: Zhangjin Wu Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/kernel/irq.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/riscv/kernel/irq.c b/arch/riscv/kernel/irq.c index d0577cc6a081..a8efa053c4a5 100644 --- a/arch/riscv/kernel/irq.c +++ b/arch/riscv/kernel/irq.c @@ -84,6 +84,9 @@ void do_softirq_own_stack(void) : [sp] "r" (sp) : "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "t0", "t1", "t2", "t3", "t4", "t5", "t6", +#ifndef CONFIG_FRAME_POINTER + "s0", +#endif "memory"); } else #endif