From patchwork Sun Jul 16 00:15:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 12092 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp401483vqt; Sat, 15 Jul 2023 18:08:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlHoky+cSyqjBiUb1JPT1L+wiGhroDwTyte+U9E0eA6RFth2hnQMl+iNztb1pQkkaHPMgytj X-Received: by 2002:a17:906:8a78:b0:991:d2a8:658a with SMTP id hy24-20020a1709068a7800b00991d2a8658amr7795890ejc.34.1689469726204; Sat, 15 Jul 2023 18:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689469726; cv=none; d=google.com; s=arc-20160816; b=cAREgGdgEWi8x0WbnY7FB0eDY9rPuOOartLfhtQlYAG8S6+zvx6nOaBdxyG13AA7SH B9lIBxs16EZ4XlyUnEvNabdznBnqa0/OGb/JIj1R+AjeaxbwrAtpEYJoSTH97BRtBjKD MSj7ziP5U2VmKRu8ddCpzsp0d0vsLhwOiyuoZY4eEx/kFUhdX4O39/T2KN9bqX+mGz5r bORfKTIG082g/tomPWS0uELeeEZkq0qqH+PTc4q7J2ZckyEKB27zIHyUylsOr4WqcXeD t+NVgVjl4UXWahb19QkAribnqhsl553hszLcELj806s/CLPvb4b+mxhxDt7suCS3GMnH GFpA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=zKHcwLix1cLWcgcKuNgn2nGST0HDE8XyqCt79GDAHSc=; fh=uKQNkDNGEjgoOgJohgoIcWSeHNL9bR/V2EX+gA7xVIA=; b=f3Mw1mWUH/h4Xf96E7YPQ+wDIe0AQWLLgEdYS0wnoRf1rC6ueuKPYcB3PrO6yz+70L 7ytOAfFiPA2p6dzkBy9q6h3GNq43QL5HkTUrfvpSW4RW9ciYHZfPx6AcpujIxWgIuNL5 KhWVW9ozHi9nGcJx6VMk3N+hl6vjbLnh7UhifHpad+cW2LqQSw6cqK2Az+f+jT9Ovgb7 oQWIGENmcKLciE/WfDYGpjzxVmeQeALuI82Qt8kd4kkOlrB6P8p8UQyCwTCF/XSV9Szc 7tN7iSwguRtVz4aq0A7MLv7MoJiaKNux+NanvBvPEFRgFbsCecG3u5ah2f9s6AOktpWW BHIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MWdWp6KA; 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 n22-20020a170906841600b00992bd86ece6si4780131ejx.725.2023.07.15.18.08.12; Sat, 15 Jul 2023 18:08: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=pass header.i=@kernel.org header.s=k20201202 header.b=MWdWp6KA; 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 S229815AbjGPAPR (ORCPT + 99 others); Sat, 15 Jul 2023 20:15:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbjGPAPQ (ORCPT ); Sat, 15 Jul 2023 20:15:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED141212E; Sat, 15 Jul 2023 17:15:14 -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 7288760B9B; Sun, 16 Jul 2023 00:15:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF3B3C433C7; Sun, 16 Jul 2023 00:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689466513; bh=X6hTcvtJBK7dd2SCGFkBhw9aiwlqXCXsF5zEG0CNbnw=; h=From:To:Cc:Subject:Date:From; b=MWdWp6KASNJjzqYRAXOjBuKgG/7fkrdNiXgYlgLalGY9LulRL6o30PkpSSpzv5ybB X7ahc6tTYmlLkQzk1n1BmZcAg7P2G1g9+GuC37CWYEoF0AypT9Q4zGs4AM0m49FjeA GKoM9xl0UpvfH9vErJLimz5QX53O7h8tvbzxQgqr1im5sgPNqi0CAbc9+Uj37NPUei 5aEyrHPsLCSQe4PCY4LtjoEinvhwhjeGM9p2+0GWEf80gXmlHPRhMRAN+UzZoSNtpS 0EZLoN0/jbas70QOBZufRvadwJ085yilH+GIZgCFYXHaGMaYy6t7t8OQ11+y0vJzX1 EBt2+19XmVoXQ== 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 0/2] riscv: stack: Fixup independent softirq/irq stack for CONFIG_FRAME_POINTER=n Date: Sat, 15 Jul 2023 20:15:04 -0400 Message-Id: <20230716001506.3506041-1-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 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: 1771496093690445278 X-GMAIL-MSGID: 1771537407444989378 From: Guo Ren The independent softirq/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. <+0>: addi sp,sp,-32 <+2>: sd s0,16(sp) <+4>: sd s1,8(sp) <+6>: sd ra,24(sp) <+8>: sd s2,0(sp) <+10>: mv s0,a0 --> compiler allocate s0 for a0 when CONFIG_FRAME_POINTER=n <+12>: jal ra,0xffffffff800bc0ce <+16>: ld a5,56(tp) # 0x38 <+20>: lui a4,0x4 <+22>: mv s1,a0 <+24>: xor a5,a5,sp <+28>: bgeu a5,a4,0xffffffff800bc092 <+32>: auipc s2,0x5d <+36>: ld s2,1118(s2) # 0xffffffff801194b8 <+40>: add s2,s2,a4 <+42>: addi sp,sp,-8 <+44>: sd ra,0(sp) <+46>: addi sp,sp,-8 <+48>: sd s0,0(sp) <+50>: addi s0,sp,16 --> our code clobber the s0 <+52>: mv sp,s2 <+54>: mv a0,s0 --> a0 got wrong value for handle_riscv_irq <+56>: jal ra,0xffffffff800bbb3a Changelog: V2 - Fixup compile error with CONFIG_FRAME_POINTER=y - FIxup stable@vger.kernel.org tag Guo Ren (2): riscv: stack: Fixup independent irq stack for CONFIG_FRAME_POINTER=n riscv: stack: Fixup independent softirq stack for CONFIG_FRAME_POINTER=n arch/riscv/kernel/irq.c | 3 +++ arch/riscv/kernel/traps.c | 3 +++ 2 files changed, 6 insertions(+) Tested-by: Drew Fustini