From patchwork Tue Aug 28 14:57:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10578667 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2BB065A4 for ; Tue, 28 Aug 2018 14:58:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8689E2A477 for ; Tue, 28 Aug 2018 14:58:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A8062A494; Tue, 28 Aug 2018 14:58:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09F122A477 for ; Tue, 28 Aug 2018 14:58:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BD666B46E5; Tue, 28 Aug 2018 10:57:43 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 81B966B46E6; Tue, 28 Aug 2018 10:57:43 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 732E96B46E7; Tue, 28 Aug 2018 10:57:43 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id 2EF8D6B46E5 for ; Tue, 28 Aug 2018 10:57:43 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id x85-v6so1067675pfe.13 for ; Tue, 28 Aug 2018 07:57:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=yIwb6uEk5/hv3Tvm4Xff2KDOLO6LMMPMM9lI85j8icw=; b=HRKPBiHFHtkFieTI4YeiOjcZreGOcelct81Za8TeBhnKfZaYqSQMxd47NaVM0InVu1 HcTrhDvtQsds6SFaR8pEuC2mXqfpGrxXXtgxpXgm26In9qcYZIg4BCJuJznRi8KUn1+H FDZfk0YpBWyK1OX6dPu9AeQEbg6IpLjAD2FubvBkfSMA+FiZu4CEtNlQ23tlXmX+NTaB uqgGVXo7H95qQa4NEevKbmZDsf1iysQy/x2V+3eO0grh4h4hN0o+6nyratR2Qbrfoq+O qXWeA+4zlBvyspoQNiG3m9Z7USB7nokwusiItl8gb2GVu4RpVbIWZMT0BnZIGSU5i/cl z21Q== X-Gm-Message-State: APzg51Bc0ucPyE/VPQTQXZflJylAkKALQxqkLHPADN5IETT1nBlH+hyf Kz8aa3n1QPsxGn8k396NNfRHTEDzlNyuqIiNV2yEWNQ07XjL8Xe2zPmoenimzjph4mfIk4LGHuf dnb6/9WYaz3+FqAirPHmCc2ajLzHixYje5LVp/GDfmj/RV1zQ++kpYNlVCzH0wPYigA== X-Received: by 2002:a63:6485:: with SMTP id y127-v6mr1874335pgb.393.1535468262864; Tue, 28 Aug 2018 07:57:42 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdaef/vKlwKao6LJpE0IXjXieh2ZO6VFMJZRpVc3nCsvfZvjs9b22u7vOMuncQJzc8cG8WHi X-Received: by 2002:a63:6485:: with SMTP id y127-v6mr1874312pgb.393.1535468262114; Tue, 28 Aug 2018 07:57:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535468262; cv=none; d=google.com; s=arc-20160816; b=GdTexr2nsyAM9k6PVtw+n795H9wPI3mF51/XUBSRVm7X6RE5Se0+pdk4AL6HOZfkgF 5fLFRd94uZ1C9nDLUxR4Z6DFB4pYHOUnDsDv8OcFIg6ZquCMBzZ8BqvDMKFvJTOpYuWc E3Zl9o0PPsM89nptFdiEcIlnm+hOHquV+9lQvN1kKilfx4gMlh3UyMSW1Yv3RdG1uM/E pmfmaXaw/BVYfahcxrOrBct5mXwxVNMsXPRbhsw/qFaQfGiaCtBJRzLY1zsZtWvwUWPD /GpNqnXkucipMQZO2aUMhXDlfKm/zbPE9C+ZPuBcQ/MGWVe3wVIkt2K01pIRjkeg/7Nd teFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=yIwb6uEk5/hv3Tvm4Xff2KDOLO6LMMPMM9lI85j8icw=; b=rgyi8kPKy3RaSPYSTC+SYfThYL8BRY9+fT3H75mIi+MQbYtyXMJsl6ICKsJ7UWfgIL gi3dg7ehJDYn7h+dzw7WNUQFZtoe96pk1XSUA7S2WP0Z1gaWYlyqHhLe0z+uB3Pc+wrH 8YuT2QUkUN/+xxuDUCTZb0bEJ+UEsxyaQRELFGHj4q2rufii6+7Ra4u8jqBlE/CHR1uz XNAqcamwUBuQpFMgeoNq4Up/UR5GMl16su5UskLufDrrv5OUa7V/ciJKBbRP6eEiOe3J yMmIQr0ZitaBdQoOtwuo9UHSqArHqJjh56mNAXJu13FCJp/9HwVPtnUn4BG5z8EIuXkM Zs5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=jdK7t+GJ; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id e14-v6si1078299pfi.184.2018.08.28.07.57.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Aug 2018 07:57:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=jdK7t+GJ; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=yIwb6uEk5/hv3Tvm4Xff2KDOLO6LMMPMM9lI85j8icw=; b=jdK7t+GJO9QxRmlulZaY5yL/W OdR3fcQJKAtlhRmv5uVYKENCdMZbmVFAny4B1K51WA1i0sI/Yn7KEV9G+H93xvEzgwvL/B6KUCPVI /+nXfAIcAKWgJnMOG5i2nRBz/V2Kz6Zc920fR+886fWGd+Qu7+sKLDhfSVFP7Vf4xgkhXvgLF2ND1 XGgy7/e7rciYG6915eCcateQmg42qd/7s6MtJNs0vjeZPLjlNH7eZlDQAmfCLIS5z2tvWfogIx4TX LrVEy2yxzm0+51aPCOBM0EPUXXWwQiD0PxT/Itcs/5+fAtVjDinGzVGXs7L9bMWTF5sIy71VvMO4W qkyTiFWBA==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fufR6-0003Bz-1X; Tue, 28 Aug 2018 14:57:40 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , Nicolas Pitre , Souptick Joarder , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] mm: Remove references to vm_insert_pfn Date: Tue, 28 Aug 2018 07:57:24 -0700 Message-Id: <20180828145728.11873-7-willy@infradead.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180828145728.11873-1-willy@infradead.org> References: <20180828145728.11873-1-willy@infradead.org> 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: X-Virus-Scanned: ClamAV using ClamSMTP Documentation and comments. Signed-off-by: Matthew Wilcox --- Documentation/x86/pat.txt | 4 ++-- include/asm-generic/pgtable.h | 4 ++-- include/linux/hmm.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/x86/pat.txt b/Documentation/x86/pat.txt index 2a4ee6302122..481d8d8536ac 100644 --- a/Documentation/x86/pat.txt +++ b/Documentation/x86/pat.txt @@ -90,12 +90,12 @@ pci proc | -- | -- | WC | Advanced APIs for drivers ------------------------- A. Exporting pages to users with remap_pfn_range, io_remap_pfn_range, -vm_insert_pfn +vmf_insert_pfn Drivers wanting to export some pages to userspace do it by using mmap interface and a combination of 1) pgprot_noncached() -2) io_remap_pfn_range() or remap_pfn_range() or vm_insert_pfn() +2) io_remap_pfn_range() or remap_pfn_range() or vmf_insert_pfn() With PAT support, a new API pgprot_writecombine is being added. So, drivers can continue to use the above sequence, with either pgprot_noncached() or diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 88ebc6102c7c..5657a20e0c59 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -757,7 +757,7 @@ static inline pmd_t pmd_swp_clear_soft_dirty(pmd_t pmd) /* * Interfaces that can be used by architecture code to keep track of * memory type of pfn mappings specified by the remap_pfn_range, - * vm_insert_pfn. + * vmf_insert_pfn. */ /* @@ -773,7 +773,7 @@ static inline int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, /* * track_pfn_insert is called when a _new_ single pfn is established - * by vm_insert_pfn(). + * by vmf_insert_pfn(). */ static inline void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, pfn_t pfn) diff --git a/include/linux/hmm.h b/include/linux/hmm.h index 4c92e3ba3e16..dde947083d4e 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -107,7 +107,7 @@ enum hmm_pfn_flag_e { * HMM_PFN_ERROR: corresponding CPU page table entry points to poisoned memory * HMM_PFN_NONE: corresponding CPU page table entry is pte_none() * HMM_PFN_SPECIAL: corresponding CPU page table entry is special; i.e., the - * result of vm_insert_pfn() or vm_insert_page(). Therefore, it should not + * result of vmf_insert_pfn() or vm_insert_page(). Therefore, it should not * be mirrored by a device, because the entry will never have HMM_PFN_VALID * set and the pfn value is undefined. *