From: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
To: akpm@linux-foundation.org, tglx@linutronix.de, mingo@redhat.com,
hpa@zytor.com
Cc: tangchen@cn.fujitsu.com, toshi.kani@hp.com,
linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org,
guz.fnst@cn.fujitsu.com, zhangyanfei@cn.fujitsu.com
Subject: [PATCH 1/2] x86,mem-hotplug: pass sync_global_pgds() a correct argument in remove_pagetable()
Date: Wed, 18 Jun 2014 15:37:18 +0900 [thread overview]
Message-ID: <53A1339E.2000000@jp.fujitsu.com> (raw)
In-Reply-To: <53A132E2.9000605@jp.fujitsu.com>
remove_pagetable() gets start argument and passes the argument to
sync_global_pgds(). In this case, the argument must not be modified.
If the argument is modified and passed to sync_global_pgds(),
sync_global_pgds() does not correctly synchronize PGD to PGD entries
of all processes MM since synchronized range of memory [start, end]
is wrong.
Unfortunately the start argument is modified in remove_pagetable().
So this patch fixes the issue.
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
---
arch/x86/mm/init_64.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index df1a992..a5b245d 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -975,19 +975,20 @@ static void __meminit
remove_pagetable(unsigned long start, unsigned long end, bool direct)
{
unsigned long next;
+ unsigned long addr;
pgd_t *pgd;
pud_t *pud;
bool pgd_changed = false;
- for (; start < end; start = next) {
- next = pgd_addr_end(start, end);
+ for (addr = start; addr < end; addr = next) {
+ next = pgd_addr_end(addr, end);
- pgd = pgd_offset_k(start);
+ pgd = pgd_offset_k(addr);
if (!pgd_present(*pgd))
continue;
pud = (pud_t *)pgd_page_vaddr(*pgd);
- remove_pud_table(pud, start, next, direct);
+ remove_pud_table(pud, addr, next, direct);
if (free_pud_table(pud, pgd))
pgd_changed = true;
}
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
To: <akpm@linux-foundation.org>, <tglx@linutronix.de>,
<mingo@redhat.com>, <hpa@zytor.com>
Cc: <tangchen@cn.fujitsu.com>, <toshi.kani@hp.com>,
<linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
<x86@kernel.org>, <guz.fnst@cn.fujitsu.com>,
<zhangyanfei@cn.fujitsu.com>
Subject: [PATCH 1/2] x86,mem-hotplug: pass sync_global_pgds() a correct argument in remove_pagetable()
Date: Wed, 18 Jun 2014 15:37:18 +0900 [thread overview]
Message-ID: <53A1339E.2000000@jp.fujitsu.com> (raw)
In-Reply-To: <53A132E2.9000605@jp.fujitsu.com>
remove_pagetable() gets start argument and passes the argument to
sync_global_pgds(). In this case, the argument must not be modified.
If the argument is modified and passed to sync_global_pgds(),
sync_global_pgds() does not correctly synchronize PGD to PGD entries
of all processes MM since synchronized range of memory [start, end]
is wrong.
Unfortunately the start argument is modified in remove_pagetable().
So this patch fixes the issue.
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
---
arch/x86/mm/init_64.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index df1a992..a5b245d 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -975,19 +975,20 @@ static void __meminit
remove_pagetable(unsigned long start, unsigned long end, bool direct)
{
unsigned long next;
+ unsigned long addr;
pgd_t *pgd;
pud_t *pud;
bool pgd_changed = false;
- for (; start < end; start = next) {
- next = pgd_addr_end(start, end);
+ for (addr = start; addr < end; addr = next) {
+ next = pgd_addr_end(addr, end);
- pgd = pgd_offset_k(start);
+ pgd = pgd_offset_k(addr);
if (!pgd_present(*pgd))
continue;
pud = (pud_t *)pgd_page_vaddr(*pgd);
- remove_pud_table(pud, start, next, direct);
+ remove_pud_table(pud, addr, next, direct);
if (free_pud_table(pud, pgd))
pgd_changed = true;
}
next prev parent reply other threads:[~2014-06-18 6:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-18 6:34 [PATCH 0/2] fix kernel panic on memory hotplug Yasuaki Ishimatsu
2014-06-18 6:34 ` Yasuaki Ishimatsu
2014-06-18 6:37 ` Yasuaki Ishimatsu [this message]
2014-06-18 6:37 ` [PATCH 1/2] x86,mem-hotplug: pass sync_global_pgds() a correct argument in remove_pagetable() Yasuaki Ishimatsu
2014-06-20 18:27 ` Toshi Kani
2014-06-20 18:27 ` Toshi Kani
2014-06-24 0:33 ` Yasuaki Ishimatsu
2014-06-24 0:33 ` Yasuaki Ishimatsu
2014-06-18 6:38 ` [PATCH 2/2] x86,mem-hotplug: modify PGD entry when removing memory Yasuaki Ishimatsu
2014-06-18 6:38 ` Yasuaki Ishimatsu
2014-06-20 18:30 ` Toshi Kani
2014-06-20 18:30 ` Toshi Kani
2014-06-24 0:31 ` Yasuaki Ishimatsu
2014-06-24 0:31 ` Yasuaki Ishimatsu
2014-06-24 15:12 ` Toshi Kani
2014-06-24 15:12 ` Toshi Kani
2014-06-24 23:29 ` Yasuaki Ishimatsu
2014-06-24 23:29 ` Yasuaki Ishimatsu
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=53A1339E.2000000@jp.fujitsu.com \
--to=isimatu.yasuaki@jp.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=guz.fnst@cn.fujitsu.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@redhat.com \
--cc=tangchen@cn.fujitsu.com \
--cc=tglx@linutronix.de \
--cc=toshi.kani@hp.com \
--cc=x86@kernel.org \
--cc=zhangyanfei@cn.fujitsu.com \
/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: link
Be 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.