From patchwork Fri Jan 27 09:10:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JeeHeng Sia X-Patchwork-Id: 4616 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp734115wrn; Fri, 27 Jan 2023 01:17:43 -0800 (PST) X-Google-Smtp-Source: AK7set+ZWVnTwc+i2W3OCD/Rw3ZPSzXyEYfSyovvbtViNQJxAau9ZA4U41iMfbHYU2wvW+QNK4QE X-Received: by 2002:a50:ee0b:0:b0:4a0:e323:d59c with SMTP id g11-20020a50ee0b000000b004a0e323d59cmr4583678eds.20.1674811063594; Fri, 27 Jan 2023 01:17:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674811063; cv=none; d=google.com; s=arc-20160816; b=pQU+hFUm1L9XZNWPyG9NAVkmW/dcx0hxXznoXk0f7+ICYJJBqpb9hxdSHaQU1kzfP/ 3amrtUMmu9J/nSIrhN9afqLGylcJ0ItnaJUT3rrjbBnRYTBEBzk/VpKJLmyrevZX8HKs bYrfk/2OGDs0KyuvrAqmWbS+E/FmKYvT4zgtNqUqairCW4oWHC7xnIsaBMKx7IwnFSAK LAHztigesUDDkq5MfgRhQIJCf+m7VNPvTCXuYDd75jrGibmKL7LDQN9glnGOnjtv2Phr 4oN5resjgdJxlvD6Ts+kMxw88byLZCsDaCfLLNtklHosKVPfY2/ZwZtNtadLTOO89dcn iXyg== 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=1RaE4tWUqbyuyJ5q6SPMCkSU8N5rdtiTqW9Xe+2q+GQ=; b=nnT5kcx+HUBiehs5KBejuR53NicfDDbSL524rjdeQE92Ttku+yw8w4GPqP3bjmFpzk DdyH0d+loylAM3lxlc6eZFo0Avc1NpejFQJbLIra1PseKLXL8AhH6ZLyhwoT/TlAOsaH YK5GBw7CJpeCHwxGYZqQIRfkwzBq78MrOmJR6vcKufVk8uZsCNCyhTF9EqiJTPvvV2/8 brIjUelrtGX3zNnKl3maEcOfE2XSRMRdebz8o8aM6lrbHUS0Z88TrW2hNpw16/lrOLKQ 8oXgfNi1oP7xAGehBG9wS5M4SIQ1RUxT7yAZjInRhY7LyE1RqKlGqprQ1Zbz6jIUZ1hP JfNQ== 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 v25-20020aa7d819000000b004a0e2b46929si3985229edq.515.2023.01.27.01.17.20; Fri, 27 Jan 2023 01:17:43 -0800 (PST) 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 S232525AbjA0JLS convert rfc822-to-8bit (ORCPT + 99 others); Fri, 27 Jan 2023 04:11:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232728AbjA0JLR (ORCPT ); Fri, 27 Jan 2023 04:11:17 -0500 Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95882761D0 for ; Fri, 27 Jan 2023 01:11:05 -0800 (PST) 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 79B1424DDB2; Fri, 27 Jan 2023 17:11:02 +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; Fri, 27 Jan 2023 17:11:02 +0800 Received: from jsia-virtual-machine.localdomain (60.50.196.81) by EXMBX066.cuchost.com (172.16.6.66) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 27 Jan 2023 17:10:58 +0800 From: Sia Jee Heng To: , , CC: , , , , Subject: [PATCH v3 0/4] RISC-V Hibernation Support Date: Fri, 27 Jan 2023 17:10:47 +0800 Message-ID: <20230127091051.1465278-1-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [60.50.196.81] 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=-1.9 required=5.0 tests=BAYES_00,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?1756166685525012687?= X-GMAIL-MSGID: =?utf-8?q?1756166685525012687?= 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_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.2-rc5 and are tested on StarFive VF2 SBC board and Qemu. ACPI platform mode is not supported in this series. 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 | 7 + arch/riscv/include/asm/assembler.h | 82 +++++++ arch/riscv/include/asm/suspend.h | 24 ++ arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/asm-offsets.c | 5 + arch/riscv/kernel/hibernate-asm.S | 89 +++++++ arch/riscv/kernel/hibernate.c | 360 +++++++++++++++++++++++++++++ arch/riscv/kernel/suspend.c | 4 +- arch/riscv/kernel/suspend_entry.S | 34 +-- arch/riscv/mm/pageattr.c | 6 + 10 files changed, 579 insertions(+), 33 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: 7c46948a6e9cf47ed03b0d489fde894ad46f1437