Enable 32bit dirty log pointers on 64bit host
PATCH 1/1 Enable 32bit dirty log pointers on 64bit host
From: Arnd Bergmann <[email protected]>
With big endian userspace, we can't quite figure out if a pointer is 32 bit (shifted >> 32) or 64 bit when we read a 64 bit pointer.
This is what happens with dirty logging. To get the pointer interpreted correctly, we thus need Arnd's patch to implement a compat layer for the ioctl:
A better way to do this is to add a separate compat_ioctl() method that converts this for you.
From: Arnd Bergmann <[email protected]>
---
Changes from Arnd's example version:
- s/log.log/log/ (Avi)
- use sizeof(compat_log) (Avi)
- compile fixes
--- virt/kvm/kvm_main.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-)
virt/kvm/kvm_main.c +48 -1
@@ -43,6 +43,7 @@#include <linux/swap.h> #include <linux/bitops.h> #include <linux/spinlock.h> +#include <linux/compat.h> #include <asm/processor.h> #include <asm/io.h>
@@ -1542,6 +1543,52 @@ out:return r; } +#ifdef CONFIG_COMPAT +struct compat_kvm_dirty_log { +__u32 slot; +__u32 padding1; +union { +compat_uptr_t dirty_bitmap;/* one bit per page */ +__u64 padding2; + }; +}; + +static long kvm_vm_compat_ioctl (struct file *filp, +unsigned int ioctl,unsigned long arg) +{ +struct kvm *kvm = filp->private_data; +int r; + +if (kvm->mm != current->mm) +return -EIO ; +switch (ioctl) { +case KVM_GET_DIRTY_LOG : { +struct compat_kvm_dirty_log compat_log; +struct kvm_dirty_log log; + + r = -EFAULT ; +if (copy_from_user (&compat_log, (void __user *)arg, +sizeof (compat_log))) + goto out; + log.slot = compat_log.slot; + log.padding1 = compat_log.padding1; + log.padding2 = compat_log.padding2; + log.dirty_bitmap =compat_ptr (compat_log.dirty_bitmap); + + r =kvm_vm_ioctl_get_dirty_log (kvm, &log); +if (r) + goto out; +break ; + } +default : + r =kvm_vm_ioctl (filp, ioctl, arg); + } + +out: +return r; +} +#endif +static int kvm_vm_fault (struct vm_area_struct *vma,struct vm_fault *vmf) {struct page *page[1 ];
@@ -1576,7 +1623,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)static struct file_operations kvm_vm_fops = { .release = kvm_vm_release, .unlocked_ioctl = kvm_vm_ioctl, - .compat_ioctl = kvm_vm_ioctl, + .compat_ioctl = kvm_vm_compat_ioctl, .mmap = kvm_vm_mmap, };
Signature · 1 line
1.6.0.2
Quoted 9 lines · Alexander Graf
From: Arnd Bergmann<[email protected]>
With big endian userspace, we can't quite figure out if a pointer is 32 bit (shifted>> 32) or 64 bit when we read a 64 bit pointer.
This is what happens with dirty logging. To get the pointer interpreted correctly, we thus need Arnd's patch to implement a compat layer for the ioctl:
Quoted 8 lines
A better way to do this is to add a separate
compat_ioctl()method that converts this for you.From: Arnd Bergmann<[email protected]>
Signed-off-by Arnd Bergmann<[email protected]>Acked-by Alexander Graf<[email protected]>
If you send someone's patch, you need to sign this off. That says you are legally allowed to send it along.
Ack means "I have a say in this area and it looks good to me", you add it when someone else is doing the sending.
Quoted 2 lines
Changes from Arnd's example version:
This goes double when changing the patch.
With all the legalese out of the way, the actual code looks good.
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 19 lines · Avi Kivity
Quoted 9 lines · Alexander Graf
From: Arnd Bergmann<[email protected]>
With big endian userspace, we can't quite figure out if a pointer is 32 bit (shifted>> 32) or 64 bit when we read a 64 bit pointer.
This is what happens with dirty logging. To get the pointer interpreted correctly, we thus need Arnd's patch to implement a compat layer for the ioctl:
Quoted 8 lines
A better way to do this is to add a separate
compat_ioctl()method that converts this for you.From: Arnd Bergmann<[email protected]>
Signed-off-by Arnd Bergmann<[email protected]>Acked-by Alexander Graf<[email protected]>
Quoted 3 lines
If you send someone's patch, you need to sign this off. That says you are legally allowed to send it along.
Ack means "I have a say in this area and it looks good to me", you add it when someone else is doing the sending.
Ok, so is it still a From: Arnd then? Is it still signed-off by Arnd even though I change it?
Is there a Based-on-patch-by: tag? :-)
Alex
A message that is not in the archive (sent off-list or not yet received): 03CB8BC3-B33F-4253-A259-A1517A099698-l3A5Bk7waGM@public.gmane.org
Quoted 6 lines · Alexander Graf
Quoted 3 lines
If you send someone's patch, you need to sign this off. That says you are legally allowed to send it along.
Ack means "I have a say in this area and it looks good to me", you add it when someone else is doing the sending.
Ok, so is it still a From: Arnd then? Is it still signed-off by Arnd even though I change it?
Yes. Most kvm patches are From: other people, I just add my signoff (and definitely don't remote theirs).
Whether to change From: depends on the changes. If you rewrite the patch, it's From: you. If you just fix a couple of bugs, you generally leave From: alone.
Quoted 1 line
Is there a Based-on-patch-by: tag? :-)
You can always say "Based on initial patch from ...".
Signature · 1 line
error compiling committee.c: too many arguments to function
Marcelo Tosatti
AppliedQuoted 16 lines · Alexander Graf
From: Arnd Bergmann <[email protected]>
With big endian userspace, we can't quite figure out if a pointer is 32 bit (shifted >> 32) or 64 bit when we read a 64 bit pointer.
This is what happens with dirty logging. To get the pointer interpreted correctly, we thus need Arnd's patch to implement a compat layer for the ioctl:
A better way to do this is to add a separate
compat_ioctl()method that converts this for you.From: Arnd Bergmann <[email protected]>
Signed-off-by Arnd Bergmann <[email protected]>Acked-by Alexander Graf <[email protected]>
Quoted 7 lines
---
Changes from Arnd's example version:
- s/log.log/log/ (Avi)
- usesizeof(compat_log)(Avi)
- compile fixes
Applied, thanks.
Quoted 93 lines · Alexander Graf
From: Arnd Bergmann <[email protected]>
With big endian userspace, we can't quite figure out if a pointer is 32 bit (shifted >> 32) or 64 bit when we read a 64 bit pointer.
This is what happens with dirty logging. To get the pointer interpreted correctly, we thus need Arnd's patch to implement a compat layer for the ioctl:
A better way to do this is to add a separate
compat_ioctl()method that converts this for you.From: Arnd Bergmann <[email protected]>
Signed-off-by Arnd Bergmann <[email protected]>Acked-by Alexander Graf <[email protected]>---
Changes from Arnd's example version:
- s/log.log/log/ (Avi)
- usesizeof(compat_log)(Avi)
- compile fixes--- virt/kvm/kvm_main.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-)virt/kvm/kvm_main.c +47
-0@@ -43,6 +43,7 @@#include <linux/swap.h> #include <linux/bitops.h> #include <linux/spinlock.h> +#include <linux/compat.h> #include <asm/processor.h> #include <asm/io.h> @@ -1542,6 +1543,52 @@ out:return r; } +#ifdef CONFIG_COMPAT +struct compat_kvm_dirty_log { +__u32 slot; +__u32 padding1; +union { +compat_uptr_t dirty_bitmap;/* one bit per page */ +__u64 padding2; + }; +}; + +static long kvm_vm_compat_ioctl (struct file *filp, +unsigned int ioctl,unsigned long arg) +{ +struct kvm *kvm = filp->private_data; +int r; + +if (kvm->mm != current->mm) +return -EIO ; +switch (ioctl) { +case KVM_GET_DIRTY_LOG : { +struct compat_kvm_dirty_log compat_log; +struct kvm_dirty_log log; + + r = -EFAULT ; +if (copy_from_user (&compat_log, (void __user *)arg, +sizeof (compat_log))) + goto out; + log.slot = compat_log.slot; + log.padding1 = compat_log.padding1; + log.padding2 = compat_log.padding2; + log.dirty_bitmap =compat_ptr (compat_log.dirty_bitmap); + + r =kvm_vm_ioctl_get_dirty_log (kvm, &log); +if (r) + goto out; +break ; + } +default : + r =kvm_vm_ioctl (filp, ioctl, arg); + } + +out: +return r; +} +#endif +static int kvm_vm_fault (struct vm_area_struct *vma,struct vm_fault *vmf) {struct page *page[1 ];
virt/kvm/kvm_main.c static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma) · line 1626
Quoted 5 lines
virt/kvm/kvm_main.c +1
-1@@ -1576,7 +1623,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)static struct file_operations kvm_vm_fops = { .release = kvm_vm_release, .unlocked_ioctl = kvm_vm_ioctl, - .compat_ioctl = kvm_vm_ioctl, + .compat_ioctl = kvm_vm_compat_ioctl,
This fails in the absence of CONFIG_COMPAT.
Jan
Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 95 lines · Jan Kiszka
Quoted 94 lines · Alexander Graf
From: Arnd Bergmann <[email protected]>
With big endian userspace, we can't quite figure out if a pointer is 32 bit (shifted >> 32) or 64 bit when we read a 64 bit pointer.
This is what happens with dirty logging. To get the pointer interpreted correctly, we thus need Arnd's patch to implement a compat layer for the ioctl:
A better way to do this is to add a separate
compat_ioctl()method that converts this for you.From: Arnd Bergmann <[email protected]>
Signed-off-by Arnd Bergmann <[email protected]>Acked-by Alexander Graf <[email protected]>---
Changes from Arnd's example version:
- s/log.log/log/ (Avi)
- usesizeof(compat_log)(Avi)
- compile fixes
---virt/kvm/kvm_main.c| 49 +++++++++++++++++++++++++++++++++++++++++
+++++++-1 files changed, 48 insertions(+), 1 deletions(-)virt/kvm/kvm_main.c +47
-0@@ -43,6 +43,7 @@#include <linux/swap.h> #include <linux/bitops.h> #include <linux/spinlock.h> +#include <linux/compat.h> #include <asm/processor.h> #include <asm/io.h> @@ -1542,6 +1543,52 @@ out:return r; } +#ifdef CONFIG_COMPAT +struct compat_kvm_dirty_log { +__u32 slot; +__u32 padding1; +union { +compat_uptr_t dirty_bitmap;/* one bit per page */ +__u64 padding2; + }; +}; + +static long kvm_vm_compat_ioctl (struct file *filp, +unsigned int ioctl,unsigned long arg) +{ +struct kvm *kvm = filp->private_data; +int r; + +if (kvm->mm != current->mm) +return -EIO ; +switch (ioctl) { +case KVM_GET_DIRTY_LOG : { +struct compat_kvm_dirty_log compat_log; +struct kvm_dirty_log log; + + r = -EFAULT ; +if (copy_from_user (&compat_log, (void __user *)arg, +sizeof (compat_log))) + goto out; + log.slot = compat_log.slot; + log.padding1 = compat_log.padding1; + log.padding2 = compat_log.padding2; + log.dirty_bitmap =compat_ptr (compat_log.dirty_bitmap); + + r =kvm_vm_ioctl_get_dirty_log (kvm, &log); +if (r) + goto out; +break ; + } +default : + r =kvm_vm_ioctl (filp, ioctl, arg); + } + +out: +return r; +} +#endif +static int kvm_vm_fault (struct vm_area_struct *vma,struct vm_fault *vmf) {struct page *page[1 ];@@ -1576,7 +1623,7 @@ static int kvm_vm_mmap(struct file *file,
Quoted 8 lines
virt/kvm/kvm_main.c static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma) · line 1626
Quoted 6 lines
virt/kvm/kvm_main.c +1
-1struct vm_area_struct *vma)static struct file_operations kvm_vm_fops = { .release = kvm_vm_release, .unlocked_ioctl = kvm_vm_ioctl, - .compat_ioctl = kvm_vm_ioctl, + .compat_ioctl = kvm_vm_compat_ioctl,This fails in the absence of
CONFIG_COMPAT.
So should it rather be
#ifdef CONFIG_COMPAT
.compat_ioctl = kvm_vm_compat_ioctl,
#else
.compat_ioctl = kvm_vm_ioctl,
#endif
or
#ifdef CONFIG_COMPAT
.compat_ioctl = kvm_vm_compat_ioctl,
#endif
?
Alex
Quoted 117 lines · Alexander Graf
Quoted 97 lines · Jan Kiszka
Quoted 96 lines · Alexander Graf
From: Arnd Bergmann <[email protected]>
With big endian userspace, we can't quite figure out if a pointer is 32 bit (shifted >> 32) or 64 bit when we read a 64 bit pointer.
This is what happens with dirty logging. To get the pointer interpreted
correctly, we thus need Arnd's patch to implement a compat layer for the ioctl:A better way to do this is to add a separate
compat_ioctl()method that
converts this for you.From: Arnd Bergmann <[email protected]>
Signed-off-by Arnd Bergmann <[email protected]>Acked-by Alexander Graf <[email protected]>---
Changes from Arnd's example version:
- s/log.log/log/ (Avi)
- usesizeof(compat_log)(Avi)
- compile fixes
---virt/kvm/kvm_main.c| 49 +++++++++++++++++++++++++++++++++++++++++
+++++++-1 files changed, 48 insertions(+), 1 deletions(-)virt/kvm/kvm_main.c +47
-0@@ -43,6 +43,7 @@#include <linux/swap.h> #include <linux/bitops.h> #include <linux/spinlock.h> +#include <linux/compat.h> #include <asm/processor.h> #include <asm/io.h> @@ -1542,6 +1543,52 @@ out:return r; } +#ifdef CONFIG_COMPAT +struct compat_kvm_dirty_log { +__u32 slot; +__u32 padding1; +union { +compat_uptr_t dirty_bitmap;/* one bit per page */ +__u64 padding2; + }; +}; + +static long kvm_vm_compat_ioctl (struct file *filp, +unsigned int ioctl,unsigned long arg) +{ +struct kvm *kvm = filp->private_data; +int r; + +if (kvm->mm != current->mm) +return -EIO ; +switch (ioctl) { +case KVM_GET_DIRTY_LOG : { +struct compat_kvm_dirty_log compat_log; +struct kvm_dirty_log log; + + r = -EFAULT ; +if (copy_from_user (&compat_log, (void __user *)arg, +sizeof (compat_log))) + goto out; + log.slot = compat_log.slot; + log.padding1 = compat_log.padding1; + log.padding2 = compat_log.padding2; + log.dirty_bitmap =compat_ptr (compat_log.dirty_bitmap); + + r =kvm_vm_ioctl_get_dirty_log (kvm, &log); +if (r) + goto out; +break ; + } +default : + r =kvm_vm_ioctl (filp, ioctl, arg); + } + +out: +return r; +} +#endif +static int
kvm_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf){ struct page *page[1];Quoted 8 lines
virt/kvm/kvm_main.c static int kvm_vm_mmap(struct file *file, · line 1627
Quoted 7 lines
virt/kvm/kvm_main.c +1
-1@@ -1576,7 +1623,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)static struct file_operations kvm_vm_fops = { .release = kvm_vm_release, .unlocked_ioctl = kvm_vm_ioctl, - .compat_ioctl = kvm_vm_ioctl, + .compat_ioctl = kvm_vm_compat_ioctl,This fails in the absence of
CONFIG_COMPAT.So should it rather be
#ifdef
CONFIG_COMPAT
.compat_ioctl =kvm_vm_compat_ioctl,
#else
.compat_ioctl =kvm_vm_ioctl,
#endif
Quoted 7 lines
or
#ifdef
CONFIG_COMPAT
.compat_ioctl =kvm_vm_compat_ioctl,
#endif?
I would say the latter as .compat_ioctl should simply be unused in case of !CONFIG_COMPAT.
Jan
Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux