Hi!
Thanks for review, much appreciated!
Alexander Graf <agraf@xxxxxxx> writes:
> On 08.07.14 07:06, Stewart Smith wrote:
>> @@ -1528,6 +1535,7 @@ static void kvmppc_run_core(struct kvmppc_vcore *vc)
>> int i, need_vpa_update;
>> int srcu_idx;
>> struct kvm_vcpu *vcpus_to_update[threads_per_core];
>> + phys_addr_t phy_addr, tmp;
>
> Please put the variable declarations into the if () branch so that the
> compiler can catch potential leaks :)
ack. will fix.
>> @@ -1590,9 +1598,48 @@ static void kvmppc_run_core(struct kvmppc_vcore *vc)
>>
>> srcu_idx = srcu_read_lock(&vc->kvm->srcu);
>>
>> + /* If we have a saved list of L2/L3, restore it */
>> + if (cpu_has_feature(CPU_FTR_ARCH_207S) && vc->mpp_buffer) {
>> + phy_addr = virt_to_phys((void *)vc->mpp_buffer);
>> +#if defined(CONFIG_PPC_4K_PAGES)
>> + phy_addr = (phy_addr + 8*4096) & ~(8*4096);
>
> get_free_pages() is automatically aligned to the order, no?
That's what Paul reckoned too, and then we've attempted to find anywhere
that documents that behaviour. Happen to be able to point to docs/source
that say this is part of API?
>> +#endif
>> + tmp = phy_addr & PPC_MPPE_ADDRESS_MASK;
>> + tmp = tmp | PPC_MPPE_WHOLE_TABLE;
>> +
>> + /* For sanity, abort any 'save' requests in progress */
>> + asm volatile(PPC_LOGMPP(R1) : : "r" (tmp));
>> +
>> + /* Inititate a cache-load request */
>> + mtspr(SPRN_MPPR, tmp);
>> + }
>
> In fact, this whole block up here could be a function, no?
It could, perfectly happy for it to be one. Will fix.
>> +
>> + /* Allocate memory before switching out of guest so we don't
>> + trash L2/L3 with memory allocation stuff */
>> + if (cpu_has_feature(CPU_FTR_ARCH_207S) && !vc->mpp_buffer) {
>> + vc->mpp_buffer = __get_free_pages(GFP_KERNEL|__GFP_ZERO,
>> + MPP_BUFFER_ORDER);
>
> get_order(64 * 1024)?
>
> Also, why allocate it here and not on vcore creation?
There's also the possibility of saving/restorting part of the L3 cache
as well, and I was envisioning a future patch to this which checks a
flag in vcore (maybe exposed via sysfs or whatever mechanism is
applicable) if it should save/restore L2 or L2/L3, so thus it makes a
bit more sense allocating it there rather than elsewhere.
There's also no real reason to fail to create a vcore if we can't
allocate a buffer for L2/L3 cache contents - retrying later is perfectly
harmless.
>> +
>> + if (cpu_has_feature(CPU_FTR_ARCH_207S) && vc->mpp_buffer) {
>> + phy_addr = (phys_addr_t)virt_to_phys((void *)vc->mpp_buffer);
>> +#if defined(CONFIG_PPC_4K_PAGES)
>> + phy_addr = (phy_addr + 8*4096) & ~(8*4096);
>> +#endif
>> + tmp = PPC_MPPE_ADDRESS_MASK & phy_addr;
>> + tmp = tmp | PPC_MPPE_LOG_L2;
>> +
>> + /* Abort any existing 'fetch' operations for this core */
>> + mtspr(SPRN_MPPR, tmp&0x0fffffffffffffff);
>
> pretty magical, no?
Yeah, sorry about that.... I'll hide it in a function at least, and do
something a bit better there... IIRC this magic came from the initial
work that proved the hardware functionality, so I'll go back and re-read
some hardware documentation to see where exactly this came from...
>> +
>> + /* Finally, issue logmpp to save cache contents for L2 */
>> + asm volatile(PPC_LOGMPP(R1) : : "r" (tmp));
>> + }
>
> This too should be a separate function.
ack.
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
