| Message ID | 20200523232035.1029349-2-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | KVM: Dirty ring support (QEMU part) | expand |
On Sun, 24 May 2020 at 00:21, Peter Xu <peterx@redhat.com> wrote: > > Signed-off-by: Peter Xu <peterx@redhat.com> Header updates should always include the upstream kernel commit against which you ran the scripts/update-linux-headers.sh script, please. linux-headers/asm-x86/kvm.h | 1 + linux-headers/linux/kvm.h | 53 +++++++++++++++++++++++++++++++++++++ Are these really the only files which had changes? It looks a suspiciously short list... thanks -- PMM
Hi, Peter, On Sun, May 24, 2020 at 02:27:14PM +0100, Peter Maydell wrote: > On Sun, 24 May 2020 at 00:21, Peter Xu <peterx@redhat.com> wrote: > > > > Signed-off-by: Peter Xu <peterx@redhat.com> > > Header updates should always include the upstream > kernel commit against which you ran the scripts/update-linux-headers.sh > script, please. This is based on a kernel series that hasn't yet been merged, so I didn't tag it (so this is still a RFC series). Will do when it's merged. > > linux-headers/asm-x86/kvm.h | 1 + > linux-headers/linux/kvm.h | 53 +++++++++++++++++++++++++++++++++++++ > > Are these really the only files which had changes? It looks > a suspiciously short list... I didn't check, but I did use the script all the time.. Thanks,
On Sun, 24 May 2020 at 15:07, Peter Xu <peterx@redhat.com> wrote: > > Hi, Peter, > > On Sun, May 24, 2020 at 02:27:14PM +0100, Peter Maydell wrote: > > On Sun, 24 May 2020 at 00:21, Peter Xu <peterx@redhat.com> wrote: > > > > > > Signed-off-by: Peter Xu <peterx@redhat.com> > > > > Header updates should always include the upstream > > kernel commit against which you ran the scripts/update-linux-headers.sh > > script, please. > > This is based on a kernel series that hasn't yet been merged, so I didn't tag > it (so this is still a RFC series). Will do when it's merged. Ah, cool. (It's helpful to note in the commit message for the header-update patch if it's a not-yet-upstream set of changes.) thanks -- PMM
On Sun, May 24, 2020 at 06:50:28PM +0100, Peter Maydell wrote: > On Sun, 24 May 2020 at 15:07, Peter Xu <peterx@redhat.com> wrote: > > > > Hi, Peter, > > > > On Sun, May 24, 2020 at 02:27:14PM +0100, Peter Maydell wrote: > > > On Sun, 24 May 2020 at 00:21, Peter Xu <peterx@redhat.com> wrote: > > > > > > > > Signed-off-by: Peter Xu <peterx@redhat.com> > > > > > > Header updates should always include the upstream > > > kernel commit against which you ran the scripts/update-linux-headers.sh > > > script, please. > > > > This is based on a kernel series that hasn't yet been merged, so I didn't tag > > it (so this is still a RFC series). Will do when it's merged. > > Ah, cool. (It's helpful to note in the commit message for the > header-update patch if it's a not-yet-upstream set of changes.) Sure. I'll add that some into the commit message in my next post if the kernel series is still unmerged (which is very likely). Thanks,
diff --git a/linux-headers/asm-x86/kvm.h b/linux-headers/asm-x86/kvm.h index 3f3f780c8c..99b15ce39e 100644 --- a/linux-headers/asm-x86/kvm.h +++ b/linux-headers/asm-x86/kvm.h @@ -12,6 +12,7 @@ #define KVM_PIO_PAGE_OFFSET 1 #define KVM_COALESCED_MMIO_PAGE_OFFSET 2 +#define KVM_DIRTY_LOG_PAGE_OFFSET 64 #define DE_VECTOR 0 #define DB_VECTOR 1 diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index 9804495a46..f0f3cecce1 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -236,6 +236,7 @@ struct kvm_hyperv_exit { #define KVM_EXIT_IOAPIC_EOI 26 #define KVM_EXIT_HYPERV 27 #define KVM_EXIT_ARM_NISV 28 +#define KVM_EXIT_DIRTY_RING_FULL 29 /* For KVM_EXIT_INTERNAL_ERROR */ /* Emulate instruction failed. */ @@ -1017,6 +1018,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_S390_VCPU_RESETS 179 #define KVM_CAP_S390_PROTECTED 180 #define KVM_CAP_PPC_SECURE_GUEST 181 +#define KVM_CAP_DIRTY_LOG_RING 182 #ifdef KVM_CAP_IRQ_ROUTING @@ -1518,6 +1520,9 @@ struct kvm_pv_cmd { /* Available with KVM_CAP_S390_PROTECTED */ #define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd) +/* Available with KVM_CAP_DIRTY_LOG_RING */ +#define KVM_RESET_DIRTY_RINGS _IO(KVMIO, 0xc6) + /* Secure Encrypted Virtualization command */ enum sev_cmd_id { /* Guest initialization commands */ @@ -1671,4 +1676,52 @@ struct kvm_hyperv_eventfd { #define KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE (1 << 0) #define KVM_DIRTY_LOG_INITIALLY_SET (1 << 1) +/* + * Arch needs to define the macro after implementing the dirty ring + * feature. KVM_DIRTY_LOG_PAGE_OFFSET should be defined as the + * starting page offset of the dirty ring structures. + */ +#ifndef KVM_DIRTY_LOG_PAGE_OFFSET +#define KVM_DIRTY_LOG_PAGE_OFFSET 0 +#endif + +/* + * KVM dirty GFN flags, defined as: + * + * |---------------+---------------+--------------| + * | bit 1 (reset) | bit 0 (dirty) | Status | + * |---------------+---------------+--------------| + * | 0 | 0 | Invalid GFN | + * | 0 | 1 | Dirty GFN | + * | 1 | X | GFN to reset | + * |---------------+---------------+--------------| + * + * Lifecycle of a dirty GFN goes like: + * + * dirtied collected reset + * 00 -----------> 01 -------------> 1X -------+ + * ^ | + * | | + * +------------------------------------------+ + * + * The userspace program is only responsible for the 01->1X state + * conversion (to collect dirty bits). Also, it must not skip any + * dirty bits so that dirty bits are always collected in sequence. + */ +#define KVM_DIRTY_GFN_F_DIRTY BIT(0) +#define KVM_DIRTY_GFN_F_RESET BIT(1) +#define KVM_DIRTY_GFN_F_MASK 0x3 + +/* + * KVM dirty rings should be mapped at KVM_DIRTY_LOG_PAGE_OFFSET of + * per-vcpu mmaped regions as an array of struct kvm_dirty_gfn. The + * size of the gfn buffer is decided by the first argument when + * enabling KVM_CAP_DIRTY_LOG_RING. + */ +struct kvm_dirty_gfn { + __u32 flags; + __u32 slot; + __u64 offset; +}; + #endif /* __LINUX_KVM_H */
Signed-off-by: Peter Xu <peterx@redhat.com> --- linux-headers/asm-x86/kvm.h | 1 + linux-headers/linux/kvm.h | 53 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+)