From mboxrd@z Thu Jan 1 00:00:00 1970 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 B8C9A3FF893 for ; Fri, 29 May 2026 16:51:39 +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=1780073503; cv=none; b=dkaYfOuhd0cqtqelq36PNtDbfr2dPevjJQvAHXXoo66tpVnuB46B/mx/FDFa5C+GkQAiXyB1y5q3sy7LHKMzrbTv12sUqR1TolVjP1wwgcHYaZX1vMLJudqXQpYAOpI55RnZVgY/LeLPjgPohYrbIX76bXTdE+3Lrjy8QS82akA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780073503; c=relaxed/simple; bh=/9vK7oqgWkxOq5hWyTgPFsyB6Rd5CA1wT66CgweGhZs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=N2r5wbBpc03SoiHSXnToLubWxW8ONSbS7mD9R6MVOXHJlmm3Yc+kZzOKzxgQ0HMXaTCYlyZLfRzsb0a5lkvKwIJqdwGqVNVf8VhbhPjvatxBJ9NXcfJ888DhBBd8UHs76T5JBjwkDp2FtFqXjR+Lz1gXmoIQJJ1lZX9dLA4uwEM= 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=jDwaP4Ym; 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="jDwaP4Ym" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2b4530a90fdso106711725ad.1 for ; Fri, 29 May 2026 09:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780073499; x=1780678299; 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=M1JXo6LdkJRwGuJhKDA/Rf+G/NM5xlKF3M5/hZnE0Xg=; b=jDwaP4Ym9fmlCJygZM8QD52oGKKp0EswUayfuL7eCbq9vAkeLuo+wH5ZLjDzVKC49k p8kYFLo39qYkeg7YVLu2PvghCYUcXUynlxfZdQDh0Ng1Wc0c0HbVg5fPzKUw4NF6KVAD 9fJMAbfP4hPbWm8jmLoQHAgX1o6lgfNgndN7RAEV01b4JKjr4oqjuQJmzBoZxSEUKlqN Ac0fwDqMDvwHfv7w8/AWA87Cv/257ER6uNHMX3i9nrzcSg/svT2tXrc8lNsfDymXuyQp SEUTfR/jE/k8XzdDTgOaFGrHSRjAS+doGFXhXZwlKFw8cIOmSNOZUfZ3MAiqUAInItNA UZ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780073499; x=1780678299; 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=M1JXo6LdkJRwGuJhKDA/Rf+G/NM5xlKF3M5/hZnE0Xg=; b=UgPrMiTrHv8YW0sQqJOURz2qdx5l+8Gbanbt6Jl6L79vN7XBWtUbyA10ST9JmFfLoN IyuNj1s1veVOMyTTVNe+63tUUoPb3iOSlpRXtI8acwMGQOBmeXzEh8iewzJ/vFoh9aLQ RDSb8kBNFb+VWqN56c7XrmIgjkBT2su5q+L+JwCkgVUYRJCrdx0Oo8hp9Gv5XsIavApi AVghzPN8w9Zhnn3imN7i3jX0zeUmrxdL5AA8U+O5EIxrlIn+lY8DMYzPFMG973NduVd8 UU8Men5Npp4gP386BJfJovL7LOxBvnP1PhXunSwBHERJOu/R9MRM48bMU+R7v9ByauHe xtaw== X-Forwarded-Encrypted: i=1; AFNElJ8XBgd20JyHwoktP6KBgoUXKSS8POOi8XDpbxasn9mzUTwcKFq0uxbbYyaLykLNRe2J9AOULcIoKfOVd5U=@vger.kernel.org X-Gm-Message-State: AOJu0YyG4ttTHuoijSCoYUT28xWBHpqBNmS0l8f7t+j9tD5t3IAblDkp y4sXrGaMDAhvw46RStS/LIRfM/tTdTInpix9RoYkNYxNtqJ5RGH6UhrRcbHI9n+mMT7jq3zIuKW oEMdGDg== X-Received: from plbmi12.prod.google.com ([2002:a17:902:fccc:b0:2b0:51f0:272d]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1c6:b0:2ba:4ad9:70f6 with SMTP id d9443c01a7336-2bf36875e60mr7672905ad.31.1780073498742; Fri, 29 May 2026 09:51:38 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 09:51:08 -0700 In-Reply-To: <20260529165114.748639-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: <20260529165114.748639-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260529165114.748639-15-seanjc@google.com> Subject: [PATCH v2 14/20] KVM: x86/xen: Convert wait_pending_event() to gpc's CLASS() APIs From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , David Woodhouse , Paul Durrant , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng Cc: Waiman Long , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, David Woodhouse , Sebastian Andrzej Siewior , syzbot+208f7f3e5f59c11aeb90@syzkaller.appspotmail.com, Carsten Stollmaier Content-Type: text/plain; charset="UTF-8" Use gpc's CLASS() interface to lock and check the shared info page when processing a SCHEDOP_poll hypercall. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/xen.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c index d9b09809e243..8f822acb11a4 100644 --- a/arch/x86/kvm/xen.c +++ b/arch/x86/kvm/xen.c @@ -1433,36 +1433,28 @@ static bool wait_pending_event(struct kvm_vcpu *vcpu, int nr_ports, struct kvm *kvm = vcpu->kvm; struct gfn_to_pfn_cache *gpc = &kvm->arch.xen.shinfo_cache; unsigned long *pending_bits; - bool ret = true; int i; guard(srcu)(&kvm->srcu); - if (!read_trylock(&gpc->lock)) - return ret; + CLASS(gpc_try_map_local_ro, shinfo_map)(gpc, PAGE_SIZE); + if (IS_ERR(shinfo_map)) + return true; - if (!kvm_gpc_check(gpc, PAGE_SIZE)) - goto out_rcu; - - ret = false; if (IS_ENABLED(CONFIG_64BIT) && kvm->arch.xen.long_mode) { - struct shared_info *shinfo = gpc->khva; + struct shared_info *shinfo = *shinfo_map; pending_bits = (unsigned long *)&shinfo->evtchn_pending; } else { - struct compat_shared_info *shinfo = gpc->khva; + struct compat_shared_info *shinfo = *shinfo_map; pending_bits = (unsigned long *)&shinfo->evtchn_pending; } for (i = 0; i < nr_ports; i++) { - if (test_bit(ports[i], pending_bits)) { - ret = true; - break; - } + if (test_bit(ports[i], pending_bits)) + return true; } - out_rcu: - read_unlock(&gpc->lock); - return ret; + return false; } static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode, -- 2.54.0.823.g6e5bcc1fc9-goog