From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: "Siddha, Suresh B" <suresh.b.siddha@intel.com>
Cc: Andi Kleen <ak@suse.de>, Pavel Machek <pavel@ucw.cz>,
Andrew Morton <akpm@osdl.org>,
LKML <linux-kernel@vger.kernel.org>,
discuss@x86-64.org
Subject: Re: [PATCH][Fix][Resend] Fix Bug #4959: Page tables corrupted during resume on x86-64 (take 3)
Date: Fri, 30 Sep 2005 00:01:08 +0200 [thread overview]
Message-ID: <200509300001.10258.rjw@sisk.pl> (raw)
In-Reply-To: <20050928170031.D30088@unix-os.sc.intel.com>
Hi,
On Thursday, 29 of September 2005 02:00, Siddha, Suresh B wrote:
> On Wed, Sep 28, 2005 at 10:24:42PM +0200, Rafael J. Wysocki wrote:
> > On Wednesday, 28 of September 2005 21:18, Andi Kleen wrote:
> > > Also Suresh S. has a patch out to turn the initial page tables
> > > into initdata. It'll probably conflict with that. Needs to be coordinated
> > > with him.
> >
> > Do you mean the patch at:
> > http://www.x86-64.org/lists/discuss/msg07297.html ?
> > Unfortunately it interferes with the current swsusp code, which uses
> > init_level4_pgt anyway.
> >
> > Could we please treat my patch as a (very much needed) urgent bugfix
> > and make the whole swsusp code in line with the Suresh's patch later on?
> >
> > Suresh, could you please say what you think of it?
>
> My patch as such shouldn't change the behavior of the existing swsup
> code. I am making only boot_level4_pgt as initdata. But not the
> init_level4_pgt.
Suresh, unfortunately the kernel does not boot with your patch, because
it clears init_level4_pgt. I think the patch that follows should be applied on
top of it.
If I am right, than your patch does not conflict with mine (just tested).
Greetings,
Rafael
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Index: linux-2.6.14-rc2-git7/arch/x86_64/mm/init.c
===================================================================
--- linux-2.6.14-rc2-git7.orig/arch/x86_64/mm/init.c 2005-09-29 22:13:34.000000000 +0200
+++ linux-2.6.14-rc2-git7/arch/x86_64/mm/init.c 2005-09-29 22:13:55.000000000 +0200
@@ -313,7 +313,7 @@
void __cpuinit zap_low_mappings(int cpu)
{
if (cpu == 0) {
- pgd_t *pgd = pgd_offset_k(0UL);
+ pgd_t *pgd = boot_level4_pgt;
pgd_clear(pgd);
} else {
/*
Index: linux-2.6.14-rc2-git7/include/asm-x86_64/proto.h
===================================================================
--- linux-2.6.14-rc2-git7.orig/include/asm-x86_64/proto.h 2005-09-21 11:04:24.000000000 +0200
+++ linux-2.6.14-rc2-git7/include/asm-x86_64/proto.h 2005-09-29 22:22:19.000000000 +0200
@@ -22,6 +22,7 @@
#define mtrr_bp_init() do {} while (0)
#endif
extern void init_memory_mapping(unsigned long start, unsigned long end);
+extern void zap_low_mappings(int cpu);
extern void system_call(void);
extern int kernel_syscall(void);
next prev parent reply other threads:[~2005-09-29 22:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-28 14:24 [PATCH][Fix][Resend] Fix Bug #4959: Page tables corrupted during resume on x86-64 (take 3) Rafael J. Wysocki
2005-09-28 19:18 ` Andi Kleen
2005-09-28 20:24 ` Rafael J. Wysocki
2005-09-28 20:33 ` [discuss] " Andi Kleen
2005-09-28 22:11 ` Rafael J. Wysocki
2005-09-28 22:35 ` Pavel Machek
2005-09-29 11:25 ` Rafael J. Wysocki
2005-09-29 0:00 ` Siddha, Suresh B
2005-09-29 10:58 ` Rafael J. Wysocki
2005-09-29 22:01 ` Rafael J. Wysocki [this message]
2005-09-29 22:29 ` Siddha, Suresh B
2005-09-29 23:04 ` Rafael J. Wysocki
2005-09-29 23:59 ` Siddha, Suresh B
2005-09-30 5:26 ` Rafael J. Wysocki
2005-09-30 6:51 ` [discuss] " Rafael J. Wysocki
2005-10-01 1:25 ` Siddha, Suresh B
2005-10-01 7:47 ` Rafael J. Wysocki
2005-10-01 10:03 ` Rafael J. Wysocki
2005-10-02 1:08 ` Siddha, Suresh B
2005-10-02 9:54 ` Rafael J. Wysocki
2005-09-29 20:02 ` Andrew Morton
2005-09-29 21:35 ` Rafael J. Wysocki
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=200509300001.10258.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=discuss@x86-64.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=suresh.b.siddha@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).