All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Hildenbrand <david@redhat.com>
To: kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org,
	Vasily Gorbik <gor@linux.ibm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Janosch Frank <frankja@linux.ibm.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	David Hildenbrand <david@redhat.com>,
	stable@vger.kernel.org
Subject: [PATCH v2 1/5] KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks
Date: Fri,  3 Apr 2020 17:30:46 +0200	[thread overview]
Message-ID: <20200403153050.20569-2-david@redhat.com> (raw)
In-Reply-To: <20200403153050.20569-1-david@redhat.com>

In case we have a region 1 ASCE, our shadow/g3 address can have any value.
Unfortunately, (-1UL << 64) is undefined and triggers sometimes,
rejecting valid shadow addresses when trying to walk our shadow table
hierarchy.

The result is that the prefix cannot get mapped and will loop basically
forever trying to map it (-EAGAIN loop).

After all, the broken check is only a sanity check, our table shadowing
code in kvm_s390_shadow_tables() already checks these conditions, injecting
proper translation exceptions. Turn it into a WARN_ON_ONCE().

Fixes: 4be130a08420 ("s390/mm: add shadow gmap support")
Tested-by: Janosch Frank <frankja@linux.ibm.com>
Reported-by: Janosch Frank <frankja@linux.ibm.com>
Cc: <stable@vger.kernel.org> # v4.8+
Signed-off-by: David Hildenbrand <david@redhat.com>
---
 arch/s390/mm/gmap.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index 2fbece47ef6f..b93dd54b234a 100644
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -787,14 +787,18 @@ static void gmap_call_notifier(struct gmap *gmap, unsigned long start,
 static inline unsigned long *gmap_table_walk(struct gmap *gmap,
 					     unsigned long gaddr, int level)
 {
+	const int asce_type = gmap->asce & _ASCE_TYPE_MASK;
 	unsigned long *table;
 
 	if ((gmap->asce & _ASCE_TYPE_MASK) + 4 < (level * 4))
 		return NULL;
 	if (gmap_is_shadow(gmap) && gmap->removed)
 		return NULL;
-	if (gaddr & (-1UL << (31 + ((gmap->asce & _ASCE_TYPE_MASK) >> 2)*11)))
+
+	if (WARN_ON_ONCE(asce_type != _ASCE_TYPE_REGION1 &&
+			 gaddr & (-1UL << (31 + (asce_type >> 2) * 11))))
 		return NULL;
+
 	table = gmap->table;
 	switch (gmap->asce & _ASCE_TYPE_MASK) {
 	case _ASCE_TYPE_REGION1:
-- 
2.25.1


  reply	other threads:[~2020-04-03 15:31 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-03 15:30 [PATCH v2 0/5] KVM: s390: vsie: fixes and cleanups David Hildenbrand
2020-04-03 15:30 ` David Hildenbrand [this message]
2020-04-03 17:56   ` [PATCH v2 1/5] KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks Christian Borntraeger
2020-04-03 19:55     ` David Hildenbrand
2020-04-06  8:32       ` Christian Borntraeger
2020-04-07  7:33   ` Christian Borntraeger
2020-04-07  7:49     ` David Hildenbrand
2020-04-07  7:52       ` Christian Borntraeger
2020-04-07  7:53         ` David Hildenbrand
2020-04-07 10:48         ` Claudio Imbrenda
2020-04-03 15:30 ` [PATCH v2 2/5] KVM: s390: vsie: Fix delivery of addressing exceptions David Hildenbrand
2020-04-07 11:00   ` Claudio Imbrenda
2020-04-07 11:35     ` David Hildenbrand
2020-04-03 15:30 ` [PATCH v2 3/5] KVM: s390: vsie: Fix possible race when shadowing region 3 tables David Hildenbrand
2020-04-07 11:05   ` Claudio Imbrenda
2020-04-03 15:30 ` [PATCH v2 4/5] KVM: s390: vsie: Move conditional reschedule David Hildenbrand
2020-04-06 15:06   ` Christian Borntraeger
2020-04-07 10:52   ` Claudio Imbrenda
2020-04-03 15:30 ` [PATCH v2 5/5] KVM: s390: vsie: gmap_table_walk() simplifications David Hildenbrand
2020-04-06 16:06   ` Christian Borntraeger
2020-04-07 11:10   ` Claudio Imbrenda
2020-04-06 16:06 ` [PATCH v2 0/5] KVM: s390: vsie: fixes and cleanups Christian Borntraeger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200403153050.20569-2-david@redhat.com \
    --to=david@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=gor@linux.ibm.com \
    --cc=heiko.carstens@de.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.