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 B1296C38142 for ; Sat, 28 Jan 2023 14:08:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C0D36B0074; Sat, 28 Jan 2023 09:08:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2707E6B0075; Sat, 28 Jan 2023 09:08:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1381D6B0078; Sat, 28 Jan 2023 09:08:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 012F96B0074 for ; Sat, 28 Jan 2023 09:08:31 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id CC4138053D for ; Sat, 28 Jan 2023 14:08:31 +0000 (UTC) X-FDA: 80404388022.12.65C1A01 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf18.hostedemail.com (Postfix) with ESMTP id 9674F1C0009 for ; Sat, 28 Jan 2023 14:08:29 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=KobvJN7B; spf=none (imf18.hostedemail.com: domain of chao.p.peng@linux.intel.com has no SPF policy when checking 134.134.136.24) smtp.mailfrom=chao.p.peng@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674914909; h=from:from:sender:reply-to: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=7PQxkU43pKfzSOiZoRBOU9qtOSqKfEz+FaKV630dXoI=; b=ywmK3b9PWO72yOKA6qBPDXKE9eFQlmuVKVk80LZx4Hxs9pHx8VTvfx5ijB8cJ0yrXlk2z9 nZqTbEyEQu6WU9nU+4Y39CNKy/uJLYXRTk3fCEN/2ot+AqDovErvGHOjEM0aE04tnXK7C0 mlmIA1yk1AofU+70BhlwyU6CQkdcsxU= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=KobvJN7B; spf=none (imf18.hostedemail.com: domain of chao.p.peng@linux.intel.com has no SPF policy when checking 134.134.136.24) smtp.mailfrom=chao.p.peng@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674914909; a=rsa-sha256; cv=none; b=X6E9vwH9ExUdWpjb2HVYlo21itt3GGtIMau9vEfENELwt8R22gsk/uc9p6kkUc8JMnwaQS NUfacBKOIHDuIYNiB3yCNmKhguRuIU08IWI3QxKdhz0m/sv9HoCRStI40B+rpidUlj8mTO nWR+cbpxz/Fda/vJcevqm8bK56IvdgU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674914909; x=1706450909; h=date:from:to:cc:subject:message-id:reply-to:references: mime-version:in-reply-to; bh=jGLKHUiTup0wR3d32S/+noCZxMpThHkENbyPsFWyI2U=; b=KobvJN7BnOEb4pJfK3ZLRzgb9aKqOPSGRLnAFANBBdjihUwQtuAWfhH6 JFC23X5jNDi2cQN0UvV+rtaPrt71AP/8WA1574tCG3/2+Zb86ni4OLrqo 2n+4L0PYg1geGbwoSHc1f/uYVMYEOqous5NsKM58+wSblHP8/nLa6HZGP zOJo3FlqCyd3DFKYDFXjFglGyxQT4hnxNGkxp/217PTLQgx267dCXGyup rp1hJ9BmgMcsuNolF38HpV54DQUaXaNSVRJ0zhcAt4pvhFDP1aPv3DLiP p8BH7gqd3BwgJVeYXnJ0/iLzGq131Teb3Dpbu20oCXN3XHQswatNx/9j8 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10604"; a="328579170" X-IronPort-AV: E=Sophos;i="5.97,254,1669104000"; d="scan'208";a="328579170" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2023 06:08:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10604"; a="663602794" X-IronPort-AV: E=Sophos;i="5.97,254,1669104000"; d="scan'208";a="663602794" Received: from chaop.bj.intel.com (HELO localhost) ([10.240.192.105]) by orsmga002.jf.intel.com with ESMTP; 28 Jan 2023 06:08:15 -0800 Date: Sat, 28 Jan 2023 22:00:30 +0800 From: Chao Peng To: Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-arch@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 , Arnd Bergmann , Naoya Horiguchi , Miaohe Lin , x86@kernel.org, "H . Peter Anvin" , Hugh Dickins , Jeff Layton , "J . Bruce Fields" , Andrew Morton , Shuah Khan , 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 , tabba@google.com, Michael Roth , mhocko@suse.com, wei.w.wang@intel.com Subject: Re: [PATCH v10 9/9] KVM: Enable and expose KVM_MEM_PRIVATE Message-ID: <20230128140030.GB700688@chaop.bj.intel.com> Reply-To: Chao Peng References: <20221202061347.1070246-1-chao.p.peng@linux.intel.com> <20221202061347.1070246-10-chao.p.peng@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: xfbqpzhf5o5cec95bq7f7qqg8mxjkpsh X-Rspamd-Queue-Id: 9674F1C0009 X-HE-Tag: 1674914909-191588 X-HE-Meta: U2FsdGVkX1/S9pbXuRRGeVMOaDHA42ww3JdiIHi1MkfSBY4WVpx+tfeuvSN982WMFoHG26M+l/AiMPktTeKaqBnmjxHMVeZbTScflhjouhwdGOn50Y6SXF0oCdsIvuidBSLKxV75eABDmTA5BatIM8HgZpLgLjNRreubsErIbHGgNHwireqwAyb68QuGnZT5oq0MRiK37X8JUl5isDiHxYok5OIZpWaA4FoYjKMBNuOZj9W7wre5Fy6ijc+zu2JLJ0WpJDUj+vSu+xgQzbHNOd/UovVBWjLk2ZfdXFPxIlx0tsl/9KH1QRVmhj4O+Ts04ieaB+O8v0yBqeUzSc2XNnr+Oq09afdxcI28QSKwTcTvYU0Q/zRtbeU4g8ihDpD2RonpWVBcEQb63KrBn4XvA9JD8rQHOzgbDV4GPGZyu3dpgV8P7FdZu+qkW0QMbFp7YVTVe7ka3AkLsxyubPM+CYhAh8r/mquY+s1Gb/G2rtYYJFguD9eJVWuHAS4hNPOePBWG8/wEuuRsaGgbsNAyrxcTc3obLVwKvMygF3emzrsIGzCAhz7v0WbL5YLdU0/JiN4as/VWMMTKt6vGrXIUvKJ4Ccb14N62FvpT/MxpYSCrcYb6WuYZ/S/OQ94oLb2zS7qOCAP1uHOa4kgu3RHyABrfYYey1g4qC5I+Z2LOs3C/QfS/1vhpc25MPqjH7cv+NWAf83VdXPOg0pAmFnL8A+jVxth6wSTpFxUBmgsRBpXzEptlCQm/TTCMNcq53KKxy1lr7rzGosVdaoFSMUw2XeUiVJrF7CZIwoZc4T98wfb5Ry3CaudgFJOnhvH63gp2EZiDj5vaN/s9EI82/0kBd0lkQNgVMrBNbjMEWwWsPSpHNaXu7Tl0+9SJvBMeel3qLKtcNzGo5x3jppHTU8I8PK4mBV6pFlxorxI45YFK94tH1ZhIN6xwik+ha9ClbUOKmoiqf1y/78BvzOC1VT/ lcfaDnaw IpChzQWUgfAb3FNVRmYsisQABu9LhZzQglJCcQtgepbaN7FscODAek6SYQ4diYJ9R/YNepU0AhN0JJYUUb53LLjA9HsxHR6a0BfquDvckfFnPfEN9N59WngmQStzdC8JVv7sS0HVkr79u0Wu6faHvbHf0ONbb02eyQ2lnKGBROdGrMBlmtLj/k+8ej6IyWMtbMlgMMygae2UMuhdbgdlrm03y1M3Y9CuswZ9hnaRKYhpViEYSoGRwpH77YwdaIa3VnxIrMFK4DZONoGnpMNGWZCeuvOC8wYxfR76PqH/vsuIOjLA= 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 Sat, Jan 14, 2023 at 12:01:01AM +0000, Sean Christopherson wrote: > On Fri, Dec 02, 2022, Chao Peng wrote: ... > Strongly prefer to use similar logic to existing code that detects wraps: > > mem->restricted_offset + mem->memory_size < mem->restricted_offset > > This is also where I'd like to add the "gfn is aligned to offset" check, though > my brain is too fried to figure that out right now. Used count_trailing_zeros() for this TODO, unsure we have other better approach. diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index afc8c26fa652..fd34c5f7cd2f 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -56,6 +56,7 @@ #include #include #include +#include #include "coalesced_mmio.h" #include "async_pf.h" @@ -2087,6 +2088,19 @@ static bool kvm_check_memslot_overlap(struct kvm_memslots *slots, int id, return false; } +/* + * Return true when ALIGNMENT(offset) >= ALIGNMENT(gpa). + */ +static bool kvm_check_rmem_offset_alignment(u64 offset, u64 gpa) +{ + if (!offset) + return true; + if (!gpa) + return false; + + return !!(count_trailing_zeros(offset) >= count_trailing_zeros(gpa)); +} + /* * Allocate some memory and give it an address in the guest physical address * space. @@ -2128,7 +2142,8 @@ int __kvm_set_memory_region(struct kvm *kvm, if (mem->flags & KVM_MEM_PRIVATE && (mem->restrictedmem_offset & (PAGE_SIZE - 1) || mem->restrictedmem_offset + mem->memory_size < mem->restrictedmem_offset || - 0 /* TODO: require gfn be aligned with restricted offset */)) + !kvm_check_rmem_offset_alignment(mem->restrictedmem_offset, + mem->guest_phys_addr))) return -EINVAL; if (as_id >= kvm_arch_nr_memslot_as_ids(kvm) || id >= KVM_MEM_SLOTS_NUM) return -EINVAL;