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 57C6823AE95 for ; Thu, 28 Aug 2025 00:02:15 +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=1756339337; cv=none; b=Eu5DqjaqRt0KekIJw7DxFtSd+Emxdc6AdLpAX8lg5fpLvOIHJhxKo+7KTy4PCC9g8AzvQ+W+DpghNQNWud5i3nOn4S4jUcJXKqlrI9a8WLAHV/yK+LR/nw8OOPTPdxKiKJdoc5ll5usGD3l9faO23wdKrctvBAJxP+o5VrIqYhE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756339337; c=relaxed/simple; bh=5KZra7rrb6EshYnRt06iajnZTBGSSVrTrCSYe32dt9s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=e9hu+Vcy9GFKXKXK/4UevXBk068oHE5IEQD4REE4ipTPFIkkBRtN5mVdFd/zmjm75z9aUFShj5AWDwo48+h0yYUJb+nSKcOcgRqbNsulM77+rS6eLQ30WkjXgkBnYUIYhwub5yW/cSGIcQ7NEZxEHimucgfFwqZqyWZWmTq2BjM= 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=P3ILK07k; 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="P3ILK07k" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-324e4c3af5fso368375a91.3 for ; Wed, 27 Aug 2025 17:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756339335; x=1756944135; 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=qS5zxATrMXESBFPKwTqytXa2jxoDaW3HrytCSPyurss=; b=P3ILK07kHqpUGuivkSLsoI+MFv54KeHD0qtH79NPU/KqIIn8aXu3po2ImTA6Zbi1rb E5fBA7B2UekDDNvUsAKexzToVzRJc7Mw5dg7uHLZwb62LaaH+ax04wKyjta2qvvu3S+h kTOk1iAlOQBWuwZhpmkRB+iXKBRmnXgrckSG/m3GzzzExftf50JP43JiZxW6f235Lo7V fFCHf9fbjIGrlALSh3sn42twHZWzxgWNcnuQqOMarurbLQfJXVDcqoaiP3Wyv10FIbtY 4WAE16o5571YGlB8Lz65SnxkmdGx0ApLw47O36szCXI96jYaIvBsgiiEaF4hhKpQRkP3 /LPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756339335; x=1756944135; 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=qS5zxATrMXESBFPKwTqytXa2jxoDaW3HrytCSPyurss=; b=ZmVTF3sNkUjzF6sqTAPjcVB0eSxBTVmIVwgU9RjrUbqFAIiKshTtkWAT3bDd+MBnyZ Tzcq45vGJflspKRUvit5x+M4x6T2NGChcAGrSdarm8qJ6wz9rDify9t4fwhdPddHNNF6 JQnwvQc11OCEAi28ZajWhkdw6UKt9G5SezQm4F7HgK0TwnqM72S2a7UDCC6HnQHTsN4n DJOBmCYjeLQ/0tAY2jfSIoewOA+ShVovCpzuXkjs2PE/lv5LUzYGuYbDk/pHkoPm0oFe c3Gmua3DM6+lbLpafsDsAsKQRB89oUeykfdhGE1IoJv4yCHGV6YqzHyzycb0MmnhgUJu EeKw== X-Forwarded-Encrypted: i=1; AJvYcCVfvT1PLxy5+9XLbmseF5xhZtZTZK5hv/Ik/Vnj4rjp9HQfxz4h/f9QCHgQCgoEYkQXGwk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9A9YC8niiKRxAltaKDn6kUA/opWIvT6kT5BnlgQ/6UXygQbX8 XGHJi1IC5XN2ttHnxXhkxnM61Tqr0VPE1cyXe63uiPG/vaOz2hCZA5PZb6FUBYelf2Ookk0GO+P wYhAb1Q== X-Google-Smtp-Source: AGHT+IHTwHRJ1LtJUNLrZJovplfjTJdtHnbpa9Rw0OlaHYLIVyGS/gJ8LisaniBrYJHJcn/KzpZqw55zABU= X-Received: from pjbsc11.prod.google.com ([2002:a17:90b:510b:b0:321:c36d:1b8a]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3941:b0:327:b01c:4fd4 with SMTP id 98e67ed59e1d1-327b01c52bcmr306189a91.2.1756339334767; Wed, 27 Aug 2025 17:02:14 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 27 Aug 2025 17:01:56 -0700 In-Reply-To: <20250828000156.23389-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org 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-8-seanjc@google.com> Subject: [PATCH v2 7/7] Drivers: hv: Use "entry virt" APIs to do work before returning to lower VTL 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 returning to a lower VTL. Drop the now-defunct common MSHV helper for doing work as the VTL driver was the last user. No functional change intended. Signed-off-by: Sean Christopherson --- drivers/hv/Kconfig | 1 + drivers/hv/mshv.h | 2 -- drivers/hv/mshv_common.c | 22 ---------------------- drivers/hv/mshv_vtl_main.c | 11 +++-------- 4 files changed, 4 insertions(+), 32 deletions(-) diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 894037afcbf9..b00b2b3fe3db 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig @@ -85,6 +85,7 @@ config MSHV_VTL # Therefore, do not attempt to access or modify MTRRs here. depends on !MTRR select CPUMASK_OFFSTACK + select VIRT_XFER_TO_GUEST_WORK default n help Select this option to enable Hyper-V VTL driver support. diff --git a/drivers/hv/mshv.h b/drivers/hv/mshv.h index 0340a67acd0a..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); -int mshv_do_pre_guest_mode_work(ulong th_flags); - #endif /* _MSHV_H */ diff --git a/drivers/hv/mshv_common.c b/drivers/hv/mshv_common.c index eb3df3e296bb..aa2be51979fd 100644 --- a/drivers/hv/mshv_common.c +++ b/drivers/hv/mshv_common.c @@ -138,25 +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. - */ -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; -} -EXPORT_SYMBOL_GPL(mshv_do_pre_guest_mode_work); diff --git a/drivers/hv/mshv_vtl_main.c b/drivers/hv/mshv_vtl_main.c index 4ca13c54c0a0..1eabed16aab9 100644 --- a/drivers/hv/mshv_vtl_main.c +++ b/drivers/hv/mshv_vtl_main.c @@ -8,6 +8,7 @@ * Naman Jain */ +#include #include #include #include @@ -727,22 +728,16 @@ static int mshv_vtl_ioctl_return_to_lower_vtl(void) { preempt_disable(); for (;;) { - const unsigned long VTL0_WORK = _TIF_SIGPENDING | _TIF_NEED_RESCHED | - _TIF_NOTIFY_RESUME | _TIF_NOTIFY_SIGNAL | - _TIF_NEED_RESCHED_LAZY; - unsigned long ti_work; unsigned long irq_flags; struct hv_vp_assist_page *hvp; int ret; - ti_work = READ_ONCE(current_thread_info()->flags); - if (unlikely(ti_work & VTL0_WORK)) { + if (__xfer_to_guest_mode_work_pending()) { preempt_enable(); - ret = mshv_do_pre_guest_mode_work(ti_work); + ret = xfer_to_guest_mode_handle_work(); if (ret) return ret; preempt_disable(); - continue; } local_irq_save(irq_flags); -- 2.51.0.268.g9569e192d0-goog