From nobody Fri Oct 3 20:25:48 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1272D250BEC for ; Wed, 11 Jun 2025 21:36:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749677776; cv=none; b=riGsf5G2nVKg2ju4QZzeUkuxSgtxGSWZe6K6ve0e9J9oMFlXDJHLefutjAt/YQ3JrTQfP2smVrEsWqibMYsZwXZxOHn14nXS7v4nu52pdb/4BisgZCgyERJg9nUGKD1ZUigdUJTOy/p1BzQoFGb+jHELgDgteQR5b/dQOq6lmNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749677776; c=relaxed/simple; bh=XorePl0mxfOcrJfGTzaPFq1U7BBsUL2+aNak2wohPm4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=kofHUeTyDTpJgZ4pjIEEtWbnHc7OzPwJpc1chXJflsfX6u1SFRHDPp4xHGrOaE/jnS3epzDyHK4e9p3sKcJf4yjjuVol3JWVxd+KMS5XvPkF6YWZ2md92ZFzwoQGwWjRuPLzlmz1mEnOha1XIKWSjuTaTsqKNhf2WdsFwFOmPJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=xrjHjBhB; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="xrjHjBhB" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3122368d82bso446580a91.0 for ; Wed, 11 Jun 2025 14:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749677773; x=1750282573; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=4gDUIVx78BpW8niDMorhxWJJwZ8FKj7ZSpFaK3gGW20=; b=xrjHjBhB9OuZWoH14W4L+aQYZz4vNCO3yBjwtw1zxDRzptLbLUGBxUwLkm9R4Z5MhW stEUONlsVskkmJGWI+3Osdby+gcUVpx+bf1InMd1MVdYCbSLhnUmcfLuu3OCNR3KyaTD Rc+d07PszsQU++hgLwS4MQ1EjLVVFnpmkmxp4RSv//cyaMJxCNNWe0Rz8cBr6eYrgYl+ +Yy+VajFlfz4dL8o+0+3W41ccuPVo2QcaoxNJGJWcnf4h5OyomgnWOCRMIRo3ajUE9lU cf94C2Kne9p9RypVAZqDUVLzIzKcnx1pqEbPZy8begexOfXOayzVJ82M/OXJ9fMbaIHp arRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749677773; x=1750282573; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4gDUIVx78BpW8niDMorhxWJJwZ8FKj7ZSpFaK3gGW20=; b=USQgveNfxIzpWnowbDPp0GnK5MAJgVrsojm5Rv2MFe4a94i1eCcbTBqt14b1nl1oXw DYJTb2+X42OYEKBibaBUjwd4CbNFUR3+bO2n6b8axhmdVaAH1inmA5rZwzIHFWTVYj9I r0/hUPS1hU5+nYoDyZL75ZdHtvJ/NQj/P77WWtWOrE67Li9e8jk0MeOCndUzwO0QudEr 8Gc4ni0pQJ3AbSbi2UseYKSAK4vCAtY+CCORYCu7dMb1i5IAHTDqbwArG6C3mco8LHHc bYama5zz9MNHbAcPNyJqBO4lHPUo5Cmx624yhfIW47xYJ01BtcUBtdG/VyIooLIEm3to 9aBA== X-Forwarded-Encrypted: i=1; AJvYcCUnAubhISbT9s5gvuXCKiP33dk5zFdYyTs+uSHluIAg+/yr1XB0jz7J7LAHr1ZBuCx3DKSsL4e8XnLzjI0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3zhZQnyMW/4C7pQil843Gbb2T3un/NEXDtZtNr3KJAVoVF7te I52LBrrk3bm02Xv2HE+UZ1FmZrMgsGhmAo6R1yT+rb6R3uMB09P1JnLQ58QDd3/Z/YZAU5IYnCP /9+3c0Q== X-Google-Smtp-Source: AGHT+IFxUADQqWbYA8KE1mFSsyzUwkZdB7xqcgPI+4qVwr0jLE4fnzqBJqKweobTOL2ru25CHC0FfYWl+BI= X-Received: from pjl7.prod.google.com ([2002:a17:90b:2f87:b0:312:1dae:6bf0]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:520a:b0:312:1d2d:18e2 with SMTP id 98e67ed59e1d1-313bfbf4236mr1385761a91.20.1749677773499; Wed, 11 Jun 2025 14:36:13 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 11 Jun 2025 14:35:46 -0700 In-Reply-To: <20250611213557.294358-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611213557.294358-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc1.591.g9c95f17f64-goog Message-ID: <20250611213557.294358-8-seanjc@google.com> Subject: [PATCH v2 07/18] KVM: x86: Rename irqchip_kernel() to irqchip_full() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Kai Huang Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename irqchip_kernel() to irqchip_full(), as "kernel" is very ambiguous due to the existence of split IRQ chip support, where only some of the "irqchip" is in emulated by the kernel/KVM. E.g. irqchip_kernel() often gets confused with irqchip_in_kernel(). Opportunistically hoist the definition up in irq.h so that it's co-located with other "full" irqchip code in anticipation of wrapping it all with a Kconfig/#ifdef. No functional change intended. Suggested-by: Paolo Bonzini Signed-off-by: Sean Christopherson Acked-by: Kai Huang --- arch/x86/kvm/ioapic.h | 2 +- arch/x86/kvm/irq.c | 2 +- arch/x86/kvm/irq.h | 22 +++++++++++----------- arch/x86/kvm/irq_comm.c | 2 +- arch/x86/kvm/x86.c | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h index a86f59bbea44..289cca3aec69 100644 --- a/arch/x86/kvm/ioapic.h +++ b/arch/x86/kvm/ioapic.h @@ -103,7 +103,7 @@ do { \ =20 static inline int ioapic_in_kernel(struct kvm *kvm) { - return irqchip_kernel(kvm); + return irqchip_full(kvm); } =20 void kvm_rtc_eoi_tracking_restore_one(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index da47e2165389..97e1617ce24d 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c @@ -172,7 +172,7 @@ bool kvm_arch_irqfd_allowed(struct kvm *kvm, struct kvm= _irqfd *args) { bool resample =3D args->flags & KVM_IRQFD_FLAG_RESAMPLE; =20 - return resample ? irqchip_kernel(kvm) : irqchip_in_kernel(kvm); + return resample ? irqchip_full(kvm) : irqchip_in_kernel(kvm); } =20 bool kvm_arch_irqchip_in_kernel(struct kvm *kvm) diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h index aa77a6b2828c..4ac346102350 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h @@ -69,16 +69,7 @@ int kvm_pic_set_irq(struct kvm_kernel_irq_routing_entry = *e, struct kvm *kvm, int kvm_vm_ioctl_get_irqchip(struct kvm *kvm, struct kvm_irqchip *chip); int kvm_vm_ioctl_set_irqchip(struct kvm *kvm, struct kvm_irqchip *chip); =20 -static inline int irqchip_split(struct kvm *kvm) -{ - int mode =3D kvm->arch.irqchip_mode; - - /* Matches smp_wmb() when setting irqchip_mode */ - smp_rmb(); - return mode =3D=3D KVM_IRQCHIP_SPLIT; -} - -static inline int irqchip_kernel(struct kvm *kvm) +static inline int irqchip_full(struct kvm *kvm) { int mode =3D kvm->arch.irqchip_mode; =20 @@ -89,7 +80,16 @@ static inline int irqchip_kernel(struct kvm *kvm) =20 static inline int pic_in_kernel(struct kvm *kvm) { - return irqchip_kernel(kvm); + return irqchip_full(kvm); +} + +static inline int irqchip_split(struct kvm *kvm) +{ + int mode =3D kvm->arch.irqchip_mode; + + /* Matches smp_wmb() when setting irqchip_mode */ + smp_rmb(); + return mode =3D=3D KVM_IRQCHIP_SPLIT; } =20 static inline int irqchip_in_kernel(struct kvm *kvm) diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c index 28a8555ab58b..bcf2f1e4a005 100644 --- a/arch/x86/kvm/irq_comm.c +++ b/arch/x86/kvm/irq_comm.c @@ -200,7 +200,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_so= urce_id) goto unlock; } clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap); - if (!irqchip_kernel(kvm)) + if (!irqchip_full(kvm)) goto unlock; =20 kvm_ioapic_clear_all(kvm->arch.vioapic, irq_source_id); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 311a670b6652..fb7b0d301c38 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7039,7 +7039,7 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int= ioctl, unsigned long arg) } =20 r =3D -ENXIO; - if (!irqchip_kernel(kvm)) + if (!irqchip_full(kvm)) goto get_irqchip_out; r =3D kvm_vm_ioctl_get_irqchip(kvm, chip); if (r) @@ -7063,7 +7063,7 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int= ioctl, unsigned long arg) } =20 r =3D -ENXIO; - if (!irqchip_kernel(kvm)) + if (!irqchip_full(kvm)) goto set_irqchip_out; r =3D kvm_vm_ioctl_set_irqchip(kvm, chip); set_irqchip_out: --=20 2.50.0.rc1.591.g9c95f17f64-goog