From: Anthony Yznaga <anthony.yznaga@oracle.com> To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, rppt@kernel.org, akpm@linux-foundation.org, ebiederm@xmission.com, keescook@chromium.org, graf@amazon.com, jason.zeng@intel.com, lei.l.li@intel.com, steven.sistare@oracle.com, fam.zheng@bytedance.com, mgalaxy@akamai.com, kexec@lists.infradead.org Subject: [RFC v3 17/21] kexec: PKRAM: avoid clobbering already preserved pages Date: Wed, 26 Apr 2023 17:08:53 -0700 [thread overview] Message-ID: <1682554137-13938-18-git-send-email-anthony.yznaga@oracle.com> (raw) In-Reply-To: <1682554137-13938-1-git-send-email-anthony.yznaga@oracle.com> Ensure destination ranges of the kexec segments do not overlap with any kernel pages marked to be preserved across kexec. For kexec_load, return EADDRNOTAVAIL if overlap is detected. For kexec_file_load, skip ranges containing preserved pages when seaching for available ranges to use. Signed-off-by: Anthony Yznaga <anthony.yznaga@oracle.com> --- kernel/kexec_core.c | 3 +++ kernel/kexec_file.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 3d578c6fefee..e0d52f70cb48 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -40,6 +40,7 @@ #include <linux/hugetlb.h> #include <linux/objtool.h> #include <linux/kmsg_dump.h> +#include <linux/pkram.h> #include <asm/page.h> #include <asm/sections.h> @@ -178,6 +179,8 @@ int sanity_check_segment_list(struct kimage *image) return -EADDRNOTAVAIL; if (mend >= KEXEC_DESTINATION_MEMORY_LIMIT) return -EADDRNOTAVAIL; + if (pkram_has_preserved_pages(mstart, mend)) + return -EADDRNOTAVAIL; } /* Verify our destination addresses do not overlap. diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index ca2aa2d61955..8bca01060d32 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -490,6 +490,11 @@ static int locate_mem_hole_bottom_up(unsigned long start, unsigned long end, continue; } + if (pkram_has_preserved_pages(temp_start, temp_end + 1)) { + temp_start = temp_start - PAGE_SIZE; + continue; + } + /* We found a suitable memory range */ break; } while (1); -- 1.9.4
WARNING: multiple messages have this Message-ID (diff)
From: Anthony Yznaga <anthony.yznaga@oracle.com> To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, rppt@kernel.org, akpm@linux-foundation.org, ebiederm@xmission.com, keescook@chromium.org, graf@amazon.com, jason.zeng@intel.com, lei.l.li@intel.com, steven.sistare@oracle.com, fam.zheng@bytedance.com, mgalaxy@akamai.com, kexec@lists.infradead.org Subject: [RFC v3 17/21] kexec: PKRAM: avoid clobbering already preserved pages Date: Wed, 26 Apr 2023 17:08:53 -0700 [thread overview] Message-ID: <1682554137-13938-18-git-send-email-anthony.yznaga@oracle.com> (raw) In-Reply-To: <1682554137-13938-1-git-send-email-anthony.yznaga@oracle.com> Ensure destination ranges of the kexec segments do not overlap with any kernel pages marked to be preserved across kexec. For kexec_load, return EADDRNOTAVAIL if overlap is detected. For kexec_file_load, skip ranges containing preserved pages when seaching for available ranges to use. Signed-off-by: Anthony Yznaga <anthony.yznaga@oracle.com> --- kernel/kexec_core.c | 3 +++ kernel/kexec_file.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 3d578c6fefee..e0d52f70cb48 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -40,6 +40,7 @@ #include <linux/hugetlb.h> #include <linux/objtool.h> #include <linux/kmsg_dump.h> +#include <linux/pkram.h> #include <asm/page.h> #include <asm/sections.h> @@ -178,6 +179,8 @@ int sanity_check_segment_list(struct kimage *image) return -EADDRNOTAVAIL; if (mend >= KEXEC_DESTINATION_MEMORY_LIMIT) return -EADDRNOTAVAIL; + if (pkram_has_preserved_pages(mstart, mend)) + return -EADDRNOTAVAIL; } /* Verify our destination addresses do not overlap. diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index ca2aa2d61955..8bca01060d32 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -490,6 +490,11 @@ static int locate_mem_hole_bottom_up(unsigned long start, unsigned long end, continue; } + if (pkram_has_preserved_pages(temp_start, temp_end + 1)) { + temp_start = temp_start - PAGE_SIZE; + continue; + } + /* We found a suitable memory range */ break; } while (1); -- 1.9.4 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2023-04-27 0:10 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-04-27 0:08 [RFC v3 00/21] Preserved-over-Kexec RAM Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 01/21] mm: add PKRAM API stubs and Kconfig Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 02/21] mm: PKRAM: implement node load and save functions Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 03/21] mm: PKRAM: implement object " Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 04/21] mm: PKRAM: implement folio stream operations Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 05/21] mm: PKRAM: implement byte " Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 06/21] mm: PKRAM: link nodes by pfn before reboot Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 07/21] mm: PKRAM: introduce super block Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-06-05 2:40 ` Coiby Xu 2023-06-05 2:40 ` Coiby Xu 2023-06-06 2:01 ` Anthony Yznaga 2023-06-06 2:01 ` Anthony Yznaga 2023-06-06 2:55 ` Coiby Xu 2023-06-06 2:55 ` Coiby Xu 2023-06-06 3:12 ` Anthony Yznaga 2023-06-06 3:12 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 08/21] PKRAM: track preserved pages in a physical mapping pagetable Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 09/21] PKRAM: pass a list of preserved ranges to the next kernel Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 10/21] PKRAM: prepare for adding preserved ranges to memblock reserved Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 11/21] mm: PKRAM: reserve preserved memory at boot Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 12/21] PKRAM: free the preserved ranges list Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 13/21] PKRAM: prevent inadvertent use of a stale superblock Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 14/21] PKRAM: provide a way to ban pages from use by PKRAM Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 15/21] kexec: PKRAM: prevent kexec clobbering preserved pages in some cases Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 16/21] PKRAM: provide a way to check if a memory range has preserved pages Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga [this message] 2023-04-27 0:08 ` [RFC v3 17/21] kexec: PKRAM: avoid clobbering already " Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 18/21] mm: PKRAM: allow preserved memory to be freed from userspace Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 19/21] PKRAM: disable feature when running the kdump kernel Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 20/21] x86/KASLR: PKRAM: support physical kaslr Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 0:08 ` [RFC v3 21/21] x86/boot/compressed/64: use 1GB pages for mappings Anthony Yznaga 2023-04-27 0:08 ` Anthony Yznaga 2023-04-27 18:40 ` H. Peter Anvin 2023-04-27 18:40 ` H. Peter Anvin 2023-04-27 22:38 ` Anthony Yznaga 2023-04-27 22:38 ` Anthony Yznaga 2023-05-26 13:57 ` [RFC v3 00/21] Preserved-over-Kexec RAM Gowans, James 2023-05-26 13:57 ` Gowans, James 2023-05-31 23:14 ` Anthony Yznaga 2023-05-31 23:14 ` Anthony Yznaga 2023-06-01 2:15 ` Baoquan He 2023-06-01 2:15 ` Baoquan He 2023-06-01 23:58 ` Anthony Yznaga 2023-06-01 23:58 ` Anthony Yznaga
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=1682554137-13938-18-git-send-email-anthony.yznaga@oracle.com \ --to=anthony.yznaga@oracle.com \ --cc=akpm@linux-foundation.org \ --cc=bp@alien8.de \ --cc=dave.hansen@linux.intel.com \ --cc=ebiederm@xmission.com \ --cc=fam.zheng@bytedance.com \ --cc=graf@amazon.com \ --cc=hpa@zytor.com \ --cc=jason.zeng@intel.com \ --cc=keescook@chromium.org \ --cc=kexec@lists.infradead.org \ --cc=lei.l.li@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=luto@kernel.org \ --cc=mgalaxy@akamai.com \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=rppt@kernel.org \ --cc=steven.sistare@oracle.com \ --cc=tglx@linutronix.de \ --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.