Received-SPF: pass (google.com: domain of linux-kernel+bounces-62968-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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, akpm@linux-foundation.org, luto@kernel.org,
        bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com,
        mingo@redhat.com, juri.lelli@redhat.com, vincent.guittot@linaro.org,
        willy@infradead.org, mgorman@suse.de, jpoimboe@kernel.org,
        mark.rutland@arm.com, jgross@suse.com, andrew.cooper3@citrix.com,
        bristot@kernel.org, mathieu.desnoyers@efficios.com,
        geert@linux-m68k.org, glaubitz@physik.fu-berlin.de,
        anton.ivanov@cambridgegreys.com, mattst88@gmail.com,
        krypton@ulrich-teichert.org, rostedt@goodmis.org,
        David.Laight@ACULAB.COM, richard@nod.at, mjguzik@gmail.com,
        jon.grimm@amd.com, bharata@amd.com, raghavendra.kt@amd.com,
        boris.ostrovsky@oracle.com, konrad.wilk@oracle.com,
        Ankur Arora <ankur.a.arora@oracle.com>,
        Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH 07/30] entry/kvm: handle lazy rescheduling at guest-entry
Date: Mon, 12 Feb 2024 21:55:31 -0800
Message-Id: <20240213055554.1802415-8-ankur.a.arora@oracle.com>
In-Reply-To: <20240213055554.1802415-1-ankur.a.arora@oracle.com>
References: <20240213055554.1802415-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?uXjjGIct/j1Z6QBj7gEpfjAO8+p2Xzc/wEDMaEHwNyV+dpYxXbqdFMsyoZro?=
 =?us-ascii?Q?wjf3i4gRZ2vx+4DTzYX3mMgRGmI2F+h49DtpZI72e39jNa/igKD1k3Q1FamH?=
 =?us-ascii?Q?B2owSRQi/caCieb12YAYdVKLtRjDx+vfW2y5+ubE05zGNCGwibZ+GfOXGyQ2?=
 =?us-ascii?Q?O7ohvYAE0hDQD9cbG8Ua9avnobXzI9ynAbZY7J2qYh6H5Sx23YLKgO5i+E0+?=
 =?us-ascii?Q?riWBe6oUj1yRMFO3R6hw7xyPw8lix6FGi9YpUl+ONPA4EY1KlFQXeidLbzUt?=
 =?us-ascii?Q?1vuQtesvtky+YJbDKVMbkre4QL9xl/0EdQpNYY+m5lPTNNnKTz3ex37rH5Vk?=
 =?us-ascii?Q?15475R7Z+aQrVtiXQL+7kTeAtULp0drtCmcbYjjeVHiYlj7Lg+tqZpUv2sdK?=
 =?us-ascii?Q?XcQuwFz+7JbrLvvsVHPezfnHI70zm3pEOzpVxoExYtSfppMA3nJc3CWQOcwq?=
 =?us-ascii?Q?WshXiqeFDbcIDIrZkAxbDwLIL9MHyEEwB5XqCHc2p/W7spTaHLSdlESTDAGd?=
 =?us-ascii?Q?cjiXUsEifdYmWM9f7Y2LmFCHMzZq+XQJYNvrWQyKJUX/0vtZoz4fd4lROdlY?=
 =?us-ascii?Q?HH5OTkb2W6S0IgJG60HvpCZPDiJyCE609f30rf7tv8JU6e5y+90RGkJiDyVd?=
 =?us-ascii?Q?iwfTszF42IY0gx4RX0jramW1JtYI67DdrquAxZrruAyIGWBpagGPHxDXEYKw?=
 =?us-ascii?Q?TgPXdy6kbaWGsdzwEEiFhucjfban+JcbGuHoOzm0kocrDPR8Jeup02pCkoAe?=
 =?us-ascii?Q?8HaXtW4OvgU7CWM30NYrIQlKj7wrA0q6mbWpg3HbW7Op58qM0GKPaYChqw+x?=
 =?us-ascii?Q?r/GEbL9TSEItrQ6kj7YmXUk6JEHoQoDF7D1bTpYQ44+r54GbtXiDDWJnjvdN?=
 =?us-ascii?Q?0C1gFrlnxHFS7sY5GorcJPD5I+FErhPQbKt3P8BM00OLlJ5+glSEIq0oYf9d?=
 =?us-ascii?Q?y5dMyZZol0WtmMSJLU9Iz4AOyaG3Qi4ALUCuDtPYJdAzwWDO5Yq+nw69JRO/?=
 =?us-ascii?Q?mMv0j1HL1UmRehAVPaFfvbvfaX/Z/Vh4xBlZt4QC5vDGEpiQXs0FCtSUIqOx?=
 =?us-ascii?Q?OzvCZ+JHzJoOSv8gZ2ZR+CsttKK+Ej/uH2laU7lmQuRIt2ncc8Hf6LDXa//z?=
 =?us-ascii?Q?WJ90tSk/c/FgB/2wHP3UHOVLBHuAprAgwlM56LfT21l9D8Xtg091PknyhyYZ?=
 =?us-ascii?Q?J9nVvr82JywKvnMAZr+/ezMNU3q7vQl9Qqy0os2RsDJrcau5fDqoGxWVlSAc?=
 =?us-ascii?Q?fjsABRjKRXWHXlx5qXN2OSlHzk60NJ11N0pMgWZMSqjEhDltOvgJ/Ci0vzJ2?=
 =?us-ascii?Q?dIVC5eZIKDzIahrl7dh0LcsChCzhTNDeuFxvxAJl1u+kjf8GuK9hxyVf34iU?=
 =?us-ascii?Q?y5gmN+1Nn8mw522sjnjWAfhwASbioYQai9cfD6i0rRkLFvyvKnwWf2i8eQQX?=
 =?us-ascii?Q?bkqosT+fH8tWC0h7vl3NYqDUDKcRLfL/wEyiNi5iaaUAn7eN5nKaCZ09aKZG?=
 =?us-ascii?Q?OCkqXJ0lzW9JUAUGuQDB5m88ZuUzU/rytBitBZ8UTgAxs9rD59Ry8QW4Rtz8?=
 =?us-ascii?Q?zEikb7CZL2U8MMp0olNsF/UI7v6hnz6KONnvasR2Z0msJozjW6Yp8ODdLs1h?=
 =?us-ascii?Q?3Q=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	A1OCSDJWHJPUzHM3SL1fRFGKl0gxD9Faqk6T9/lDrZvbm44VpD958Kb9+Tr6xgq/HAEVcCwHFInmRuvUGb7FRFvMvIWu7vNMWw76Fj8wR9h8OfVJbXabFj2HsTVIWEI6eSNrmxZM97TZdKF/SGrIGRAMifWSTaMo+GcHstB5fW6yfpZsnU05WAeIm2oWfLTeAG4y7h3Lx+tROsoCm7CKThnPzc/RcybZFnrXh9+KGsQmpuyt1MBp5e7ymMb2m9SnNLCmh74Yx3zY4qDtwzNwXwrB3FAs4LlCrtFFSpl2cH7WCFx8gwS1OOe25ZFKjouBITTZ0c5tmPUUQ/+VxlNc0OslY/Ubb+JdiNX+IXwKFH+m6WZ6BbKXE2FxilvylbShk6xYEkkbnxFoGtmDVwr7lsOCWAVqObx7fvOqFGWaxG3vJI/rR1uO0b65g2KMnrbG+AjlXEiN6IybmL9tzoUJDIhxNzvbV/73Eu8jTdLAMhGU5HsUOQeBbPZh62ojg9quPVCcazyb2cABr1OZtKshCXHZpJm9WkbCoiZCg9OHZWKAp/LVw4pqAJGECHvwJ4r/8K6/LrUO671CX0I5SE7Yg7TTGn76UKZ0t7L6pipcKgg=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e7e8c939-38f2-4950-f0c8-08dc2c58719d
X-MS-Exchange-CrossTenant-AuthSource: CO6PR10MB5409.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 05:55:55.6332
 (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: NYRjJ5vvaA2PLH4R1G18TbBEXmRCNnH+CH4vImvfUghwYg+ti4UDfO3shLlP0iU3omBtmNOPTt3Ud8d+efBOgdm5qWeWLcpfwWT39IQJHqY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4642
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-13_02,2024-02-12_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=718 phishscore=0 mlxscore=0
 bulkscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2402130043
X-Proofpoint-GUID: DHA3pgLUIH21BP735zBhJ29t70HzAB8d
X-Proofpoint-ORIG-GUID: DHA3pgLUIH21BP735zBhJ29t70HzAB8d

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