mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/virt: extract mp-affinity calculation in separate function

Browse Source 
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <1493816238-33120-3-git-send-email-imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-05-03 14:56:56 +02:00 committed by Eduardo Habkost
parent 63baf8bf01
commit 46de5913b6
3 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hw/arm/virt.c
View File

@ -1194,6 +1194,29 @@ void virt_machine_done(Notifier *notifier, void *data)
virt_build_smbios(vms); virt_build_smbios(vms);
} }
static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx)
{
uint8_t clustersz = ARM_DEFAULT_CPUS_PER_CLUSTER;
VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
if (!vmc->disallow_affinity_adjustment) {
/* Adjust MPIDR like 64-bit KVM hosts, which incorporate the
* GIC's target-list limitations. 32-bit KVM hosts currently
* always create clusters of 4 CPUs, but that is expected to
* change when they gain support for gicv3. When KVM is enabled
* it will override the changes we make here, therefore our
* purposes are to make TCG consistent (with 64-bit KVM hosts)
* and to improve SGI efficiency.
*/
if (vms->gic_version == 3) {
clustersz = GICV3_TARGETLIST_BITS;
} else {
clustersz = GIC_TARGETLIST_BITS;
}
}
return arm_cpu_mp_affinity(idx, clustersz);
}
static void machvirt_init(MachineState *machine) static void machvirt_init(MachineState *machine)
{ {
VirtMachineState *vms = VIRT_MACHINE(machine); VirtMachineState *vms = VIRT_MACHINE(machine);
@ -1210,7 +1233,6 @@ static void machvirt_init(MachineState *machine)
CPUClass *cc; CPUClass *cc;
Error *err = NULL; Error *err = NULL;
bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0); bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);
uint8_t clustersz;
if (!cpu_model) { if (!cpu_model) {
cpu_model = "cortex-a15"; cpu_model = "cortex-a15";
@ -1263,10 +1285,8 @@ static void machvirt_init(MachineState *machine)
*/ */
if (vms->gic_version == 3) { if (vms->gic_version == 3) {
virt_max_cpus = vms->memmap[VIRT_GIC_REDIST].size / 0x20000; virt_max_cpus = vms->memmap[VIRT_GIC_REDIST].size / 0x20000;
clustersz = GICV3_TARGETLIST_BITS;
} else { } else {
virt_max_cpus = GIC_NCPU; virt_max_cpus = GIC_NCPU;
clustersz = GIC_TARGETLIST_BITS;
} }
if (max_cpus > virt_max_cpus) { if (max_cpus > virt_max_cpus) {
@ -1326,20 +1346,9 @@ static void machvirt_init(MachineState *machine)
for (n = 0; n < smp_cpus; n++) { for (n = 0; n < smp_cpus; n++) {
Object *cpuobj = object_new(typename); Object *cpuobj = object_new(typename);
if (!vmc->disallow_affinity_adjustment) {
/* Adjust MPIDR like 64-bit KVM hosts, which incorporate the object_property_set_int(cpuobj, virt_cpu_mp_affinity(vms, n),
* GIC's target-list limitations. 32-bit KVM hosts currently "mp-affinity", NULL);
* always create clusters of 4 CPUs, but that is expected to
* change when they gain support for gicv3. When KVM is enabled
* it will override the changes we make here, therefore our
* purposes are to make TCG consistent (with 64-bit KVM hosts)
* and to improve SGI efficiency.
*/
uint8_t aff1 = n / clustersz;
uint8_t aff0 = n % clustersz;
object_property_set_int(cpuobj, (aff1 << ARM_AFF1_SHIFT) | aff0,
"mp-affinity", NULL);
}
if (!vms->secure) { if (!vms->secure) {
object_property_set_bool(cpuobj, false, "has_el3", NULL); object_property_set_bool(cpuobj, false, "has_el3", NULL);

12
target/arm/cpu.c
View File

@ -458,6 +458,13 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info)
} }
} }
uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz)
{
uint32_t Aff1 = idx / clustersz;
uint32_t Aff0 = idx % clustersz;
return (Aff1 << ARM_AFF1_SHIFT) | Aff0;
}
static void arm_cpu_initfn(Object *obj) static void arm_cpu_initfn(Object *obj)
{ {
CPUState *cs = CPU(obj); CPUState *cs = CPU(obj);
@ -709,9 +716,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
* so these bits always RAZ. * so these bits always RAZ.
*/ */
if (cpu->mp_affinity == ARM64_AFFINITY_INVALID) { if (cpu->mp_affinity == ARM64_AFFINITY_INVALID) {
uint32_t Aff1 = cs->cpu_index / ARM_DEFAULT_CPUS_PER_CLUSTER; cpu->mp_affinity = arm_cpu_mp_affinity(cs->cpu_index,
uint32_t Aff0 = cs->cpu_index % ARM_DEFAULT_CPUS_PER_CLUSTER; ARM_DEFAULT_CPUS_PER_CLUSTER);
cpu->mp_affinity = (Aff1 << ARM_AFF1_SHIFT) | Aff0;
} }
if (cpu->reset_hivecs) { if (cpu->reset_hivecs) {

2
target/arm/cpu.h
View File

@ -710,6 +710,8 @@ static inline ARMCPU *arm_env_get_cpu(CPUARMState *env)
return container_of(env, ARMCPU, env); return container_of(env, ARMCPU, env);
} }
uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz);
#define ENV_GET_CPU(e) CPU(arm_env_get_cpu(e)) #define ENV_GET_CPU(e) CPU(arm_env_get_cpu(e))
#define ENV_OFFSET offsetof(ARMCPU, env) #define ENV_OFFSET offsetof(ARMCPU, env)