From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BF49C433DF for ; Mon, 25 May 2020 15:27:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DE4752070A for ; Mon, 25 May 2020 15:27:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eXUisQw9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE4752070A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 80DEE8004B; Mon, 25 May 2020 11:27:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7BC588E0008; Mon, 25 May 2020 11:27:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6844C8004B; Mon, 25 May 2020 11:27:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0114.hostedemail.com [216.40.44.114]) by kanga.kvack.org (Postfix) with ESMTP id 4DD6B8E0008 for ; Mon, 25 May 2020 11:27:05 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 018878245571 for ; Mon, 25 May 2020 15:27:05 +0000 (UTC) X-FDA: 76855619610.12.fang79_3dc4066acb82d X-HE-Tag: fang79_3dc4066acb82d X-Filterd-Recvd-Size: 6456 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Mon, 25 May 2020 15:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590420423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=D//cvB4ccMcU7KW9UZeTWAleysSnbPmlxts0hTz3QMU=; b=eXUisQw9YjXCmbyjVS+/gbkH0znmy3p6sxaBvXi69LqER2FMR1WQGb7Y++/Gp6LvFuDx9X OSEIAIBrebmb0uWXnS1DT6+MFG+vxJiVNO3xoizQ4Nk4ISdqE1FRfFNhSJ9TnQjlFXchuj XYEILfXJpKPWOdG1m/E62/x/XYmpmwE= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-446-D-D84u4GMImw6Npcot7WDw-1; Mon, 25 May 2020 11:27:01 -0400 X-MC-Unique: D-D84u4GMImw6Npcot7WDw-1 Received: by mail-ed1-f71.google.com with SMTP id bm11so7576136edb.8 for ; Mon, 25 May 2020 08:27:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=D//cvB4ccMcU7KW9UZeTWAleysSnbPmlxts0hTz3QMU=; b=Pjky+nWFh9EeqJBXl48XiJAqQ0ldmNv1tyZtnVKbEeVXLVmetKBhOC2U1UDJ+GQlz2 tk7JHjFllGFvNVy0zx6cIg0u3Lq07B/BRVXWhdhRQijaw2zNdQIPPPsPi6WAbtAItIuv ZdieTDDQm4MkvsOI3PUSCmj7zMnFTD2okfWhZMGFk7q+EKIudLJut2C1Tp1EWIKZz22z UWhQKcY2z6sc0At45KsvOOntOMj4SyEjqOwJarlEskqtkHuGxkIWZk0iAirQM7b5CTbR 8XizbWksovnPuoGofcnt55uFsADZa6W8P/5uVEEcnwjTYnOyuifuYNmlu7a9wOH/vDwb qpcg== X-Gm-Message-State: AOAM532FmSZzYmRR6L2uzUW35shGO8PNfvTOzIluiRmQ3y/BT8qhZeH7 vJoZiSGFe/Y+UyeBWpJ5KdFn2cdu4redXb3m9Te4tOJbPbuJO6DWFmYN8yc9amVl1LjWNsJ6aPt X61nPGCa2jBE= X-Received: by 2002:aa7:c3cb:: with SMTP id l11mr15085919edr.364.1590420420657; Mon, 25 May 2020 08:27:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZJ5nnz6Pm1rUfoN4Xt+hW/+DcDkZEDQAlbclmL9sVABHeTOqcq9oYu+WEZFJdsIkhoWrV9g== X-Received: by 2002:aa7:c3cb:: with SMTP id l11mr15085907edr.364.1590420420401; Mon, 25 May 2020 08:27:00 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id cm26sm15655925edb.87.2020.05.25.08.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 May 2020 08:26:59 -0700 (PDT) From: Vitaly Kuznetsov To: "Kirill A. Shutemov" Cc: David Rientjes , Andrea Arcangeli , Kees Cook , Will Drewry , "Edgecombe\, Rick P" , "Kleen\, Andi" , x86@kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Paolo Bonzini , Sean Christopherson , Wanpeng Li , Jim Mattson , Joerg Roedel Subject: Re: [RFC 10/16] KVM: x86: Enabled protected memory extension In-Reply-To: <20200522125214.31348-11-kirill.shutemov@linux.intel.com> References: <20200522125214.31348-1-kirill.shutemov@linux.intel.com> <20200522125214.31348-11-kirill.shutemov@linux.intel.com> Date: Mon, 25 May 2020 17:26:58 +0200 Message-ID: <871rn8827x.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: "Kirill A. Shutemov" writes: > Wire up hypercalls for the feature and define VM_KVM_PROTECTED. > > Signed-off-by: Kirill A. Shutemov > --- > arch/x86/Kconfig | 1 + > arch/x86/kvm/cpuid.c | 3 +++ > arch/x86/kvm/x86.c | 9 +++++++++ > include/linux/mm.h | 4 ++++ > 4 files changed, 17 insertions(+) > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 58dd44a1b92f..420e3947f0c6 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -801,6 +801,7 @@ config KVM_GUEST > select ARCH_CPUIDLE_HALTPOLL > select X86_MEM_ENCRYPT_COMMON > select SWIOTLB > + select ARCH_USES_HIGH_VMA_FLAGS > default y > ---help--- > This option enables various optimizations for running under the KVM > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 901cd1fdecd9..94cc5e45467e 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -714,6 +714,9 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) > (1 << KVM_FEATURE_POLL_CONTROL) | > (1 << KVM_FEATURE_PV_SCHED_YIELD); > > + if (VM_KVM_PROTECTED) > + entry->eax |=(1 << KVM_FEATURE_MEM_PROTECTED); Nit: missing space. > + > if (sched_info_on()) > entry->eax |= (1 << KVM_FEATURE_STEAL_TIME); > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index c17e6eb9ad43..acba0ac07f61 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -7598,6 +7598,15 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) > kvm_sched_yield(vcpu->kvm, a0); > ret = 0; > break; > + case KVM_HC_ENABLE_MEM_PROTECTED: > + ret = kvm_protect_all_memory(vcpu->kvm); > + break; > + case KVM_HC_MEM_SHARE: > + ret = kvm_protect_memory(vcpu->kvm, a0, a1, false); > + break; > + case KVM_HC_MEM_UNSHARE: > + ret = kvm_protect_memory(vcpu->kvm, a0, a1, true); > + break; > default: > ret = -KVM_ENOSYS; > break; > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 4f7195365cc0..6eb771c14968 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -329,7 +329,11 @@ extern unsigned int kobjsize(const void *objp); > # define VM_MAPPED_COPY VM_ARCH_1 /* T if mapped copy of data (nommu mmap) */ > #endif > > +#if defined(CONFIG_X86_64) && defined(CONFIG_KVM) > +#define VM_KVM_PROTECTED VM_HIGH_ARCH_4 > +#else > #define VM_KVM_PROTECTED 0 > +#endif > > #ifndef VM_GROWSUP > # define VM_GROWSUP VM_NONE -- Vitaly