From: David Hildenbrand <david@redhat.com>
To: Cornelia Huck <cohuck@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>,
Janosch Frank <frankja@linux.ibm.com>,
qemu-devel@nongnu.org, Halil Pasic <pasic@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, Richard Henderson <rth@twiddle.net>
Subject: Re: [Qemu-devel] [PATCH-for-4.2 v1 2/6] s390x/tcg: Rework MMU selection for instruction fetches
Date: Tue, 13 Aug 2019 14:53:23 +0200 [thread overview]
Message-ID: <63dc4322-03f5-aff3-e9eb-db494ad04711@redhat.com> (raw)
In-Reply-To: <20190813145237.58e83eeb.cohuck@redhat.com>
On 13.08.19 14:52, Cornelia Huck wrote:
> On Mon, 12 Aug 2019 15:37:39 +0200
> David Hildenbrand <david@redhat.com> wrote:
>
>> On 12.08.19 13:27, David Hildenbrand wrote:
>>> Instructions are always fetched from primary address space, except when
>>> in home address mode. Perform the selection directly in cpu_mmu_index().
>>>
>>> get_mem_index() is only used to perform data access, instructions are
>>> fetched via cpu_lduw_code(), which translates to cpu_mmu_index(env, true).
>>>
>>> We don't care about restricting the access permissions of the TLB
>>> entries anymore, as we no longer enter PRIMARY entries into the
>>> SECONDARY MMU. Cleanup related code a bit.
>>>
>>> Signed-off-by: David Hildenbrand <david@redhat.com>
>>> ---
>>> target/s390x/cpu.h | 7 +++++++
>>> target/s390x/mmu_helper.c | 35 ++++++++++++++---------------------
>>> 2 files changed, 21 insertions(+), 21 deletions(-)
>>>
>>> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
>>> index a606547b4d..c34992bb2e 100644
>>> --- a/target/s390x/cpu.h
>>> +++ b/target/s390x/cpu.h
>>> @@ -332,6 +332,13 @@ static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)
>>> return MMU_REAL_IDX;
>>> }
>>>
>>> + if (ifetch) {
>>> + if ((env->psw.mask & PSW_MASK_ASC) == PSW_ASC_HOME) {
>>> + return MMU_HOME_IDX;
>>> + }
>>> + return MMU_PRIMARY_IDX;
>>> + }
>>> +
>>> switch (env->psw.mask & PSW_MASK_ASC) {
>>> case PSW_ASC_PRIMARY:
>>> return MMU_PRIMARY_IDX;
>>> diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
>>> index 6e9c4d6151..2c9bb3acc0 100644
>>> --- a/target/s390x/mmu_helper.c
>>> +++ b/target/s390x/mmu_helper.c
>>> @@ -349,6 +349,7 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc,
>>> {
>>> static S390SKeysState *ss;
>>> static S390SKeysClass *skeyclass;
>>> + uint64_t asce;
>>> int r = -1;
>>
>> I can now stop initializing r.
>>
>>> uint8_t key;
>>>
>>> @@ -381,35 +382,21 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc,
>>> if (!(env->psw.mask & PSW_MASK_DAT)) {
>>> *raddr = vaddr;
>>> r = 0;
>>
>> and this can go as well.
>>
>>> - goto out;
>>> + goto nodat;
>>> }
>>>
>>
>>
>
> So, there will be a v2?
Yes, but waiting for more feedback.
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2019-08-13 12:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 11:27 [Qemu-devel] [PATCH-for-4.2 v1 0/6] s390x/mmu: Storage key reference and change bit handling David Hildenbrand
2019-08-12 11:27 ` [Qemu-devel] [PATCH-for-4.2 v1 1/6] s390x/mmu: ASC selection in s390_cpu_get_phys_page_debug() David Hildenbrand
2019-08-12 15:18 ` [Qemu-devel] [qemu-s390x] " Thomas Huth
2019-08-12 15:28 ` David Hildenbrand
2019-08-12 15:39 ` David Hildenbrand
2019-08-12 16:04 ` Thomas Huth
2019-08-13 12:51 ` [Qemu-devel] " Cornelia Huck
2019-08-12 11:27 ` [Qemu-devel] [PATCH-for-4.2 v1 2/6] s390x/tcg: Rework MMU selection for instruction fetches David Hildenbrand
2019-08-12 13:37 ` David Hildenbrand
2019-08-13 12:52 ` Cornelia Huck
2019-08-13 12:53 ` David Hildenbrand [this message]
2019-08-13 13:16 ` Cornelia Huck
2019-08-12 11:27 ` [Qemu-devel] [PATCH-for-4.2 v1 3/6] s390x/tcg: Flush the TLB of all CPUs on SSKE and RRBE David Hildenbrand
2019-08-13 13:42 ` Cornelia Huck
2019-08-12 11:27 ` [Qemu-devel] [PATCH-for-4.2 v1 4/6] s390x/mmu: Trace the right value if setting/getting the storage key fails David Hildenbrand
2019-08-12 13:01 ` Cornelia Huck
2019-08-12 11:27 ` [Qemu-devel] [PATCH-for-4.2 v1 5/6] s390x/mmu: Better storage key reference and change bit handling David Hildenbrand
2019-08-13 14:54 ` Cornelia Huck
2019-08-14 7:20 ` [Qemu-devel] [qemu-s390x] " David Hildenbrand
2019-08-12 11:27 ` [Qemu-devel] [PATCH-for-4.2 v1 6/6] s390x/mmu: Factor out storage key handling David Hildenbrand
2019-08-13 15:04 ` Cornelia Huck
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=63dc4322-03f5-aff3-e9eb-db494ad04711@redhat.com \
--to=david@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/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).