From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 BF3382236EE for ; Thu, 28 Aug 2025 00:02:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756339335; cv=none; b=hGE9bVAJKEEBCVLL9XPzrM6+uItekqySOJAvFqVOqoyvrsezAArm7X6xPxe86l8CcBKWNHozsmqTmQikP/hnUavBEkNDL34E6cBS/JYCMHJpbXJMC+7n43eyz2dh92RZ/P3ql5pUEW0cU4YTX5bTECbKxl4wYS/VyHfEzST5M6A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756339335; c=relaxed/simple; bh=HB2czoPRXRoML34y9sGK0CPNDZK1NSst82B/XrgzCeI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=InNu5y4VUdYHN3e88nmpaMVn04gmLuSF9URQYNdnpHFKN91r9PYPqNvuxD0eQt2A3/hodpT3YP+dMFZrRgFv+8jycBpayoFS2jGB8EMOmqtPJvOxhzSD3MPmELASzCkKBxAhO4P8WmQSMzBrBJCsjWF4KAJnTPFV3HkWgj4DaXg= 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=pz5KZdf4; arc=none smtp.client-ip=209.85.216.74 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="pz5KZdf4" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-324e4c3af5fso368339a91.3 for ; Wed, 27 Aug 2025 17:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756339333; x=1756944133; darn=lists.linux.dev; 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=EmsaxLywmqXJrqAtwLwAP27sFBwlzqDgNEuWnDn/370=; b=pz5KZdf4dkXWULUZgks4pJnkrkrZcByPiqNPh41ErdUTZIOht1VzPkd9GjLgIWuQYv OpFCff8WyId2BSopIYs8vagN/PkW2vYedvlNdVYpbYeCyozMicxcWfaL6+njjqWbNCup 1bDRlr3Mf977KlIn48UE1/7C6idTqnaedMP+1t83Zs721YSDfDks/f2PwbEVpnGQBlbE JzOH5Pd3TsPap5dfcqg80TkFNvGSxi30b8z/k0gmhQBY8muZQnIQGvt2LPPcpMMUkgSv K6I+TBevMwlkVTNE6Czn5j0/wXslsossG11/Jv8SHAVXanzgCs5tgnjehVYcw8qkZP9g HSUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756339333; x=1756944133; 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=EmsaxLywmqXJrqAtwLwAP27sFBwlzqDgNEuWnDn/370=; b=OdcZ//frY6vur3O94/5sfLpNxCBUvxILi9unq4MjUamPwV8EKiCjwP7dxpLExul2NL N6PSMbFbyW62WMafezHXYroWaQu2xoxFtsMvh9bQav2VBJLtfHBdF7Q5xb4F5fs+z115 b6ckeVLa6AXe1KnjxTf7+2B44IMIvNV8zNZfM1SCreoPcu8Zfmo8zvdEBYahdVUvVhfY jTkLkKfW9UGSQtpW+MoQdJg0TMartC0+ycDQFgu+xGWRPrW7TxvSGrUIkyR/EVnT7NO6 qpmPFZY9BP9xs+QMgO27464q7S1Zhav6moRBjHb+4xaG6qbtYxA22KK2m8oSLeeNzkxe h5OA== X-Forwarded-Encrypted: i=1; AJvYcCX1Z6jFYR3xYuTM5TyYzStVC456r0X7muN+pv4rKh/OvxgO2NeDfF/GYU0LOgO6AS6AAAEeRDQ=@lists.linux.dev X-Gm-Message-State: AOJu0Yx45ykytN8UVNEooEmTAaPAd/8pyBPHqvezQ09cLW5bo46pRaSs vWEvN1rc6DoWkiQknjzkPAuzTjaxl5XwUPEdpsGPRhNlZpWISKUj6MW+s/pmIpCPpBQe+X8W0GA W4AnlQw== X-Google-Smtp-Source: AGHT+IHWkrv7kVZHVzSto7MjJE9ImCnU6mvGeqto5tWqGBVv3p+HjVdYjEAK6cb7aWSN7qrvwO4+vOKCqys= X-Received: from pjur11.prod.google.com ([2002:a17:90a:d40b:b0:325:9404:7ff3]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2785:b0:31f:9114:ead8 with SMTP id 98e67ed59e1d1-32515e2d5a0mr28901913a91.6.1756339332928; Wed, 27 Aug 2025 17:02:12 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 27 Aug 2025 17:01:55 -0700 In-Reply-To: <20250828000156.23389-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250828000156.23389-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.268.g9569e192d0-goog Message-ID: <20250828000156.23389-7-seanjc@google.com> Subject: [PATCH v2 6/7] Drivers: hv: Use common "entry virt" APIs to do work in root 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, Nuno Das Neves , Mukesh R 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_root_main.c | 32 ++++++-------------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 2e8df09db599..894037afcbf9 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_root_main.c b/drivers/hv/mshv_root_main.c index 0d849f09160a..7c83f656e071 100644 --- a/drivers/hv/mshv_root_main.c +++ b/drivers/hv/mshv_root_main.c @@ -8,6 +8,7 @@ * Authors: Microsoft Linux virtualization team */ +#include #include #include #include @@ -481,29 +482,6 @@ mshv_vp_wait_for_hv_kick(struct mshv_vp *vp) return 0; } -static int mshv_pre_guest_mode_work(struct mshv_vp *vp) -{ - const ulong work_flags = _TIF_NOTIFY_SIGNAL | _TIF_SIGPENDING | - _TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY | - _TIF_NOTIFY_RESUME; - ulong th_flags; - - th_flags = read_thread_flags(); - while (th_flags & work_flags) { - int ret; - - /* nb: following will call schedule */ - ret = mshv_do_pre_guest_mode_work(th_flags); - - if (ret) - return ret; - - th_flags = read_thread_flags(); - } - - return 0; -} - /* Must be called with interrupts enabled */ static long mshv_run_vp_with_root_scheduler(struct mshv_vp *vp) { @@ -524,9 +502,11 @@ static long mshv_run_vp_with_root_scheduler(struct mshv_vp *vp) u32 flags = 0; struct hv_output_dispatch_vp output; - ret = mshv_pre_guest_mode_work(vp); - if (ret) - break; + if (__xfer_to_guest_mode_work_pending()) { + ret = xfer_to_guest_mode_handle_work(); + if (ret) + break; + } if (vp->run.flags.intercept_suspend) flags |= HV_DISPATCH_VP_FLAG_CLEAR_INTERCEPT_SUSPEND; -- 2.51.0.268.g9569e192d0-goog