Re: [RFC][PATCH 1/5] [PATCH 1/5] kvm: register in task_struct
8 messages,
3 authors,
2018-09-04 · open the first message on its own page
On September 2, 2018 5:21:15 AM, fengguang.wu@intel.com wrote: quoted hunk diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 8b47507faab5..0c483720de8d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3892,6 +3892,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm)
if ( type == KVM_EVENT_CREATE_VM ) {
add_uevent_var ( env , "EVENT=create" );
kvm -> userspace_pid = task_pid_nr ( current );
+ current -> kvm = kvm ;
Is it OK to store `kvm` on the task_struct? What if the thread that
originally created the VM exits? From the documentation it seems
like a VM is associated with an address space and not a specific
thread, so maybe it should be stored on mm_struct?
From Documentation/virtual/kvm/api.txt:
Only run VM ioctls from the same process (address space) that was used
to create the VM.
-Nikita } else if (type == KVM_EVENT_DESTROY_VM) {
add_uevent_var(env, "EVENT=destroy");
}
--
2.15.0
On 09/03/2018 04:10 PM, Nikita Leshenko wrote: On September 2, 2018 5:21:15 AM, fengguang.wu@intel.com wrote: quoted diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 8b47507faab5..0c483720de8d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3892,6 +3892,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm)
if ( type == KVM_EVENT_CREATE_VM ) {
add_uevent_var ( env , "EVENT=create" );
kvm -> userspace_pid = task_pid_nr ( current );
+ current -> kvm = kvm ;
Is it OK to store `kvm` on the task_struct? What if the thread that
originally created the VM exits? From the documentation it seems
like a VM is associated with an address space and not a specific
thread, so maybe it should be stored on mm_struct?
Yes, ioctls accessing the kvm can happen from all threads.
From Documentation/virtual/kvm/api.txt:
Only run VM ioctls from the same process (address space) that was used
to create the VM.
-Nikita quoted } else if (type == KVM_EVENT_DESTROY_VM) {
add_uevent_var(env, "EVENT=destroy");
}
--
2.15.0
Hi Christian and Nikita,
On Mon, Sep 03, 2018 at 06:03:49PM +0200, Christian Borntraeger wrote:
On 09/03/2018 04:10 PM, Nikita Leshenko wrote: quoted On September 2, 2018 5:21:15 AM, fengguang.wu@intel.com wrote: quoted diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 8b47507faab5..0c483720de8d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3892,6 +3892,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm)
if ( type == KVM_EVENT_CREATE_VM ) {
add_uevent_var ( env , "EVENT=create" );
kvm -> userspace_pid = task_pid_nr ( current );
+ current -> kvm = kvm ;
Is it OK to store `kvm` on the task_struct? What if the thread that
originally created the VM exits? From the documentation it seems
like a VM is associated with an address space and not a specific
thread, so maybe it should be stored on mm_struct?
Yes, ioctls accessing the kvm can happen from all threads.
Good point, thank you for the tips! I'll move kvm pointer to mm_struct.
quoted From Documentation/virtual/kvm/api.txt:
Only run VM ioctls from the same process (address space) that was used
to create the VM.
-Nikita
Regards,
Fengguang
On Tue, Sep 04, 2018 at 08:28:18AM +0800, Fengguang Wu wrote: Hi Christian and Nikita,
On Mon, Sep 03, 2018 at 06:03:49PM +0200, Christian Borntraeger wrote: quoted
On 09/03/2018 04:10 PM, Nikita Leshenko wrote: quoted On September 2, 2018 5:21:15 AM, fengguang.wu@intel.com wrote: quoted diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 8b47507faab5..0c483720de8d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3892,6 +3892,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm)
if ( type == KVM_EVENT_CREATE_VM ) {
add_uevent_var ( env , "EVENT=create" );
kvm -> userspace_pid = task_pid_nr ( current );
+ current -> kvm = kvm ;
Is it OK to store `kvm` on the task_struct? What if the thread that
originally created the VM exits? From the documentation it seems
like a VM is associated with an address space and not a specific
thread, so maybe it should be stored on mm_struct?
Yes, ioctls accessing the kvm can happen from all threads.
Good point, thank you for the tips! I'll move kvm pointer to mm_struct.
quoted quoted From Documentation/virtual/kvm/api.txt:
Only run VM ioctls from the same process (address space) that was used
to create the VM.
-Nikita
Here it goes:
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 99ce070e7dcb..27c5446f3deb 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h @@ -27,6 +27,7 @@ typedef int vm_fault_t; struct address_space;
struct mem_cgroup;
struct hmm;
+struct kvm;
/*
* Each physical page in the system has a struct page associated with @@ -489,10 +490,19 @@ struct mm_struct { /* HMM needs to track a few things per mm */
struct hmm *hmm;
#endif
+#if IS_ENABLED(CONFIG_KVM)
+ struct kvm *kvm;
+#endif
} __randomize_layout;
extern struct mm_struct init_mm;
+#if IS_ENABLED(CONFIG_KVM)
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return mm->kvm; }
+#else
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return NULL; }
+#endif
+
static inline void mm_init_cpumask(struct mm_struct *mm)
{
#ifdef CONFIG_CPUMASK_OFFSTACK diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 0c483720de8d..dca6156a7b35 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3892,7 +3892,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) if (type == KVM_EVENT_CREATE_VM) {
add_uevent_var(env, "EVENT=create");
kvm->userspace_pid = task_pid_nr(current);
- current->kvm = kvm;
+ current->mm->kvm = kvm;
} else if (type == KVM_EVENT_DESTROY_VM) {
add_uevent_var(env, "EVENT=destroy");
}
On 4 Sep 2018, at 2:46, Fengguang Wu [off-list ref] wrote: quoted hunk
Here it goes:
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 99ce070e7dcb..27c5446f3deb 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h @@ -27,6 +27,7 @@ typedef int vm_fault_t; struct address_space;
struct mem_cgroup;
struct hmm;
+struct kvm;
/*
* Each physical page in the system has a struct page associated with @@ -489,10 +490,19 @@ struct mm_struct { /* HMM needs to track a few things per mm */
struct hmm *hmm;
#endif
+#if IS_ENABLED(CONFIG_KVM)
+ struct kvm *kvm;
+#endif
} __randomize_layout;
extern struct mm_struct init_mm;
+#if IS_ENABLED(CONFIG_KVM)
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return mm->kvm; }
+#else
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return NULL; }
+#endif
+
static inline void mm_init_cpumask(struct mm_struct *mm)
{
#ifdef CONFIG_CPUMASK_OFFSTACK diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 0c483720de8d..dca6156a7b35 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3892,7 +3892,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) if (type == KVM_EVENT_CREATE_VM) {
add_uevent_var(env, "EVENT=create");
kvm->userspace_pid = task_pid_nr(current);
- current->kvm = kvm;
+ current->mm->kvm = kvm; I think you also need to reset kvm to NULL once the VM is
destroyed, otherwise it would point to dangling memory.
-Nikita } else if (type == KVM_EVENT_DESTROY_VM) {
add_uevent_var(env, "EVENT=destroy");
}
On Tue, Sep 04, 2018 at 08:37:03AM +0200, Nikita Leshenko wrote: On 4 Sep 2018, at 2:46, Fengguang Wu [off-list ref] wrote: quoted
Here it goes:
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 99ce070e7dcb..27c5446f3deb 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h @@ -27,6 +27,7 @@ typedef int vm_fault_t; struct address_space;
struct mem_cgroup;
struct hmm;
+struct kvm;
/*
* Each physical page in the system has a struct page associated with @@ -489,10 +490,19 @@ struct mm_struct { /* HMM needs to track a few things per mm */
struct hmm *hmm;
#endif
+#if IS_ENABLED(CONFIG_KVM)
+ struct kvm *kvm;
+#endif
} __randomize_layout;
extern struct mm_struct init_mm;
+#if IS_ENABLED(CONFIG_KVM)
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return mm->kvm; }
+#else
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return NULL; }
+#endif
+
static inline void mm_init_cpumask(struct mm_struct *mm)
{
#ifdef CONFIG_CPUMASK_OFFSTACK diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 0c483720de8d..dca6156a7b35 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3892,7 +3892,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) if (type == KVM_EVENT_CREATE_VM) {
add_uevent_var(env, "EVENT=create");
kvm->userspace_pid = task_pid_nr(current);
- current->kvm = kvm;
+ current->mm->kvm = kvm; I think you also need to reset kvm to NULL once the VM is
destroyed, otherwise it would point to dangling memory.
Good point! Here is the incremental patch:
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3894,6 +3894,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm)
kvm -> userspace_pid = task_pid_nr ( current );
current -> mm -> kvm = kvm ;
} else if ( type == KVM_EVENT_DESTROY_VM ) {
+ current -> mm -> kvm = NULL ;
add_uevent_var ( env , "EVENT=destroy" );
}
add_uevent_var ( env , "PID=%d" , kvm -> userspace_pid );
Thanks,
Fengguang
On 09/04/2018 09:15 AM, Fengguang Wu wrote: quoted hunk On Tue, Sep 04, 2018 at 08:37:03AM +0200, Nikita Leshenko wrote: quoted On 4 Sep 2018, at 2:46, Fengguang Wu [off-list ref] wrote: quoted
Here it goes:
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 99ce070e7dcb..27c5446f3deb 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h @@ -27,6 +27,7 @@ typedef int vm_fault_t; struct address_space;
struct mem_cgroup;
struct hmm;
+struct kvm;
/*
* Each physical page in the system has a struct page associated with @@ -489,10 +490,19 @@ struct mm_struct { /* HMM needs to track a few things per mm */
struct hmm *hmm;
#endif
+#if IS_ENABLED(CONFIG_KVM)
+ struct kvm *kvm;
+#endif
} __randomize_layout;
extern struct mm_struct init_mm;
+#if IS_ENABLED(CONFIG_KVM)
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return mm->kvm; }
+#else
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return NULL; }
+#endif
+
static inline void mm_init_cpumask(struct mm_struct *mm)
{
#ifdef CONFIG_CPUMASK_OFFSTACK diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 0c483720de8d..dca6156a7b35 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3892,7 +3892,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) if (type == KVM_EVENT_CREATE_VM) {
add_uevent_var(env, "EVENT=create");
kvm->userspace_pid = task_pid_nr(current);
- current->kvm = kvm;
+ current->mm->kvm = kvm; I think you also need to reset kvm to NULL once the VM is
destroyed, otherwise it would point to dangling memory.
Good point! Here is the incremental patch:
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3894,6 +3894,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) kvm->userspace_pid = task_pid_nr(current);
current->mm->kvm = kvm;
} else if (type == KVM_EVENT_DESTROY_VM) {
+ current->mm->kvm = NULL;
add_uevent_var(env, "EVENT=destroy");
}
add_uevent_var(env, "PID=%d", kvm->userspace_pid);
I think you should put both code snippets somewhere else. This has probably nothing to do
with the uevent. Instead this should go into kvm_destroy_vm and kvm_create_vm. Make sure
to take care of the error handling.
Can you point us to the original discussion about the why and what you are
trying to achieve?
On Tue, Sep 04, 2018 at 09:43:50AM +0200, Christian Borntraeger wrote:
On 09/04/2018 09:15 AM, Fengguang Wu wrote: quoted On Tue, Sep 04, 2018 at 08:37:03AM +0200, Nikita Leshenko wrote: quoted On 4 Sep 2018, at 2:46, Fengguang Wu [off-list ref] wrote: quoted
Here it goes:
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 99ce070e7dcb..27c5446f3deb 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h @@ -27,6 +27,7 @@ typedef int vm_fault_t; struct address_space;
struct mem_cgroup;
struct hmm;
+struct kvm;
/*
* Each physical page in the system has a struct page associated with @@ -489,10 +490,19 @@ struct mm_struct { /* HMM needs to track a few things per mm */
struct hmm *hmm;
#endif
+#if IS_ENABLED(CONFIG_KVM)
+ struct kvm *kvm;
+#endif
} __randomize_layout;
extern struct mm_struct init_mm;
+#if IS_ENABLED(CONFIG_KVM)
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return mm->kvm; }
+#else
+static inline struct kvm *mm_kvm(struct mm_struct *mm) { return NULL; }
+#endif
+
static inline void mm_init_cpumask(struct mm_struct *mm)
{
#ifdef CONFIG_CPUMASK_OFFSTACK diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 0c483720de8d..dca6156a7b35 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3892,7 +3892,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) if (type == KVM_EVENT_CREATE_VM) {
add_uevent_var(env, "EVENT=create");
kvm->userspace_pid = task_pid_nr(current);
- current->kvm = kvm;
+ current->mm->kvm = kvm; I think you also need to reset kvm to NULL once the VM is
destroyed, otherwise it would point to dangling memory.
Good point! Here is the incremental patch:
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -3894,6 +3894,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) kvm->userspace_pid = task_pid_nr(current);
current->mm->kvm = kvm;
} else if (type == KVM_EVENT_DESTROY_VM) {
+ current->mm->kvm = NULL;
add_uevent_var(env, "EVENT=destroy");
}
add_uevent_var(env, "PID=%d", kvm->userspace_pid);
I think you should put both code snippets somewhere else. This has probably nothing to do
with the uevent. Instead this should go into kvm_destroy_vm and kvm_create_vm. Make sure
to take care of the error handling.
OK. Will set the pointer late and reset it early like this. Since
there are several error conditions after kvm_create_vm(), it may be
more convenient to set it in kvm_dev_ioctl_create_vm(), when there are
no more errors to handle:
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c @@ -724,6 +724,7 @@ static void kvm_destroy_vm(struct kvm *kvm)
struct mm_struct * mm = kvm -> mm ;
kvm_uevent_notify_change ( KVM_EVENT_DESTROY_VM , kvm );
+ current -> mm -> kvm = NULL ;
kvm_destroy_vm_debugfs ( kvm );
kvm_arch_sync_events ( kvm );
spin_lock ( & kvm_lock ); @@ -3206,6 +3207,7 @@ static int kvm_dev_ioctl_create_vm(unsigned long type)
fput ( file );
return - ENOMEM ;
}
+ current -> mm -> kvm = kvm ;
kvm_uevent_notify_change ( KVM_EVENT_CREATE_VM , kvm );
fd_install ( r , file );
Can you point us to the original discussion about the why and what you are
trying to achieve?
It's the initial RFC post. [PATCH 0] describes some background info.
Basically we're implementing /proc/PID/idle_bitmap for user space to
walk page tables and get "accessed" bits. Since VM's "accessed" bits
will be reflected in EPT (or AMD NPT), we'll need to walk EPT when
detected it is QEMU main process.
Thanks,
Fengguang