Commit 64bc98f4 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

s390x/cpumodel: take care of the cpuid format bit for KVM 



Let's also properly forward that bit. It should always be set. I
verified it under z/VM, it seems to be always set there. For now,
zKVM guests never get that bit set when the CPU model is active.

The PoP mentiones, that z800 + z900 (HW generation 7) always set this
bit to 0, so let's take care of that.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170531193434.6918-2-david@redhat.com>
Acked-by: default avatarJason J. Herne <jjherne@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent c68f4503

target/s390x/cpu_models.c

+1 −0
Original line number Diff line number Diff line
@@ -740,6 +740,7 @@ void s390_realize_cpu_model(CPUState *cs, Error **errp) 
    /* copy over properties that can vary */

    cpu->model->lowest_ibc = max_model->lowest_ibc;

    cpu->model->cpu_id = max_model->cpu_id;

    cpu->model->cpu_id_format = max_model->cpu_id_format;

    cpu->model->cpu_ver = max_model->cpu_ver;



    check_consistency(cpu->model);

target/s390x/cpu_models.h

+7 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ typedef struct S390CPUModel { 
    /* values copied from the "host" model, can change during migration */

    uint16_t lowest_ibc;    /* lowest IBC that the hardware supports */

    uint32_t cpu_id;        /* CPU id */

    uint8_t cpu_id_format;  /* CPU id format bit */

    uint8_t cpu_ver;        /* CPU version, usually "ff" for kvm */

} S390CPUModel;
@@ -54,12 +55,14 @@ typedef struct S390CPUModel { 
 *

 * bits 0-7: Zeroes (ff for kvm)

 * bits 8-31: CPU ID (serial number)

 * bits 32-48: Machine type

 * bits 48-63: Zeroes

 * bits 32-47: Machine type

 * bit  48: CPU ID format

 * bits 49-63: Zeroes

 */

#define cpuid_type(x)     (((x) >> 16) & 0xffff)

#define cpuid_id(x)       (((x) >> 32) & 0xffffff)

#define cpuid_ver(x)      (((x) >> 56) & 0xff)

#define cpuid_format(x)   (((x) >> 15) & 0x1)



#define lowest_ibc(x)     (((uint32_t)(x) >> 16) & 0xfff)

#define unblocked_ibc(x)  ((uint32_t)(x) & 0xfff)
@@ -92,7 +95,8 @@ static inline uint64_t s390_cpuid_from_cpu_model(const S390CPUModel *model) 
{

    return ((uint64_t)model->cpu_ver << 56) |

           ((uint64_t)model->cpu_id << 32) |

           ((uint64_t)model->def->type << 16);

           ((uint64_t)model->def->type << 16) |

           (model->def->gen == 7 ? 0 : (uint64_t)model->cpu_id_format << 15);

}

S390CPUDef const *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga,

                                    S390FeatBitmap features);

target/s390x/kvm.c

+1 −0
Original line number Diff line number Diff line
@@ -2580,6 +2580,7 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) 
        unblocked_ibc = unblocked_ibc(prop.ibc);

    }

    model->cpu_id = cpuid_id(prop.cpuid);

    model->cpu_id_format = cpuid_format(prop.cpuid);

    model->cpu_ver = 0xff;



    /* get supported cpu features indicated via STFL(E) */