Skip to contentSkip to conversation

gnttab: Improve scaleability

PATCH Superseded David Vrabel 3 participants 22 messages Jun 2, 2015 – Jun 12, 2015

v11 of 15 Superseded Latest is v15 →

lore
Share & tools
lore
#0 lore raw

v11 cover gnttab: Improve scaleability

The series builds on the original series by Matt Wilson and Christoph Egger from Amazon.

Performance results for aggregate intrahost network throughput (between 20 VM pairs, with 16 dom0 VCPUs) show substantial improvements.

Throughput/Gbit/s

Base 9.7
Split locks 25.8
Split locks 42.9
+ per-VCPU maptrack lists

v11:
* Fix exists test in gnttab_map_exists().
* Call gnttab_need_iommu_mapping() once for each lock/unlock.
* Take active entry lock in gnttab_transfer().

* Use read_atomic() when checking maptrack flags for validity (note:

    all other reads of map->flags are either after it is validated as
    stable or protected by the active entry lock and thus don't need
    read_atomic()).

* Add comment to double_gt_lock().
* Allocate maptrack array with vzalloc() since it may be >1 page.

v10:
* Reduce scope of act in grant_map_exists().
* Make unlock sequence in error paths consistent in

    __acquire_grant_for_copy().

* gnt_unlock_out -> to gt_unlock_out in __acquire_grant_for_copy().
* In gnttab_map_grant_ref(), keep double lock around maptrack update if gnttab_need_iommu_mapping(). Use a wmb(), otherwise.
* Divide max_maptrack_frames evenly amongst the VCPUs.
* Increase default max_maptrack_frames to compensate.

v9:
* Refactor the locking patches into three commits:
1. Add per-active entry locking.
2. Add maptrack_lock.
3. Make the grant table lock a read-write lock.
* Keep the double lock around IOMMU updates, but adjust their scope to only the IOMMU updates.

v8:
* Misc locking fixes.
* Use read/write_atomic() in per-VCPU maptrack free list.
* Improve locking docs.

v7:
* Re-add grant table rwlock (locking was broken without it and the gains are minimal anyway).
* Remove unneeded locks from grant_table_destroy().
* Fix get_maptrack_handle() locking.
v6:
* Remove most uses of the grant table lock.
* Make the grant table lock a spin lock again (there were only writers left after the above)
* Add per-VCPU maptrack free lists.
v5:
* Addressed locking issue pointed out by Jan Beulich
* Fixed git rebase merge issue introduced in v4 (acquiring locking twice)
* Change for ()-loop in grant_map_exists
* Coding style fixes
v4:
* Coding style nits from Jan Beulich
* Fixup read locks pointed out by Jan Beulich
* renamed double_gt_(un)lock to double_maptrack_(un)lock per request from Jan Beulich
* Addressed ASSERT()'s from Jan Beulich
* Addressed locking issues in unmap_common pointed out by Jan Beulich
v3:
* Addressed gnttab_swap_grant_ref() comment from Andrew Cooper
v2:
* Add arm part per request from Julien Grall

David

#1 lore raw

PATCH v11 1/4 gnttab: per-active entry locking

Introduce a per-active entry spin lock to protect active entry state The grant table lock must be locked before acquiring (locking) an active entry.

This is a step in reducing contention on the grant table lock, but will only do so once the grant table lock is turned into a read-write lock.

Based on a patch originally by Matt Wilson <[email protected]>.

---
Changes in v11:
- Fix exists test in gnttab_map_exists().

Changes in v10:
- Reduce scope of act in grant_map_exists().
- Make unlock sequence in error paths consistent in __acquire_grant_for_copy().
- gnt_unlock_out -> to gt_unlock_out in __acquire_grant_for_copy().

---
 docs/misc/grant-tables.txt |   42 ++++++++++++-
 xen/common/grant_table.c   |  146 ++++++++++++++++++++++++++++++++------------
 2 files changed, 147 insertions(+), 41 deletions(-)
docs/misc/grant-tables.txt +41 -1
index 19db4ec..2a3f591 100644
@@ -63,6 +63,7 @@ is complete.
   act->domid : remote domain being granted rights
   act->frame : machine frame being granted
   act->pin   : used to hold reference counts
+  act->lock  : spinlock used to serialize access to active entry state
 
  Map tracking
  ~~~~~~~~~~~~
@@ -74,7 +75,46 @@ is complete.
  matching map track entry is then removed, as if unmap had been invoked.
  These are not used by the transfer mechanism.
   map->domid         : owner of the mapped frame
-  map->ref_and_flags : grant reference, ro/rw, mapped for host or device access
+  map->ref           : grant reference
+  map->flags         : ro/rw, mapped for host or device access
+
+********************************************************************************
+ Locking
+ ~~~~~~~
+ Xen uses several locks to serialize access to the internal grant table state.
+
+  grant_table->lock          : lock used to prevent readers from accessing
+                               inconsistent grant table state such as current
+                               version, partially initialized active table pages,
+                               etc.
+  active_grant_entry->lock   : spinlock used to serialize modifications to
+                               active entries
+
+ The primary lock for the grant table is a spinlock. All functions
+ that access members of struct grant_table must acquire the lock
+ around critical sections.
+
+ Active entries are obtained by calling active_entry_acquire(gt, ref).
+ This function returns a pointer to the active entry after locking its
+ spinlock. The caller must hold the grant table lock for the gt in
+ question before calling active_entry_acquire(). This is because the
+ grant table can be dynamically extended via gnttab_grow_table() while
+ a domain is running and must be fully initialized. Once all access to
+ the active entry is complete, release the lock by calling
+ active_entry_release(act).
+
+ Summary of rules for locking:
+  active_entry_acquire() and active_entry_release() can only be
+  called when holding the relevant grant table's lock. I.e.:
+    spin_lock(&gt->lock);
+    act = active_entry_acquire(gt, ref);
+    ...
+    active_entry_release(act);
+    spin_unlock(&gt->lock);
+
+ Active entries cannot be acquired while holding the maptrack lock.
+ Multiple active entries can be acquired while holding the grant table
+ lock.
 
 ********************************************************************************
 
xen/common/grant_table.c +106 -40

422 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#2 lore raw

Re: [PATCHv11 1/4] gnttab: per-active entry locking

xen/common/grant_table.c static void mapcount( · line 576

Quoted 12 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +6 -0
@@ -546,13 +567,19 @@ static void mapcount(
 
     *wrc = *rdc = 0;
 
+    /*
+     * Must have the remote domain's grant table lock while counting
+     * its active entries.
+     */
+    ASSERT(spin_is_locked(&rd->grant_table->lock));
+
     for ( handle = 0; handle < lgt->maptrack_limit; handle++ )

The comment and the use of lgt->maptrack_limit contradict the documentation you add in patch 2, and it indeed is unclear why at this point the local domain's lock (its maptrack lock starting with patch 2) doesn't also need to be held.

Jan

#3 lore raw

Re: [PATCHv11 1/4] gnttab: per-active entry locking

Quoted 5 lines · Jan Beulich
Quoted 5 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +0 -0
@@ -546,13 +567,19 @@ static void mapcount(
 
     *wrc = *rdc = 0;
 
Quoted 12 lines

xen/common/grant_table.c static void mapcount( · line 576

Quoted 7 lines
xen/common/grant_table.c +6 -0
+    /*
+     * Must have the remote domain's grant table lock while counting
+     * its active entries.
+     */
+    ASSERT(spin_is_locked(&rd->grant_table->lock));
+
     for ( handle = 0; handle < lgt->maptrack_limit; handle++ )

The comment and the use of lgt->maptrack_limit contradict the documentation you add in patch 2, and it indeed is unclear why at this point the local domain's lock (its maptrack lock starting with patch 2) doesn't also need to be held.

Maybe it's a a bit subtle, but holding the local (write) lock means no new mappings can be created and thus lgt->maptrack_limit cannot change.

Should I add

ASSERT(spin_is_locked(&lgt->lock));

here as well?

David

#4 lore raw

Re: [PATCHv11 1/4] gnttab: per-active entry locking

Quoted 20 lines
Quoted 1 line
Quoted 1 line · On 05.06.15 at 15:41, <[email protected]> wrote:
Quoted 5 lines · Jan Beulich
Quoted 5 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +0 -0
@@ -546,13 +567,19 @@ static void mapcount(
 
     *wrc = *rdc = 0;
 
Quoted 12 lines

xen/common/grant_table.c static void mapcount( · line 576

Quoted 7 lines
xen/common/grant_table.c +6 -0
+    /*
+     * Must have the remote domain's grant table lock while counting
+     * its active entries.
+     */
+    ASSERT(spin_is_locked(&rd->grant_table->lock));
+
     for ( handle = 0; handle < lgt->maptrack_limit; handle++ )

The comment and the use of lgt->maptrack_limit contradict the documentation you add in patch 2, and it indeed is unclear why at this point the local domain's lock (its maptrack lock starting with patch 2) doesn't also need to be held.

Quoted 8 lines

Maybe it's a a bit subtle, but holding the local (write) lock means no new mappings can be created and thus lgt->maptrack_limit cannot change.

Should I add

ASSERT(spin_is_locked(&lgt->lock));

here as well?

Yes, that's what I was basically asking about. And the subtlety should probably be spelled out in a comment.

Jan

#5 lore raw

PATCH v11 2/4 gnttab: introduce maptrack lock

In reply to David Vrabel

Split grant table lock into two separate locks. One to protect maptrack state (maptrack_lock) and one for everything else (lock).

Based on a patch originally by Matt Wilson <[email protected]>.

---
 docs/misc/grant-tables.txt    |    9 +++++++++
 xen/common/grant_table.c      |    9 +++++----
 xen/include/xen/grant_table.h |    2 ++
 3 files changed, 16 insertions(+), 4 deletions(-)
docs/misc/grant-tables.txt +9 -0
index 2a3f591..83b3454 100644
@@ -87,6 +87,7 @@ is complete.
                                inconsistent grant table state such as current
                                version, partially initialized active table pages,
                                etc.
+  grant_table->maptrack_lock : spinlock used to protect the maptrack state
   active_grant_entry->lock   : spinlock used to serialize modifications to
                                active entries
 
@@ -94,6 +95,14 @@ is complete.
  that access members of struct grant_table must acquire the lock
  around critical sections.
 
+ The maptrack state is protected by its own spinlock. Any access (read
+ or write) of struct grant_table members that have a "maptrack_"
+ prefix must be made while holding the maptrack lock. The maptrack
+ state can be rapidly modified under some workloads, and the critical
+ sections are very small, thus we use a spinlock to protect them.
+
+ The maptrack lock may be locked while holding the grant table lock.
+
  Active entries are obtained by calling active_entry_acquire(gt, ref).
  This function returns a pointer to the active entry after locking its
  spinlock. The caller must hold the grant table lock for the gt in
xen/common/grant_table.c +5 -4
index d91661b..e0ac16f 100644
@@ -288,10 +288,10 @@ static inline void
 put_maptrack_handle(
     struct grant_table *t, int handle)
 {
-    spin_lock(&t->lock);
+    spin_lock(&t->maptrack_lock);
     maptrack_entry(t, handle).ref = t->maptrack_head;
     t->maptrack_head = handle;
-    spin_unlock(&t->lock);
+    spin_unlock(&t->maptrack_lock);
 }
 
 static inline int
@@ -303,7 +303,7 @@ get_maptrack_handle(
     struct grant_mapping *new_mt;
     unsigned int          new_mt_limit, nr_frames;
 
-    spin_lock(&lgt->lock);
+    spin_lock(&lgt->maptrack_lock);
 
     while ( unlikely((handle = __get_maptrack_handle(lgt)) == -1) )
     {
@@ -332,7 +332,7 @@ get_maptrack_handle(
                  nr_frames + 1);
     }
 
-    spin_unlock(&lgt->lock);
+    spin_unlock(&lgt->maptrack_lock);
 
     return handle;
 }
@@ -3005,6 +3005,7 @@ grant_table_create(
 
     /* Simple stuff. */
     spin_lock_init(&t->lock);
+    spin_lock_init(&t->maptrack_lock);
     t->nr_grant_frames = INITIAL_NR_GRANT_FRAMES;
 
     /* Active grant table. */
xen/include/xen/grant_table.h +2 -0
index 32f5786..0b35a5e 100644
@@ -82,6 +82,8 @@ struct grant_table {
     struct grant_mapping **maptrack;
     unsigned int          maptrack_head;
     unsigned int          maptrack_limit;
+    /* Lock protecting the maptrack page list, head, and limit */
+    spinlock_t            maptrack_lock;
     /* Lock protecting updates to active and shared grant tables. */
     spinlock_t            lock;
     /* The defined versions are 1 and 2.  Set to 0 if we don't know
Signature · 1 line
1.7.10.4
#6 lore raw

Re: [PATCHv11 2/4] gnttab: introduce maptrack lock

xen/common/grant_table.c static inline void put_maptrack_handle( · line 293

Quoted 12 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +2 -2
@@ -288,10 +288,10 @@ static inline void put_maptrack_handle(
     struct grant_table *t, int handle)
 {
-    spin_lock(&t->lock);
+    spin_lock(&t->maptrack_lock);
     maptrack_entry(t, handle).ref = t->maptrack_head;
     t->maptrack_head = handle;
-    spin_unlock(&t->lock);
+    spin_unlock(&t->maptrack_lock);

Starting with this change it becomes unclear what protects the maptrack entries - the grant table lock or the maptrack one?

Jan

#7 lore raw

Re: [PATCHv11 2/4] gnttab: introduce maptrack lock

Quoted 15 lines · Jan Beulich

xen/common/grant_table.c static inline void put_maptrack_handle( · line 293

Quoted 12 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +2 -2
@@ -288,10 +288,10 @@ static inline void put_maptrack_handle(
     struct grant_table *t, int handle)
 {
-    spin_lock(&t->lock);
+    spin_lock(&t->maptrack_lock);
     maptrack_entry(t, handle).ref = t->maptrack_head;
     t->maptrack_head = handle;
-    spin_unlock(&t->lock);
+    spin_unlock(&t->maptrack_lock);

Starting with this change it becomes unclear what protects the maptrack entries - the grant table lock or the maptrack one?

The grant table lock. The docs aren't very good here -- the maptrack lock is only for the maptrack free list.

David

#8 lore raw

Re: [PATCHv11 2/4] gnttab: introduce maptrack lock

Quoted 18 lines
Quoted 1 line
Quoted 1 line · On 05.06.15 at 15:44, <[email protected]> wrote:
Quoted 15 lines · Jan Beulich

xen/common/grant_table.c static inline void put_maptrack_handle( · line 293

Quoted 12 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +2 -2
@@ -288,10 +288,10 @@ static inline void put_maptrack_handle(
     struct grant_table *t, int handle)
 {
-    spin_lock(&t->lock);
+    spin_lock(&t->maptrack_lock);
     maptrack_entry(t, handle).ref = t->maptrack_head;
     t->maptrack_head = handle;
-    spin_unlock(&t->lock);
+    spin_unlock(&t->maptrack_lock);

Starting with this change it becomes unclear what protects the maptrack entries - the grant table lock or the maptrack one?

Quoted 2 lines

The grant table lock. The docs aren't very good here -- the maptrack lock is only for the maptrack free list.

I don't think the grant table lock serves that purpose, at least not anymore after being converted to RW. See my reply on patch 3.

Jan

#9 lore raw

Re: [PATCHv11 2/4] gnttab: introduce maptrack lock

Quoted 18 lines · Jan Beulich
Quoted 18 lines
Quoted 1 line
Quoted 1 line · On 05.06.15 at 15:44, <[email protected]> wrote:
Quoted 15 lines · Jan Beulich

xen/common/grant_table.c static inline void put_maptrack_handle( · line 293

Quoted 12 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +2 -2
@@ -288,10 +288,10 @@ static inline void put_maptrack_handle(
     struct grant_table *t, int handle)
 {
-    spin_lock(&t->lock);
+    spin_lock(&t->maptrack_lock);
     maptrack_entry(t, handle).ref = t->maptrack_head;
     t->maptrack_head = handle;
-    spin_unlock(&t->lock);
+    spin_unlock(&t->maptrack_lock);

Starting with this change it becomes unclear what protects the maptrack entries - the grant table lock or the maptrack one?

Quoted 5 lines
Quoted 2 lines

The grant table lock. The docs aren't very good here -- the maptrack lock is only for the maptrack free list.

I don't think the grant table lock serves that purpose, at least not anymore after being converted to RW. See my reply on patch 3.

Sorry for not being clear, after this patch #2 it is the grant table lock that serves this purpose. After #3 it's as you said there.

David

#10 lore raw

PATCH v11 3/4 gnttab: make the grant table lock a read-write lock

In reply to David Vrabel

In combination with the per-active entry locks, the grant table lock can be made a read-write lock since the majority of cases only the read lock is required. The grant table read lock protects against changes to the table version or size (which are done with the write lock held).

The write lock is also required when two active entries must be acquired.

The double lock is still required when updating IOMMU page tables.

With the lock contention being only on the maptrack lock (unless IOMMU updates are required), performance and scalability is improved.

Based on a patch originally by Matt Wilson <[email protected]>.

---
v11:
- Call gnttab_need_iommu_mapping() once for each lock/unlock.
- Take active entry lock in gnttab_transfer().
- Use read_atomic() when checking maptrack flags for validity (note:
all other reads of map->flags are either after it is validated as stable or protected by the active entry lock and thus don't need read_atomic()).
- Add comment to double_gt_lock().

v10:
- In gnttab_map_grant_ref(), keep double lock around maptrack update if gnttab_need_iommu_mapping(). Use a wmb(), otherwise.

---
 docs/misc/grant-tables.txt    |   30 ++++----
 xen/arch/arm/mm.c             |    4 +-
 xen/arch/x86/mm.c             |    4 +-
 xen/common/grant_table.c      |  171 ++++++++++++++++++++++++-----------------
 xen/include/xen/grant_table.h |    9 ++-
 5 files changed, 126 insertions(+), 92 deletions(-)
docs/misc/grant-tables.txt +17 -13
index 83b3454..9d9d01f 100644
@@ -83,7 +83,7 @@ is complete.
  ~~~~~~~
  Xen uses several locks to serialize access to the internal grant table state.
 
-  grant_table->lock          : lock used to prevent readers from accessing
+  grant_table->lock          : rwlock used to prevent readers from accessing
                                inconsistent grant table state such as current
                                version, partially initialized active table pages,
                                etc.
@@ -91,9 +91,13 @@ is complete.
   active_grant_entry->lock   : spinlock used to serialize modifications to
                                active entries
 
- The primary lock for the grant table is a spinlock. All functions
- that access members of struct grant_table must acquire the lock
- around critical sections.
+ The primary lock for the grant table is a read/write spinlock. All
+ functions that access members of struct grant_table must acquire a
+ read lock around critical sections. Any modification to the members
+ of struct grant_table (e.g., nr_status_frames, nr_grant_frames,
+ active frames, etc.) must only be made if the write lock is
+ held. These elements are read-mostly, and read critical sections can
+ be large, which makes a rwlock a good choice.
 
  The maptrack state is protected by its own spinlock. Any access (read
  or write) of struct grant_table members that have a "maptrack_"
@@ -105,25 +109,25 @@ is complete.
 
  Active entries are obtained by calling active_entry_acquire(gt, ref).
  This function returns a pointer to the active entry after locking its
- spinlock. The caller must hold the grant table lock for the gt in
- question before calling active_entry_acquire(). This is because the
- grant table can be dynamically extended via gnttab_grow_table() while
- a domain is running and must be fully initialized. Once all access to
- the active entry is complete, release the lock by calling
+ spinlock. The caller must hold the grant table read lock before
+ calling active_entry_acquire(). This is because the grant table can
+ be dynamically extended via gnttab_grow_table() while a domain is
+ running and must be fully initialized. Once all access to the active
+ entry is complete, release the lock by calling
  active_entry_release(act).
 
  Summary of rules for locking:
   active_entry_acquire() and active_entry_release() can only be
-  called when holding the relevant grant table's lock. I.e.:
-    spin_lock(&gt->lock);
+  called when holding the relevant grant table's read lock. I.e.:
+    read_lock(&gt->lock);
     act = active_entry_acquire(gt, ref);
     ...
     active_entry_release(act);
-    spin_unlock(&gt->lock);
+    read_unlock(&gt->lock);
 
  Active entries cannot be acquired while holding the maptrack lock.
  Multiple active entries can be acquired while holding the grant table
- lock.
+ _write_ lock.
 
 ********************************************************************************
 
xen/arch/arm/mm.c +2 -2
index a91ea77..b305041 100644
@@ -1048,7 +1048,7 @@ int xenmem_add_to_physmap_one(
     switch ( space )
     {
     case XENMAPSPACE_grant_table:
-        spin_lock(&d->grant_table->lock);
+        write_lock(&d->grant_table->lock);
 
         if ( d->grant_table->gt_version == 0 )
             d->grant_table->gt_version = 1;
@@ -1078,7 +1078,7 @@ int xenmem_add_to_physmap_one(
 
         t = p2m_ram_rw;
 
-        spin_unlock(&d->grant_table->lock);
+        write_unlock(&d->grant_table->lock);
         break;
     case XENMAPSPACE_shared_info:
         if ( idx != 0 )
xen/arch/x86/mm.c +2 -2
index 7a7a854..83639e7 100644
@@ -4589,7 +4589,7 @@ int xenmem_add_to_physmap_one(
                 mfn = virt_to_mfn(d->shared_info);
             break;
         case XENMAPSPACE_grant_table:
-            spin_lock(&d->grant_table->lock);
+            write_lock(&d->grant_table->lock);
 
             if ( d->grant_table->gt_version == 0 )
                 d->grant_table->gt_version = 1;
@@ -4611,7 +4611,7 @@ int xenmem_add_to_physmap_one(
                     mfn = virt_to_mfn(d->grant_table->shared_raw[idx]);
             }
 
-            spin_unlock(&d->grant_table->lock);
+            write_unlock(&d->grant_table->lock);
             break;
         case XENMAPSPACE_gmfn_range:
         case XENMAPSPACE_gmfn:
xen/common/grant_table.c +99 -72

513 lines not on this page · raw message

xen/include/xen/grant_table.h +6 -3
index 0b35a5e..f22ebd0 100644
@@ -64,6 +64,11 @@ struct grant_mapping {
 
 /* Per-domain grant information. */
 struct grant_table {
+    /*
+     * Lock protecting updates to grant table state (version, active
+     * entry list, etc.)
+     */
+    rwlock_t              lock;
     /* Table size. Number of frames shared with guest */
     unsigned int          nr_grant_frames;
     /* Shared grant table (see include/public/grant_table.h). */
@@ -84,8 +89,6 @@ struct grant_table {
     unsigned int          maptrack_limit;
     /* Lock protecting the maptrack page list, head, and limit */
     spinlock_t            maptrack_lock;
-    /* Lock protecting updates to active and shared grant tables. */
-    spinlock_t            lock;
     /* The defined versions are 1 and 2.  Set to 0 if we don't know
        what version to use yet. */
     unsigned              gt_version;
@@ -103,7 +106,7 @@ gnttab_release_mappings(
     struct domain *d);
 
 /* Increase the size of a domain's grant table.
- * Caller must hold d's grant table lock.
+ * Caller must hold d's grant table write lock.
  */
 int
 gnttab_grow_table(struct domain *d, unsigned int req_nr_frames);
Signature · 1 line
1.7.10.4
Reviewed-by on v11 3/4
#11 lore raw

Re: [PATCHv11 3/4] gnttab: make the grant table lock a read-write lock

Quoted 15 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +3 -2
@@ -970,9 +988,10 @@ __gnttab_unmap_common(
     TRACE_1D(TRC_MEM_PAGE_GRANT_UNMAP, dom);
 
     rgt = rd->grant_table;
-    double_gt_lock(lgt, rgt);
 
-    op->flags = op->map->flags;
+    read_lock(&rgt->lock);
+
+    op->flags = read_atomic(&op->map->flags);
     if ( unlikely(!op->flags) || unlikely(op->map->domid != dom) )
     {
         gdprintk(XENLOG_WARNING, "Unstable handle %u\n", op->handle);

xen/common/grant_table.c __gnttab_unmap_common( · line 1044

Quoted 8 lines
xen/common/grant_table.c +4 -1
@@ -1019,31 +1038,34 @@ __gnttab_unmap_common(
             act->pin -= GNTPIN_hstw_inc;
     }
 
-    if ( gnttab_need_iommu_mapping(ld) )
+ act_release_out:
+    active_entry_release(act);
+ unmap_out:
+    read_unlock(&rgt->lock);

Trying to answer the question on what protects the maptrack
entries: With the flags check done first and, after initial setup, the ref field never changing, all modifications of flags as well as the decision whether to drop the maptrack handle appear to be guarded by ref's active entry lock. I think this is implicit enough to require being properly spelled out somewhere.

Together with struct grant_mapping not being used elsewhere (I just now created a patch to make this more explicit by moving its declaration to the C file) I think this addresses that particular concern. If you agree, feel free to add

Jan

#12 lore raw

Re: [PATCHv11 3/4] gnttab: make the grant table lock a read-write lock

Quoted 31 lines · Jan Beulich
Quoted 15 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +3 -2
@@ -970,9 +988,10 @@ __gnttab_unmap_common(
     TRACE_1D(TRC_MEM_PAGE_GRANT_UNMAP, dom);
 
     rgt = rd->grant_table;
-    double_gt_lock(lgt, rgt);
 
-    op->flags = op->map->flags;
+    read_lock(&rgt->lock);
+
+    op->flags = read_atomic(&op->map->flags);
     if ( unlikely(!op->flags) || unlikely(op->map->domid != dom) )
     {
         gdprintk(XENLOG_WARNING, "Unstable handle %u\n", op->handle);

xen/common/grant_table.c __gnttab_unmap_common( · line 1044

Quoted 8 lines
xen/common/grant_table.c +4 -1
@@ -1019,31 +1038,34 @@ __gnttab_unmap_common(
             act->pin -= GNTPIN_hstw_inc;
     }
 
-    if ( gnttab_need_iommu_mapping(ld) )
+ act_release_out:
+    active_entry_release(act);
+ unmap_out:
+    read_unlock(&rgt->lock);

Trying to answer the question on what protects the maptrack
entries: With the flags check done first and, after initial setup, the ref field never changing, all modifications of flags as well as the decision whether to drop the maptrack handle appear to be guarded by ref's active entry lock. I think this is implicit enough to require being properly spelled out somewhere.

Quoted 4 lines

Together with struct grant_mapping not being used elsewhere (I just now created a patch to make this more explicit by moving its declaration to the C file) I think this addresses that particular concern. If you agree, feel free to add

Yes, this was exactly my reasoning. I shall improve the docs/comments to make this clearer in v12.

Quoted 1 line

Thanks!

David

#13 lore raw

PATCH v11 4/4 gnttab: use per-VCPU maptrack free lists

In reply to David Vrabel

Performance analysis of aggregate network throughput with many VMs shows that performance is signficantly limited by contention on the maptrack lock when obtaining/releasing maptrack handles from the free list.

Instead of a single free list use a per-VCPU list. This avoids any contention when obtaining a handle. Handles must be released back to their original list and since this may occur on a different VCPU there is some contention on the destination VCPU's free list tail pointer (but this is much better than a per-domain lock).

Increase the default maximum number of maptrack frames by 4 times
because: a) struct grant_mapping is now 16 bytes (instead of 8); and
b) a guest may not evenly distribute all the grant map operations across the VCPUs (meaning some VCPUs need more maptrack entries than others).

---
v11:
- Allocate maptrack array with vzalloc() since it may be >1 page.

v10:
- Divide max_maptrack_frames evenly amongst the VCPUs.
- Increase default max_maptrack_frames to compensate.

---
 xen/common/grant_table.c      |  149 +++++++++++++++++++++++++----------------
 xen/include/xen/grant_table.h |    8 ++-
 xen/include/xen/sched.h       |    5 ++
 3 files changed, 101 insertions(+), 61 deletions(-)
xen/common/grant_table.c +91 -58
index b16e696..b35fe12 100644
@@ -37,6 +37,7 @@
 #include <xen/iommu.h>
 #include <xen/paging.h>
 #include <xen/keyhandler.h>
+#include <xen/vmap.h>
 #include <xsm/xsm.h>
 #include <asm/flushtlb.h>
 
@@ -57,7 +58,7 @@ integer_param("gnttab_max_frames", max_grant_frames);
  * New options allow to set max_maptrack_frames and
  * map_grant_table_frames independently.
  */
-#define DEFAULT_MAX_MAPTRACK_FRAMES 256
+#define DEFAULT_MAX_MAPTRACK_FRAMES 1024
 
 static unsigned int __read_mostly max_maptrack_frames;
 integer_param("gnttab_max_maptrack_frames", max_maptrack_frames);
@@ -117,12 +118,6 @@ struct gnttab_unmap_common {
 #define maptrack_entry(t, e) \
     ((t)->maptrack[(e)/MAPTRACK_PER_PAGE][(e)%MAPTRACK_PER_PAGE])
 
-static inline unsigned int
-nr_maptrack_frames(struct grant_table *t)
-{
-    return t->maptrack_limit / MAPTRACK_PER_PAGE;
-}
-
 #define MAPTRACK_TAIL (~0u)
 
 #define SHGNT_PER_PAGE_V1 (PAGE_SIZE / sizeof(grant_entry_v1_t))
@@ -279,66 +274,104 @@ double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt)
 
 static inline int
 __get_maptrack_handle(
-    struct grant_table *t)
+    struct grant_table *t,
+    struct vcpu *v)
 {
-    unsigned int h;
-    if ( unlikely((h = t->maptrack_head) == MAPTRACK_TAIL) )
+    unsigned int head, next;
+
+    /* No maptrack pages allocated for this VCPU yet? */
+    head = v->maptrack_head;
+    if ( unlikely(head == MAPTRACK_TAIL) )
         return -1;
-    t->maptrack_head = maptrack_entry(t, h).ref;
-    return h;
+
+    /*
+     * Always keep one entry in the free list to make it easier to add
+     * free entries to the tail.
+     */
+    next = read_atomic(&maptrack_entry(t, head).ref);
+    if ( unlikely(next == MAPTRACK_TAIL) )
+        return -1;
+
+    v->maptrack_head = next;
+
+    return head;
 }
 
 static inline void
 put_maptrack_handle(
     struct grant_table *t, int handle)
 {
-    spin_lock(&t->maptrack_lock);
-    maptrack_entry(t, handle).ref = t->maptrack_head;
-    t->maptrack_head = handle;
-    spin_unlock(&t->maptrack_lock);
+    struct domain *d = current->domain;
+    struct vcpu *v;
+    unsigned int prev_tail, cur_tail;
+
+    /* 1. Set entry to be a tail. */
+    maptrack_entry(t, handle).ref = MAPTRACK_TAIL;
+
+    /* 2. Add entry to the tail of the list on the original VCPU. */
+    v = d->vcpu[maptrack_entry(t,handle).vcpu];
+
+    cur_tail = read_atomic(&v->maptrack_tail);
+    do {
+        prev_tail = cur_tail;
+        cur_tail = cmpxchg(&v->maptrack_tail, prev_tail, handle);
+    } while ( cur_tail != prev_tail );
+
+    /* 3. Update the old tail entry to point to the new entry. */
+    write_atomic(&maptrack_entry(t, prev_tail).ref, handle);
 }
 
 static inline int
 get_maptrack_handle(
     struct grant_table *lgt)
 {
+    struct vcpu          *v = current;
     int                   i;
     grant_handle_t        handle;
     struct grant_mapping *new_mt;
-    unsigned int          new_mt_limit, nr_frames;
 
-    spin_lock(&lgt->maptrack_lock);
+    handle = __get_maptrack_handle(lgt, v);
+    if ( likely(handle != -1) )
+        return handle;
 
-    while ( unlikely((handle = __get_maptrack_handle(lgt)) == -1) )
-    {
-        nr_frames = nr_maptrack_frames(lgt);
-        if ( nr_frames >= max_maptrack_frames )
-            break;
+    /*
+     * max_maptrack_frames is per domain so each VCPU gets a share of
+     * the maximum, but allow at least one frame per VCPU.
+     */
+    if ( v->maptrack_frames
+         && v->maptrack_frames >= max_maptrack_frames / v->domain->max_vcpus )
+        return -1;
 
-        new_mt = alloc_xenheap_page();
-        if ( !new_mt )
-            break;
+    new_mt = alloc_xenheap_page();
+    if ( !new_mt )
+        return -1;
+    clear_page(new_mt);
 
-        clear_page(new_mt);
+    spin_lock(&lgt->maptrack_lock);
 
-        new_mt_limit = lgt->maptrack_limit + MAPTRACK_PER_PAGE;
+    for ( i = 1; i < MAPTRACK_PER_PAGE; i++ )
+    {
+        new_mt[i - 1].ref = (lgt->maptrack_pages * MAPTRACK_PER_PAGE) + i;
+        new_mt[i - 1].vcpu = v->vcpu_id;
+    }
+    /* Set last entry vcpu and ref */
+    new_mt[i - 1].ref = v->maptrack_head;
+    new_mt[i - 1].vcpu = v->vcpu_id;
 
-        for ( i = 1; i < MAPTRACK_PER_PAGE; i++ )
-            new_mt[i - 1].ref = lgt->maptrack_limit + i;
-        new_mt[i - 1].ref = lgt->maptrack_head;
-        lgt->maptrack_head = lgt->maptrack_limit;
+    v->maptrack_head = lgt->maptrack_pages * MAPTRACK_PER_PAGE;
 
-        lgt->maptrack[nr_frames] = new_mt;
-        smp_wmb();
-        lgt->maptrack_limit      = new_mt_limit;
+    /* Set tail directly if this is the first page for this VCPU. */
+    if ( v->maptrack_tail == MAPTRACK_TAIL )
+        v->maptrack_tail = (lgt->maptrack_pages * MAPTRACK_PER_PAGE)
+            + MAPTRACK_PER_PAGE - 1;
 
-        gdprintk(XENLOG_INFO, "Increased maptrack size to %u frames\n",
-                 nr_frames + 1);
-    }
+    lgt->maptrack[lgt->maptrack_pages++] = new_mt;
 
     spin_unlock(&lgt->maptrack_lock);
 
-    return handle;
+    v->maptrack_frames++;
+
+    return __get_maptrack_handle(lgt, v);
 }
 
 /* Number of grant table entries. Caller must hold d's grant table lock. */
@@ -577,7 +610,8 @@ static void mapcount(
      */
     ASSERT(rw_is_write_locked(&rd->grant_table->lock));
 
-    for ( handle = 0; handle < lgt->maptrack_limit; handle++ )
+    for ( handle = 0; handle < lgt->maptrack_pages * MAPTRACK_PER_PAGE; 
+          handle++ )
     {
         map = &maptrack_entry(lgt, handle);
         if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) ||
@@ -947,7 +981,7 @@ __gnttab_unmap_common(
 
     op->frame = (unsigned long)(op->dev_bus_addr >> PAGE_SHIFT);
 
-    if ( unlikely(op->handle >= lgt->maptrack_limit) )
+    if ( unlikely(op->handle >= lgt->maptrack_pages * MAPTRACK_PER_PAGE) )
     {
         gdprintk(XENLOG_INFO, "Bad handle (%d).\n", op->handle);
         op->status = GNTST_bad_handle;
@@ -1422,6 +1456,7 @@ gnttab_setup_table(
     struct gnttab_setup_table op;
     struct domain *d;
     struct grant_table *gt;
+    struct vcpu *v;
     int            i;
     xen_pfn_t  gmfn;
 
@@ -1463,6 +1498,17 @@ gnttab_setup_table(
     gt = d->grant_table;
     write_lock(&gt->lock);
 
+    /* Tracking of mapped foreign frames table */
+    gt->maptrack = vzalloc(max_maptrack_frames * sizeof(*gt->maptrack));
+    if ( gt->maptrack == NULL )
+        goto out3;
+    for_each_vcpu( d, v )
+    {
+        v->maptrack_head = MAPTRACK_TAIL;
+        v->maptrack_tail = MAPTRACK_TAIL;
+    }
+    gt->maptrack_pages = 0;
+
     if ( gt->gt_version == 0 )
         gt->gt_version = 1;
 
@@ -3049,18 +3095,6 @@ grant_table_create(
             spin_lock_init(&t->active[i][j].lock);
     }
 
-    /* Tracking of mapped foreign frames table */
-    if ( (t->maptrack = xzalloc_array(struct grant_mapping *,
-                                      max_maptrack_frames)) == NULL )
-        goto no_mem_2;
-    if ( (t->maptrack[0] = alloc_xenheap_page()) == NULL )
-        goto no_mem_3;
-    clear_page(t->maptrack[0]);
-    t->maptrack_limit = MAPTRACK_PER_PAGE;
-    for ( i = 1; i < MAPTRACK_PER_PAGE; i++ )
-        t->maptrack[0][i - 1].ref = i;
-    t->maptrack[0][i - 1].ref = MAPTRACK_TAIL;
-
     /* Shared grant table. */
     if ( (t->shared_raw = xzalloc_array(void *, max_grant_frames)) == NULL )
         goto no_mem_3;
@@ -3091,8 +3125,6 @@ grant_table_create(
         free_xenheap_page(t->shared_raw[i]);
     xfree(t->shared_raw);
  no_mem_3:
-    free_xenheap_page(t->maptrack[0]);
-    xfree(t->maptrack);
  no_mem_2:
     for ( i = 0;
           i < num_act_frames_from_sha_frames(INITIAL_NR_GRANT_FRAMES); i++ )
@@ -3120,7 +3152,8 @@ gnttab_release_mappings(
 
     BUG_ON(!d->is_dying);
 
-    for ( handle = 0; handle < gt->maptrack_limit; handle++ )
+    for ( handle = 0; handle < gt->maptrack_pages * MAPTRACK_PER_PAGE;
+          handle++ )
     {
         map = &maptrack_entry(gt, handle);
         if ( !(map->flags & (GNTMAP_device_map|GNTMAP_host_map)) )
@@ -3225,9 +3258,9 @@ grant_table_destroy(
         free_xenheap_page(t->shared_raw[i]);
     xfree(t->shared_raw);
 
-    for ( i = 0; i < nr_maptrack_frames(t); i++ )
+    for ( i = 0; i < t->maptrack_pages; i++ )
         free_xenheap_page(t->maptrack[i]);
-    xfree(t->maptrack);
+    vfree(t->maptrack);
 
     for ( i = 0; i < nr_active_grant_frames(t); i++ )
         free_xenheap_page(t->active[i]);
xen/include/xen/grant_table.h +5 -3
index f22ebd0..c6e4ebf 100644
@@ -60,6 +60,8 @@ struct grant_mapping {
     u32      ref;           /* grant ref */
     u16      flags;         /* 0-4: GNTMAP_* ; 5-15: unused */
     domid_t  domid;         /* granting domain */
+    u32      vcpu;          /* vcpu which created the grant mapping */
+    u32      pad;           /* round size to a power of 2 */
 };
 
 /* Per-domain grant information. */
@@ -83,10 +85,10 @@ struct grant_table {
     grant_status_t       **status;
     /* Active grant table. */
     struct active_grant_entry **active;
-    /* Mapping tracking table. */
+    /* Mapping tracking table per vcpu. */
     struct grant_mapping **maptrack;
-    unsigned int          maptrack_head;
-    unsigned int          maptrack_limit;
+    /* Total pages used for mapping tracking table */
+    unsigned int          maptrack_pages;
     /* Lock protecting the maptrack page list, head, and limit */
     spinlock_t            maptrack_lock;
     /* The defined versions are 1 and 2.  Set to 0 if we don't know
xen/include/xen/sched.h +5 -0
index 80c6f62..d46a561 100644
@@ -219,6 +219,11 @@ struct vcpu
     /* VCPU paused by system controller. */
     int              controller_pause_count;
 
+    /* Maptrack */
+    unsigned int     maptrack_head;
+    unsigned int     maptrack_tail;
+    unsigned int     maptrack_frames;
+
     /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */
     evtchn_port_t    virq_to_evtchn[NR_VIRQS];
     spinlock_t       virq_lock;
Signature · 1 line
1.7.10.4
#14 lore raw

Re: [PATCHv11 4/4] gnttab: use per-VCPU maptrack free lists

Quoted 4 lines · David Vrabel

Performance analysis of aggregate network throughput with many VMs shows that performance is signficantly limited by contention on the maptrack lock when obtaining/releasing maptrack handles from the free list.

Sometime during all this refactoring, I dropped the authorship of this patch. Please ensure this is

From: Malcolm Crossley <[email protected]>

Thanks.

David

#15 lore raw

Re: [PATCHv11 4/4] gnttab: use per-VCPU maptrack free lists

In reply to David Vrabel
Quoted 18 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:

Performance analysis of aggregate network throughput with many VMs shows that performance is signficantly limited by contention on the maptrack lock when obtaining/releasing maptrack handles from the free list.

Instead of a single free list use a per-VCPU list. This avoids any contention when obtaining a handle. Handles must be released back to their original list and since this may occur on a different VCPU there is some contention on the destination VCPU's free list tail pointer (but this is much better than a per-domain lock).

Increase the default maximum number of maptrack frames by 4 times
because: a) struct grant_mapping is now 16 bytes (instead of 8); and
b) a guest may not evenly distribute all the grant map operations across the VCPUs (meaning some VCPUs need more maptrack entries than others).

Quoted 3 lines

What version was that ack given for?

Quoted 7 lines

---
v11:
- Allocate maptrack array with vzalloc() since it may be >1 page.

v10:
- Divide max_maptrack_frames evenly amongst the VCPUs.
- Increase default max_maptrack_frames to compensate.

Iirc before both of these changes, and the v10 ones imo should have invalidated it. Tim, I'm particularly trying to understand whether you're okay with the original's (potentially even heavier) resource use and/or this version's (risking to run out of maptrack entries _much_ earlier than currently).

xen/common/grant_table.c double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) · line 298

Quoted 8 lines

static inline void
put_maptrack_handle(
struct grant_table *t, int handle)
{

xen/common/grant_table.c +0 -4
-    spin_lock(&t->maptrack_lock);
-    maptrack_entry(t, handle).ref = t->maptrack_head;
-    t->maptrack_head = handle;
-    spin_unlock(&t->maptrack_lock);

I think the dropping of the lock here makes it necessary to add a write barrier between __gnttab_unmap_common_complete() zeroing op->map->flags and the call of this function.

Quoted 17 lines

static inline int
get_maptrack_handle(
struct grant_table *lgt)
{

xen/common/grant_table.c +4 -4
+    struct vcpu          *v = current;
     int                   i;
     grant_handle_t        handle;
     struct grant_mapping *new_mt;
-    unsigned int          new_mt_limit, nr_frames;
 
-    spin_lock(&lgt->maptrack_lock);
+    handle = __get_maptrack_handle(lgt, v);
+    if ( likely(handle != -1) )
+        return handle;
 
-    while ( unlikely((handle = __get_maptrack_handle(lgt)) == -1) )
-    {

xen/common/grant_table.c double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) · line 343

Quoted 10 lines
xen/common/grant_table.c +7 -3
-        nr_frames = nr_maptrack_frames(lgt);
-        if ( nr_frames >= max_maptrack_frames )
-            break;
+    /*
+     * max_maptrack_frames is per domain so each VCPU gets a share of
+     * the maximum, but allow at least one frame per VCPU.
+     */
+    if ( v->maptrack_frames
+         && v->maptrack_frames >= max_maptrack_frames / v->domain->max_vcpus )
+        return -1;

So with e.g. max_maptrack_frames being 256 and ->max_vcpus being 129 you'd potentially allow each vCPU to only have exactly one page despite there being 127 more to use.

Jan

#16 lore raw

Re: [PATCHv11 4/4] gnttab: use per-VCPU maptrack free lists

Quoted 18 lines · Jan Beulich
Quoted 18 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:

Performance analysis of aggregate network throughput with many VMs shows that performance is signficantly limited by contention on the maptrack lock when obtaining/releasing maptrack handles from the free list.

Instead of a single free list use a per-VCPU list. This avoids any contention when obtaining a handle. Handles must be released back to their original list and since this may occur on a different VCPU there is some contention on the destination VCPU's free list tail pointer (but this is much better than a per-domain lock).

Increase the default maximum number of maptrack frames by 4 times
because: a) struct grant_mapping is now 16 bytes (instead of 8); and
b) a guest may not evenly distribute all the grant map operations across the VCPUs (meaning some VCPUs need more maptrack entries than others).

Quoted 5 lines
Quoted 3 lines

What version was that ack given for?

v9

Quoted 11 lines

xen/common/grant_table.c double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) · line 343

Quoted 7 lines
xen/common/grant_table.c +7 -0
+    /*
+     * max_maptrack_frames is per domain so each VCPU gets a share of
+     * the maximum, but allow at least one frame per VCPU.
+     */
+    if ( v->maptrack_frames
+         && v->maptrack_frames >= max_maptrack_frames / v->domain->max_vcpus )
+        return -1;

So with e.g. max_maptrack_frames being 256 and ->max_vcpus being 129 you'd potentially allow each vCPU to only have exactly one page despite there being 127 more to use.

There's a limit to how many wacky combinations we can support with a single default limit.

With the standard defaults and 129 VCPUs:

Before

131072 entries (256 * 4096 / 8)

After

231168 entries (1024 / 129 * 129 * 4096 / 16)
1792 entries per vcpu.

David

#17 lore raw

Re: [PATCHv11 4/4] gnttab: use per-VCPU maptrack free lists

Quoted 20 lines
Quoted 1 line
Quoted 1 line · On 05.06.15 at 17:55, <[email protected]> wrote:
Quoted 9 lines · Jan Beulich

xen/common/grant_table.c double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) · line 343

Quoted 8 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +7 -0
+    /*
+     * max_maptrack_frames is per domain so each VCPU gets a share of
+     * the maximum, but allow at least one frame per VCPU.
+     */
+    if ( v->maptrack_frames
+         && v->maptrack_frames >= max_maptrack_frames / v->domain->max_vcpus )
+        return -1;
Quoted 3 lines

So with e.g. max_maptrack_frames being 256 and ->max_vcpus being 129 you'd potentially allow each vCPU to only have exactly one page despite there being 127 more to use.

There's a limit to how many wacky combinations we can support with a single default limit.

With the standard defaults and 129 VCPUs:

Quoted 8 lines

Before

131072 entries (256 * 4096 / 8)

After

231168 entries (1024 / 129 * 129 * 4096 / 16)
1792 entries per vcpu.

And that's why I'm putting the currently proposed resource management model under question.

Jan

#18 lore raw

Re: [PATCHv11 4/4] gnttab: use per-VCPU maptrack free lists

Quoted 24 lines · Jan Beulich
Quoted 24 lines
Quoted 1 line
Quoted 1 line · On 05.06.15 at 17:55, <[email protected]> wrote:
Quoted 9 lines · Jan Beulich

xen/common/grant_table.c double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) · line 343

Quoted 8 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +7 -0
+    /*
+     * max_maptrack_frames is per domain so each VCPU gets a share of
+     * the maximum, but allow at least one frame per VCPU.
+     */
+    if ( v->maptrack_frames
+         && v->maptrack_frames >= max_maptrack_frames / v->domain->max_vcpus )
+        return -1;
Quoted 3 lines

So with e.g. max_maptrack_frames being 256 and ->max_vcpus being 129 you'd potentially allow each vCPU to only have exactly one page despite there being 127 more to use.

There's a limit to how many wacky combinations we can support with a single default limit.

With the standard defaults and 129 VCPUs:

Before

131072 entries (256 * 4096 / 8)

Quoted 7 lines
Quoted 4 lines

After

231168 entries (1024 / 129 * 129 * 4096 / 16)
1792 entries per vcpu.

And that's why I'm putting the currently proposed resource management model under question.

The new default of 1024 frames ensures that with any number of VCPUs results in the domain having /more/ entries than then old default (256 frames).

It's not at all clear what you want here. Can you provide a proposal?

David

#19 lore raw

Re: [PATCHv11 4/4] gnttab: use per-VCPU maptrack free lists

Quoted 31 lines
Quoted 1 line
Quoted 1 line · On 05.06.15 at 18:42, <[email protected]> wrote:
Quoted 29 lines · Jan Beulich
Quoted 28 lines
Quoted 1 line
Quoted 1 line · On 05.06.15 at 17:55, <[email protected]> wrote:
Quoted 9 lines · Jan Beulich

xen/common/grant_table.c double_gt_unlock(struct grant_table *lgt, struct grant_table *rgt) · line 343

Quoted 8 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:
xen/common/grant_table.c +7 -0
+    /*
+     * max_maptrack_frames is per domain so each VCPU gets a share of
+     * the maximum, but allow at least one frame per VCPU.
+     */
+    if ( v->maptrack_frames
+         && v->maptrack_frames >= max_maptrack_frames / v->domain->max_vcpus )
+        return -1;
Quoted 3 lines

So with e.g. max_maptrack_frames being 256 and ->max_vcpus being 129 you'd potentially allow each vCPU to only have exactly one page despite there being 127 more to use.

There's a limit to how many wacky combinations we can support with a single default limit.

With the standard defaults and 129 VCPUs:

Before

131072 entries (256 * 4096 / 8)

After

231168 entries (1024 / 129 * 129 * 4096 / 16)
1792 entries per vcpu.

Quoted 8 lines
Quoted 2 lines

And that's why I'm putting the currently proposed resource management model under question.

The new default of 1024 frames ensures that with any number of VCPUs results in the domain having /more/ entries than then old default (256 frames).

It's not at all clear what you want here. Can you provide a proposal?

There being more frames per domain doesn't help a guest e.g. first doing one or more mappings on each vCPU and then wanting to do very many mappings on a single vCPU. I think there needs to be a (slow) fallback path where using "foreign" vCPU-s' maptrack entries is possible. Or something else to avoid regressing in scenarios that work prior to your change.

Jan

#20 lore raw

Re: [PATCHv11 4/4] gnttab: use per-VCPU maptrack free lists

In reply to Jan Beulich
Quoted 18 lines · Jan Beulich
Quoted 18 lines
Quoted 1 line
Quoted 1 line · On 02.06.15 at 18:26, <[email protected]> wrote:

Performance analysis of aggregate network throughput with many VMs shows that performance is signficantly limited by contention on the maptrack lock when obtaining/releasing maptrack handles from the free list.

Instead of a single free list use a per-VCPU list. This avoids any contention when obtaining a handle. Handles must be released back to their original list and since this may occur on a different VCPU there is some contention on the destination VCPU's free list tail pointer (but this is much better than a per-domain lock).

Increase the default maximum number of maptrack frames by 4 times
because: a) struct grant_mapping is now 16 bytes (instead of 8); and
b) a guest may not evenly distribute all the grant map operations across the VCPUs (meaning some VCPUs need more maptrack entries than others).

Quoted 5 lines
Quoted 3 lines

What version was that ack given for?

v7, IIRC.

Quoted 5 lines

Iirc before both of these changes, and the v10 ones imo should have invalidated it. Tim, I'm particularly trying to understand whether you're okay with the original's (potentially even heavier) resource use and/or this version's (risking to run out of maptrack entries _much_ earlier than currently).

The concern with the earlier version being that the maximum maptrack limit gets a lot higher with many vcpus? I was OK with that. There are a lot of things that scale with #vcpus, and xenheap pages are not particularly scarce any more. So let's say I don't find one 128-vcpu guest much different from 128 1-vcpu guests for this purpose.

Cheers,

Tim.

#21 lore raw

Re: [PATCHv11 4/4] gnttab: use per-VCPU maptrack free lists

Quoted 8 lines
Quoted 1 line
Quoted 1 line · On 11.06.15 at 17:28, <[email protected]> wrote:
Quoted 5 lines · Jan Beulich

Iirc before both of these changes, and the v10 ones imo should have invalidated it. Tim, I'm particularly trying to understand whether you're okay with the original's (potentially even heavier) resource use and/or this version's (risking to run out of maptrack entries _much_ earlier than currently).

Quoted 5 lines

The concern with the earlier version being that the maximum maptrack limit gets a lot higher with many vcpus? I was OK with that. There are a lot of things that scale with #vcpus, and xenheap pages are not particularly scarce any more. So let's say I don't find one 128-vcpu guest much different from 128 1-vcpu guests for this purpose.

I certainly can see that resource consumption may scale with the number of vCPU-s a guest has. But whether that ought to apply to everything, i.e. including all per-domain (rather than per-vCPU) resources (which the maptrack table is only an example of) I'm not sure about. In the end, if we were to talk about v9 and the default of 256 frames, a 1024-vCPU DomU could consume 1Gb of memory for its maptrack even if (quite likely) it doesn't serve any other guest. IOW to me it would seem that a necessary prereq to this change would be to make the limit a per-domain setting, with only Dom0 getting its limit bumped by default (and even then the at-least-one-page-per-vCPU requirement undermines that, i.e. a slow path to avoid going over the set limit would still seem necessary).

Additionally, with the maptrack pages no longer shared across vCPU-s, running into an allocation failure namely on ballooned setups (where Xen typically doesn't have much memory available, since the ballooning ordinarily only accounts for the immediate domain needs) is going to become quite a bit more likely. Yes, I already hear David saying "I don't care about the ballooning case", but no, I don't think we can simply ignore this case (unless we want to declare ballooning a deprecated, no longer supported feature).

Jan