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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 829D4C43334 for ; Fri, 17 Jun 2022 21:27:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06DB26B0071; Fri, 17 Jun 2022 17:27:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F37626B0073; Fri, 17 Jun 2022 17:27:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB11A6B0074; Fri, 17 Jun 2022 17:27:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C55686B0071 for ; Fri, 17 Jun 2022 17:27:31 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 95FCA90D for ; Fri, 17 Jun 2022 21:27:31 +0000 (UTC) X-FDA: 79589014302.02.382FE4F Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf10.hostedemail.com (Postfix) with ESMTP id 3F005C008A for ; Fri, 17 Jun 2022 21:27:31 +0000 (UTC) Received: by mail-pj1-f43.google.com with SMTP id k12-20020a17090a404c00b001eaabc1fe5dso5643869pjg.1 for ; Fri, 17 Jun 2022 14:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=4Nh/ioaLxS4TiMuv6mrO3BuuJxs5edtEcbJCJ0DlzHg=; b=kqV10ZowD4mEAwkhnGeH7Vi46uyd6cVb+D27K/8D7q4ZgbepI0UMc7Xg/GhUj7mWCn sUXIO1GdA6DWiQTudDzJU8yc0x7fO1CRRIYu+qGUSrN9fwrVOrLdD1rfHGdBXyFAfxoY HUeLpXo40NmxK6NMGADGQ7EfuqeHEdheydvWwcQvIfZxA5YfRVWSMGNAX2325hWiHuHY 7FXv22PI/DmPa7E2x1nANjza+zy8ei0HlKM5niFMLK6Y/yuw6Rd/UBQlspC2hX9x3Qb4 bTlUA9qVQpHAf6cfcS9FKqlK43DFOWeREbCmJaIPzqYk2+TsXXbIzRcnGQoReMxVEUKW K2kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=4Nh/ioaLxS4TiMuv6mrO3BuuJxs5edtEcbJCJ0DlzHg=; b=oSi+EYmxoUh9tRZ3WcvViJy93OgcS2ppQuQQt395u2iQhuUvRG+unZkHS83YkVEnY5 fljS9GGHTRC2jhg54qz56Qvx23EE9HtHHPRyQqMvHmT26KkrrmUuBcpOLvObVK5BLp9l 9IdwBRGPM3jHo10dXpQyeF6MawF0mjcqTCqpebWgFmVbTU2yf/J4d/3uz2+W5c1BdlZw 86kp0bqMzmyJjiTzjvC+wHubU9QdDW+bQMNaNM2UG/e5jyZrxZrlv2teTpooMgIkOSMA Oyl/aSwRlqZEiiMUnG7+mpFJQhYCgQrNhTTf9eM2NndlzQYQLMoNK9WmYmGC6O1vgsQH PRAA== X-Gm-Message-State: AJIora+qBR12Ic69clF7jG3dT4/+jyIOIgpDKLjQsG+5h3O2zkaZZ+2k oweQcCDFfPhfpVbO+RYvm+5Etg== X-Google-Smtp-Source: AGRyM1uRS2fAbjyxhFU2PYlmkBtwm8UeO62IZrWZixGAXkVAe6FeSFCI9nOgPKmO0Bfh0yLM2ya5lQ== X-Received: by 2002:a17:90a:4503:b0:1ea:4718:829f with SMTP id u3-20020a17090a450300b001ea4718829fmr12496982pjg.103.1655501249895; Fri, 17 Jun 2022 14:27:29 -0700 (PDT) Received: from google.com (123.65.230.35.bc.googleusercontent.com. [35.230.65.123]) by smtp.gmail.com with ESMTPSA id f2-20020a62db02000000b0051868677e6dsm4218356pfg.51.2022.06.17.14.27.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 14:27:29 -0700 (PDT) Date: Fri, 17 Jun 2022 21:27:25 +0000 From: Sean Christopherson To: Chao Peng Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, linux-doc@vger.kernel.org, qemu-devel@nongnu.org, Paolo Bonzini , Jonathan Corbet , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H . Peter Anvin" , Hugh Dickins , Jeff Layton , "J . Bruce Fields" , Andrew Morton , Mike Rapoport , Steven Price , "Maciej S . Szmigiero" , Vlastimil Babka , Vishal Annapurve , Yu Zhang , "Kirill A . Shutemov" , luto@kernel.org, jun.nakajima@intel.com, dave.hansen@intel.com, ak@linux.intel.com, david@redhat.com, aarcange@redhat.com, ddutile@redhat.com, dhildenb@redhat.com, Quentin Perret , Michael Roth , mhocko@suse.com Subject: Re: [PATCH v6 4/8] KVM: Extend the memslot to support fd-based private memory Message-ID: References: <20220519153713.819591-1-chao.p.peng@linux.intel.com> <20220519153713.819591-5-chao.p.peng@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655501251; a=rsa-sha256; cv=none; b=RPajY2GOBJGtC+L3OJAGNH7aZ0QI6nOC8wWQofboNDmX7Rm7WC3Z3JwbRAP8ook0yMzRhS CNwp+dxN2AODt0JJHf6OdZ/swQtZse1kCVvmpoy3oQU9JjA+oLgqtMFFtf9ChTIbnY971z ArkSKSY9kkfWDAjqawxEqMrxIQez9Gs= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=kqV10Zow; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf10.hostedemail.com: domain of seanjc@google.com designates 209.85.216.43 as permitted sender) smtp.mailfrom=seanjc@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655501251; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4Nh/ioaLxS4TiMuv6mrO3BuuJxs5edtEcbJCJ0DlzHg=; b=pdDfDvTXX19mcS8zglkTdfYsj2zHCGVY73jFVZLPb3QcRSkaHCEHu0PXSWBnWTBt6x01Iq K4GSDrQYKzh4ZuQYISHDekPH45sFIh61u1q1qab+rURVLU4Moe7Vi4iO0k30aYl8nKEh2T 4r2xdA1F6ECq/ilRBaGZTtKbJb8055I= Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=kqV10Zow; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf10.hostedemail.com: domain of seanjc@google.com designates 209.85.216.43 as permitted sender) smtp.mailfrom=seanjc@google.com X-Rspam-User: X-Stat-Signature: 8n1693igjrunnjdxzgaj7n799di84ugr X-Rspamd-Queue-Id: 3F005C008A X-Rspamd-Server: rspam08 X-HE-Tag: 1655501251-56178 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: On Fri, Jun 17, 2022, Sean Christopherson wrote: > > @@ -110,6 +133,7 @@ struct kvm_userspace_memory_region { > > */ > > #define KVM_MEM_LOG_DIRTY_PAGES (1UL << 0) > > #define KVM_MEM_READONLY (1UL << 1) > > +#define KVM_MEM_PRIVATE (1UL << 2) > > Hmm, KVM_MEM_PRIVATE is technically wrong now that a "private" memslot maps private > and/or shared memory. Strictly speaking, we don't actually need a new flag. Valid > file descriptors must be >=0, so the logic for specifying a memslot that can be > converted between private and shared could be that "(int)private_fd < 0" means > "not convertible", i.e. derive the flag from private_fd. > > And looking at the two KVM consumers of the flag, via kvm_slot_is_private(), they're > both wrong. Both kvm_faultin_pfn() and kvm_mmu_max_mapping_level() should operate > on the _fault_, not the slot. So it would actually be a positive to not have an easy > way to query if a slot supports conversion. I take that back, the usage in kvm_faultin_pfn() is correct, but the names ends up being confusing because it suggests that it always faults in a private pfn. diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index b6d75016e48c..e1008f00609d 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4045,7 +4045,7 @@ static int kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) return RET_PF_EMULATE; } - if (fault->is_private) { + if (kvm_slot_can_be_private(slot)) { r = kvm_faultin_pfn_private(vcpu, fault); if (r != RET_PF_CONTINUE) return r == RET_PF_FIXED ? RET_PF_CONTINUE : r; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 31f704c83099..c5126190fb71 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -583,9 +583,9 @@ struct kvm_memory_slot { struct kvm *kvm; }; -static inline bool kvm_slot_is_private(const struct kvm_memory_slot *slot) +static inline bool kvm_slot_can_be_private(const struct kvm_memory_slot *slot) { - return slot && (slot->flags & KVM_MEM_PRIVATE); + return slot && !!slot->private_file; } static inline bool kvm_slot_dirty_track_enabled(const struct kvm_memory_slot *slot)