Skip to contentSkip to conversation

KVM: s390: vsie/gmap: reduce gmap_rmap overhead

PATCH/RFC Christian Borntraeger 2 participants 2 messages Apr 29, 2022

Subsystems (3)
lore
Share & tools
lore

Christian Borntraeger

author reviewer
#0 lore raw

there are cases that trigger a 2nd shadow event for the same vmaddr/raddr combination. (prefix changes, reboots, some known races) This will increase memory usages and it will result in long latencies when cleaning up, e.g. on shutdown. To avoid cases with a list that has hundreds of identical raddrs we check existing entries at insert time. As this measurably reduces the list length this will be faster than traversing the list at shutdown time.

In the long run several places will be optimized to create less entries and a shrinker might be necessary.

Fixes 4be130a08420 ("s390/mm: add shadow gmap support")
---
 arch/s390/mm/gmap.c | 7 +++++++
 1 file changed, 7 insertions(+)
arch/s390/mm/gmap.c +7 -0
index 69c08d966fda..0fc0c26a71f2 100644
@@ -1185,12 +1185,19 @@ static inline void gmap_insert_rmap(struct gmap *sg, unsigned long vmaddr,
 				    struct gmap_rmap *rmap)
 {
 	void __rcu **slot;
+	struct gmap_rmap *temp;
 
 	BUG_ON(!gmap_is_shadow(sg));
 	slot = radix_tree_lookup_slot(&sg->host_to_rmap, vmaddr >> PAGE_SHIFT);
 	if (slot) {
 		rmap->next = radix_tree_deref_slot_protected(slot,
 							&sg->guest_table_lock);
+		for (temp = rmap->next; temp; temp = temp->next) {
+			if (temp->raddr == rmap->raddr) {
+				kfree(rmap);
+				return;
+			}
+		}
 		radix_tree_replace_slot(&sg->host_to_rmap, slot, rmap);
 	} else {
 		rmap->next = NULL;
Signature · 1 line
2.35.1
#1 lore raw
Quoted 31 lines · Christian Borntraeger

there are cases that trigger a 2nd shadow event for the same vmaddr/raddr combination. (prefix changes, reboots, some known races) This will increase memory usages and it will result in long latencies when cleaning up, e.g. on shutdown. To avoid cases with a list that has hundreds of identical raddrs we check existing entries at insert time. As this measurably reduces the list length this will be faster than traversing the list at shutdown time.

In the long run several places will be optimized to create less entries and a shrinker might be necessary.

Fixes 4be130a08420 ("s390/mm: add shadow gmap support")
---
 arch/s390/mm/gmap.c | 7 +++++++
 1 file changed, 7 insertions(+)
arch/s390/mm/gmap.c +1 -0
index 69c08d966fda..0fc0c26a71f2 100644
@@ -1185,12 +1185,19 @@ static inline void gmap_insert_rmap(struct gmap *sg, unsigned long vmaddr,
 				    struct gmap_rmap *rmap)
 {
 	void __rcu **slot;
+	struct gmap_rmap *temp;
 
 	BUG_ON(!gmap_is_shadow(sg));
 	slot = radix_tree_lookup_slot(&sg->host_to_rmap, vmaddr >> PAGE_SHIFT);
 	if (slot) {
 		rmap->next = radix_tree_deref_slot_protected(slot,

arch/s390/mm/gmap.c static inline void gmap_insert_rmap(struct gmap *sg, unsigned long vmaddr, · line 1203

Quoted 10 lines
arch/s390/mm/gmap.c +6 -0
 							&sg->guest_table_lock);
+		for (temp = rmap->next; temp; temp = temp->next) {
+			if (temp->raddr == rmap->raddr) {
+				kfree(rmap);
+				return;
+			}
+		}
 		radix_tree_replace_slot(&sg->host_to_rmap, slot, rmap);
 	} else {
 		rmap->next = NULL;
Signature · 3 lines
Thanks,

David / dhildenb