From patchwork Thu Mar 30 06:43:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JeeHeng Sia X-Patchwork-Id: 7434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp920163vqo; Wed, 29 Mar 2023 23:46:53 -0700 (PDT) X-Google-Smtp-Source: AKy350YySlZUQSW7kAT1DD9g1W9LnqY5xy802GDUMiIVrJYfc6DoYi3udzLUddaw3psihJv0I+O5 X-Received: by 2002:aa7:d44c:0:b0:502:52dc:b9d4 with SMTP id q12-20020aa7d44c000000b0050252dcb9d4mr8117521edr.10.1680158813449; Wed, 29 Mar 2023 23:46:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680158813; cv=none; d=google.com; s=arc-20160816; b=gmH1hscPJ2FbnrrVHjIYiybvclOvt8VQX4u1EUFhkcCn1Jr31bEREG/BfvDMVX5lea dNb27y1MIJIRPSKk7IqL0/mDJ9TpsNKuyJn9zTsb/+PCueK9Lyg9e9mDMTZYQ7Cz18LK z9PmIqEHK7d68nYpEI0k+efvfTna/278GV6jvXfanciSJjZfPbUJFJM0G128VLf/NWo8 DsHWQhS62QNRyNgWKAmyj6bV7TJcb2SM+VDXz+wSfegg0eXlqPAUJVI44iVb4V0hWpIN B2XSQNqwdGnD5fyiwwLyl3CihqstRKCYENb4Qr9tvRWc4z8P1/WgiTidGkfmcd7PFLzY aCGQ== 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; bh=nMyBvPUOmxpBSFRDYXmxmVTw5QQcFiEj2n7EPImrshA=; b=EiOFpWVNlC3IyBBmQNVbYT+wSnq55SaQfv8KZ2+C+HtisVeFbhHBHSLcPcMqqo4adZ aba6wtINvOoE09+i5bnNducjOjpuywTrPPc5qtNZgbOdQgmW1vyXA51J75hisKqzb2dA tmO79HS5FM8sFMWfVZgYvoiKfhk46N5inEfWP2rX3X7zc2l1/kfOmqWYYjuimIWT1VG0 mqI7nzhnmjJoW9wRZM0bTc22v1TJq97Nz4vRn5ELPceBGuVo8k7NrMKCXj4hSErFyVUm 2cZmzO0WaxezklMl5+ztHc2E7LbjH1tKa0TTALfCCuVVrMcuGh5ncO4M4cSq2hatejzN dC7w== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v16-20020aa7dbd0000000b005024a8c6c30si7796302edt.272.2023.03.29.23.46.29; Wed, 29 Mar 2023 23:46:53 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229776AbjC3Gnm convert rfc822-to-8bit (ORCPT + 99 others); Thu, 30 Mar 2023 02:43:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbjC3Gnk (ORCPT ); Thu, 30 Mar 2023 02:43:40 -0400 Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D20A40CA for ; Wed, 29 Mar 2023 23:43:38 -0700 (PDT) Received: from EXMBX165.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX165", Issuer "EXMBX165" (not verified)) by ex01.ufhost.com (Postfix) with ESMTP id 9194224E25A; Thu, 30 Mar 2023 14:43:30 +0800 (CST) Received: from EXMBX066.cuchost.com (172.16.7.66) by EXMBX165.cuchost.com (172.16.6.75) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 30 Mar 2023 14:43:28 +0800 Received: from jsia-virtual-machine.localdomain (202.188.176.82) by EXMBX066.cuchost.com (172.16.6.66) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 30 Mar 2023 14:43:25 +0800 From: Sia Jee Heng To: , , CC: , , , , Subject: [PATCH v8 0/4] RISC-V Hibernation Support Date: Thu, 30 Mar 2023 14:43:17 +0800 Message-ID: <20230330064321.1008373-1-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [202.188.176.82] X-ClientProxiedBy: EXCAS066.cuchost.com (172.16.6.26) To EXMBX066.cuchost.com (172.16.6.66) X-YovoleRuleAgent: yovoleflag X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761774208076902748?= X-GMAIL-MSGID: =?utf-8?q?1761774208076902748?= This series adds RISC-V Hibernation/suspend to disk support. Low level Arch functions were created to support hibernation. swsusp_arch_suspend() relies code from __cpu_suspend_enter() to write cpu state onto the stack, then calling swsusp_save() to save the memory image. Arch specific hibernation header is implemented and is utilized by the arch_hibernation_header_restore() and arch_hibernation_header_save() functions. The arch specific hibernation header consists of satp, hartid, and the cpu_resume address. The kernel built version is also need to be saved into the hibernation image header to making sure only the same kernel is restore when resume. swsusp_arch_resume() creates a temporary page table that covering only the linear map. It copies the restore code to a 'safe' page, then start to restore the memory image. Once completed, it restores the original kernel's page table. It then calls into __hibernate_cpu_resume() to restore the CPU context. Finally, it follows the normal hibernation path back to the hibernation core. To enable hibernation/suspend to disk into RISCV, the below config need to be enabled: - CONFIG_HIBERNATION - CONFIG_ARCH_HIBERNATION_HEADER - CONFIG_ARCH_HIBERNATION_POSSIBLE At high-level, this series includes the following changes: 1) Change suspend_save_csrs() and suspend_restore_csrs() to public function as these functions are common to suspend/hibernation. (patch 1) 2) Refactor the common code in the __cpu_resume_enter() function and __hibernate_cpu_resume() function. The common code are used by hibernation and suspend. (patch 2) 3) Enhance kernel_page_present() function to support huge page. (patch 3) 4) Add arch/riscv low level functions to support hibernation/suspend to disk. (patch 4) The above patches are based on kernel v6.3-rc4 and have been tested on StarFive VF2 SBC board and Qemu (using raw disk format). ACPI platform mode is not supported in this series. Changes since v7: - Rebased to kernel v6.3-rc4 - Added "select CPU_PM if CPU_IDLE || HIBERNATION" to arch/riscv/Kconfig Changes since v6: - Rebased to kernel v6.3-rc3 - Resolved nit Changes since v5: - Rebased to kernel v6.3-rc2 - Removed extra line at the commit msg - Added comment to describe the reason to map the kernel address Changes since v4: - Rebased to kernel v6.3-rc1 - Resolved typo(s) - Removed unnecessary helper function - Removed unnecessary "addr" local variable - Removed typecast of 'int' - Used def_bool HIBERNATION - Used "mv a0, zero" instead of "add a0, zero, zero" - Make linear region as executable and writable when restoring the image Changes since v3: - Rebased to kernel v6.2 - Temporary page table code refactoring by reference to ARM64 - Resolved typo(s) and grammars - Resolved documentation errors - Resolved clang build issue - Removed unnecessary comments - Used kzalloc instead of kcalloc Changes since v2: - Rebased to kernel v6.2-rc5 - Refactor the common code used by hibernation and suspend - Create copy_page macro - Solved other comments from Andrew and Conor Changes since v1: - Rebased to kernel v6.2-rc3 - Fixed bot's compilation error Sia Jee Heng (4): RISC-V: Change suspend_save_csrs and suspend_restore_csrs to public function RISC-V: Factor out common code of __cpu_resume_enter() RISC-V: mm: Enable huge page support to kernel_page_present() function RISC-V: Add arch functions to support hibernation/suspend-to-disk arch/riscv/Kconfig | 8 +- arch/riscv/include/asm/assembler.h | 82 ++++++ arch/riscv/include/asm/suspend.h | 22 ++ arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/asm-offsets.c | 5 + arch/riscv/kernel/hibernate-asm.S | 77 ++++++ arch/riscv/kernel/hibernate.c | 427 +++++++++++++++++++++++++++++ arch/riscv/kernel/suspend.c | 4 +- arch/riscv/kernel/suspend_entry.S | 34 +-- arch/riscv/mm/pageattr.c | 8 + 10 files changed, 634 insertions(+), 34 deletions(-) create mode 100644 arch/riscv/include/asm/assembler.h create mode 100644 arch/riscv/kernel/hibernate-asm.S create mode 100644 arch/riscv/kernel/hibernate.c base-commit: ffe78bbd512166e0ef1cc4858010b128c510ed7d