From nobody Fri Oct 3 20:25:49 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 4EC1A248F4A for ; Wed, 11 Jun 2025 21:36:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749677769; cv=none; b=R8feY3mfSxaYZoeYZIGvd0WmQ7Dg85tNDpgXaS7cW/c5Ai11hYebV86lI+niAOboxT8CdO8dFOzSuxdMSkSo+26aFso10HYF0jkN09ATQn4H1cMmcDOj1ALvNmpWn+icELa9/H5VE0/quqx8CLOdU9mStbMJSNNA8JJfd1YUD+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749677769; c=relaxed/simple; bh=2vrLJKj19OX456GsG99Naj+YqCT8eAfkbz2WrX4rr1w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IgQZfB8ucPxL0LV3Gvnu1rZT/u2U++SEnN2I5d/iJ4e7lTPWXP54qJ7oihwRQMxkQPryRNqTyTmVXbSJ7S/RdLpL8bEf7BEPUguxy97XaWyKvyP8ILF8C6wWXLKnuBIytg+XKXDQLXlypUT+p6lRf8nf4/74x1Ngm9G4h7yIIFY= 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=v5c1bG6x; arc=none smtp.client-ip=209.85.215.201 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="v5c1bG6x" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b2f5a5da5efso58210a12.2 for ; Wed, 11 Jun 2025 14:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749677766; x=1750282566; 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=uHI3xCbsYOP2KWw/2eMjfu9hFT7kUbJEy5buHfIZCTM=; b=v5c1bG6xrpbvnB6xSwz7/gZPOT67S/kThMBrz21kCI/m3N8eZVU9nFlwixhqULe721 4/KscdBGBy+H9087podLKaD7oIIh4qnLOES5Nfnqpmhxy6Mylm0EVdODG9BvMbZc+ewr /QHkyAh8L5qMyU5IMRY3+/wL7KjfXioOuhbqAAzOuQ44l0S7yvFXGjcbNhz0hBKsfZYI QCmVPmGynqR0CvncDynbx9p5cM/hDoNnpnPK8vrQr0dy4hsOqp+gRVtq+99b2GXmbQed lHwBBb4nVkbiqe6J9l7zxxJ/9xd0sMnwbmgIajtLIDjJ2AAwvbhSaX0ioQXcPDKj+Zuc 4MJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749677766; x=1750282566; 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=uHI3xCbsYOP2KWw/2eMjfu9hFT7kUbJEy5buHfIZCTM=; b=tNaEZ9ni6Wcg6rDjW7a5jWeB4OfmWAqffDip3hbPMRYNIvYsi5dS4BuyQnWmOoRWWB ZxECDuyYsIoYu3QVzHr9OZGiPUKJvcWRcjJHog2MLrp7ANzM+Ip3DwS0kTUgQgNgYwQV nL1RHubMVZZQYXY+Dq2qGdnVPRsaPa75FQRdY/W1gGxYMB3TuHxLuy5kMTCAWNI28jQ4 Rqc4y+pCS4gB7p34x7mJWw/WM6TuHwfVu+N+clvBo+b6QYUMr1c3+1Clcn6pA9OGypj2 n648quVsv86f662oM0fO6Lmca/Rr/E3Nsovz5qdj9fDB2Mpzmhds9Ui5KN8cEVh1PvsR WeXg== X-Forwarded-Encrypted: i=1; AJvYcCXh0CWI6/3QZEb1DOkm4CMu0ZI/C7M3WEYcqAlvyCavFafk8UoVUMQ6M87AEvJb2EF7SgjVF+LxUyVM9Q8=@vger.kernel.org X-Gm-Message-State: AOJu0YyXOB52sQnejB/hqu0ty854v2VLwtBbJ/EkUqapNG4FL9E8nTZu fW+xl647TekpkpQ0Ey27fpla70C/v2dm28BbWvJKnSLluil5YVOsg4a6lqY3cn7rYbRGFN+HgFr vlXQKYA== X-Google-Smtp-Source: AGHT+IGhUDDedez1Ad1IXxuj+ld9CEuEoa6u2kh/UYMFajcgbRUQg7tQQlHdw5YhnDOJpsmI7+uKkGAssNU= X-Received: from pgar4.prod.google.com ([2002:a05:6a02:2e84:b0:b2c:4ef2:ca0e]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:7345:b0:21a:de8e:44b4 with SMTP id adf61e73a8af0-21f9b9f8536mr424572637.16.1749677766665; Wed, 11 Jun 2025 14:36:06 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 11 Jun 2025 14:35:43 -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-5-seanjc@google.com> Subject: [PATCH v2 04/18] KVM: x86: Drop superfluous kvm_hv_set_sint() => kvm_hv_synic_set_irq() wrapper 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" Drop the superfluous kvm_hv_set_sint() and instead wire up ->set() directly to its final destination, kvm_hv_synic_set_irq(). Keep hv_synic_set_irq() instead of kvm_hv_set_sint() to provide some amount of consistency in the ->set() helpers, e.g. to match kvm_pic_set_irq() and kvm_ioapic_set_irq(). kvm_set_msi() is arguably the oddball, e.g. kvm_set_msi_irq() should be something like kvm_msi_to_lapic_irq() so that kvm_set_msi() can instead be kvm_set_msi_irq(), but that's a future problem to solve. No functional change intended. Cc: Vitaly Kuznetsov Cc: Kai Huang Signed-off-by: Sean Christopherson Acked-by: Kai Huang Reviewed-by: Vitaly Kuznetsov --- arch/x86/kvm/hyperv.c | 10 +++++++--- arch/x86/kvm/hyperv.h | 3 ++- arch/x86/kvm/irq_comm.c | 18 +++--------------- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index 24f0318c50d7..f316e11383aa 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -497,15 +497,19 @@ static int synic_set_irq(struct kvm_vcpu_hv_synic *sy= nic, u32 sint) return ret; } =20 -int kvm_hv_synic_set_irq(struct kvm *kvm, u32 vpidx, u32 sint) +int kvm_hv_synic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kv= m *kvm, + int irq_source_id, int level, bool line_status) { struct kvm_vcpu_hv_synic *synic; =20 - synic =3D synic_get(kvm, vpidx); + if (!level) + return -1; + + synic =3D synic_get(kvm, e->hv_sint.vcpu); if (!synic) return -EINVAL; =20 - return synic_set_irq(synic, sint); + return synic_set_irq(synic, e->hv_sint.sint); } =20 void kvm_hv_synic_send_eoi(struct kvm_vcpu *vcpu, int vector) diff --git a/arch/x86/kvm/hyperv.h b/arch/x86/kvm/hyperv.h index 913bfc96959c..6ce160ffa678 100644 --- a/arch/x86/kvm/hyperv.h +++ b/arch/x86/kvm/hyperv.h @@ -103,7 +103,8 @@ static inline bool kvm_hv_hypercall_enabled(struct kvm_= vcpu *vcpu) int kvm_hv_hypercall(struct kvm_vcpu *vcpu); =20 void kvm_hv_irq_routing_update(struct kvm *kvm); -int kvm_hv_synic_set_irq(struct kvm *kvm, u32 vcpu_id, u32 sint); +int kvm_hv_synic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kv= m *kvm, + int irq_source_id, int level, bool line_status); void kvm_hv_synic_send_eoi(struct kvm_vcpu *vcpu, int vector); int kvm_hv_activate_synic(struct kvm_vcpu *vcpu, bool dont_zero_synic_page= s); =20 diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c index 8dcb6a555902..28a8555ab58b 100644 --- a/arch/x86/kvm/irq_comm.c +++ b/arch/x86/kvm/irq_comm.c @@ -127,18 +127,6 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, return kvm_irq_delivery_to_apic(kvm, NULL, &irq, NULL); } =20 -#ifdef CONFIG_KVM_HYPERV -static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e, - struct kvm *kvm, int irq_source_id, int level, - bool line_status) -{ - if (!level) - return -1; - - return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint); -} -#endif - int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, int irq_source_id, int level, bool line_status) @@ -149,8 +137,8 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_rou= ting_entry *e, switch (e->type) { #ifdef CONFIG_KVM_HYPERV case KVM_IRQ_ROUTING_HV_SINT: - return kvm_hv_set_sint(e, kvm, irq_source_id, level, - line_status); + return kvm_hv_synic_set_irq(e, kvm, irq_source_id, level, + line_status); #endif =20 case KVM_IRQ_ROUTING_MSI: @@ -302,7 +290,7 @@ int kvm_set_routing_entry(struct kvm *kvm, break; #ifdef CONFIG_KVM_HYPERV case KVM_IRQ_ROUTING_HV_SINT: - e->set =3D kvm_hv_set_sint; + e->set =3D kvm_hv_synic_set_irq; e->hv_sint.vcpu =3D ue->u.hv_sint.vcpu; e->hv_sint.sint =3D ue->u.hv_sint.sint; break; --=20 2.50.0.rc1.591.g9c95f17f64-goog