Skip to content

Commit

Permalink
s390/mm: flush tlb of shadows in all situations
Browse files Browse the repository at this point in the history
For now, the tlb of shadow gmap is only flushed when the parent is removed,
not when it is removed upfront. Therefore other shadow gmaps can reuse the
tables without the tlb getting flushed.

Fix this by simply flushing the tlb
1. Before the shadow tables are removed (analogouos to other unshadow functions)
2. When the gmap is freed and therefore the top level pages are freed.

Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
  • Loading branch information
David Hildenbrand authored and Christian Borntraeger committed Jun 20, 2016
1 parent aa17aa5 commit eea3678
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions arch/s390/mm/gmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ static void gmap_free(struct gmap *gmap)
{
struct page *page, *next;

/* Flush tlb of all gmaps (if not already done for shadows) */
if (!(gmap_is_shadow(gmap) && gmap->removed))
gmap_flush_tlb(gmap);
/* Free all segment & region tables. */
list_for_each_entry_safe(page, next, &gmap->crst_list, lru)
__free_pages(page, 2);
Expand Down Expand Up @@ -226,13 +229,10 @@ void gmap_remove(struct gmap *gmap)
{
struct gmap *sg, *next;

/* Flush tlb. */
gmap_flush_tlb(gmap);
/* Remove all shadow gmaps linked to this gmap */
if (!list_empty(&gmap->children)) {
spin_lock(&gmap->shadow_lock);
list_for_each_entry_safe(sg, next, &gmap->children, list) {
gmap_flush_tlb(sg);
list_del(&sg->list);
gmap_put(sg);
}
Expand Down Expand Up @@ -1360,6 +1360,7 @@ static void gmap_unshadow(struct gmap *sg)
return;
sg->removed = 1;
gmap_call_notifier(sg, 0, -1UL);
gmap_flush_tlb(sg);
table = (unsigned long *)(sg->asce & _ASCE_ORIGIN);
switch (sg->asce & _ASCE_TYPE_MASK) {
case _ASCE_TYPE_REGION1:
Expand Down

0 comments on commit eea3678

Please sign in to comment.