From patchwork Tue Dec 19 16:11:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 181092 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2068242dyi; Tue, 19 Dec 2023 08:44:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjb9OSK/9fQPXabbxNtXngNd/aaAothbQ3OdStMwkuE2+kCXjVTevP0kpH1f5ysjlCZrd1 X-Received: by 2002:a17:907:9158:b0:a23:4832:2bcb with SMTP id l24-20020a170907915800b00a2348322bcbmr1959356ejs.0.1703004276984; Tue, 19 Dec 2023 08:44:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703004276; cv=none; d=google.com; s=arc-20160816; b=ZKNyd8RNbR7OtcAfd0OWZrWrVaYjeWA0LMecsWxETzKJyQY9BYQZXDZphrYk4QplOU wHXA8ThdbVs/Q+Yji/KScZo22Uf8mBDtErGSj7vlygWhQinUeltih8HZFS5DwPBGv72S ceuLeoCidH14aeAOnn5OjdUXaZAN8SyojtJhGyoAMuY/KRGS8T5R6fml6HE5HLmj/pVx 8y6130YbKr3Ulj7K92mdZvCjgYcfM5b+1SD2LNSfLj1HLDJI6VCVey8FiC9EwtjO8ngd e75K+ihZ5kdgNt4/O4YHDGtx8CgyFParUd3oIhJHu88IkYM+Ffa/6ZL/bTz2dblISiMZ 0CNQ== ARC-Message-Signature: i=1; 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=IwIWZblfKj3BKuq8ExzGdK6LpJ/7Q2oHMm87qqFklHc=; fh=aAPqvXm40pY9772UiBOljEePwtz/3Q0zIOpw238tj3M=; b=O2aKwONAKtQPOnCC+DOvicM/S5H43PlwIBWFXwEMYZZE6Z9/aLPARMrS2wzVnEOrUN zREShJwPDe3FSb+CzDjI4hTE29aH3uVqqg6k0+8RvNARPbkJUcInhCVa2G+GCX7fvHfr mB5PO3SOHhsqqFDLuv1MYKF30KSb/jBtTQQxYad9tfZ5Tx0E0zuSQTMBwnEFANtHXADa X/+aJFbGqjLVHh3MqokofxeRkAk0EUq40ccockn9GYvdgXQFjUOPzxPtJZN9sTQGL5Hp ueDkYCxdU+qLLzOSbWO5bEvwZcSoRMGLyi1ezLbl6a+A3H200uPV4NX/gItTqe6MlBLV 8Yqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=QuR6CFsK; spf=pass (google.com: domain of linux-kernel+bounces-5582-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5582-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 e11-20020a170906044b00b00a232de45ef1si2827631eja.942.2023.12.19.08.44.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 08:44:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5582-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=QuR6CFsK; spf=pass (google.com: domain of linux-kernel+bounces-5582-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5582-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 98A511F25A84 for ; Tue, 19 Dec 2023 16:44:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C909A38DCA; Tue, 19 Dec 2023 16:41:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen.org header.i=@xen.org header.b="QuR6CFsK" X-Original-To: linux-kernel@vger.kernel.org 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 C8F81225D8; Tue, 19 Dec 2023 16:41:49 +0000 (UTC) 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=IwIWZblfKj3BKuq8ExzGdK6LpJ/7Q2oHMm87qqFklHc=; b=QuR6CFsKaG9aHpbhPULi6nCIgb vkNzsgbGYFJ+0kGXQsmZpZjW74zcjDKKf4NEtkI6weJ+uVzqd+bdS1IuVep9ArMovGgjsbaN+wq/P 34atUECo3kgdEPUoJXWncHkztuAgGzOyr4ufZgkVon+Zl2RHqJiOCGwCOvjNXv+FBXow=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rFd9y-000651-5I; Tue, 19 Dec 2023 16:41:34 +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 1rFck9-0005h9-W4; Tue, 19 Dec 2023 16:14:54 +0000 From: Paul Durrant To: Paolo Bonzini , Jonathan Corbet , 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-kselftest@vger.kernel.org Subject: [PATCH v11 10/19] KVM: xen: re-initialize shared_info if guest (32/64-bit) mode is set Date: Tue, 19 Dec 2023 16:11:00 +0000 Message-Id: <20231219161109.1318-11-paul@xen.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231219161109.1318-1-paul@xen.org> References: <20231219161109.1318-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: 1785729412691357294 X-GMAIL-MSGID: 1785729412691357294 From: Paul Durrant If the shared_info PFN cache has already been initialized then the content of the shared_info page needs to be re-initialized whenever the guest mode is (re)set. Setting the guest mode is either done explicitly by the VMM via the KVM_XEN_ATTR_TYPE_LONG_MODE attribute, or implicitly when the guest writes the MSR to set up the hypercall page. 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 v11: - Drop the hunk removing the call to kvm_xen_shared_info_init() when KVM_XEN_ATTR_TYPE_SHARED_INFO is set; it was a mistake and causes self- test failures. v10: - New in this version. --- arch/x86/kvm/xen.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c index df53fea73747..27d0e89fc4ab 100644 --- a/arch/x86/kvm/xen.c +++ b/arch/x86/kvm/xen.c @@ -623,10 +623,20 @@ int kvm_xen_hvm_set_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data) if (!IS_ENABLED(CONFIG_64BIT) && data->u.long_mode) { r = -EINVAL; } else { + bool lm = !!data->u.long_mode; + mutex_lock(&kvm->arch.xen.xen_lock); - kvm->arch.xen.long_mode = !!data->u.long_mode; + if (kvm->arch.xen.long_mode != lm) { + kvm->arch.xen.long_mode = lm; + + /* + * Re-initialize shared_info to put the wallclock in the + * correct place. + */ + r = kvm->arch.xen.shinfo_cache.active ? + kvm_xen_shared_info_init(kvm) : 0; + } mutex_unlock(&kvm->arch.xen.xen_lock); - r = 0; } break; @@ -1101,9 +1111,24 @@ int kvm_xen_write_hypercall_page(struct kvm_vcpu *vcpu, u64 data) u32 page_num = data & ~PAGE_MASK; u64 page_addr = data & PAGE_MASK; bool lm = is_long_mode(vcpu); + int r = 0; + + mutex_lock(&kvm->arch.xen.xen_lock); + if (kvm->arch.xen.long_mode != lm) { + kvm->arch.xen.long_mode = lm; + + /* + * Re-initialize shared_info to put the wallclock in the + * correct place. + */ + if (kvm->arch.xen.shinfo_cache.active && + kvm_xen_shared_info_init(kvm)) + r = 1; + } + mutex_unlock(&kvm->arch.xen.xen_lock); - /* Latch long_mode for shared_info pages etc. */ - vcpu->kvm->arch.xen.long_mode = lm; + if (r) + return r; /* * If Xen hypercall intercept is enabled, fill the hypercall