[v2] x86/mem-sharing: statically initialize audit list head and lock

Commit Message

Jan Beulich April 11, 2019, 6:51 a.m. UTC

There's no need to execute any instructions for doing so. Drop the then
effectively empty mem_sharing_init() altogether.

Signed-off-by: Jan Beulich <[e-mail]>
---
v2: Drop mem_sharing_init().

Comments

George Dunlap April 11, 2019, 8:57 a.m. UTC | #1

On 4/11/19 7:51 AM, Jan Beulich wrote:
> There's no need to execute any instructions for doing so. Drop the then
> effectively empty mem_sharing_init() altogether.
> 
> Signed-off-by: Jan Beulich <[e-mail]>

Acked-by: George Dunlap <[e-mail]>

Tamas K Lengyel April 11, 2019, 1:14 p.m. UTC | #2

On Thu, Apr 11, 2019 at 12:51 AM Jan Beulich <[e-mail]> wrote:
>
> There's no need to execute any instructions for doing so. Drop the then
> effectively empty mem_sharing_init() altogether.
>
> Signed-off-by: Jan Beulich <[e-mail]>

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

Patch

--- a/xen/arch/x86/mm/mem_sharing.c
+++ b/xen/arch/x86/mm/mem_sharing.c
@@ -65,8 +65,8 @@  static DEFINE_PER_CPU(pg_lock_data_t, __
 
 #if MEM_SHARING_AUDIT
 
-static struct list_head shr_audit_list;
-static spinlock_t shr_audit_lock;
+static LIST_HEAD(shr_audit_list);
+static DEFINE_SPINLOCK(shr_audit_lock);
 static DEFINE_RCU_READ_LOCK(shr_audit_read_lock);
 
 /* RCU delayed free of audit list entry */
@@ -1650,13 +1650,3 @@  int mem_sharing_domctl(struct domain *d,
 
     return rc;
 }
-
-void __init mem_sharing_init(void)
-{
-    printk("Initing memory sharing.\n");
-#if MEM_SHARING_AUDIT
-    spin_lock_init(&shr_audit_lock);
-    INIT_LIST_HEAD(&shr_audit_list);
-#endif
-}
-
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -368,8 +368,6 @@  void __init arch_init_memory(void)
 
     efi_init_memory();
 
-    mem_sharing_init();
-
 #ifndef NDEBUG
     if ( highmem_start )
     {
--- a/xen/include/asm-x86/mem_sharing.h
+++ b/xen/include/asm-x86/mem_sharing.h
@@ -88,7 +88,6 @@  int mem_sharing_notify_enomem(struct dom
 int mem_sharing_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_sharing_op_t) arg);
 int mem_sharing_domctl(struct domain *d, 
                        struct xen_domctl_mem_sharing_op *mec);
-void mem_sharing_init(void);
 
 /* Scans the p2m and relinquishes any shared pages, destroying 
  * those for which this domain holds the final reference.