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>
Subject: [PATCH v2 5/5] KVM: s390: vsie: gmap_table_walk() simplifications
Date: Fri, 3 Apr 2020 17:30:50 +0200 [thread overview]
Message-ID: <20200403153050.20569-6-david@redhat.com> (raw)
In-Reply-To: <20200403153050.20569-1-david@redhat.com>
Let's use asce_type where applicable. Also, simplify our sanity check for
valid table levels and convert it into a WARN_ON_ONCE(). Check if we even
have a valid gmap shadow as the very first step.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
arch/s390/mm/gmap.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index 24ef30fb0833..a2bd8d7792e9 100644
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -788,19 +788,19 @@ 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;
+ unsigned long *table = gmap->table;
- if ((gmap->asce & _ASCE_TYPE_MASK) + 4 < (level * 4))
- return NULL;
if (gmap_is_shadow(gmap) && gmap->removed)
return NULL;
+ if (WARN_ON_ONCE(level > (asce_type >> 2) + 1))
+ return NULL;
+
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) {
+ switch (asce_type) {
case _ASCE_TYPE_REGION1:
table += (gaddr & _REGION1_INDEX) >> _REGION1_SHIFT;
if (level == 4)
--
2.25.1
next prev parent 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 ` [PATCH v2 1/5] KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks David Hildenbrand
2020-04-03 17:56 ` 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 ` David Hildenbrand [this message]
2020-04-06 16:06 ` [PATCH v2 5/5] KVM: s390: vsie: gmap_table_walk() simplifications 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-6-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 \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).