From patchwork Thu Feb 15 15:29:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 201587 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp489554dyb; Thu, 15 Feb 2024 07:49:39 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX/mAy8k0Bob5iVoH6rTUsVFZV3AlyV3eRdlBDjZ3kicGPUWPJWIxQaiwn5VZXzWF1yFm7Pch/P9B5olDG9bkF15YXd4g== X-Google-Smtp-Source: AGHT+IF+HHimoJP5f2nS01bvXBvFhxlHCrz5Btno2qeFVYCwR0/9//tgQwdm++o3o6mPs3PnBkNN X-Received: by 2002:a17:906:d145:b0:a3d:ab5f:2113 with SMTP id br5-20020a170906d14500b00a3dab5f2113mr958728ejb.38.1708012179250; Thu, 15 Feb 2024 07:49:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708012179; cv=pass; d=google.com; s=arc-20160816; b=QVXt8U1U1FSJ4gWRsXN5aaLOQEL/4SNras7IVUVO9hyzePoQ3tsmWYjj14DbM+Ijbe nD65/45HjQFSmndz2+cIn2NnwfT+GWsDlKkJ30HNPWfzdM2aPBtSwefFDtcplCifiKUy G8Lc2WfpDVnVFj+YR7Y4/cf8XSQUf/M73qg/u54lF7G1VybhsoEsEiCd1WaY527UT90e lVvbp7ZYxeP1UubUFiyO9Sqb2iDcyq/i6egFkaC7lOfH+9EWS8ZuLsp2ULbFpKcJ5Xm6 Rmp4qtWIxuoPBU6F9uClSDvQOSA9OZv+a9kJVG1fqm/cMjjQp+qvw6MaPC4wd4L+B/g4 +Q2w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=1MkSaLF7c08GKXChco4qld/H7sOx3qJp6Y3BVchMvB4=; fh=NrOggL3VZvuSFh5W9Wj2+kLgS4v0nogfnAWvBJoouXQ=; b=j2Vhkl7EbdL0uOJM8oA8ObpLoPKSQOpO6XDhtDk+ktDQq9/8YOFCPi7E11mJI8dY68 FG4xKdirizvUPSR0kTw+VX/lRaytrEIxpeOVDeGXtnmM2C7B6v6jtlGnG6q9YiLCLZny Kr2TOmQC6exR8R9srL1fNdBjLHVE6ilB7u2CSdDhBB3xqfQsmuCKpE1hAiYA7Q52Za2G Q+R0lfCjCyKGr4lI0733uDei7odtZwORSSCV5OO9FtuIFWRLlCgeE3GUL5sXzZ5fmDY6 wPpII+dbxbHzt4Hg7fIi8KmHvnsJb3QzIu7rpwGtNFpqTee898jRRz0dvgeC2PABj92b LHUQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=LDDATzJU; arc=pass (i=1 spf=pass spfdomain=xen.org dkim=pass dkdomain=xen.org); spf=pass (google.com: domain of linux-kernel+bounces-67230-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67230-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id kb16-20020a1709070f9000b00a3ba6fe0848si736571ejc.765.2024.02.15.07.49.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 07:49:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67230-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=LDDATzJU; arc=pass (i=1 spf=pass spfdomain=xen.org dkim=pass dkdomain=xen.org); spf=pass (google.com: domain of linux-kernel+bounces-67230-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67230-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 5E7461F2A1B9 for ; Thu, 15 Feb 2024 15:48:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 45E0A13666C; Thu, 15 Feb 2024 15:44:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen.org header.i=@xen.org header.b="LDDATzJU" Received: from mail.xenproject.org (mail.xenproject.org [104.130.215.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CED6A134CF3; Thu, 15 Feb 2024 15:44:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=104.130.215.37 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708011877; cv=none; b=G4UPgVuRKlJ0Lfo+m+vQoll61DF8CWPK/hVMMm9aiH/7dPW2KpliJbTjbnyZkJLwr4Pi9R3aNkYunV6FG3uWl7kisA6Ck1AlpqGMN73auO0kHqVOaZ1SYwZwVUz3QGKMu+LGWDpuESVnPRR9+aXhBhjWlZ5IonTl9gWOkbwj7gM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708011877; c=relaxed/simple; bh=szYE4dBrS14T5FnVhn+t4sIXYh2/J0t9jHt/WAPjtCM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TBjMa7AvSMc8DUl/RUcxAi7dBRAmDkn6Hs2AXa3y1JRz7oO5SJu9nMab5eZDOfaHrCeZ8a2RUsbf2K5AU7u4JyXfza92pv7FkKdwSPQrJ7LlfN1iRC/Lddzzb5UZupF+hfdg+qUDDaCsm4PoEB8hM6gkwSKey1O4NOu5471+bMY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org; spf=pass smtp.mailfrom=xen.org; dkim=pass (1024-bit key) header.d=xen.org header.i=@xen.org header.b=LDDATzJU; arc=none smtp.client-ip=104.130.215.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xen.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From; bh=1MkSaLF7c08GKXChco4qld/H7sOx3qJp6Y3BVchMvB4=; b=LDDATzJUtbk4aXB5cGW8Z7kXBN /U8PGPAtsqIfrudSvWx+sTGNOOsS+AemAudbmeHvIKgE6EoG3uGIQ6rslkmMeC6JD50m2Ejy8NTQ/ BOjU0elxcCBcnnHbqc/5/KUIq3GT7jFCvAg1Y7CJquhTXVqh0V8LGNRKVoPaOSpzT+hI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1raduL-0001WO-V7; Thu, 15 Feb 2024 15:44:17 +0000 Received: from 54-240-197-226.amazon.com ([54.240.197.226] helo=REM-PW02S00X.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1radh7-00089r-0K; Thu, 15 Feb 2024 15:30:37 +0000 From: Paul Durrant To: Paolo Bonzini , Jonathan Corbet , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , David Hildenbrand , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Sven Schnelle , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , David Woodhouse , Paul Durrant , Shuah Khan , kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v13 10/21] KVM: x86/xen: separate initialization of shared_info cache and content Date: Thu, 15 Feb 2024 15:29:05 +0000 Message-Id: <20240215152916.1158-11-paul@xen.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240215152916.1158-1-paul@xen.org> References: <20240215152916.1158-1-paul@xen.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790980578601656380 X-GMAIL-MSGID: 1790980578601656380 From: Paul Durrant A subsequent patch will allow shared_info to be initialized using either a GPA or a user-space (i.e. VMM) HVA. To make that patch cleaner, separate the initialization of the shared_info content from the activation of the pfncache. Signed-off-by: Paul Durrant Reviewed-by: David Woodhouse --- Cc: Sean Christopherson Cc: Paolo Bonzini Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: David Woodhouse Cc: x86@kernel.org v13: - Patch title change. v11: - Fix accidental regression from commit 5d6d6a7d7e66a ("KVM: x86: Refine calculation of guest wall clock to use a single TSC read"). v10: - New in this version. --- arch/x86/kvm/xen.c | 55 +++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c index e90464225467..031e98d88ba2 100644 --- a/arch/x86/kvm/xen.c +++ b/arch/x86/kvm/xen.c @@ -34,41 +34,32 @@ static bool kvm_xen_hcall_evtchn_send(struct kvm_vcpu *vcpu, u64 param, u64 *r); DEFINE_STATIC_KEY_DEFERRED_FALSE(kvm_xen_enabled, HZ); -static int kvm_xen_shared_info_init(struct kvm *kvm, gfn_t gfn) +static int kvm_xen_shared_info_init(struct kvm *kvm) { struct gfn_to_pfn_cache *gpc = &kvm->arch.xen.shinfo_cache; struct pvclock_wall_clock *wc; - gpa_t gpa = gfn_to_gpa(gfn); u32 *wc_sec_hi; u32 wc_version; u64 wall_nsec; int ret = 0; int idx = srcu_read_lock(&kvm->srcu); - if (gfn == KVM_XEN_INVALID_GFN) { - kvm_gpc_deactivate(gpc); - goto out; - } + read_lock_irq(&gpc->lock); + while (!kvm_gpc_check(gpc, PAGE_SIZE)) { + read_unlock_irq(&gpc->lock); - do { - ret = kvm_gpc_activate(gpc, gpa, PAGE_SIZE); + ret = kvm_gpc_refresh(gpc, PAGE_SIZE); if (ret) goto out; - /* - * This code mirrors kvm_write_wall_clock() except that it writes - * directly through the pfn cache and doesn't mark the page dirty. - */ - wall_nsec = kvm_get_wall_clock_epoch(kvm); - - /* It could be invalid again already, so we need to check */ read_lock_irq(&gpc->lock); + } - if (gpc->valid) - break; - - read_unlock_irq(&gpc->lock); - } while (1); + /* + * This code mirrors kvm_write_wall_clock() except that it writes + * directly through the pfn cache and doesn't mark the page dirty. + */ + wall_nsec = kvm_get_wall_clock_epoch(kvm); /* Paranoia checks on the 32-bit struct layout */ BUILD_BUG_ON(offsetof(struct compat_shared_info, wc) != 0x900); @@ -639,12 +630,30 @@ int kvm_xen_hvm_set_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data) } break; - case KVM_XEN_ATTR_TYPE_SHARED_INFO: + case KVM_XEN_ATTR_TYPE_SHARED_INFO: { + int idx; + mutex_lock(&kvm->arch.xen.xen_lock); - r = kvm_xen_shared_info_init(kvm, data->u.shared_info.gfn); + + idx = srcu_read_lock(&kvm->srcu); + + if (data->u.shared_info.gfn == KVM_XEN_INVALID_GFN) { + kvm_gpc_deactivate(&kvm->arch.xen.shinfo_cache); + r = 0; + } else { + r = kvm_gpc_activate(&kvm->arch.xen.shinfo_cache, + gfn_to_gpa(data->u.shared_info.gfn), + PAGE_SIZE); + } + + srcu_read_unlock(&kvm->srcu, idx); + + if (!r && kvm->arch.xen.shinfo_cache.active) + r = kvm_xen_shared_info_init(kvm); + mutex_unlock(&kvm->arch.xen.xen_lock); break; - + } case KVM_XEN_ATTR_TYPE_UPCALL_VECTOR: if (data->u.vector && data->u.vector < 0x10) r = -EINVAL;