[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v9 10/15] s390x: protvirt: Move diag 308 data over SIDA
From: |
Janosch Frank |
Subject: |
Re: [PATCH v9 10/15] s390x: protvirt: Move diag 308 data over SIDA |
Date: |
Thu, 12 Mar 2020 17:05:44 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 |
On 3/12/20 4:17 PM, Christian Borntraeger wrote:
>
>
> On 11.03.20 14:21, Janosch Frank wrote:
>> For protected guests the IPIB is written/read to/from the SIDA, so we
>
> I think we need to make up our mind regarding IPLB vs. IPIB....
>
> Otherwise
> Reviewed-by: Christian Borntraeger <address@hidden>
Shall I put that onto the list of things I need to fix in my cleanup series?
>
>> need those accesses to go through s390_cpu_pv_mem_read/write().
>>
>> Signed-off-by: Janosch Frank <address@hidden>
>> Reviewed-by: David Hildenbrand <address@hidden>
>> ---
>> target/s390x/diag.c | 27 +++++++++++++++++++++------
>> 1 file changed, 21 insertions(+), 6 deletions(-)
>>
>> diff --git a/target/s390x/diag.c b/target/s390x/diag.c
>> index b245e557037ded06..a733485caf162111 100644
>> --- a/target/s390x/diag.c
>> +++ b/target/s390x/diag.c
>> @@ -88,6 +88,7 @@ static int diag308_parm_check(CPUS390XState *env, uint64_t
>> r1, uint64_t addr,
>> void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3,
>> uintptr_t ra)
>> {
>> CPUState *cs = env_cpu(env);
>> + S390CPU *cpu = S390_CPU(cs);
>> uint64_t addr = env->regs[r1];
>> uint64_t subcode = env->regs[r3];
>> IplParameterBlock *iplb;
>> @@ -124,13 +125,22 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1,
>> uint64_t r3, uintptr_t ra)
>> return;
>> }
>> iplb = g_new0(IplParameterBlock, 1);
>> - cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
>> + if (!s390_is_pv()) {
>> + cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
>> + } else {
>> + s390_cpu_pv_mem_read(cpu, 0, iplb, sizeof(iplb->len));
>> + }
>> +
>> if (!iplb_valid_len(iplb)) {
>> env->regs[r1 + 1] = DIAG_308_RC_INVALID;
>> goto out;
>> }
>>
>> - cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
>> + if (!s390_is_pv()) {
>> + cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
>> + } else {
>> + s390_cpu_pv_mem_read(cpu, 0, iplb, be32_to_cpu(iplb->len));
>> + }
>>
>> if (!iplb_valid(iplb)) {
>> env->regs[r1 + 1] = DIAG_308_RC_INVALID;
>> @@ -152,12 +162,17 @@ out:
>> } else {
>> iplb = s390_ipl_get_iplb();
>> }
>> - if (iplb) {
>> - cpu_physical_memory_write(addr, iplb, be32_to_cpu(iplb->len));
>> - env->regs[r1 + 1] = DIAG_308_RC_OK;
>> - } else {
>> + if (!iplb) {
>> env->regs[r1 + 1] = DIAG_308_RC_NO_CONF;
>> + return;
>> }
>> +
>> + if (!s390_is_pv()) {
>> + cpu_physical_memory_write(addr, iplb, be32_to_cpu(iplb->len));
>> + } else {
>> + s390_cpu_pv_mem_write(cpu, 0, iplb, be32_to_cpu(iplb->len));
>> + }
>> + env->regs[r1 + 1] = DIAG_308_RC_OK;
>> return;
>> case DIAG308_PV_START:
>> iplb = s390_ipl_get_iplb_pv();
>>
signature.asc
Description: OpenPGP digital signature
Re: [PATCH v9 11/15] s390x: protvirt: Disable address checks for PV guest IO emulation, Claudio Imbrenda, 2020/03/13
Re: [PATCH v9 11/15] s390x: protvirt: Disable address checks for PV guest IO emulation, Cornelia Huck, 2020/03/17