vmevent: reduce include dependencies

Commit Message

Jan Beulich March 9, 2020, 11:51 a.m. UTC

There's no need for virtually everything to include public/vm_event.h.
Move its inclusion out of sched.h. This requires using the non-typedef
name in p2m_mem_paging_resume()'s prototype; by not changing the
function definition at the same time it'll remain certain that the build
would fail if the typedef itself was changed.

Signed-off-by: Jan Beulich <[e-mail]>

Comments

Ross Lagerwall March 9, 2020, 11:55 a.m. UTC | #1

On 3/9/20 11:51 AM, Jan Beulich wrote:
> There's no need for virtually everything to include public/vm_event.h.
> Move its inclusion out of sched.h. This requires using the non-typedef
> name in p2m_mem_paging_resume()'s prototype; by not changing the
> function definition at the same time it'll remain certain that the build
> would fail if the typedef itself was changed.
> 
> Signed-off-by: Jan Beulich <[e-mail]>
> 

Acked-by: Ross Lagerwall <[e-mail]>

Alexandru Stefan ISAILA March 9, 2020, 2:16 p.m. UTC | #2

On 09.03.2020 13:51, Jan Beulich wrote:
> There's no need for virtually everything to include public/vm_event.h.
> Move its inclusion out of sched.h. This requires using the non-typedef
> name in p2m_mem_paging_resume()'s prototype; by not changing the
> function definition at the same time it'll remain certain that the build
> would fail if the typedef itself was changed.
> 
> Signed-off-by: Jan Beulich <[e-mail]>

Reviewed-by: Alexandru Isaila <[e-mail]>

Tamas K Lengyel March 9, 2020, 3:06 p.m. UTC | #3

On Mon, Mar 9, 2020 at 5:51 AM Jan Beulich <[e-mail]> wrote:
>
> There's no need for virtually everything to include public/vm_event.h.
> Move its inclusion out of sched.h. This requires using the non-typedef
> name in p2m_mem_paging_resume()'s prototype; by not changing the
> function definition at the same time it'll remain certain that the build
> would fail if the typedef itself was changed.
>
> Signed-off-by: Jan Beulich <[e-mail]>

Acked-by: Tamas K Lengyel <[e-mail]>

Patch

--- a/xen/arch/x86/livepatch.c
+++ b/xen/arch/x86/livepatch.c
@@ -11,6 +11,7 @@ 
 #include <xen/livepatch_elf.h>
 #include <xen/livepatch.h>
 #include <xen/sched.h>
+#include <xen/vm_event.h>
 
 #include <asm/fixmap.h>
 #include <asm/nmi.h>
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -743,7 +743,8 @@  void p2m_mem_paging_populate(struct doma
 /* Prepare the p2m for paging a frame in */
 int p2m_mem_paging_prep(struct domain *d, unsigned long gfn, uint64_t buffer);
 /* Resume normal operation (in case a domain was paused) */
-void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp);
+struct vm_event_st;
+void p2m_mem_paging_resume(struct domain *d, struct vm_event_st *rsp);
 
 /* 
  * Internal functions, only called by other p2m code
--- a/xen/include/asm-x86/vm_event.h
+++ b/xen/include/asm-x86/vm_event.h
@@ -20,6 +20,7 @@ 
 #define __ASM_X86_VM_EVENT_H__
 
 #include <xen/sched.h>
+#include <public/vm_event.h>
 
 /*
  * Should we emulate the next matching instruction on VCPU resume
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -27,7 +27,6 @@ 
 #include <public/domctl.h>
 #include <public/sysctl.h>
 #include <public/vcpu.h>
-#include <public/vm_event.h>
 #include <public/event_channel.h>
 
 #ifdef CONFIG_COMPAT
@@ -313,30 +312,6 @@  struct sched_unit {
 #define domain_lock(d) spin_lock_recursive(&(d)->domain_lock)
 #define domain_unlock(d) spin_unlock_recursive(&(d)->domain_lock)
 
-/* VM event */
-struct vm_event_domain
-{
-    spinlock_t lock;
-    /* The ring has 64 entries */
-    unsigned char foreign_producers;
-    unsigned char target_producers;
-    /* shared ring page */
-    void *ring_page;
-    struct page_info *ring_pg_struct;
-    /* front-end ring */
-    vm_event_front_ring_t front_ring;
-    /* event channel port (vcpu0 only) */
-    int xen_port;
-    /* vm_event bit for vcpu->pause_flags */
-    int pause_flag;
-    /* list of vcpus waiting for room in the ring */
-    struct waitqueue_head wq;
-    /* the number of vCPUs blocked */
-    unsigned int blocked;
-    /* The last vcpu woken up */
-    unsigned int last_vcpu_wake_up;
-};
-
 struct evtchn_port_ops;
 
 struct domain
--- a/xen/include/xen/vm_event.h
+++ b/xen/include/xen/vm_event.h
@@ -26,6 +26,29 @@ 
 #include <xen/sched.h>
 #include <public/vm_event.h>
 
+struct vm_event_domain
+{
+    spinlock_t lock;
+    /* The ring has 64 entries */
+    unsigned char foreign_producers;
+    unsigned char target_producers;
+    /* shared ring page */
+    void *ring_page;
+    struct page_info *ring_pg_struct;
+    /* front-end ring */
+    vm_event_front_ring_t front_ring;
+    /* event channel port (vcpu0 only) */
+    int xen_port;
+    /* vm_event bit for vcpu->pause_flags */
+    int pause_flag;
+    /* list of vcpus waiting for room in the ring */
+    struct waitqueue_head wq;
+    /* the number of vCPUs blocked */
+    unsigned int blocked;
+    /* The last vcpu woken up */
+    unsigned int last_vcpu_wake_up;
+};
+
 /* Clean up on domain destruction */
 void vm_event_cleanup(struct domain *d);