Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp7351864imu; Mon, 3 Dec 2018 11:26:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/WBCHfZgE/j1s1VvXCjkiOHOrdED7PtM4kAYWA/ATpwSYhLt089+DtwAa3zlbCcIcEbWjYA X-Received: by 2002:a17:902:a03:: with SMTP id 3mr17279538plo.112.1543865213756; Mon, 03 Dec 2018 11:26:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543865213; cv=none; d=google.com; s=arc-20160816; b=MUbi6Y4dDfE81QuPjJidxBmfWWlLUZHLfJqcjFiXuFtRFpOKlUSN0SptorSuCsYfFH 5dW1+Eq4skXV+RCMgVgxViAdiuS36ruyJpxgehDljNhkksahYyF+onuP0hEu2KcITLI9 L4WgPtlnGPd3YLYnTw0ATsJvtyrUE4mRf0thsjp0emibQ8xYFB2JrVmBiYc1VOzgR+aD t8/aNrEEHidfrUvJyA78BZbHfyy4eAiCVlfqwjt0LI6yUZIDkGMb4VK5ZcFpPhAofatb ohly6pQPm0SJyzBgyUvxAA5OSs5mRGxfczOIz1Drb65SkmsiBw6b6QIHAsWkvZ7BzjC+ FyVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=STy7w+8gswWjStbq2Q93YOGUS6JNeR4D5R0c0fVb3MM=; b=GUsPEkRkESlvZG27EB99DqcbssMF45HegIJUkbZH/UaiLu8WWFdjsvgQtyq8x0LrI4 4x+6OYlN3xbYHgehFrv/MALFqQuYTmTh+DBw8/XT6epqUEVw5H5N5zjmaYVKfTtzamxY 4lxbEzLBrLqOf+8QufmgQ2PCH46y4iLMui8Jm6FRi0G0qRi2CqRYnZEwjIbr4OV0JLZF oWeAP53dWd1H8HQWX7OLZO9JhhX9VFSL5WaYgV1n+mfyaxmKzDjbMk6jgPt4SUjeNB8B FIidf3ZUuvoNFhqHLbncl1+KJhkDCQ0zQPEKQ0NfKTdPEaxXVaGRBL83I3gX42l52PAG zFoQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b14si13844952pgj.20.2018.12.03.11.26.38; Mon, 03 Dec 2018 11:26:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726189AbeLCTZm (ORCPT + 99 others); Mon, 3 Dec 2018 14:25:42 -0500 Received: from mga18.intel.com ([134.134.136.126]:5026 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725908AbeLCTZl (ORCPT ); Mon, 3 Dec 2018 14:25:41 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2018 11:25:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,311,1539673200"; d="scan'208";a="97705143" Received: from ahduyck-desk1.amr.corp.intel.com ([10.7.198.76]) by orsmga006.jf.intel.com with ESMTP; 03 Dec 2018 11:25:36 -0800 Subject: [PATCH RFC 3/3] kvm: Add additional check to determine if a page is refcounted From: Alexander Duyck To: dan.j.williams@intel.com, pbonzini@redhat.com, yi.z.zhang@linux.intel.com, brho@google.com, kvm@vger.kernel.org, linux-nvdimm@lists.01.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, dave.jiang@intel.com, yu.c.zhang@intel.com, pagupta@redhat.com, david@redhat.com, jack@suse.cz, hch@lst.de, rkrcmar@redhat.com, jglisse@redhat.com Date: Mon, 03 Dec 2018 11:25:36 -0800 Message-ID: <154386513636.27193.9038916677163713072.stgit@ahduyck-desk1.amr.corp.intel.com> In-Reply-To: <154386493754.27193.1300965403157243427.stgit@ahduyck-desk1.amr.corp.intel.com> References: <154386493754.27193.1300965403157243427.stgit@ahduyck-desk1.amr.corp.intel.com> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The function kvm_is_refcounted_page is used primarily to determine if KVM is allowed to take a reference on the page. It was using the PG_reserved flag to determine this previously, however in the case of DAX the page has the PG_reserved flag set, but supports pinning by taking a reference on the page. As such I have updated the check to add a special case for ZONE_DEVICE pages that have the new support_refcount_pinning flag set. Signed-off-by: Alexander Duyck --- virt/kvm/kvm_main.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 5e666df5666d..2e7e9fbb67bf 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -148,8 +148,20 @@ __weak int kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm, bool kvm_is_refcounted_pfn(kvm_pfn_t pfn) { - if (pfn_valid(pfn)) - return !PageReserved(pfn_to_page(pfn)); + if (pfn_valid(pfn)) { + struct page *page = pfn_to_page(pfn); + + /* + * The reference count for MMIO pages are not updated. + * Previously this was being tested for with just the + * PageReserved check, however now ZONE_DEVICE pages may + * also allow for the refcount to be updated for the sake + * of pinning the pages so use the additional check provided + * to determine if the reference count on the page can be + * used to pin it. + */ + return !PageReserved(page) || is_device_pinnable_page(page); + } return false; }