[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20071113225043.691F014543E5@imap.suse.de>
Date: Tue, 13 Nov 2007 14:50:31 -0800
From: <gregkh@...e.de>
To: jeremy@...p.org, ak@....de, akpm@...ux-foundation.org,
chrisw@...s-sol.org, gregkh@...e.de, jeremy@...source.com,
keir@...source.com, linux-kernel@...r.kernel.org,
mark.williamson@...cam.ac.uk, stable@...nel.org,
xen-users@...ten.bogeskov.dk
Cc: <stable@...nel.org>, <stable-commits@...r.kernel.org>
Subject: patch xen-fix-register_vcpu_info.patch queued to -stable tree
This is a note to let you know that we have just queued up the patch titled
Subject: xen: fix incorrect vcpu_register_vcpu_info hypercall argument
to the 2.6.23-stable tree. Its filename is
xen-fix-register_vcpu_info.patch
A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>From stable-bounces@...ux.kernel.org Fri Oct 12 14:33:49 2007
From: Jeremy Fitzhardinge <jeremy@...p.org>
Date: Fri, 12 Oct 2007 14:11:40 -0700
Subject: xen: fix incorrect vcpu_register_vcpu_info hypercall argument
To: LKML <linux-kernel@...r.kernel.org>
Cc: xen-devel@...ts.xensource.com, virtualization@...ts.osdl.org, Mark Williamson <mark.williamson@...cam.ac.uk>, Morten Bøgeskov <xen-users@...ten.bogeskov.dk>, Chris Wright <chrisw@...s-sol.org>, Andi Kleen <ak@....de>, Andrew Morton <akpm@...ux-foundation.org>, Keir Fraser <keir@...source.com>, Stable Kernel <stable@...nel.org>
Message-ID: <20071012211148.610399000@...p.org>
Content-Disposition: inline; filename=xen-fix-register_vcpu_info.patch
From: Jeremy Fitzhardinge <jeremy@...p.org>
patch e3d2697669abbe26c08dc9b95e2a71c634d096ed in mainline.
The kernel's copy of struct vcpu_register_vcpu_info was out of date,
at best causing the hypercall to fail and the guest kernel to fall
back to the old mechanism, or worse, causing random memory corruption.
Signed-off-by: Jeremy Fitzhardinge <jeremy@...source.com>
Cc: Stable Kernel <stable@...nel.org>
Cc: Morten =?utf-8?q?B=C3=B8geskov?= <xen-users@...ten.bogeskov.dk>
Cc: Mark Williamson <mark.williamson@...cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
arch/i386/xen/enlighten.c | 2 +-
include/xen/interface/vcpu.h | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
--- a/arch/i386/xen/enlighten.c
+++ b/arch/i386/xen/enlighten.c
@@ -116,7 +116,7 @@ static void __init xen_vcpu_setup(int cp
info.mfn = virt_to_mfn(vcpup);
info.offset = offset_in_page(vcpup);
- printk(KERN_DEBUG "trying to map vcpu_info %d at %p, mfn %x, offset %d\n",
+ printk(KERN_DEBUG "trying to map vcpu_info %d at %p, mfn %llx, offset %d\n",
cpu, vcpup, info.mfn, info.offset);
/* Check to see if the hypervisor will put the vcpu_info
--- a/include/xen/interface/vcpu.h
+++ b/include/xen/interface/vcpu.h
@@ -160,8 +160,9 @@ struct vcpu_set_singleshot_timer {
*/
#define VCPUOP_register_vcpu_info 10 /* arg == struct vcpu_info */
struct vcpu_register_vcpu_info {
- uint32_t mfn; /* mfn of page to place vcpu_info */
- uint32_t offset; /* offset within page */
+ uint64_t mfn; /* mfn of page to place vcpu_info */
+ uint32_t offset; /* offset within page */
+ uint32_t rsvd; /* unused */
};
#endif /* __XEN_PUBLIC_VCPU_H__ */
Patches currently in stable-queue which might be from jeremy@...p.org are
queue-2.6.23/xen-handle-lazy-cr3-on-unpin.patch
queue-2.6.23/xen-multicall-callbacks.patch
queue-2.6.23/xen-fix-register_vcpu_info.patch
queue-2.6.23/xen-xfs-unmap.patch
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists