From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:33576) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTMXH-0005GP-0J for guix-patches@gnu.org; Tue, 28 Apr 2020 05:30:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTMUC-0005xY-IA for guix-patches@gnu.org; Tue, 28 Apr 2020 05:28:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55637) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTMUC-0005xS-2j for guix-patches@gnu.org; Tue, 28 Apr 2020 05:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTMUA-0000uo-VR for guix-patches@gnu.org; Tue, 28 Apr 2020 05:25:02 -0400 Subject: [bug#40927] [PATCH] Allow resume from swap device during boot Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:55174) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTM1t-0007yp-7C for guix-patches@gnu.org; Tue, 28 Apr 2020 04:58:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTLvs-0005Cn-Ey for guix-patches@gnu.org; Tue, 28 Apr 2020 04:50:48 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:50268) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTKdR-0000Wm-Ul for guix-patches@gnu.org; Tue, 28 Apr 2020 03:26:30 -0400 Received: by mail-wm1-x342.google.com with SMTP id x25so1527991wmc.0 for ; Tue, 28 Apr 2020 00:26:29 -0700 (PDT) Received: from guixrules ([2a01:e35:2e0b:a6b0:e2ce:c3ff:fe74:cec8]) by smtp.gmail.com with ESMTPSA id t20sm2716706wmi.2.2020.04.28.00.26.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 00:26:26 -0700 (PDT) From: Jean-Baptiste Note Date: Tue, 28 Apr 2020 07:26:15 +0000 Message-ID: <87zhawax60.fsf@m4x.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40927@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Dear GUIX maintainers, Current the GUIX SD boot process does not allow resuming from sleep, even thought sleep options are available through loginctl, eg: loginctl hybrid-sleep loginctl hibernate This is a very important feature for people like me using GUIX SD on a laptop (yes, it is possible, mine is a corebooted X230 running linux-libre!) This patch is based on a patch floating around. The core functionality has been isolated, the resume function isolated, the patch rebased and tested. I'm not taking credit for it, even though tracing the exact origin is hard. The resume hook is called if the resume= kernel argument is provided, which one can do during system configuration. My scheme level is zero, so please bear with me. In particular, some conditionals could maybe be moved within the function, or the function itself called within some already-available hooks. Also it is not clear if the commit log is adequate for such a change. Please let me know how to improve this and get this merged; I can also write some documentation (probably once the mechanism is in place) to explain how the feature can be used. Kind regards, Jean-Baptiste --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-linux-boot-Add-support-for-resuming-from-swap-device.patch Content-Transfer-Encoding: quoted-printable Content-Description: allow resume from swap From=202531d1d08dabb53ff15020aedcec2ad5d8e6c600 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Note Date: Mon, 27 Apr 2020 20:42:03 +0000 Subject: [PATCH] linux-boot: Add support for resuming from swap device. * gnu/build/linux-boot.scm (resume-from-device): Add function. * gnu/build/linux-boot.scm (boot-system): Add hook calling resume-from-devi= ce if specified on commandline, before mounting any actual disk filesystems. =2D-- gnu/build/linux-boot.scm | 43 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 4fb711b8f2..907c84276f 100644 =2D-- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -357,6 +357,37 @@ the last argument of `mknod'." (compose (cut string=3D? program <>) basename)))) (filter-map string->number (scandir "/proc"))))) =20 +(define (resume-from-device resume-device) + "Resume from hibernation state on device DEVICE. This *must* happen befo= re +we mount any filesystems on disk. See +linux-libre/Documentation/swsusp.txt. Please note that this function will = not +return if resume happens successfully, and will return if swap device does= not +contain a valid resume signature." + (false-if-exception + (let* ((device-base-name + ;; The base name of the device file, after resolving + ;; symlinks. + (let loop ((file resume-device)) + (match (stat:type (lstat file)) + ('symlink + (let ((target (readlink file))) + (if (string-prefix? "/" target) + (loop target) + (loop (string-append (dirname file) "/" target))))) + (_ (basename file))))) + (major+minor + ;; The major:minor string (e.g. "8:2") corresponding + ;; to the resume device. + (call-with-input-file (string-append "/sys/class/block/" + device-base-name + "/dev") + read-line))) + ;; Write the major:minor string to /sys/power/resume + ;; to attempt resume from hibernation. + (when major+minor + (call-with-output-file "/sys/power/resume" + (cut display major+minor <>)))))) + (define* (mount-root-file-system root type #:key volatile-root? (flags 0) options) "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROO= T? is @@ -493,9 +524,10 @@ upon error." (call-with-error-handling (lambda () (mount-essential-file-systems) =2D (let* ((args (linux-command-line)) =2D (to-load (find-long-option "--load" args)) =2D (root (find-long-option "--root" args))) + (let* ((args (linux-command-line)) + (to-load (find-long-option "--load" args)) + (root (find-long-option "--root" args)) + (resume-device (find-long-option "resume" args))) =20 (when (member "--repl" args) (start-repl)) @@ -528,6 +560,11 @@ upon error." (unless (pre-mount) (error "pre-mount actions failed"))) =20 + (when (and resume-device + (file-exists? resume-device) + (file-exists? "/sys/power/resume")) + (resume-from-device resume-device)) + (setenv "EXT2FS_NO_MTAB_OK" "1") =20 (if root =2D-=20 2.26.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEPxcq3dp4FVY5UpckkC0pVsuz75YFAl6n2pcACgkQkC0pVsuz 75alJhAAgVioSCWGAi3lUwiYvDIM6KaZLFDMbORZGFnGF5qtI82i1EvOs7GMk8QV fLyUfepbIRMPLnJtmIcQb1Cnqz1dG45168Gr0BcTNY1L3YiFhjnxlKQrAoa0KgK/ o1hO1T/6uR3QiRpCNwCrcV5ouk4cZVnnNx2JKKeQAOlgHn8eSFwO6dIRnbfL54p7 tFhg6si2QqrxPnY1exeZ0LFxLbzivel4OCRNja03VGv0CTQnK+htls496rkqtZEx 84a/7LT1P8dtmq9bv0CACfDfU7VIKVnozQOJhx0Ek2yfV34127xvfIU8alF1TWpe yzthVSJ8uzS83c/ximcAi7uNrEszQqoEPoOnJBqRuzuPXfWgroCNnOUrQbETMD/g APYYvSruXcbWkZd5VIBNo6fZZUzYFdI6y/DU2bK2X2Y4hsT8hendt3/pSFv8bv55 yexEWmrxEuDCm0Mb2P8DewxOTnPvSH0N2VLizTb4ZPg6vjHbzuvdzY3QzquTclk6 5SI5C4XlNPYNp1rSjMJnG1uv7BN771yfWnbQQQKg/0jWP0NIZ2REU27p/G4YbNcA ZhbS74upz/iEsEGBRWkyPEnSKtGgCbLDiT3VDeJ+Dbhae3egxiiQ0KBEfXUjqkLX a8sgx66ZhmgxO5IubMTsoJrc1e+u7IRSmB9dmfunxOisryxG7sY= =db63 -----END PGP SIGNATURE----- --==-=-=--