From: Stanislav Kinsburskii <skinsburskii@linux.microsoft.com> To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, ebiederm@xmission.com, akpm@linux-foundation.org, stanislav.kinsburskii@gmail.com, corbet@lwn.net, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org, kys@microsoft.com, jgowans@amazon.com, wei.liu@kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org, graf@amazon.de, pbonzini@redhat.com Subject: [RFC PATCH v2 6/7] pmpool: Restore state from device tree post-kexec Date: Mon, 25 Sep 2023 14:28:22 -0700 [thread overview] Message-ID: <169567730206.19708.13228262570187347469.stgit@skinsburskii.> (raw) In-Reply-To: <169567722094.19708.3583735425859054859.stgit@skinsburskii.> From: Stanislav Kinsburskii <stanislav.kinsburskii@gmail.com> Retrieve the pmpool bitmap from metadata in the fdt passed over kexec, bypassing the need for reinitialization. This ensures the seamless transfer of the pmpool state across kexec. Signed-off-by: Stanislav Kinsburskii <skinsburskii@linux.microsoft.com> --- mm/pmpool.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/mm/pmpool.c b/mm/pmpool.c index f2173db782d6..6c1a28fd3493 100644 --- a/mm/pmpool.c +++ b/mm/pmpool.c @@ -9,6 +9,7 @@ #include <linux/libfdt.h> #include <linux/memblock.h> #include <linux/mm.h> +#include <linux/of.h> #include <linux/pmpool.h> #include "cma.h" @@ -49,11 +50,56 @@ static void pmpool_fixup_cma(struct cma *cma) pr_info("CMA bitmap moved to %#llx\n", virt_to_phys(cma->bitmap)); } +static int pmpool_fdt_restore(struct cma *cma) +{ + struct device_node *dn; + u64 val; + + dn = of_find_compatible_node(NULL, NULL, "pmpool"); + if (!dn) + return -ENOENT; + + if (of_property_read_u64(dn, "base", &val)) { + pr_err("invalid fdt: no base\n"); + return -EINVAL; + } + if (val != PFN_PHYS(cma->base_pfn)) { + pr_err("fdt base doesn't match: %#llx != %#llx\n", + val, PFN_PHYS(cma->base_pfn)); + return -EINVAL; + } + + if (of_property_read_u64(dn, "size", &val)) { + pr_err("invalid fdt: no size\n"); + return -EINVAL; + } + if (val != (cma->count << PAGE_SHIFT)) { + pr_err("fdt size doesn't match: %#llx != %#lx\n", + val, cma->count << PAGE_SHIFT); + return -EINVAL; + } + + if (of_property_read_u64(dn, "bitmap", &val)) { + pr_err("invalid fdt: no bitmap\n"); + return -EINVAL; + } + + pr_info("CMA bitmap restored to %#llx\n", val); + + bitmap_free(cma->bitmap); + cma->bitmap = phys_to_virt(val); + + return 0; +} + static int __init default_pmpool_fixup_cma(void) { if (!default_pmpool) return 0; + if (!pmpool_fdt_restore(default_pmpool->cma)) + return 0; + pmpool_fixup_cma(default_pmpool->cma); return 0; }
WARNING: multiple messages have this Message-ID (diff)
From: Stanislav Kinsburskii <skinsburskii@linux.microsoft.com> To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, ebiederm@xmission.com, akpm@linux-foundation.org, stanislav.kinsburskii@gmail.com, corbet@lwn.net, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org, kys@microsoft.com, jgowans@amazon.com, wei.liu@kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org, graf@amazon.de, pbonzini@redhat.com Subject: [RFC PATCH v2 6/7] pmpool: Restore state from device tree post-kexec Date: Mon, 25 Sep 2023 14:28:22 -0700 [thread overview] Message-ID: <169567730206.19708.13228262570187347469.stgit@skinsburskii.> (raw) In-Reply-To: <169567722094.19708.3583735425859054859.stgit@skinsburskii.> From: Stanislav Kinsburskii <stanislav.kinsburskii@gmail.com> Retrieve the pmpool bitmap from metadata in the fdt passed over kexec, bypassing the need for reinitialization. This ensures the seamless transfer of the pmpool state across kexec. Signed-off-by: Stanislav Kinsburskii <skinsburskii@linux.microsoft.com> --- mm/pmpool.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/mm/pmpool.c b/mm/pmpool.c index f2173db782d6..6c1a28fd3493 100644 --- a/mm/pmpool.c +++ b/mm/pmpool.c @@ -9,6 +9,7 @@ #include <linux/libfdt.h> #include <linux/memblock.h> #include <linux/mm.h> +#include <linux/of.h> #include <linux/pmpool.h> #include "cma.h" @@ -49,11 +50,56 @@ static void pmpool_fixup_cma(struct cma *cma) pr_info("CMA bitmap moved to %#llx\n", virt_to_phys(cma->bitmap)); } +static int pmpool_fdt_restore(struct cma *cma) +{ + struct device_node *dn; + u64 val; + + dn = of_find_compatible_node(NULL, NULL, "pmpool"); + if (!dn) + return -ENOENT; + + if (of_property_read_u64(dn, "base", &val)) { + pr_err("invalid fdt: no base\n"); + return -EINVAL; + } + if (val != PFN_PHYS(cma->base_pfn)) { + pr_err("fdt base doesn't match: %#llx != %#llx\n", + val, PFN_PHYS(cma->base_pfn)); + return -EINVAL; + } + + if (of_property_read_u64(dn, "size", &val)) { + pr_err("invalid fdt: no size\n"); + return -EINVAL; + } + if (val != (cma->count << PAGE_SHIFT)) { + pr_err("fdt size doesn't match: %#llx != %#lx\n", + val, cma->count << PAGE_SHIFT); + return -EINVAL; + } + + if (of_property_read_u64(dn, "bitmap", &val)) { + pr_err("invalid fdt: no bitmap\n"); + return -EINVAL; + } + + pr_info("CMA bitmap restored to %#llx\n", val); + + bitmap_free(cma->bitmap); + cma->bitmap = phys_to_virt(val); + + return 0; +} + static int __init default_pmpool_fixup_cma(void) { if (!default_pmpool) return 0; + if (!pmpool_fdt_restore(default_pmpool->cma)) + return 0; + pmpool_fixup_cma(default_pmpool->cma); return 0; } _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2023-09-25 21:28 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-09-25 21:27 [RFC PATCH v2 0/7] Introduce persistent memory pool Stanislav Kinsburskii 2023-09-25 21:27 ` Stanislav Kinsburskii 2023-09-25 21:27 ` [RFC PATCH v2 1/7] kexec_file: Add fdt modification callback support Stanislav Kinsburskii 2023-09-25 21:27 ` Stanislav Kinsburskii 2023-09-25 21:27 ` [RFC PATCH v2 2/7] x86: kexec: Transfer existing fdt to the new kernel Stanislav Kinsburskii 2023-09-25 21:27 ` Stanislav Kinsburskii 2023-09-25 21:28 ` [RFC PATCH v2 3/7] x86: kexec: Enable fdt modification in callbacks Stanislav Kinsburskii 2023-09-25 21:28 ` Stanislav Kinsburskii 2023-09-25 21:28 ` [RFC PATCH v2 4/7] pmpool: Introduce persistent memory pool Stanislav Kinsburskii 2023-09-25 21:28 ` Stanislav Kinsburskii 2023-09-25 21:28 ` [RFC PATCH v2 5/7] pmpool: Update device tree on kexec Stanislav Kinsburskii 2023-09-25 21:28 ` Stanislav Kinsburskii 2023-09-25 21:28 ` Stanislav Kinsburskii [this message] 2023-09-25 21:28 ` [RFC PATCH v2 6/7] pmpool: Restore state from device tree post-kexec Stanislav Kinsburskii 2023-09-25 21:28 ` [RFC PATCH v2 7/7] Drivers: hv: Allocate persistent pages for root partition Stanislav Kinsburskii 2023-09-25 21:28 ` Stanislav Kinsburskii
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=169567730206.19708.13228262570187347469.stgit@skinsburskii. \ --to=skinsburskii@linux.microsoft.com \ --cc=akpm@linux-foundation.org \ --cc=arnd@arndb.de \ --cc=bp@alien8.de \ --cc=corbet@lwn.net \ --cc=dave.hansen@linux.intel.com \ --cc=ebiederm@xmission.com \ --cc=graf@amazon.de \ --cc=gregkh@linuxfoundation.org \ --cc=hpa@zytor.com \ --cc=jgowans@amazon.com \ --cc=kexec@lists.infradead.org \ --cc=kys@microsoft.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mingo@redhat.com \ --cc=pbonzini@redhat.com \ --cc=stanislav.kinsburskii@gmail.com \ --cc=tglx@linutronix.de \ --cc=wei.liu@kernel.org \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.