From nobody Fri Dec 19 15:49:17 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 152E1221289 for ; Mon, 19 May 2025 23:28:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747697303; cv=none; b=ibut6u4Z7+csYfoCM/TV6X20kTwlKAoV/cOv+mc7ZEXqxR8dbgM4baZHNkFb3WUfA50aaBxCDPihcHge7d4DOF93QzeSjHKRg7u4tKnJBp8C3mS64mNBHW/rMlV+hRcCF1AThQ2/D4T4Fz9YPCsmsMTWBt8rsNseBuN/mH6Jc60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747697303; c=relaxed/simple; bh=TZGr2td1h33ko9T6IYN3lnbl4ki862/9brDQeg1ijGk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=N/64plZvu9RuKUuSL+eORaQdOemB4UMG4mZw262dYSjonURI9yrj/P25GdazHfxUvwt/7KERk26+ce9ADtA0f9L1kTx6Ou0/xVB02ybCr3gY5bt0QwMX95ChOulsJKCH4fQubgOVvsL9S6+xirFtvhkOd/TKUrtAnavWvFibMdY= 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=ys2gxZKo; arc=none smtp.client-ip=209.85.215.202 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="ys2gxZKo" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b0e5f28841dso3415073a12.2 for ; Mon, 19 May 2025 16:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747697301; x=1748302101; 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=EcRbALdwTeGNvoC4govCYju6evjp/u15dHDXwG2KWSs=; b=ys2gxZKowIPfHh64xpMd0Y3c9QvzTQCgY0CQCfX5z9QSu5L11V0aY60T5dqnx2ZDmL c3ZYYpnanQ6KmAiDdpgZBiw3OMNCvAQWsWCIHVp3WS+phjxUz6VJkA6LmByLcY1NZq3R 5/uh4KosuEGEnNyieSkoJpX8sHy400v1v7uGGUu+Z7vlBpgBew683oDV086C81pYUwl2 MngmvTy3BclJmkypwU5DDbGy6EvCFuf9y7sDeyqOu+9zqTKsvunm7OvTgqA1UFqXfOK3 H3VP1QWiMI4F/qfy4nPChkymmKYri6eSRWcVQ1QXr5LnY1zjAIkE6/YN1EzaCzVQJ/dC I//g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747697301; x=1748302101; 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=EcRbALdwTeGNvoC4govCYju6evjp/u15dHDXwG2KWSs=; b=tngg0dnOKckMWvKRU57D4Fb1GF6+f1C4m9volZ05plCCdQzHhTwrXmByRWaIU1gmru Y6CfWWRhbwbAP7QFPYr171dTJhDJnT4EsEgC2o//E5Rq95LYEja1JdM/Y7w1WSiv9e6N DFhanxN6/icf94knbXISudJF6tP0ACaPZ+DyYu8JooLkCGC2aopX5iFzFXS/Qq2OHPOI yNfkQ6GOu34gp4W5y5RuQ56/keikipTSvNRBx4DN2XU818SjCHn++sSqIH1q1Bydye3F KiWuEGN4qo3ew0Gny13Xu69dgp0VVfBEER9CYHKuTq6zHZkrT1kg/LDUNT2IczWPA8Cy XYyA== X-Forwarded-Encrypted: i=1; AJvYcCURY55a7Oasg4frFzPYujocnkXlSI2g6MEJuFw8/emIpj20dQCJe32SWt7NZtpaINrLW5369nRxD4KdnfY=@vger.kernel.org X-Gm-Message-State: AOJu0YwWUyztneNn5dfDEnStVKa7VFUSwAK2bRlRTYlyFX5bm2XrjNmH qeQ/pVoshF9UoOugd/NX4tyDjZGkR3H/QJRyBm0AWvwLkipi7TgJFVjITMY+IMsu4qjA8AgmScn Q1BCodw== X-Google-Smtp-Source: AGHT+IF7+4b7yGtntkh4zoI53SgqpcYBnPjTzm88X0tIel2RclzHU5WAM3rg5ojEKoeoo+USix/wmVCrCBc= X-Received: from pjboi16.prod.google.com ([2002:a17:90b:3a10:b0:2fe:7f7a:74b2]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3d25:b0:1f5:8072:d7f3 with SMTP id adf61e73a8af0-216219f04f0mr23522411637.30.1747697301306; Mon, 19 May 2025 16:28:21 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 19 May 2025 16:27:57 -0700 In-Reply-To: <20250519232808.2745331-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: <20250519232808.2745331-1-seanjc@google.com> X-Mailer: git-send-email 2.49.0.1101.gccaa498523-goog Message-ID: <20250519232808.2745331-5-seanjc@google.com> Subject: [PATCH 04/15] 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 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. No functional change intended. Signed-off-by: Sean Christopherson Reviewed-by: Vitaly Kuznetsov --- arch/x86/kvm/hyperv.c | 10 +++++++--- arch/x86/kvm/hyperv.h | 3 ++- arch/x86/kvm/irq_comm.c | 12 ------------ 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index 24f0318c50d7..7f565636edde 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_set_sint(struct kvm_kernel_irq_routing_entry *e, struct kvm *kv= m, + 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..4ad5a0749739 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_set_sint(struct kvm_kernel_irq_routing_entry *e, struct kvm *kv= m, + 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..b85e4be2ddff 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) --=20 2.49.0.1101.gccaa498523-goog