From nobody Fri Oct 3 20:25:18 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 1C163284B4E for ; Mon, 25 Aug 2025 20:06:27 +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=1756152389; cv=none; b=hK5tfoYXu1abcsEXcMORRiLi1JxEUtlEspNLOYBd6TCSOx30ozZMfSUC3GkUTuck6VUlGZO3WMqHgu6qUqKD5Gro8ZaWqb8TFeUvSO4ps5LoHCpruWLDFHpv/FheAX4keE+LFo3ZmDOl/6aGBvySewytYwDo7fflhENTlW0RaCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756152389; c=relaxed/simple; bh=aOaAMFU0lRUzQeN1F6iLwL6S3YUHwj3pFv409qQl9yQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CkIs+7ssMhQXf1DtQfO6Yy73WVkHvgByqxnQFIm6qRQqx9JntmNv4iDNqBtFT1zRcvYBHYVbUSu/JMAFsCxfhtjCkPaeMrXvjlMoh3MCzPlVHe5eEdzesizrRqTpKMmCV9+1aABbP4mFhXPsQt3CGp7yzH7sODEm96nfbtRdlbY= 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=paRzXkPY; 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="paRzXkPY" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b47174bdce2so3790455a12.2 for ; Mon, 25 Aug 2025 13:06:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756152387; x=1756757187; 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=n6KAJgpe+g35DHpdkouiNXTkH/lGhIRNqTvdrNu3evo=; b=paRzXkPYY6C9gGx1xtvlFnhsaQhvZWvKcnW7AzKfSVqSynNxgDM8yGutVYQPcSZIqi 6gw1Yuomw9vSmb7Zk1lN+IP7uiFDCG2oZuBv8uUzDxRN8Naf33a6LeWFNevpvUvSu9uc 5rkslGWHL+o6Du9K1s5WKNnO/BHQi/ytiMXjAfGXdOeo4NZh8v0lw49iBPYwVL62Uu8W nxA+HmbVhfO9u9Dv6dpJDBZydZeTuflEsnS/6DkxGRgF1F4CtTxL1V+XGQRGrMsqg9D8 ej2H9xd1wj74wxBJsPNq9uLa1kLwZLjDrDzdZRgpb4A9nf7X88gHm4e0rZ6CNWegY3qz qhMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756152387; x=1756757187; 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=n6KAJgpe+g35DHpdkouiNXTkH/lGhIRNqTvdrNu3evo=; b=NpWO2jWK5hdbyPqP9T0vdIkmMjcyravx5v63Sq4AA6HM1w3kMqY1tnZg3PQKhzvxOl jahiWsEqgSih+2ppLBDUWV6g8E83CdbgWt3AlNmAOsWQAAN9gJtlYSApzX+LTSO1Co+9 d0l2/xfsbKuGaF4xs/98nlPOxqFz2fZ6z/fEEI7jpER+q719DANsOIVGW77hGwjDOq5g O8EsJmx3VcY83IoHVPXL4dNxa4ZS/3nTRTz7sqkh0OegQv9B9yug0igkYgw0ydIT24VR OWEJcDp6LMpxh4CWdd3CVrKKrm+rGnPoK3+Qm9yhgpMyNXJxLNO1Es5N4wnTa+sszfwf d9Bw== X-Gm-Message-State: AOJu0Yz85Etyi10WCtb/c9rvOsxvSL0mUCtshnhaGGmj1/oV4rVVLCDV VRxhFSRdRqrdPLWNmZu3Z7IUTNM/HpcZBqCx5ntYmVMUXb22eU03NqDfqq/hphcoF6DCiezVShM 11ZT0mQ== X-Google-Smtp-Source: AGHT+IF91dn1j6fIvX+uRWorld3If0wpZl5jf5hDJFPUly2WnQsNSAnJfoCi7L3EWOQImM7m2slTmOJmyMA= X-Received: from pjbok14.prod.google.com ([2002:a17:90b:1d4e:b0:325:8fba:708c]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:fc4b:b0:246:76ed:e25d with SMTP id d9443c01a7336-24676edecf2mr117886095ad.50.1756152387296; Mon, 25 Aug 2025 13:06:27 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 25 Aug 2025 13:06:18 -0700 In-Reply-To: <20250825200622.3759571-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: <20250825200622.3759571-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.261.g7ce5a0a67e-goog Message-ID: <20250825200622.3759571-2-seanjc@google.com> Subject: [PATCH 1/5] Drivers: hv: Move TIF pre-guest work handling fully into mshv_common.c From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Peter Zijlstra , Andy Lutomirski , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Uladzislau Rezki Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-hyperv@vger.kernel.org, rcu@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the root partition's handling of pending thread work fully into mshv_common.c so that the "work pending" and "do work" code is co-located. Splitting the flags-to-check logic makes the code unnnecessarily difficult to maintain, e.g. it would be all too easy to add a check in "do work" but not in "work pending", and vice versa. Note, this adds an extra CALL+RET when no work is pending; that will be remedied in the near feature by switching to common virtualization entry APIs. No functional change intended. Signed-off-by: Sean Christopherson --- drivers/hv/mshv.h | 2 +- drivers/hv/mshv_common.c | 24 +++++++++++++++++++++++- drivers/hv/mshv_root_main.c | 24 +----------------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/hv/mshv.h b/drivers/hv/mshv.h index 0340a67acd0a..db3aa3831c43 100644 --- a/drivers/hv/mshv.h +++ b/drivers/hv/mshv.h @@ -25,6 +25,6 @@ int hv_call_set_vp_registers(u32 vp_index, u64 partition_= id, u16 count, int hv_call_get_partition_property(u64 partition_id, u64 property_code, u64 *property_value); =20 -int mshv_do_pre_guest_mode_work(ulong th_flags); +int mshv_do_pre_guest_mode_work(void); =20 #endif /* _MSHV_H */ diff --git a/drivers/hv/mshv_common.c b/drivers/hv/mshv_common.c index 6f227a8a5af7..1acc47c4be0d 100644 --- a/drivers/hv/mshv_common.c +++ b/drivers/hv/mshv_common.c @@ -146,7 +146,7 @@ EXPORT_SYMBOL_GPL(hv_call_get_partition_property); * * Returns: 0 on success, -errno on error. */ -int mshv_do_pre_guest_mode_work(ulong th_flags) +static int __mshv_do_pre_guest_mode_work(ulong th_flags) { if (th_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) return -EINTR; @@ -159,4 +159,26 @@ int mshv_do_pre_guest_mode_work(ulong th_flags) =20 return 0; } + +int mshv_do_pre_guest_mode_work(void) +{ + const ulong work_flags =3D _TIF_NOTIFY_SIGNAL | _TIF_SIGPENDING | + _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME; + ulong th_flags; + + th_flags =3D read_thread_flags(); + while (th_flags & work_flags) { + int ret; + + /* nb: following will call schedule */ + ret =3D __mshv_do_pre_guest_mode_work(th_flags); + if (ret) + return ret; + + th_flags =3D read_thread_flags(); + } + + return 0; + +} EXPORT_SYMBOL_GPL(mshv_do_pre_guest_mode_work); diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c index 72df774e410a..6f677fb93af0 100644 --- a/drivers/hv/mshv_root_main.c +++ b/drivers/hv/mshv_root_main.c @@ -487,28 +487,6 @@ mshv_vp_wait_for_hv_kick(struct mshv_vp *vp) return 0; } =20 -static int mshv_pre_guest_mode_work(struct mshv_vp *vp) -{ - const ulong work_flags =3D _TIF_NOTIFY_SIGNAL | _TIF_SIGPENDING | - _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME; - ulong th_flags; - - th_flags =3D read_thread_flags(); - while (th_flags & work_flags) { - int ret; - - /* nb: following will call schedule */ - ret =3D mshv_do_pre_guest_mode_work(th_flags); - - if (ret) - return ret; - - th_flags =3D read_thread_flags(); - } - - return 0; -} - /* Must be called with interrupts enabled */ static long mshv_run_vp_with_root_scheduler(struct mshv_vp *vp) { @@ -529,7 +507,7 @@ static long mshv_run_vp_with_root_scheduler(struct mshv= _vp *vp) u32 flags =3D 0; struct hv_output_dispatch_vp output; =20 - ret =3D mshv_pre_guest_mode_work(vp); + ret =3D mshv_do_pre_guest_mode_work(); if (ret) break; =20 --=20 2.51.0.261.g7ce5a0a67e-goog From nobody Fri Oct 3 20:25:18 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 D9F68289805 for ; Mon, 25 Aug 2025 20:06:29 +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=1756152391; cv=none; b=pz/3UV+XxcYoZCsq9qetzKIDKvK03QDh4lp04WRvCYnlW4H/th1aWf/YT7SFnIz1LOLx9mfPCinVGt/V6HXbDRWYVAnBdsauL04yNzxafjbZ+7zOYSW6teQGv7KtouLslrxZUqSEp7C1wkzSem1PhOYW1iu28gQCAOlYjDGJnmE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756152391; c=relaxed/simple; bh=CPxGdk0WNt19VUixP2aZz/PEan9gfYpnqsgV+WcH6LI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jwtXc7DT4rVRsBwL0mvLt3T5pWjxfFBw6fP4wkJJfLXYH1qEMbnrd0C2WWQz4DJNYBzjYpZjVCQF24GRzKWRlUdCVpopHxVow6g/UGPCUNzzxUewnrozyi3x6iVdNhAcCQAdsonM10OLZDFBemSQRJM8/d6c89NH0heZZL9jSAk= 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=NWmdMSd3; 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="NWmdMSd3" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b49de40e845so988802a12.1 for ; Mon, 25 Aug 2025 13:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756152389; x=1756757189; 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=+oyHFbNT6msf6glrd5KFIdZcOF0+oR5scj5fBrCtJpc=; b=NWmdMSd3Lh10JlmT2fWKv02KZDQWiuEQKdysC/tiz9kaKQ/k4A39kYJnNa2BNLKkM/ VpttUz9ySpgSnao3Bktbskfo+UjH3o+87N8A/tCWclenpElnhwJ/rxC11zWTM/WC5Kl9 VOV/tc2lcMAeDu6jkkFHcmHv0rMmCDlJWgYNPzcKRCMVn+7ywyg7QLfRgjWtmziNPaC9 dq4rkucXgreYX/IiVgJWe048tjvvkJ88x/lrY5JKODFhuLDnU9iFSEtyruFaSdYb6pmx +SdTY5qfATYC9PJyU/uHK9omJ4W368olV7Ml76H2TxsU1+w/cBza7VntthPaigx740Ya 39Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756152389; x=1756757189; 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=+oyHFbNT6msf6glrd5KFIdZcOF0+oR5scj5fBrCtJpc=; b=JjeJWucjvsjVLufuaQErQH2S1Ufi7KC5LOZ8VX3LwBJ0ZZU5ngmL8qHE3ebAI3G13i G3sUCJW5rRUHuTT9fAa8vKV+Y86RPCHeMO2zKy2e6/Fg+pbBbUdTJMn3yQMki9B/pYVu RJNuO57ZjMvFSACh6LzGN3bHpTaZF7kvMxz071f0OUswwfoHbo1YMn1+1KmdLJh14c3u AtTcW+DcPyAS1coPJRdaGGOcPhtPR21me8Dh/U7hKRaBjH2KnL6E4451vPhOIQLnlQ3m uGvTrAjiY576W0WPUbXJZe8GAc0r99BwslOkdhu6X92Zfg7Rjhp1nzBwEXi2WZanOdLD /ijQ== X-Gm-Message-State: AOJu0YypaT5un7nddjhTXgUuxhmY6tSwWEw1FzL92VoLUGx++0YfO8iw N8QhHNdnMzAPsM/AQgCu8DZPCw0WlhdvpbAgFBwL8L8JyE2jTRDX0vg73wTmdajuw66evHLj2F2 QIEnTPA== X-Google-Smtp-Source: AGHT+IHf2Zj5lnIbPMIr1AZKuHUHSE22v55RmD47MKsgM79RfmKmA7vJz/pJwEChfBNBSyo/bobLCf+GttQ= X-Received: from pjbpq16.prod.google.com ([2002:a17:90b:3d90:b0:325:7fbe:1c64]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:6a0f:b0:243:78a:8289 with SMTP id adf61e73a8af0-24340def606mr21242988637.48.1756152389107; Mon, 25 Aug 2025 13:06:29 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 25 Aug 2025 13:06:19 -0700 In-Reply-To: <20250825200622.3759571-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: <20250825200622.3759571-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.261.g7ce5a0a67e-goog Message-ID: <20250825200622.3759571-3-seanjc@google.com> Subject: [PATCH 2/5] Drivers: hv: Handle NEED_RESCHED_LAZY before transferring to guest From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Peter Zijlstra , Andy Lutomirski , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Uladzislau Rezki Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-hyperv@vger.kernel.org, rcu@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check for NEED_RESCHED_LAZY, not just NEED_RESCHED, prior to transferring control to a guest. Failure to check for lazy resched can unnecessarily delay rescheduling until the next tick when using a lazy preemption model. Fixes: 621191d709b1 ("Drivers: hv: Introduce mshv_root module to expose /de= v/mshv to VMMs") Signed-off-by: Sean Christopherson --- drivers/hv/mshv_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/hv/mshv_common.c b/drivers/hv/mshv_common.c index 1acc47c4be0d..b953b5e21110 100644 --- a/drivers/hv/mshv_common.c +++ b/drivers/hv/mshv_common.c @@ -151,7 +151,7 @@ static int __mshv_do_pre_guest_mode_work(ulong th_flags) if (th_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) return -EINTR; =20 - if (th_flags & _TIF_NEED_RESCHED) + if (th_flags & (_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)) schedule(); =20 if (th_flags & _TIF_NOTIFY_RESUME) @@ -163,7 +163,8 @@ static int __mshv_do_pre_guest_mode_work(ulong th_flags) int mshv_do_pre_guest_mode_work(void) { const ulong work_flags =3D _TIF_NOTIFY_SIGNAL | _TIF_SIGPENDING | - _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME; + _TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY | + _TIF_NOTIFY_RESUME; ulong th_flags; =20 th_flags =3D read_thread_flags(); --=20 2.51.0.261.g7ce5a0a67e-goog From nobody Fri Oct 3 20:25:18 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 AAC8E2F0692 for ; Mon, 25 Aug 2025 20:06:31 +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=1756152394; cv=none; b=eJHMpzBbVIgzdZY/7IG1Hq9Btkrqql2edVCXwLEdRa8QivCAIHHGO7F8z4FDvAph+/BM8lT1+Ozb0bwHeeMvL4GWH4B5RuvDp/92AAiyby3rqCx6nySfOJpOgPF/VNhwYnbO9N50UVc6EbziMSQT0UzPHkPU2l5J1/hOvYMMD6k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756152394; c=relaxed/simple; bh=AqZ16N7USWpldh2rbejgTNbQwTXg4Rackm1lGumECO0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gIMYXpVHuKlt3AgPjetEotgmsHRsJdZewG+OG/Uk4Z8pt036hEQJpwggpF7Cj8NbkYB4wki594q0B8uMIn0VbqJ04pcqvM2MVM8TaYbagomR7fASntqNEESGxuLMTQsA0hp7bYY/qO3k1lfLDDBiPk2k8alsonhBTt+LtmHFazM= 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=IjjvTrPW; 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="IjjvTrPW" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b471757d82fso3681131a12.3 for ; Mon, 25 Aug 2025 13:06:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756152391; x=1756757191; 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=8Yt+mqKBC1lScZpff+gMSGHqLsfTkvQErLtkG0vCOeI=; b=IjjvTrPWJKFUsN0vKgTzYYKlIwrF7yeGJpqqDihdzQtLZXq2NJJ+sAK1NlPHxSIlle Kr9nXTkLcQ/o1UWRWzD3sll+wKF8BMoegHqNZMkeQnpCxpLVGw7W+rkF/gQYtChNCBDS QZm97uzX23OFBECJywjv2yejb2H6Yqfm+mJfj0vUtvNfCAXci06w9LlO809fFJRj3YFv KJ2KVNNReKXNiy5vrYf7RWC1/9UggkAGJ3OlSvADq6pGkJoPf4vVWpvJc7LMIkjkrh5o 0xO61mD8NxvQH+lbzRx1ww5I0Lqa5sQrgv4mYUWU0sKFzPg3i9wbHCJnto16waFVCfVk ZB/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756152391; x=1756757191; 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=8Yt+mqKBC1lScZpff+gMSGHqLsfTkvQErLtkG0vCOeI=; b=k02uc44XZorg/iCRuLo+UiHUL2wRDhepdUVZFREb58mzReVs+JKh+2BbqR3HmeQVTU sD/rMvwTT7rLQfopAwkmr8y4NskdDZR9h3G5Z/Yk2qp4dy/1SsHI56kcJeiURLtdBYhu /9MddmXySKUb0GxaBOQV16YgZtYvy6GVV9+5K0BJ8EvWjo9Rv0X9h2Nh0DkwuewPoxct Lgg2TyZpStQGm9VmxsHJzeDhKu7A5kP99y2OxFHt3Dx/v6Av3SOxQ3YmF/bavx5ZuH97 ooP/X+mfAF4I59tKmdOqZMZGQ2TTFHY0gYsej0hg47qacA6v/PoKvdi74tXiznzKR0I1 58aA== X-Gm-Message-State: AOJu0YyfTspL5aUnccfx308p8FCZH84t4VlrFiQjFM/T/cIzU4CCE89X 4iimptMiJJDoXcgXQsoXoJXbg/tx+ghX45vBN37H7Ysv1FmSQAaRCLf8bUNtoAFFuvWRgtOv/sC VLni08Q== X-Google-Smtp-Source: AGHT+IEhWmQ2UlZ+VF2FZhFLY+yV2efXko8WF7SGmUugSmFKrlZDlQSYCijahvsEl8VwXvH23VQtDtjdo6U= X-Received: from pjbsx15.prod.google.com ([2002:a17:90b:2ccf:b0:31f:1707:80f6]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e888:b0:23d:d0e7:754b with SMTP id d9443c01a7336-2462ee0853dmr157742075ad.18.1756152390785; Mon, 25 Aug 2025 13:06:30 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 25 Aug 2025 13:06:20 -0700 In-Reply-To: <20250825200622.3759571-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: <20250825200622.3759571-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.261.g7ce5a0a67e-goog Message-ID: <20250825200622.3759571-4-seanjc@google.com> Subject: [PATCH 3/5] entry/kvm: KVM: Move KVM details related to signal/-EINTR into KVM proper From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Peter Zijlstra , Andy Lutomirski , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Uladzislau Rezki Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-hyperv@vger.kernel.org, rcu@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move KVM's morphing of pending signals into userspace exits into KVM proper, and drop the @vcpu param from xfer_to_guest_mode_handle_work(). How KVM responds to -EINTR is a detail that really belongs in KVM itself, and invoking kvm_handle_signal_exit() from kernel code creates an inverted module dependency. E.g. attempting to move kvm_handle_signal_exit() into kvm_main.c would generate an linker error when building kvm.ko as a module. Dropping KVM details will also converting the KVM "entry" code into a more generic virtualization framework so that it can be used when running as a Hyper-V root partition. Lastly, eliminating usage of "struct kvm_vcpu" outside of KVM is also nice to have for KVM x86 developers, as keeping the details of kvm_vcpu purely within KVM allows changing the layout of the structure without having to boot into a new kernel, e.g. allows rebuilding and reloading kvm.ko with a modified kvm_vcpu structure as part of debug/development. Signed-off-by: Sean Christopherson --- arch/arm64/kvm/arm.c | 3 +-- arch/loongarch/kvm/vcpu.c | 3 +-- arch/riscv/kvm/vcpu.c | 3 +-- arch/x86/kvm/vmx/vmx.c | 1 - arch/x86/kvm/x86.c | 3 +-- include/linux/entry-kvm.h | 11 +++-------- include/linux/kvm_host.h | 13 ++++++++++++- kernel/entry/kvm.c | 13 +++++-------- 8 files changed, 24 insertions(+), 26 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 888f7c7abf54..418fd3043467 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -6,7 +6,6 @@ =20 #include #include -#include #include #include #include @@ -1177,7 +1176,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) /* * Check conditions before entering the guest */ - ret =3D xfer_to_guest_mode_handle_work(vcpu); + ret =3D kvm_xfer_to_guest_mode_handle_work(vcpu); if (!ret) ret =3D 1; =20 diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index ce478151466c..450545d2fc70 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -4,7 +4,6 @@ */ =20 #include -#include #include #include #include @@ -251,7 +250,7 @@ static int kvm_enter_guest_check(struct kvm_vcpu *vcpu) /* * Check conditions before entering the guest */ - ret =3D xfer_to_guest_mode_handle_work(vcpu); + ret =3D kvm_xfer_to_guest_mode_handle_work(vcpu); if (ret < 0) return ret; =20 diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index f001e56403f9..251e787f2ebc 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -7,7 +7,6 @@ */ =20 #include -#include #include #include #include @@ -910,7 +909,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) run->exit_reason =3D KVM_EXIT_UNKNOWN; while (ret > 0) { /* Check conditions before entering the guest */ - ret =3D xfer_to_guest_mode_handle_work(vcpu); + ret =3D kvm_xfer_to_guest_mode_handle_work(vcpu); if (ret) continue; ret =3D 1; diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index aa157fe5b7b3..d7c86613e50a 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -28,7 +28,6 @@ #include #include #include -#include =20 #include #include diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a1c49bc681c4..0b13b8bf69e5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -59,7 +59,6 @@ #include #include #include -#include #include #include =20 @@ -11241,7 +11240,7 @@ static int vcpu_run(struct kvm_vcpu *vcpu) =20 if (__xfer_to_guest_mode_work_pending()) { kvm_vcpu_srcu_read_unlock(vcpu); - r =3D xfer_to_guest_mode_handle_work(vcpu); + r =3D kvm_xfer_to_guest_mode_handle_work(vcpu); kvm_vcpu_srcu_read_lock(vcpu); if (r) return r; diff --git a/include/linux/entry-kvm.h b/include/linux/entry-kvm.h index 16149f6625e4..3644de7e6019 100644 --- a/include/linux/entry-kvm.h +++ b/include/linux/entry-kvm.h @@ -21,8 +21,6 @@ _TIF_NOTIFY_SIGNAL | _TIF_NOTIFY_RESUME | \ ARCH_XFER_TO_GUEST_MODE_WORK) =20 -struct kvm_vcpu; - /** * arch_xfer_to_guest_mode_handle_work - Architecture specific xfer to gue= st * mode work handling function. @@ -32,12 +30,10 @@ struct kvm_vcpu; * Invoked from xfer_to_guest_mode_handle_work(). Defaults to NOOP. Can be * replaced by architecture specific code. */ -static inline int arch_xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcp= u, - unsigned long ti_work); +static inline int arch_xfer_to_guest_mode_handle_work(unsigned long ti_wor= k); =20 #ifndef arch_xfer_to_guest_mode_work -static inline int arch_xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcp= u, - unsigned long ti_work) +static inline int arch_xfer_to_guest_mode_handle_work(unsigned long ti_wor= k) { return 0; } @@ -46,11 +42,10 @@ static inline int arch_xfer_to_guest_mode_handle_work(s= truct kvm_vcpu *vcpu, /** * xfer_to_guest_mode_handle_work - Check and handle pending work which ne= eds * to be handled before going to guest mode - * @vcpu: Pointer to current's VCPU data * * Returns: 0 or an error code */ -int xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu); +int xfer_to_guest_mode_handle_work(void); =20 /** * xfer_to_guest_mode_prepare - Perform last minute preparation work that diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 15656b7fba6c..598b9473e46d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2,7 +2,7 @@ #ifndef __KVM_HOST_H #define __KVM_HOST_H =20 - +#include #include #include #include @@ -2450,6 +2450,17 @@ static inline void kvm_handle_signal_exit(struct kvm= _vcpu *vcpu) vcpu->run->exit_reason =3D KVM_EXIT_INTR; vcpu->stat.signal_exits++; } + +static inline int kvm_xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu) +{ + int r =3D xfer_to_guest_mode_handle_work(); + + if (r) { + WARN_ON_ONCE(r !=3D -EINTR); + kvm_handle_signal_exit(vcpu); + } + return r; +} #endif /* CONFIG_KVM_XFER_TO_GUEST_WORK */ =20 /* diff --git a/kernel/entry/kvm.c b/kernel/entry/kvm.c index 8485f63863af..6fc762eaacca 100644 --- a/kernel/entry/kvm.c +++ b/kernel/entry/kvm.c @@ -1,17 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 =20 #include -#include =20 -static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, unsigned long ti= _work) +static int xfer_to_guest_mode_work(unsigned long ti_work) { do { int ret; =20 - if (ti_work & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) { - kvm_handle_signal_exit(vcpu); + if (ti_work & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) return -EINTR; - } =20 if (ti_work & (_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)) schedule(); @@ -19,7 +16,7 @@ static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu,= unsigned long ti_work) if (ti_work & _TIF_NOTIFY_RESUME) resume_user_mode_work(NULL); =20 - ret =3D arch_xfer_to_guest_mode_handle_work(vcpu, ti_work); + ret =3D arch_xfer_to_guest_mode_handle_work(ti_work); if (ret) return ret; =20 @@ -28,7 +25,7 @@ static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu,= unsigned long ti_work) return 0; } =20 -int xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu) +int xfer_to_guest_mode_handle_work(void) { unsigned long ti_work; =20 @@ -44,6 +41,6 @@ int xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu) if (!(ti_work & XFER_TO_GUEST_MODE_WORK)) return 0; =20 - return xfer_to_guest_mode_work(vcpu, ti_work); + return xfer_to_guest_mode_work(ti_work); } EXPORT_SYMBOL_GPL(xfer_to_guest_mode_handle_work); --=20 2.51.0.261.g7ce5a0a67e-goog From nobody Fri Oct 3 20:25:18 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 5A13D3009E7 for ; Mon, 25 Aug 2025 20:06:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756152396; cv=none; b=ACgcclQrsEDS0AM71cYJ+KQXA9V+7no2xpcwCmQcIPueVO3vKmX9ZFQG7BmjWnHALDCGyl2KzvA32wxZ0PXTeAUuZlpP8Ns0gl57gCgOMpL7tQuHZWYWSR/8oqyml3To0bQkg3ywqsT5ajpJ9G5ty1DLfaQgNnuhJokl86oeo3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756152396; c=relaxed/simple; bh=Qk2bCfRSq/hOkmBV1IT00NeOq9J8y4xxXRJ0CTubeWQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JvULUVbeaVK7j6BGGK6gLn1hM9+lir8vmBai/9CBO+bn1e/BvoWT8siyvwo8xqDPVHb+Q+70IYqoRJStifLpWt5mvb/9ztPIgu4x/rvM2BbUbbi7jkHzgEPtPQBE/+/GwX75YKjBEy3Dqfqd95LsWGewH7HMi8sN5jbXGGbDglw= 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=kUVDDZi3; arc=none smtp.client-ip=209.85.214.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="kUVDDZi3" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-24680b1905fso23016435ad.2 for ; Mon, 25 Aug 2025 13:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756152393; x=1756757193; 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=wbD6+fQUFLj6ZyKIXXe+rz89WoEnq6GRJ4KXesOmIvQ=; b=kUVDDZi3CL03S0Sj19F3hGz0kkyRnArAZ1aDvfeOA503fsZW8L6PLuPCnDZgnpmWDR 1Lu4bB+RNzuU4qrZfYbz5qWn5lZUAx21mHGjQgGr3bB/5rXBjcVZrl6xWpLTNAEgWy2O gda6ZgMKZUzthblNEnz+rIdD0oj0PHTflG9SeMFK0RY9SKX26oZzhSUoDyJmtc7YZr4n NmDB1e/BszCtSfDvirgH5W3vgl5qBWapxlsiW43c619Zedq6ky9K6yJ0JiLFaCEpysNS NAsgcsqDCUf0JI2m0DW2GD+bZUpKwS2CVZ1YvOJ7un0ipytCXbZTAI67xvhrDQwQ1zz9 uiFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756152393; x=1756757193; 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=wbD6+fQUFLj6ZyKIXXe+rz89WoEnq6GRJ4KXesOmIvQ=; b=IlC1eNytUHmZPr7U7De6e1tbTVwRiJALRuTTrHorbdceCkBTF9oDyAX7pZuyUsDIwF pMn35CpQ1wfrLO+Fkb/bJr4gMtFAPj8lORZi9C23Suraws1TkOKaDJUOoi+bHnKLRDwt kXkhEL2HXfONB7Rb3svHrVuPEBxgkdt9e5h3lTgSRHJ1o+WLtEVzudWbJu8qqeY1etXp KCrmtZeO7GJWhW4CHAHwHPpEVzpsLG1YA/xARg6yqq5SYMlHuMFgu1N/djIDZoWjNAfg 8RAGWtSwUncg86uA/ARvgeK4J3597lTrmRVJ8qXms/ivookdoPqL5XngPeMBq/MtCZFM ZpeA== X-Gm-Message-State: AOJu0Yx7eHFbzZ9nYJ/xqu1F0F+pnVHsDPsRBl1PeybFGGVmx/hc4kL3 e0NVTBA0pP+2h/MGew+rXukSZTH5E0HefJr9uz0Parf2GNWDSOffXGaTd0kGkf0ZfguVjHWKs8s G9OdXwg== X-Google-Smtp-Source: AGHT+IH5IBTx24tzWYAz5h7k7ppjFmo3GXWf3YKN3bogG8Gmm6XMIM/yADKjND6wIF+ApQDKi4M8PqDi2F4= X-Received: from pjbsp3.prod.google.com ([2002:a17:90b:52c3:b0:31f:2a78:943]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:22c9:b0:246:6f78:1fc1 with SMTP id d9443c01a7336-2466f7820c6mr142747395ad.36.1756152392594; Mon, 25 Aug 2025 13:06:32 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 25 Aug 2025 13:06:21 -0700 In-Reply-To: <20250825200622.3759571-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: <20250825200622.3759571-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.261.g7ce5a0a67e-goog Message-ID: <20250825200622.3759571-5-seanjc@google.com> Subject: [PATCH 4/5] entry: Rename "kvm" entry code assets to "virt" to genericize APIs From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Peter Zijlstra , Andy Lutomirski , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Uladzislau Rezki Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-hyperv@vger.kernel.org, rcu@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename the "kvm" entry code files and Kconfigs to use generic "virt" nomenclature so that the code can be reused by other hypervisors (or rather, their root/dom0 partition drivers), without incorrectly suggesting the code somehow relies on and/or involves KVM. No functional change intended. Signed-off-by: Sean Christopherson --- MAINTAINERS | 2 +- arch/arm64/kvm/Kconfig | 2 +- arch/loongarch/kvm/Kconfig | 2 +- arch/riscv/kvm/Kconfig | 2 +- arch/x86/kvm/Kconfig | 2 +- include/linux/{entry-kvm.h =3D> entry-virt.h} | 8 ++++---- include/linux/kvm_host.h | 6 +++--- include/linux/rcupdate.h | 2 +- kernel/entry/Makefile | 2 +- kernel/entry/{kvm.c =3D> virt.c} | 2 +- kernel/rcu/tree.c | 6 +++--- virt/kvm/Kconfig | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) rename include/linux/{entry-kvm.h =3D> entry-virt.h} (94%) rename kernel/entry/{kvm.c =3D> virt.c} (97%) diff --git a/MAINTAINERS b/MAINTAINERS index fed6cd812d79..17b9c9d7958e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10211,7 +10211,7 @@ L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/entry F: include/linux/entry-common.h -F: include/linux/entry-kvm.h +F: include/linux/entry-virt.h F: include/linux/irq-entry-common.h F: kernel/entry/ =20 diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 713248f240e0..6f4fc3caa31a 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -25,7 +25,7 @@ menuconfig KVM select HAVE_KVM_CPU_RELAX_INTERCEPT select KVM_MMIO select KVM_GENERIC_DIRTYLOG_READ_PROTECT - select KVM_XFER_TO_GUEST_WORK + select VIRT_XFER_TO_GUEST_WORK select KVM_VFIO select HAVE_KVM_DIRTY_RING_ACQ_REL select NEED_KVM_DIRTY_RING_WITH_BITMAP diff --git a/arch/loongarch/kvm/Kconfig b/arch/loongarch/kvm/Kconfig index 40eea6da7c25..ae64bbdf83a7 100644 --- a/arch/loongarch/kvm/Kconfig +++ b/arch/loongarch/kvm/Kconfig @@ -31,7 +31,7 @@ config KVM select KVM_GENERIC_HARDWARE_ENABLING select KVM_GENERIC_MMU_NOTIFIER select KVM_MMIO - select KVM_XFER_TO_GUEST_WORK + select VIRT_XFER_TO_GUEST_WORK select SCHED_INFO select GUEST_PERF_EVENTS if PERF_EVENTS help diff --git a/arch/riscv/kvm/Kconfig b/arch/riscv/kvm/Kconfig index 5a62091b0809..c50328212917 100644 --- a/arch/riscv/kvm/Kconfig +++ b/arch/riscv/kvm/Kconfig @@ -30,7 +30,7 @@ config KVM select KVM_GENERIC_DIRTYLOG_READ_PROTECT select KVM_GENERIC_HARDWARE_ENABLING select KVM_MMIO - select KVM_XFER_TO_GUEST_WORK + select VIRT_XFER_TO_GUEST_WORK select KVM_GENERIC_MMU_NOTIFIER select SCHED_INFO select GUEST_PERF_EVENTS if PERF_EVENTS diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 2c86673155c9..f81074b0c0a8 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -40,7 +40,7 @@ config KVM_X86 select HAVE_KVM_MSI select HAVE_KVM_CPU_RELAX_INTERCEPT select HAVE_KVM_NO_POLL - select KVM_XFER_TO_GUEST_WORK + select VIRT_XFER_TO_GUEST_WORK select KVM_GENERIC_DIRTYLOG_READ_PROTECT select KVM_VFIO select HAVE_KVM_PM_NOTIFIER if PM diff --git a/include/linux/entry-kvm.h b/include/linux/entry-virt.h similarity index 94% rename from include/linux/entry-kvm.h rename to include/linux/entry-virt.h index 3644de7e6019..42c89e3e5ca7 100644 --- a/include/linux/entry-kvm.h +++ b/include/linux/entry-virt.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __LINUX_ENTRYKVM_H -#define __LINUX_ENTRYKVM_H +#ifndef __LINUX_ENTRYVIRT_H +#define __LINUX_ENTRYVIRT_H =20 #include #include @@ -10,7 +10,7 @@ #include =20 /* Transfer to guest mode work */ -#ifdef CONFIG_KVM_XFER_TO_GUEST_WORK +#ifdef CONFIG_VIRT_XFER_TO_GUEST_WORK =20 #ifndef ARCH_XFER_TO_GUEST_MODE_WORK # define ARCH_XFER_TO_GUEST_MODE_WORK (0) @@ -90,6 +90,6 @@ static inline bool xfer_to_guest_mode_work_pending(void) lockdep_assert_irqs_disabled(); return __xfer_to_guest_mode_work_pending(); } -#endif /* CONFIG_KVM_XFER_TO_GUEST_WORK */ +#endif /* CONFIG_VIRT_XFER_TO_GUEST_WORK */ =20 #endif diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 598b9473e46d..70ac2267d5d0 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2,7 +2,7 @@ #ifndef __KVM_HOST_H #define __KVM_HOST_H =20 -#include +#include #include #include #include @@ -2444,7 +2444,7 @@ static inline int kvm_arch_vcpu_run_pid_change(struct= kvm_vcpu *vcpu) } #endif /* CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE */ =20 -#ifdef CONFIG_KVM_XFER_TO_GUEST_WORK +#ifdef CONFIG_VIRT_XFER_TO_GUEST_WORK static inline void kvm_handle_signal_exit(struct kvm_vcpu *vcpu) { vcpu->run->exit_reason =3D KVM_EXIT_INTR; @@ -2461,7 +2461,7 @@ static inline int kvm_xfer_to_guest_mode_handle_work(= struct kvm_vcpu *vcpu) } return r; } -#endif /* CONFIG_KVM_XFER_TO_GUEST_WORK */ +#endif /* CONFIG_VIRT_XFER_TO_GUEST_WORK */ =20 /* * If more than one page is being (un)accounted, @virt must be the address= of diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 120536f4c6eb..1e1f3aa375d9 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -129,7 +129,7 @@ static inline void rcu_sysrq_start(void) { } static inline void rcu_sysrq_end(void) { } #endif /* #else #ifdef CONFIG_RCU_STALL_COMMON */ =20 -#if defined(CONFIG_NO_HZ_FULL) && (!defined(CONFIG_GENERIC_ENTRY) || !defi= ned(CONFIG_KVM_XFER_TO_GUEST_WORK)) +#if defined(CONFIG_NO_HZ_FULL) && (!defined(CONFIG_GENERIC_ENTRY) || !defi= ned(CONFIG_VIRT_XFER_TO_GUEST_WORK)) void rcu_irq_work_resched(void); #else static __always_inline void rcu_irq_work_resched(void) { } diff --git a/kernel/entry/Makefile b/kernel/entry/Makefile index 77fcd83dd663..2333d70802e4 100644 --- a/kernel/entry/Makefile +++ b/kernel/entry/Makefile @@ -14,4 +14,4 @@ CFLAGS_common.o +=3D -fno-stack-protector =20 obj-$(CONFIG_GENERIC_IRQ_ENTRY) +=3D common.o obj-$(CONFIG_GENERIC_SYSCALL) +=3D syscall-common.o syscall_user_dispatc= h.o -obj-$(CONFIG_KVM_XFER_TO_GUEST_WORK) +=3D kvm.o +obj-$(CONFIG_VIRT_XFER_TO_GUEST_WORK) +=3D virt.o diff --git a/kernel/entry/kvm.c b/kernel/entry/virt.c similarity index 97% rename from kernel/entry/kvm.c rename to kernel/entry/virt.c index 6fc762eaacca..c52f99249763 100644 --- a/kernel/entry/kvm.c +++ b/kernel/entry/virt.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 =20 -#include +#include =20 static int xfer_to_guest_mode_work(unsigned long ti_work) { diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 8eff357b0436..371447651929 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -573,7 +573,7 @@ void rcutorture_format_gp_seqs(unsigned long long seqs,= char *cp, size_t len) } EXPORT_SYMBOL_GPL(rcutorture_format_gp_seqs); =20 -#if defined(CONFIG_NO_HZ_FULL) && (!defined(CONFIG_GENERIC_ENTRY) || !defi= ned(CONFIG_KVM_XFER_TO_GUEST_WORK)) +#if defined(CONFIG_NO_HZ_FULL) && (!defined(CONFIG_GENERIC_ENTRY) || !defi= ned(CONFIG_VIRT_XFER_TO_GUEST_WORK)) /* * An empty function that will trigger a reschedule on * IRQ tail once IRQs get re-enabled on userspace/guest resume. @@ -602,7 +602,7 @@ noinstr void rcu_irq_work_resched(void) if (IS_ENABLED(CONFIG_GENERIC_ENTRY) && !(current->flags & PF_VCPU)) return; =20 - if (IS_ENABLED(CONFIG_KVM_XFER_TO_GUEST_WORK) && (current->flags & PF_VCP= U)) + if (IS_ENABLED(CONFIG_VIRT_XFER_TO_GUEST_WORK) && (current->flags & PF_VC= PU)) return; =20 instrumentation_begin(); @@ -611,7 +611,7 @@ noinstr void rcu_irq_work_resched(void) } instrumentation_end(); } -#endif /* #if defined(CONFIG_NO_HZ_FULL) && (!defined(CONFIG_GENERIC_ENTRY= ) || !defined(CONFIG_KVM_XFER_TO_GUEST_WORK)) */ +#endif /* #if defined(CONFIG_NO_HZ_FULL) && (!defined(CONFIG_GENERIC_ENTRY= ) || !defined(CONFIG_VIRT_XFER_TO_GUEST_WORK)) */ =20 #ifdef CONFIG_PROVE_RCU /** diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index 727b542074e7..ce843db53831 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -87,7 +87,7 @@ config HAVE_KVM_VCPU_RUN_PID_CHANGE config HAVE_KVM_NO_POLL bool =20 -config KVM_XFER_TO_GUEST_WORK +config VIRT_XFER_TO_GUEST_WORK bool =20 config HAVE_KVM_PM_NOTIFIER --=20 2.51.0.261.g7ce5a0a67e-goog From nobody Fri Oct 3 20:25:18 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 EDACC304BB5 for ; Mon, 25 Aug 2025 20:06:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756152397; cv=none; b=VmWBrDRWjRWDo70zRgzNathw9JjmewCNj+yKZP1+lYZcZxEkMDvK2Jb+80ytiFvOWsydnaott+55/nSlNxTUE3GyTZGQkBfy1pdXmkwMXURj9H/47PYB3yHSBuhIv70bt6mAEg4jwmuXx63d2E+yCbdX5hl7na0KsHeu1Xa8Utw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756152397; c=relaxed/simple; bh=3CyWxc3bBWcKOng0lDUJyf2wCvHLahNPzrrtR5W4C3U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=V/IHv1IHiJStkP2S+q/zZ8zRRsydC+9HuYq5UneyrjcU9Vm9j1SfIUfDhB/j2364tqvUW1hCpp9cjisjDtU7s7jcioHRGIUhbWzuve8Qnqo5mvIGSnCT2F4WlBA3x4SR5ZjUUZ0ePtG++u+NR3Kmz9SCujTCp/U/3KA0a6zs0MU= 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=rqoAProS; arc=none smtp.client-ip=209.85.214.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="rqoAProS" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-24458264c5aso52263345ad.3 for ; Mon, 25 Aug 2025 13:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756152394; x=1756757194; 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=CT7JgTEeo8ssIUb6BIDGd5TM5agUhLYUjQZKEJ9GRpQ=; b=rqoAProSjLzJcNYSQ0Jvt+HVN9pMiePGmyD1VXKO6VTSY4eSKoTlOrb8AH4Ar5CqS5 b0Nvc/fYVkOSgREHh3S+Ky7XFR2rNguABL/lrBOOogGx4BrZd3/6HEEKHdmt13blM/sO bMCC80oTywFsTHIUNL3pjKdW/W7SvFAletZZQLN2tHl6pBD4TWqYsS+6f+C4JgSBrIpH T3atW9Ly7tE3ofqTlpntiWw6RJGiLBWVjNsr947+kmVlcRkTDjCEmdFrSdXHEoQlLIVf 0aShBlOOxCwRsgWoorQiSR+/+xiTV7f3L5oxMuS1BYcl3Lt9cKAE+Bw491cDnSSVuaiu eUQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756152394; x=1756757194; 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=CT7JgTEeo8ssIUb6BIDGd5TM5agUhLYUjQZKEJ9GRpQ=; b=f4IGwRkYUUF7WVgWiJpVIcggKCXwnKSpFN6RMMlC+jQKAqJQejgO9J2UJkmdA49oP5 BiusTS8jlZNw5KyD76QQt5QcEjlJRI+LfhPD8s+3eFO5et+RN+c8lnEKacydfGtWK5z4 9Pth2oo11wEqSmdCqBUvpg+w+oEmdza58QLGT31Y1D9CkvkYWEjn9y6ztQnDAN4KvRhL hgYsLeh5IarTDsFQkL5JAUhV/lWfwHTfa4hy+LqlgoW+puyzIUAoBvKyaZt079I4wqpG qmbvIJhegqFGVxDmH31zCF670FpTba6AVac8/SzIG+pqbHwJfVGlm+XBtRI/cgyqEjn0 dRSA== X-Gm-Message-State: AOJu0YyfjMb5UTWEvV8a4SxQr0jo8zxen/1RCcYXvx4iCNU8d2STtgPC uTRVog1VKpvdmKa1mPkqGjEId8xAeiInIxMCE2b96dGxOSObmoV8o1bO2dBcnugdtZbmffX/q53 Dv+XJ2w== X-Google-Smtp-Source: AGHT+IHfBbVUXQztG4xcJ+8aXPPjjnJpBA+jqNiJZvuMravmup3swJ9oylnciy13R3aKiPcwGzmYXXd0xTE= X-Received: from pjvb15.prod.google.com ([2002:a17:90a:d88f:b0:311:c197:70a4]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f611:b0:246:60d4:8708 with SMTP id d9443c01a7336-24660d4883amr156063605ad.49.1756152394181; Mon, 25 Aug 2025 13:06:34 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 25 Aug 2025 13:06:22 -0700 In-Reply-To: <20250825200622.3759571-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: <20250825200622.3759571-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.261.g7ce5a0a67e-goog Message-ID: <20250825200622.3759571-6-seanjc@google.com> Subject: [PATCH 5/5] Drivers: hv: Use common "entry virt" APIs to do work before running guest From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Peter Zijlstra , Andy Lutomirski , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Uladzislau Rezki Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-hyperv@vger.kernel.org, rcu@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the kernel's common "entry virt" APIs to handle pending work prior to (re)entering guest mode, now that the virt APIs don't have a superfluous dependency on KVM. No functional change intended. Signed-off-by: Sean Christopherson --- drivers/hv/Kconfig | 1 + drivers/hv/mshv.h | 2 -- drivers/hv/mshv_common.c | 45 ------------------------------------- drivers/hv/mshv_root_main.c | 9 +++++--- 4 files changed, 7 insertions(+), 50 deletions(-) diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 57623ca7f350..cdb210cd3710 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig @@ -66,6 +66,7 @@ config MSHV_ROOT # no particular order, making it impossible to reassemble larger pages depends on PAGE_SIZE_4KB select EVENTFD + select VIRT_XFER_TO_GUEST_WORK default n help Select this option to enable support for booting and running as root diff --git a/drivers/hv/mshv.h b/drivers/hv/mshv.h index db3aa3831c43..d4813df92b9c 100644 --- a/drivers/hv/mshv.h +++ b/drivers/hv/mshv.h @@ -25,6 +25,4 @@ int hv_call_set_vp_registers(u32 vp_index, u64 partition_= id, u16 count, int hv_call_get_partition_property(u64 partition_id, u64 property_code, u64 *property_value); =20 -int mshv_do_pre_guest_mode_work(void); - #endif /* _MSHV_H */ diff --git a/drivers/hv/mshv_common.c b/drivers/hv/mshv_common.c index b953b5e21110..aa2be51979fd 100644 --- a/drivers/hv/mshv_common.c +++ b/drivers/hv/mshv_common.c @@ -138,48 +138,3 @@ int hv_call_get_partition_property(u64 partition_id, return 0; } EXPORT_SYMBOL_GPL(hv_call_get_partition_property); - -/* - * Handle any pre-processing before going into the guest mode on this cpu,= most - * notably call schedule(). Must be invoked with both preemption and - * interrupts enabled. - * - * Returns: 0 on success, -errno on error. - */ -static int __mshv_do_pre_guest_mode_work(ulong th_flags) -{ - if (th_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) - return -EINTR; - - if (th_flags & (_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)) - schedule(); - - if (th_flags & _TIF_NOTIFY_RESUME) - resume_user_mode_work(NULL); - - return 0; -} - -int mshv_do_pre_guest_mode_work(void) -{ - const ulong work_flags =3D _TIF_NOTIFY_SIGNAL | _TIF_SIGPENDING | - _TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY | - _TIF_NOTIFY_RESUME; - ulong th_flags; - - th_flags =3D read_thread_flags(); - while (th_flags & work_flags) { - int ret; - - /* nb: following will call schedule */ - ret =3D __mshv_do_pre_guest_mode_work(th_flags); - if (ret) - return ret; - - th_flags =3D read_thread_flags(); - } - - return 0; - -} -EXPORT_SYMBOL_GPL(mshv_do_pre_guest_mode_work); diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c index 6f677fb93af0..387491ca16d6 100644 --- a/drivers/hv/mshv_root_main.c +++ b/drivers/hv/mshv_root_main.c @@ -8,6 +8,7 @@ * Authors: Microsoft Linux virtualization team */ =20 +#include #include #include #include @@ -507,9 +508,11 @@ static long mshv_run_vp_with_root_scheduler(struct msh= v_vp *vp) u32 flags =3D 0; struct hv_output_dispatch_vp output; =20 - ret =3D mshv_do_pre_guest_mode_work(); - if (ret) - break; + if (__xfer_to_guest_mode_work_pending()) { + ret =3D xfer_to_guest_mode_handle_work(); + if (ret) + break; + } =20 if (vp->run.flags.intercept_suspend) flags |=3D HV_DISPATCH_VP_FLAG_CLEAR_INTERCEPT_SUSPEND; --=20 2.51.0.261.g7ce5a0a67e-goog