Re: [PATCH 3/3] KVM: s390: Use generic VIRT_XFER_TO_GUEST_WORK functions

[Heiko Carstens <hca@linux.ibm.com>]

On Tue, Nov 25, 2025 at 06:45:54PM +1100, Andrew Donnellan wrote:
> Switch to using the generic infrastructure to check for and handle pending
> work before transitioning into guest mode.
> 
> xfer_to_guest_mode_handle_work() does a few more things than the current
> code does when deciding whether or not to exit the __vcpu_run() loop. The
> exittime tests from kvm-unit-tests, in my tests, were +/-3% compared to
> before this series, which is within noise tolerance.

...

>  		local_irq_disable();
> +
> +		xfer_to_guest_mode_prepare();
> +		if (xfer_to_guest_mode_work_pending()) {
> +			local_irq_enable();
> +			rc = kvm_xfer_to_guest_mode_handle_work(vcpu);
> +			if (rc)
> +				break;
> +			local_irq_disable();
> +		}
> +
>  		guest_timing_enter_irqoff();
>  		__disable_cpu_timer_accounting(vcpu);

This looks racy: kvm_xfer_to_guest_mode_handle_work() returns with
interrupts enabled and before interrupts are disabled again more work
might have been become pending. But that is ignored and guest state is
entered instead. Why not change the above simply to something like
this to avoid this:

again:
	local_irq_disable();
		xfer_to_guest_mode_prepare();
		if (xfer_to_guest_mode_work_pending()) {
			local_irq_enable();
			rc = kvm_xfer_to_guest_mode_handle_work(vcpu);
			if (rc)
				break;
			goto again;
		}

		guest_timing_enter_irqoff();
		__disable_cpu_timer_accounting(vcpu);

But maybe I'm missing something?

> @@ -1181,11 +1181,21 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
>  	barrier();
>  	if (!kvm_s390_vcpu_sie_inhibited(vcpu)) {
>  		local_irq_disable();
> +		xfer_to_guest_mode_prepare();
> +		if (xfer_to_guest_mode_work_pending()) {
> +			local_irq_enable();
> +			rc = kvm_xfer_to_guest_mode_handle_work(vcpu);
> +			if (rc)
> +				goto skip_sie;
> +			local_irq_disable();
> +		}
>  		guest_timing_enter_irqoff();
>  		rc = kvm_s390_enter_exit_sie(scb_s, vcpu->run->s.regs.gprs, vsie_page->gmap->asce);

Same here.