Received-SPF: pass (google.com: domain of linux-kernel+bounces-40475-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <ZbGkZlFmi1war6vq@google.com> <20240125050823.4893-1-moehanabichan@gmail.com>
In-Reply-To: <20240125050823.4893-1-moehanabichan@gmail.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 26 Jan 2024 19:12:24 +0100
Message-ID: <CABgObfbjzmv3WiVUMpxLHHYYf+EyvGxRvaMR0_-PkiKGOmSsxg@mail.gmail.com>
Subject: Re: [PATCH v2] KVM: x86: Check irqchip mode before create PIT
To: Tengfei Yu <moehanabichan@gmail.com>
Cc: Sean Christopherson <seanjc@google.com>, Thomas Gleixner <tglx@linutronix.de>, 
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, 
	Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org, 
	"H. Peter Anvin" <hpa@zytor.com>, kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, Jan 25, 2024 at 6:09=E2=80=AFAM Tengfei Yu <moehanabichan@gmail.com=
> wrote:
>
> As the kvm api(https://docs.kernel.org/virt/kvm/api.html) reads,
> KVM_CREATE_PIT2 call is only valid after enabling in-kernel irqchip
> support via KVM_CREATE_IRQCHIP.
>
> Without this check, I can create PIT first and enable irqchip-split
> then, which may cause the PIT invalid because of lacking of in-kernel
> PIC to inject the interrupt.
>
> Signed-off-by: Tengfei Yu <moehanabichan@gmail.com>

Queued, thanks.

Paolo

> ---
> v1 -> v2: Change errno from -EEXIST to -ENOENT.
> v1 link: https://lore.kernel.org/lkml/ZbGkZlFmi1war6vq@google.com/
>
>  arch/x86/kvm/x86.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 27e23714e960..c1e3aecd627f 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -7016,6 +7016,9 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned i=
nt ioctl, unsigned long arg)
>                 r =3D -EEXIST;
>                 if (kvm->arch.vpit)
>                         goto create_pit_unlock;
> +               r =3D -ENOENT;
> +               if (!pic_in_kernel(kvm))
> +                       goto create_pit_unlock;
>                 r =3D -ENOMEM;
>                 kvm->arch.vpit =3D kvm_create_pit(kvm, u.pit_config.flags=
);
>                 if (kvm->arch.vpit)
> --
> 2.39.3
>