Received-SPF: pass (google.com: domain of linux-kernel+bounces-191554-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Ankur Arora <ankur.a.arora@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org,
        paulmck@kernel.org, rostedt@goodmis.org, mark.rutland@arm.com,
        juri.lelli@redhat.com, joel@joelfernandes.org, raghavendra.kt@amd.com,
        sshegde@linux.ibm.com, boris.ostrovsky@oracle.com,
        konrad.wilk@oracle.com, Ankur Arora <ankur.a.arora@oracle.com>,
        Paolo Bonzini <pbonzini@redhat.com>, Andy Lutomirski <luto@kernel.org>
Subject: [PATCH v2 09/35] entry/kvm: handle lazy rescheduling at guest-entry
Date: Mon, 27 May 2024 17:34:55 -0700
Message-Id: <20240528003521.979836-10-ankur.a.arora@oracle.com>
In-Reply-To: <20240528003521.979836-1-ankur.a.arora@oracle.com>
References: <20240528003521.979836-1-ankur.a.arora@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?O3xl6gNLUH1vXnnNbT4ooA51yMWyZfs0godikMA+d/ytFap4Xkr779ofZS0U?=
 =?us-ascii?Q?0ujwoMgul7HKptMuHIN3rPc4YC6cyHbcux/w2aZ+Edkgv9U4+lBb2amd25WT?=
 =?us-ascii?Q?hZUmQq5b1AITfDdGemKdHGFQ9wgx7h3Yis60nA5f2Rdvs2LNeEL+PZv4TIQg?=
 =?us-ascii?Q?m54gPSE6gLWxYlOLWkIhkth4EPeXUuIVeGFnQdPGucDZtDF0Q1G7AS54GUue?=
 =?us-ascii?Q?oXHW7iI9Jc+3HKIskFa5iFUJU1wMp5OJN2qhqElTfXuvgJs7oakzub5EjLYA?=
 =?us-ascii?Q?JojSfHxu9Q3c8L/xF0HwNAqJX7iaIWnB9AdtoWJfBp0RqrM3lEZvUZ++8Lji?=
 =?us-ascii?Q?JJmJn0oMvkktgOzGUM86uBMJAa2087iGg0N9fyPkRRdW3AMWkXi/nqOTyrnj?=
 =?us-ascii?Q?CDHm6LZTH3P8SQxnWSe5NF9nkNJpaLRvC2svakum7BR7ISuEA8CyoFitW+PT?=
 =?us-ascii?Q?kD2gP58l14Qh8BqFiYW9bfc47OT2NwvJ1EaxEm22Stv8WJq5i82QtgnYlu2s?=
 =?us-ascii?Q?XssXWfNKMUERSARriB6suFQAoZzQt3UT5ONq19nrHoOR8MfwLe7fBmrZK5Eg?=
 =?us-ascii?Q?fDwkjXeBKhgRmSDcETofs3/6eXsbAuHFoEqmvDJ1BshuzNukoOCESc5vM/6X?=
 =?us-ascii?Q?pGF22HK3f70VeW6MWVENbdHROWRg3DDgy6a1Xw8jv2pY3cZoQWfuGE17koc2?=
 =?us-ascii?Q?SFkN+WzVXpTfuxvggjUMrG5ico7F+KsDIn3hlpfCz39eRRqLlpZSQBOifsYf?=
 =?us-ascii?Q?4XRzYLToio+BWYpWKlQowXGb4qF6fhIIZRautJFmUYZJJv+NjeDDLGm3zmqb?=
 =?us-ascii?Q?ycY9GoSu25E8oDYkQQ41AnV8XtNvQCTd4WVDrQRutAolj1t8bpvdgnH3uNYF?=
 =?us-ascii?Q?T8CYcjZ8a1Z+wKtUPbEK/byWfZZq6ldkrAaU3y8b9SmKFY8U8HGbQ1PZ4rL6?=
 =?us-ascii?Q?1Fpahp12hZtPJipa8c24loNYQbEkvMbdG26r96Idz2xLNKBW9I+ISY2SKLeC?=
 =?us-ascii?Q?dG5aEzQKO4Lj2g3L1GL6573dviTaQxY5j2kjOm9inTWE9MUDdZDU7gj9Tb5K?=
 =?us-ascii?Q?5lfQrUCXMGOx1JcTnF+mQmyJeX1DLRIOqVR73iXCDf12TdA4keF68OpW0CzD?=
 =?us-ascii?Q?wGAhajrX49VFCrOlnUAVCffKQlV0MhoxoWcwcH1Rt0EmVt4/i9OQixZIvm0A?=
 =?us-ascii?Q?Pc3elYE9vOoWxBYv0m2VUhAevbyly8GsA6wewjaQ41tOr9YKZf6knlgiaFsJ?=
 =?us-ascii?Q?g9WVK18NRQtzrAku9dblP8/O8lk8xam+q1flXtE65i+IvKm9XRZioOfCU1Jx?=
 =?us-ascii?Q?8Pmd4V0MBBCYMQPCkPOIq6lryafzN5jNctxnckrJlcaXUfJdjXIhyPOOyjKF?=
 =?us-ascii?Q?VCknv8i7QhKIixMinFngbgL3qPWbZIha0tYO5K4sG2e6pq/vpRwHnjw8AdCM?=
 =?us-ascii?Q?xfbUFIuzCfmm3ZwnErSJ8R4+QYTsQhZ8BFizU4s183hYfUzbrbebMAloM9V7?=
 =?us-ascii?Q?dCn55pnZRlTpuN2m0VTXR+QvWrw6XZpWUhLx+83433a3GNtf/9VK7zU675KL?=
 =?us-ascii?Q?mecphHOjgIsicaTWl8q9e28u/WqxkQLWnhcbM6VLmpWnTLVOCPe2jftI4seH?=
 =?us-ascii?Q?Rw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	rBSGSD7ZcoiwPqurplBJIFa0FjTn0EjAYQUJVAcI4V1xT2KpQyga4uzd13cWYQD7i86mxe0+bJ7xr3dwAP1BxmsjPBhC/CvANjFpNNEoSr96wwv/X6Q/YjZ4TOaH2Z/+lSE8c/+6dRiz7sCI/lgfs8kznDkH9vNl1FgdAOemzyh+yI1uaMn3ncXOz2nKwXhk62oI/r6IsX8JSBrXwuzf6jz9kc1mSdfunGhtoa7l4r71ggCPRDiHXtYjVJRWfQPdzgaWIeczzCsjBblm/Zktsei03Fw37tFjiJ/COdEpkrwWmikK8XMEDkeg6+BSzGCjn5mJIZm5qHwL0GU8Px12mK/ZUU5fIldtAc5Z6T5sttnfs+ukYDlZbrMSHyrnV3Ft0kY5aMWIBil1q1fdvUvUxXJlsp/q5Tax9C84PN3aWfxUV3FKTgMGiNGC+kGPROL8P/UuFyDbRiwT1WmYE43GRz9Kkz1ClqBzxyJNA5uEJ271r4m9pGaADXAQ3gs0TXtOvSdGLMfW0FmmITWbvvoxwIjnO6mgGtprGCXdh4OnoQ9S6cO/cmhlhtcCOit3SzOiQhBDFBayoNgN2CbjxlR1frugdwUi134b4vWTXZqZyHE=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 086defff-5018-4c6e-44c9-08dc7eae2435
X-MS-Exchange-CrossTenant-AuthSource: CO6PR10MB5409.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 00:35:57.8455
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: efNiwVArlxJyzHw4PJE4QO5z7zruHCXEk2V11ivEDejMKq+f1Nv/L6+elOaU598BHUv6qJXQNWAgCC7T4u4JrHVEP0sD3setcDiilGdmdkU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6510
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16
 definitions=2024-05-27_06,2024-05-27_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxscore=0
 mlxlogscore=884 phishscore=0 spamscore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2405280003
X-Proofpoint-GUID: dPSxCsbDjJCKs0Ud4bFLwQjfd67qmqL5
X-Proofpoint-ORIG-GUID: dPSxCsbDjJCKs0Ud4bFLwQjfd67qmqL5

Archs defining CONFIG_KVM_XFER_TO_GUEST_WORK call
xfer_to_guest_mode_handle_work() from various KVM vcpu-run
loops to check for any task work including rescheduling.

Handle TIF_NEED_RESCHED_LAZY alongside TIF_NEED_RESCHED.

Also, while at it, remove the explicit check for need_resched() in
the exit condition as that is already covered in the loop condition.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Originally-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/lkml/87jzshhexi.ffs@tglx/
Signed-off-by: Ankur Arora <ankur.a.arora@oracle.com>
---
 include/linux/entry-kvm.h | 2 +-
 kernel/entry/kvm.c        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/entry-kvm.h b/include/linux/entry-kvm.h
index 6813171afccb..674a622c91be 100644
--- a/include/linux/entry-kvm.h
+++ b/include/linux/entry-kvm.h
@@ -18,7 +18,7 @@
 
 #define XFER_TO_GUEST_MODE_WORK						\
 	(_TIF_NEED_RESCHED | _TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL |	\
-	 _TIF_NOTIFY_RESUME | ARCH_XFER_TO_GUEST_MODE_WORK)
+	 _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED_LAZY | ARCH_XFER_TO_GUEST_MODE_WORK)
 
 struct kvm_vcpu;
 
diff --git a/kernel/entry/kvm.c b/kernel/entry/kvm.c
index 2e0f75bcb7fd..8485f63863af 100644
--- a/kernel/entry/kvm.c
+++ b/kernel/entry/kvm.c
@@ -13,7 +13,7 @@ static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, unsigned long ti_work)
 			return -EINTR;
 		}
 
-		if (ti_work & _TIF_NEED_RESCHED)
+		if (ti_work & (_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY))
 			schedule();
 
 		if (ti_work & _TIF_NOTIFY_RESUME)
@@ -24,7 +24,7 @@ static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, unsigned long ti_work)
 			return ret;
 
 		ti_work = read_thread_flags();
-	} while (ti_work & XFER_TO_GUEST_MODE_WORK || need_resched());
+	} while (ti_work & XFER_TO_GUEST_MODE_WORK);
 	return 0;
 }
 
-- 
2.31.1