From patchwork Mon Sep 18 11:21:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 14150 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2711444vqi; Mon, 18 Sep 2023 07:42:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPcCnyv8jIiB/t7i1O//71W/C+3CqwyI8RtkGiHFhEuZxFUtWhLwO5OhxL8D+93fOb6Wwu X-Received: by 2002:a05:6808:1790:b0:3ad:c0f2:e277 with SMTP id bg16-20020a056808179000b003adc0f2e277mr8562376oib.28.1695048155425; Mon, 18 Sep 2023 07:42:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695048155; cv=none; d=google.com; s=arc-20160816; b=S0Onri6CTyc2nAVo8ak9KoXSMC0Fc7L7gf7tYI94aw+TnvnZdB1RktkjHJOn765D/p S0rPDyunabPwPSziVzofZBn+u9NUaYj4wN4H9jSfL3hZukI9lpoAc131cEAF3zv6SVfJ Wn9lqbeG5YF9W+GuxHU7xhfkCp0EvxEL5jva2Fdf9baLbV6jG2LTIeFm1zdUFLHN4BWf tq1h+CvhJqJMjuuQQi/H/4bHQknmlvWk9zs5eDmzSqjCS9eO4Gki3qq0mpHZjKAVJhAL E6XWBWgXz6QBPnMVRzqmSeGHKwPp1+JLhhmjSlJC7q27h4ABwJ95udZDH1IPFgIVrH7b 546Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=5CL3lRMr4h6Yv7jfUDZjcA0xe9rzs8HRb/2DF4BY+Bw=; fh=0aWa75l3ggud5DfKnSMkPbHWchQ8NS3SOm4/A8cHGl4=; b=CHEWYzDrx0IPWLgXw6oe7I/BsVX9RjMrlkXvo319EC+8HJJO+QJ3RcTWfUGAWkPvcF vs1xv0J2s74w+pFQoly+59moJ+JTIrqL/S0y3/4FKRFzT1WmofI1FPjiGEvIlPcNeopb +XxDKNufT3NwGLSx0RK2peFi+VtjPv1gJKvHQdqkV/z4zBHBRwH6clArq3sIo56nZf7i rUibZcAwe+D/2TXqQtCQkNbbAJsMCIMKWop5JJCPtEr14y5uWGcvxiY8Q/5O/PqwA95R uWEVeJG/ssNF6Ji7hAJOk3cccb5A8vi3oTil1vm3EegZvRj3qCzbpbzTBCd0yDAjVD9g nExA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=rrwgy0zX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id bu30-20020a63295e000000b00569640c4fb7si7966573pgb.406.2023.09.18.07.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:42:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=rrwgy0zX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id DA39B823A2A5; Mon, 18 Sep 2023 04:23:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241606AbjIRLWt (ORCPT + 27 others); Mon, 18 Sep 2023 07:22:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240032AbjIRLWU (ORCPT ); Mon, 18 Sep 2023 07:22:20 -0400 Received: from mail.xenproject.org (mail.xenproject.org [104.130.215.37]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF95DD2; Mon, 18 Sep 2023 04:22:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date: Subject:Cc:To:From; bh=5CL3lRMr4h6Yv7jfUDZjcA0xe9rzs8HRb/2DF4BY+Bw=; b=rrwgy0 zX5njfIIzptNSykTDm/XipxW4f53oyBgxFwpc+M/NXcJjHiA8U598P2vi/NEF+DZgxsyaEYSVAmCC Ey858ual9StvcYPbjcjV+NNngyeQVho2eSeGA2jcaQgXzvUxklm5VZAaDGHgzvtyLfAEI5mVEJmrq k0CcZcNhGNs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiCKM-00071n-QP; Mon, 18 Sep 2023 11:22:06 +0000 Received: from ec2-63-33-11-17.eu-west-1.compute.amazonaws.com ([63.33.11.17] 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 1qiCKM-0005f3-GB; Mon, 18 Sep 2023 11:22:06 +0000 From: Paul Durrant To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paul Durrant , "H. Peter Anvin" , Borislav Petkov , Dave Hansen , David Woodhouse , Ingo Molnar , Paolo Bonzini , Sean Christopherson , Thomas Gleixner , x86@kernel.org Subject: [PATCH v2 00/12] KVM: xen: update shared_info and vcpu_info handling Date: Mon, 18 Sep 2023 11:21:36 +0000 Message-Id: <20230918112148.28855-1-paul@xen.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 18 Sep 2023 04:23:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777386814626420484 X-GMAIL-MSGID: 1777386814626420484 From: Paul Durrant Currently we treat the shared_info page as guest memory and the VMM informs KVM of its location using a GFN. However it is not guest memory as such; it's an overlay page. So we pointlessly invalidate and re-cache a mapping to the *same page* of memory every time the guest requests that shared_info be mapped into its address space. Let's avoid doing that by modifying the pfncache code to allow activation using a fixed userspace HVA as well as a GPA. Also, if the guest does not hypercall to explicitly set a pointer to a vcpu_info in its own memory, the default vcpu_info embedded in the shared_info page should be used. At the moment the VMM has to set up a pointer to the structure explicitly (again treating it like it's in guest memory, despite being in an overlay page). Let's also avoid the need for that. We already have a cached mapping for the shared_info page so just use that directly by default. Paul Durrant (12): KVM: pfncache: add a map helper function KVM: pfncache: add a mark-dirty helper KVM: pfncache: add a helper to get the gpa KVM: pfncache: base offset check on khva rather than gpa KVM: pfncache: allow a cache to be activated with a fixed (userspace) HVA KVM: xen: allow shared_info to be mapped by fixed HVA KVM: xen: prepare for using 'default' vcpu_info KVM: xen: automatically use the vcpu_info embedded in shared_info KVM: selftests / xen: set KVM_XEN_VCPU_ATTR_TYPE_VCPU_ID KVM: selftests / xen: map shared_info using HVA rather than GFN KVM: selftests / xen: don't explicitly set the vcpu_info address KVM: xen: advertize the KVM_XEN_HVM_CONFIG_SHARED_INFO_HVA capability Documentation/virt/kvm/api.rst | 43 ++++-- arch/x86/include/asm/kvm_host.h | 4 + arch/x86/kvm/x86.c | 17 +-- arch/x86/kvm/xen.c | 121 ++++++++++++---- arch/x86/kvm/xen.h | 6 +- include/linux/kvm_host.h | 43 ++++++ include/linux/kvm_types.h | 3 +- include/uapi/linux/kvm.h | 6 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 79 +++++++++-- virt/kvm/pfncache.c | 129 +++++++++++++----- 10 files changed, 342 insertions(+), 109 deletions(-) Reviewed-by: David Woodhouse --- Cc: "H. Peter Anvin" Cc: Borislav Petkov Cc: Dave Hansen Cc: David Woodhouse Cc: Ingo Molnar Cc: Paolo Bonzini Cc: Sean Christopherson Cc: Thomas Gleixner Cc: x86@kernel.org