[folded-merged] kexec-provide-arch_kexec_protectunprotect_crashkres-v4.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: kexec-provide-arch_kexec_protectunprotect_crashkres-v4
has been removed from the -mm tree.  Its filename was
     kexec-provide-arch_kexec_protectunprotect_crashkres-v4.patch

This patch was dropped because it was folded into kexec-provide-arch_kexec_protectunprotect_crashkres.patch

------------------------------------------------------
From: Xunlei Pang <xlpang@xxxxxxxxxx>
Subject: kexec-provide-arch_kexec_protectunprotect_crashkres-v4

v3->v4:
Add some comments according to Minfei's suggestion.

Signed-off-by: Xunlei Pang <xlpang@xxxxxxxxxx>
Cc: Eric Biederman <ebiederm@xxxxxxxxxxxx>
Cc: Dave Young <dyoung@xxxxxxxxxx>
Cc: Minfei Huang <mhuang@xxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/x86/kernel/machine_kexec_64.c |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff -puN arch/x86/kernel/machine_kexec_64.c~kexec-provide-arch_kexec_protectunprotect_crashkres-v4 arch/x86/kernel/machine_kexec_64.c
--- a/arch/x86/kernel/machine_kexec_64.c~kexec-provide-arch_kexec_protectunprotect_crashkres-v4
+++ a/arch/x86/kernel/machine_kexec_64.c
@@ -539,18 +539,21 @@ overflow:
 }
 #endif /* CONFIG_KEXEC_FILE */
 
-#ifdef CONFIG_KEXEC_CORE
 static int
 kexec_mark_range(unsigned long start, unsigned long end, bool protect)
 {
 	struct page *page;
 	unsigned int nr_pages;
 
-	if (!start || !end || start >= end)
+	/*
+	 * For physical range: [start, end]. We must skip the unassigned
+	 * crashk resource with zero-valued "end" member.
+	 */
+	if (!end || start > end)
 		return 0;
 
 	page = pfn_to_page(start >> PAGE_SHIFT);
-	nr_pages = (end + 1 - start) >> PAGE_SHIFT;
+	nr_pages = (end >> PAGE_SHIFT) - (start >> PAGE_SHIFT) + 1;
 	if (protect)
 		return set_pages_ro(page, nr_pages);
 	else
@@ -566,9 +569,9 @@ static void kexec_mark_crashkres(bool pr
 	/* Don't touch the control code page used in crash_kexec().*/
 	control = PFN_PHYS(page_to_pfn(kexec_crash_image->control_code_page));
 	/* Control code page is located in the 2nd page. */
-	control = control + PAGE_SIZE;
-	kexec_mark_range(crashk_res.start, control - 1, protect);
-	kexec_mark_range(control + PAGE_SIZE, crashk_res.end, protect);
+	kexec_mark_range(crashk_res.start, control + PAGE_SIZE - 1, protect);
+	control += KEXEC_CONTROL_PAGE_SIZE;
+	kexec_mark_range(control, crashk_res.end, protect);
 }
 
 void arch_kexec_protect_crashkres(void)
@@ -580,4 +583,3 @@ void arch_kexec_unprotect_crashkres(void
 {
 	kexec_mark_crashkres(false);
 }
-#endif
_

Patches currently in -mm which might be from xlpang@xxxxxxxxxx are

kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
kexec-provide-arch_kexec_protectunprotect_crashkres.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux