From 30484611dd815207d249e2034b976ac05753487d Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Thu, 8 Mar 2018 15:58:14 +0100

Subject: [PATCH 01/17] memory: inline some performance-sensitive accessors

RH-Author: Paolo Bonzini <pbonzini@redhat.com>

Message-id: <20180308155819.20598-2-pbonzini@redhat.com>

Patchwork-id: 79193

O-Subject: [RHEL7.5 qemu-kvm-rhev PATCH 1/6] memory: inline some performance-sensitive accessors

Bugzilla: 1554930

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

These accessors are called from inlined functions, and the call sequence

is much more expensive than just inlining the access.  Move the

struct declaration to memory-internal.h so that exec.c and memory.c

can both use an inline function.

Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry pick from commit 785a507ec78bbda1c346f3d3593e5a58b62e73ef)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 include/exec/memory-internal.h | 13 +++++++++----

 include/exec/memory.h          | 22 +++++++++++++++++++++-

 memory.c                       | 30 ------------------------------

 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h

index 647e9bd..fca523f 100644

--- a/include/exec/memory-internal.h

+++ b/include/exec/memory-internal.h

@@ -20,7 +20,15 @@

 #define MEMORY_INTERNAL_H

 #ifndef CONFIG_USER_ONLY

-typedef struct AddressSpaceDispatch AddressSpaceDispatch;

+static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv)

+{

+    return fv->dispatch;

+}

+

+static inline AddressSpaceDispatch *address_space_to_dispatch(AddressSpace *as)

+{

+    return flatview_to_dispatch(address_space_to_flatview(as));

+}

 extern const MemoryRegionOps unassigned_mem_ops;

@@ -30,9 +38,6 @@ bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr,

 void flatview_add_to_dispatch(FlatView *fv, MemoryRegionSection *section);

 AddressSpaceDispatch *address_space_dispatch_new(FlatView *fv);

 void address_space_dispatch_compact(AddressSpaceDispatch *d);

-

-AddressSpaceDispatch *address_space_to_dispatch(AddressSpace *as);

-AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv);

 void address_space_dispatch_free(AddressSpaceDispatch *d);

 void mtree_print_dispatch(fprintf_function mon, void *f,

diff --git a/include/exec/memory.h b/include/exec/memory.h

index b100df6..3df0dcc 100644

--- a/include/exec/memory.h

+++ b/include/exec/memory.h

@@ -328,7 +328,27 @@ struct AddressSpace {

     QTAILQ_ENTRY(AddressSpace) address_spaces_link;

 };

-FlatView *address_space_to_flatview(AddressSpace *as);

+typedef struct AddressSpaceDispatch AddressSpaceDispatch;

+typedef struct FlatRange FlatRange;

+

+/* Flattened global view of current active memory hierarchy.  Kept in sorted

+ * order.

+ */

+struct FlatView {

+    struct rcu_head rcu;

+    unsigned ref;

+    FlatRange *ranges;

+    unsigned nr;

+    unsigned nr_allocated;

+    struct AddressSpaceDispatch *dispatch;

+    MemoryRegion *root;

+};

+

+static inline FlatView *address_space_to_flatview(AddressSpace *as)

+{

+    return atomic_rcu_read(&as->current_map);

+}

+

 /**

  * MemoryRegionSection: describes a fragment of a #MemoryRegion

diff --git a/memory.c b/memory.c

index a1f1e68..5a91b9b 100644

--- a/memory.c

+++ b/memory.c

@@ -210,8 +210,6 @@ static bool memory_region_ioeventfd_equal(MemoryRegionIoeventfd a,

         && !memory_region_ioeventfd_before(b, a);

 }

-typedef struct FlatRange FlatRange;

-

 /* Range of memory in the global map.  Addresses are absolute. */

 struct FlatRange {

     MemoryRegion *mr;

@@ -222,19 +220,6 @@ struct FlatRange {

     bool readonly;

 };

-/* Flattened global view of current active memory hierarchy.  Kept in sorted

- * order.

- */

-struct FlatView {

-    struct rcu_head rcu;

-    unsigned ref;

-    FlatRange *ranges;

-    unsigned nr;

-    unsigned nr_allocated;

-    struct AddressSpaceDispatch *dispatch;

-    MemoryRegion *root;

-};

-

 typedef struct AddressSpaceOps AddressSpaceOps;

 #define FOR_EACH_FLAT_RANGE(var, view)          \

@@ -322,21 +307,6 @@ static void flatview_unref(FlatView *view)

     }

 }

-FlatView *address_space_to_flatview(AddressSpace *as)

-{

-    return atomic_rcu_read(&as->current_map);

-}

-

-AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv)

-{

-    return fv->dispatch;

-}

-

-AddressSpaceDispatch *address_space_to_dispatch(AddressSpace *as)

-{

-    return flatview_to_dispatch(address_space_to_flatview(as));

-}

-

 static bool can_merge(FlatRange *r1, FlatRange *r2)

 {

     return int128_eq(addrrange_end(r1->addr), r2->addr.start)

-- 

1.8.3.1