FAILED: patch "[PATCH] x86/ldt: Remove unused variable in map_ldt_struct()" failed to apply to 4.19-stable tree

PATCH Applied [email protected] 3 participants 3 messages Nov 19, 2018 – Nov 25, 2018

Subsystems (2)

Stable branch x86

lore

Share & tools

lore

[email protected]

author maintainer

2018-11-19 22:48 UTC #0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From b082f2dd80612015cd6d9d84e52099734ec9a0e1 Mon Sep 17 00:00:00 2001

From: "Kirill A. Shutemov" <[email protected]>
Date: Fri, 26 Oct 2018 15:28:56 +0300
Subject: [PATCH] x86/ldt: Remove unused variable in map_ldt_struct()

Splitting out the sanity check in map_ldt_struct() moved page table syncing into a separate function, which made the pgd variable unused. Remove it.

[ tglx: Massaged changelog ]

Fixes 9bae3197e15d ("x86/ldt: Split out sanity check in map_ldt_struct()")

Signed-off-by Kirill A. Shutemov <[email protected]>

Signed-off-by Thomas Gleixner <[email protected]>

Reviewed-by Andy Lutomirski <[email protected]>

Cc [email protected]

Link https://lkml.kernel.org/r/[email protected] open here

arch/x86/kernel/ldt.c +0 -8

index 18e4525c5933..6135ae8ce036 100644
@@ -207,7 +207,6 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot)
 	bool is_vmalloc;
 	spinlock_t *ptl;
 	int i, nr_pages;
-	pgd_t *pgd;
 
 	if (!static_cpu_has(X86_FEATURE_PTI))
 		return 0;

@@ -221,13 +220,6 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot)
 	/* Check if the current mappings are sane */
 	sanity_check_ldt_mapping(mm);
 
-	/*
-	 * Did we already have the top level entry allocated?  We can't
-	 * use pgd_none() for this because it doens't do anything on
-	 * 4-level page table kernels.
-	 */
-	pgd = pgd_offset(mm, LDT_BASE_ADDR);
-
 	is_vmalloc = is_vmalloc_addr(ldt->entries);
 
 	nr_pages = DIV_ROUND_UP(ldt->nr_entries * LDT_ENTRY_SIZE, PAGE_SIZE);

Kirill A. Shutemov

Reviewed-by Andy Lutomirski

2018-11-23 22:25 UTC #1 lore raw

Quoted 7 lines · On Mon, Nov 19, 2018 at 12:24:45PM +0000, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
From 956e1d94fd17a773cebafedf5513dc036706cbc5 Mon Sep 17 00:00:00 2001

From: "Kirill A. Shutemov" <[email protected]>
Date: Fri, 26 Oct 2018 15:28:56 +0300
Subject: [PATCH 3/3] x86/ldt: Remove unused variable in map_ldt_struct()

commit b082f2dd80612015cd6d9d84e52099734ec9a0e1 upstream

Splitting out the sanity check in map_ldt_struct() moved page table syncing into a separate function, which made the pgd variable unused. Remove it.

[ tglx: Massaged changelog ]

Fixes 9bae3197e15d ("x86/ldt: Split out sanity check in map_ldt_struct()")

Signed-off-by Kirill A. Shutemov <[email protected]>

Signed-off-by Thomas Gleixner <[email protected]>

Reviewed-by Andy Lutomirski <[email protected]>

Cc [email protected]

Link https://lkml.kernel.org/r/[email protected] open here

---
 arch/x86/kernel/ldt.c | 8 --------
 1 file changed, 8 deletions(-)

arch/x86/kernel/ldt.c +0 -8

index 2a71ded9b13e..65590eee6289 100644
@@ -207,7 +207,6 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot)
 	bool is_vmalloc;
 	spinlock_t *ptl;
 	int i, nr_pages;
-	pgd_t *pgd;
 
 	if (!static_cpu_has(X86_FEATURE_PTI))
 		return 0;

@@ -221,13 +220,6 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot)
 	/* Check if the current mappings are sane */
 	sanity_check_ldt_mapping(mm);
 
-	/*
-	 * Did we already have the top level entry allocated?  We can't
-	 * use pgd_none() for this because it doens't do anything on
-	 * 4-level page table kernels.
-	 */
-	pgd = pgd_offset(mm, LDT_BASE_ADDR);
-
 	is_vmalloc = is_vmalloc_addr(ldt->entries);
 
 	nr_pages = DIV_ROUND_UP(ldt->nr_entries * LDT_ENTRY_SIZE, PAGE_SIZE);

Signature · 1 line

 Kirill A. Shutemov

Sasha Levin

maintainer Applied

2018-11-25 02:45 UTC #2 lore raw

Quoted 19 lines · Kirill A. Shutemov

Quoted 7 lines · On Mon, Nov 19, 2018 at 12:24:45PM +0000, [email protected] wrote:
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
From 956e1d94fd17a773cebafedf5513dc036706cbc5 Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <[email protected]>
Date: Fri, 26 Oct 2018 15:28:56 +0300
Subject: [PATCH 3/3] x86/ldt: Remove unused variable in map_ldt_struct()
commit b082f2dd80612015cd6d9d84e52099734ec9a0e1 upstream
Splitting out the sanity check in map_ldt_struct() moved page table syncing into a separate function, which made the pgd variable unused. Remove it.
[ tglx: Massaged changelog ]

Quoted 15 lines

Fixes 9bae3197e15d ("x86/ldt: Split out sanity check in map_ldt_struct()")
Signed-off-by Kirill A. Shutemov <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Reviewed-by Andy Lutomirski <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Link https://lkml.kernel.org/r/[email protected] open here

Queued for 4.19, thank you.

--
Thanks,
Sasha