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=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 31E47C433E1 for ; Tue, 11 Aug 2020 09:45:15 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F3433205CB for ; Tue, 11 Aug 2020 09:45:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="XPVyTsCI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3433205CB Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9E71012F10E76; Tue, 11 Aug 2020 02:45:14 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=216.71.145.155; helo=esa3.hc3370-68.iphmx.com; envelope-from=roger.pau@citrix.com; receiver= Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 17B8912F10D1C for ; Tue, 11 Aug 2020 02:45:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1597139113; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=21LnmuTUq2pHs9BEPTKLR7uvR8pjWH5GPd9gh/+wq5s=; b=XPVyTsCIi7ERlJvK6jizi2Gwd6Jq7ranaauMOUbU3U6gkl69e9ibVj6s SHxXHUEJmRrppjEj5gKoaYSi0euz5wGki48egFCVY1WaCjg3F8pFoeYc7 UQdOa0whIIrSWiSYnEZ2K/5mTPcC7uary52wI8JcsL9hHU3UKltzNLttc s=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: VY5VVlCFQoEMbraTS/yrZS8UqVt0ps8DLejYExspGKQRXdGYHx6bGA2Os+p4H57m0KVTnf4ETo A58Ud1v5xBKk0UreNYyFdq6SOXG5m2ohZ6VYo+8IFfkxaK9rYzAj92qOdySbmyuAGHFC6CHXLu pXAvt/6qNEzVNM41g+QN7omxDcX9rY9EwY9KUczeMlcriiFjpFoZyR6P++og5Yj3lXRWZomi+9 8ny1E/KACaSD//Ufem6d3bKnm3jAVxF0h5A6pbWvkWT6anOcvbn8mKJ39nPavZd99plNPTlG1/ IjQ= X-SBRS: 2.7 X-MesageID: 24242470 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.75,460,1589256000"; d="scan'208";a="24242470" From: Roger Pau Monne To: Subject: [PATCH v4 1/2] memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC Date: Tue, 11 Aug 2020 11:44:46 +0200 Message-ID: <20200811094447.31208-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200811094447.31208-1-roger.pau@citrix.com> References: <20200811094447.31208-1-roger.pau@citrix.com> MIME-Version: 1.0 Message-ID-Hash: 4GJSXVQJCAAKXCMMUCBEZQMRGPA3MX7M X-Message-ID-Hash: 4GJSXVQJCAAKXCMMUCBEZQMRGPA3MX7M X-MailFrom: roger.pau@citrix.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation CC: Roger Pau Monne , "Dave Jiang , Andrew Morton , Jason Gunthorpe" , Logan Gunthorpe , linux-nvdimm@lists.01.org, xen-devel@lists.xenproject.org, linux-mm@kvack.org X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgdGhlIGxvZ2ljIGJlaGluZCBNRU1PUllfREVWSUNF X0RFVkRBWCBhbHNvDQpiZWluZyB1c2VkIGJ5IG5vbiBEQVggZGV2aWNlcy4NCg0KTm8gZnVuY3Rp b25hbCBjaGFuZ2UgaW50ZW5kZWQuDQoNClNpZ25lZC1vZmYtYnk6IFJvZ2VyIFBhdSBNb25uw6kg PHJvZ2VyLnBhdUBjaXRyaXguY29tPg0KLS0tDQpDYzogRGFuIFdpbGxpYW1zIDxkYW4uai53aWxs aWFtc0BpbnRlbC5jb20+DQpDYzogVmlzaGFsIFZlcm1hIDx2aXNoYWwubC52ZXJtYUBpbnRlbC5j b20+DQpDYzogRGF2ZSBKaWFuZyA8ZGF2ZS5qaWFuZ0BpbnRlbC5jb20+DQpDYzogQW5kcmV3IE1v cnRvbiA8YWtwbUBsaW51eC1mb3VuZGF0aW9uLm9yZz4NCkNjOiBKYXNvbiBHdW50aG9ycGUgPGpn Z0B6aWVwZS5jYT4NCkNjOiBJcmEgV2VpbnkgPGlyYS53ZWlueUBpbnRlbC5jb20+DQpDYzogIkFu ZWVzaCBLdW1hciBLLlYiIDxhbmVlc2gua3VtYXJAbGludXguaWJtLmNvbT4NCkNjOiBKb2hhbm5l cyBUaHVtc2hpcm4gPGp0aHVtc2hpcm5Ac3VzZS5kZT4NCkNjOiBMb2dhbiBHdW50aG9ycGUgPGxv Z2FuZ0BkZWx0YXRlZS5jb20+DQpDYzogbGludXgtbnZkaW1tQGxpc3RzLjAxLm9yZw0KQ2M6IHhl bi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZw0KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZw0KLS0t DQogZHJpdmVycy9kYXgvZGV2aWNlLmMgICAgIHwgMiArLQ0KIGluY2x1ZGUvbGludXgvbWVtcmVt YXAuaCB8IDkgKysrKy0tLS0tDQogbW0vbWVtcmVtYXAuYyAgICAgICAgICAgIHwgMiArLQ0KIDMg ZmlsZXMgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9kYXgvZGV2aWNlLmMgYi9kcml2ZXJzL2RheC9kZXZpY2UuYw0KaW5kZXgg NGMwYWYyZWI3ZTE5Li4xZTg5NTEzZjNjNTkgMTAwNjQ0DQotLS0gYS9kcml2ZXJzL2RheC9kZXZp Y2UuYw0KKysrIGIvZHJpdmVycy9kYXgvZGV2aWNlLmMNCkBAIC00MjksNyArNDI5LDcgQEAgaW50 IGRldl9kYXhfcHJvYmUoc3RydWN0IGRldmljZSAqZGV2KQ0KIAkJcmV0dXJuIC1FQlVTWTsNCiAJ fQ0KIA0KLQlkZXZfZGF4LT5wZ21hcC50eXBlID0gTUVNT1JZX0RFVklDRV9ERVZEQVg7DQorCWRl dl9kYXgtPnBnbWFwLnR5cGUgPSBNRU1PUllfREVWSUNFX0dFTkVSSUM7DQogCWFkZHIgPSBkZXZt X21lbXJlbWFwX3BhZ2VzKGRldiwgJmRldl9kYXgtPnBnbWFwKTsNCiAJaWYgKElTX0VSUihhZGRy KSkNCiAJCXJldHVybiBQVFJfRVJSKGFkZHIpOw0KZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgv bWVtcmVtYXAuaCBiL2luY2x1ZGUvbGludXgvbWVtcmVtYXAuaA0KaW5kZXggNWY1YjJkZjA2ZTYx Li5lNTg2Mjc0Njc1MWIgMTAwNjQ0DQotLS0gYS9pbmNsdWRlL2xpbnV4L21lbXJlbWFwLmgNCisr KyBiL2luY2x1ZGUvbGludXgvbWVtcmVtYXAuaA0KQEAgLTQ2LDExICs0NiwxMCBAQCBzdHJ1Y3Qg dm1lbV9hbHRtYXAgew0KICAqIHdha2V1cCBpcyB1c2VkIHRvIGNvb3JkaW5hdGUgcGh5c2ljYWwg YWRkcmVzcyBzcGFjZSBtYW5hZ2VtZW50IChleDoNCiAgKiBmcyB0cnVuY2F0ZS9ob2xlIHB1bmNo KSB2cyBwaW5uZWQgcGFnZXMgKGV4OiBkZXZpY2UgZG1hKS4NCiAgKg0KLSAqIE1FTU9SWV9ERVZJ Q0VfREVWREFYOg0KKyAqIE1FTU9SWV9ERVZJQ0VfR0VORVJJQzoNCiAgKiBIb3N0IG1lbW9yeSB0 aGF0IGhhcyBzaW1pbGFyIGFjY2VzcyBzZW1hbnRpY3MgYXMgU3lzdGVtIFJBTSBpLmUuIERNQQ0K LSAqIGNvaGVyZW50IGFuZCBzdXBwb3J0cyBwYWdlIHBpbm5pbmcuIEluIGNvbnRyYXN0IHRvDQot ICogTUVNT1JZX0RFVklDRV9GU19EQVgsIHRoaXMgbWVtb3J5IGlzIGFjY2VzcyB2aWEgYSBkZXZp Y2UtZGF4DQotICogY2hhcmFjdGVyIGRldmljZS4NCisgKiBjb2hlcmVudCBhbmQgc3VwcG9ydHMg cGFnZSBwaW5uaW5nLiBUaGlzIGlzIGZvciBleGFtcGxlIHVzZWQgYnkgREFYIGRldmljZXMNCisg KiB0aGF0IGV4cG9zZSBtZW1vcnkgdXNpbmcgYSBjaGFyYWN0ZXIgZGV2aWNlLg0KICAqDQogICog TUVNT1JZX0RFVklDRV9QQ0lfUDJQRE1BOg0KICAqIERldmljZSBtZW1vcnkgcmVzaWRpbmcgaW4g YSBQQ0kgQkFSIGludGVuZGVkIGZvciB1c2Ugd2l0aCBQZWVyLXRvLVBlZXINCkBAIC02MCw3ICs1 OSw3IEBAIGVudW0gbWVtb3J5X3R5cGUgew0KIAkvKiAwIGlzIHJlc2VydmVkIHRvIGNhdGNoIHVu aW5pdGlhbGl6ZWQgdHlwZSBmaWVsZHMgKi8NCiAJTUVNT1JZX0RFVklDRV9QUklWQVRFID0gMSwN CiAJTUVNT1JZX0RFVklDRV9GU19EQVgsDQotCU1FTU9SWV9ERVZJQ0VfREVWREFYLA0KKwlNRU1P UllfREVWSUNFX0dFTkVSSUMsDQogCU1FTU9SWV9ERVZJQ0VfUENJX1AyUERNQSwNCiB9Ow0KIA0K ZGlmZiAtLWdpdCBhL21tL21lbXJlbWFwLmMgYi9tbS9tZW1yZW1hcC5jDQppbmRleCAwM2UzOGI3 YTM4ZjEuLjAwNmRhY2U2MGIxYSAxMDA2NDQNCi0tLSBhL21tL21lbXJlbWFwLmMNCisrKyBiL21t L21lbXJlbWFwLmMNCkBAIC0yMTYsNyArMjE2LDcgQEAgdm9pZCAqbWVtcmVtYXBfcGFnZXMoc3Ry dWN0IGRldl9wYWdlbWFwICpwZ21hcCwgaW50IG5pZCkNCiAJCQlyZXR1cm4gRVJSX1BUUigtRUlO VkFMKTsNCiAJCX0NCiAJCWJyZWFrOw0KLQljYXNlIE1FTU9SWV9ERVZJQ0VfREVWREFYOg0KKwlj YXNlIE1FTU9SWV9ERVZJQ0VfR0VORVJJQzoNCiAJCW5lZWRfZGV2bWFwX21hbmFnZWQgPSBmYWxz ZTsNCiAJCWJyZWFrOw0KIAljYXNlIE1FTU9SWV9ERVZJQ0VfUENJX1AyUERNQToNCi0tIA0KMi4y OC4wDQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51 eC1udmRpbW0gbWFpbGluZyBsaXN0IC0tIGxpbnV4LW52ZGltbUBsaXN0cy4wMS5vcmcKVG8gdW5z dWJzY3JpYmUgc2VuZCBhbiBlbWFpbCB0byBsaW51eC1udmRpbW0tbGVhdmVAbGlzdHMuMDEub3Jn Cg== 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=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 3F61EC433E0 for ; Tue, 11 Aug 2020 09:45:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07BB6205CB for ; Tue, 11 Aug 2020 09:45:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="CkzcnAqt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728498AbgHKJpN (ORCPT ); Tue, 11 Aug 2020 05:45:13 -0400 Received: from esa3.hc3370-68.iphmx.com ([216.71.145.155]:57241 "EHLO esa3.hc3370-68.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728224AbgHKJpM (ORCPT ); Tue, 11 Aug 2020 05:45:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1597139112; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=21LnmuTUq2pHs9BEPTKLR7uvR8pjWH5GPd9gh/+wq5s=; b=CkzcnAqtQ/tz5+xuOqHSr4bd6TbAGpo6Ye/Yz17Kfq2hlQXzBqkDwrQV 37zNWpf/+UkJgZ4f+/buoTSrZ1QvJYX3HaIxh3CUNymfKtFDQR5BKFwO0 H+7kjHGZvBXtcYHDoIT5Jzv9Dgel6+bx+BIxGkc49oW+hFWp9c5oQBBY/ o=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: VY5VVlCFQoEMbraTS/yrZS8UqVt0ps8DLejYExspGKQRXdGYHx6bGA2Os+p4H57m0KVTnf4ETo A58Ud1v5xBKk0UreNYyFdq6SOXG5m2ohZ6VYo+8IFfkxaK9rYzAj92qOdySbmyuAGHFC6CHXLu pXAvt/6qNEzVNM41g+QN7omxDcX9rY9EwY9KUczeMlcriiFjpFoZyR6P++og5Yj3lXRWZomi+9 8ny1E/KACaSD//Ufem6d3bKnm3jAVxF0h5A6pbWvkWT6anOcvbn8mKJ39nPavZd99plNPTlG1/ IjQ= X-SBRS: 2.7 X-MesageID: 24242470 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.75,460,1589256000"; d="scan'208";a="24242470" From: Roger Pau Monne To: CC: Roger Pau Monne , Dan Williams , Vishal Verma , "Dave Jiang" , Andrew Morton , Jason Gunthorpe , Ira Weiny , "Aneesh Kumar K.V" , Johannes Thumshirn , Logan Gunthorpe , , , Subject: [PATCH v4 1/2] memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC Date: Tue, 11 Aug 2020 11:44:46 +0200 Message-ID: <20200811094447.31208-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200811094447.31208-1-roger.pau@citrix.com> References: <20200811094447.31208-1-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is in preparation for the logic behind MEMORY_DEVICE_DEVDAX also being used by non DAX devices. No functional change intended. Signed-off-by: Roger Pau Monné --- Cc: Dan Williams Cc: Vishal Verma Cc: Dave Jiang Cc: Andrew Morton Cc: Jason Gunthorpe Cc: Ira Weiny Cc: "Aneesh Kumar K.V" Cc: Johannes Thumshirn Cc: Logan Gunthorpe Cc: linux-nvdimm@lists.01.org Cc: xen-devel@lists.xenproject.org Cc: linux-mm@kvack.org --- drivers/dax/device.c | 2 +- include/linux/memremap.h | 9 ++++----- mm/memremap.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 4c0af2eb7e19..1e89513f3c59 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -429,7 +429,7 @@ int dev_dax_probe(struct device *dev) return -EBUSY; } - dev_dax->pgmap.type = MEMORY_DEVICE_DEVDAX; + dev_dax->pgmap.type = MEMORY_DEVICE_GENERIC; addr = devm_memremap_pages(dev, &dev_dax->pgmap); if (IS_ERR(addr)) return PTR_ERR(addr); diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 5f5b2df06e61..e5862746751b 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -46,11 +46,10 @@ struct vmem_altmap { * wakeup is used to coordinate physical address space management (ex: * fs truncate/hole punch) vs pinned pages (ex: device dma). * - * MEMORY_DEVICE_DEVDAX: + * MEMORY_DEVICE_GENERIC: * Host memory that has similar access semantics as System RAM i.e. DMA - * coherent and supports page pinning. In contrast to - * MEMORY_DEVICE_FS_DAX, this memory is access via a device-dax - * character device. + * coherent and supports page pinning. This is for example used by DAX devices + * that expose memory using a character device. * * MEMORY_DEVICE_PCI_P2PDMA: * Device memory residing in a PCI BAR intended for use with Peer-to-Peer @@ -60,7 +59,7 @@ enum memory_type { /* 0 is reserved to catch uninitialized type fields */ MEMORY_DEVICE_PRIVATE = 1, MEMORY_DEVICE_FS_DAX, - MEMORY_DEVICE_DEVDAX, + MEMORY_DEVICE_GENERIC, MEMORY_DEVICE_PCI_P2PDMA, }; diff --git a/mm/memremap.c b/mm/memremap.c index 03e38b7a38f1..006dace60b1a 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -216,7 +216,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) return ERR_PTR(-EINVAL); } break; - case MEMORY_DEVICE_DEVDAX: + case MEMORY_DEVICE_GENERIC: need_devmap_managed = false; break; case MEMORY_DEVICE_PCI_P2PDMA: -- 2.28.0 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=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 76DBAC433DF for ; Tue, 11 Aug 2020 09:45:28 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 487EE205CB for ; Tue, 11 Aug 2020 09:45:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="XPVyTsCI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 487EE205CB Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k5QqI-0004ku-Fe; Tue, 11 Aug 2020 09:45:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k5QqH-0004ko-Ev for xen-devel@lists.xenproject.org; Tue, 11 Aug 2020 09:45:13 +0000 X-Inumbo-ID: 621529f1-5d2c-4d06-a56d-5b34a6765aa6 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 621529f1-5d2c-4d06-a56d-5b34a6765aa6; Tue, 11 Aug 2020 09:45:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1597139113; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=21LnmuTUq2pHs9BEPTKLR7uvR8pjWH5GPd9gh/+wq5s=; b=XPVyTsCIi7ERlJvK6jizi2Gwd6Jq7ranaauMOUbU3U6gkl69e9ibVj6s SHxXHUEJmRrppjEj5gKoaYSi0euz5wGki48egFCVY1WaCjg3F8pFoeYc7 UQdOa0whIIrSWiSYnEZ2K/5mTPcC7uary52wI8JcsL9hHU3UKltzNLttc s=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: VY5VVlCFQoEMbraTS/yrZS8UqVt0ps8DLejYExspGKQRXdGYHx6bGA2Os+p4H57m0KVTnf4ETo A58Ud1v5xBKk0UreNYyFdq6SOXG5m2ohZ6VYo+8IFfkxaK9rYzAj92qOdySbmyuAGHFC6CHXLu pXAvt/6qNEzVNM41g+QN7omxDcX9rY9EwY9KUczeMlcriiFjpFoZyR6P++og5Yj3lXRWZomi+9 8ny1E/KACaSD//Ufem6d3bKnm3jAVxF0h5A6pbWvkWT6anOcvbn8mKJ39nPavZd99plNPTlG1/ IjQ= X-SBRS: 2.7 X-MesageID: 24242470 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.75,460,1589256000"; d="scan'208";a="24242470" From: Roger Pau Monne To: Subject: [PATCH v4 1/2] memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC Date: Tue, 11 Aug 2020 11:44:46 +0200 Message-ID: <20200811094447.31208-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200811094447.31208-1-roger.pau@citrix.com> References: <20200811094447.31208-1-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Dave Jiang , linux-nvdimm@lists.01.org, Vishal Verma , Johannes Thumshirn , linux-mm@kvack.org, Jason Gunthorpe , Logan Gunthorpe , "Aneesh Kumar K.V" , xen-devel@lists.xenproject.org, Dan Williams , Ira Weiny , Andrew Morton , Roger Pau Monne Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This is in preparation for the logic behind MEMORY_DEVICE_DEVDAX also being used by non DAX devices. No functional change intended. Signed-off-by: Roger Pau Monné --- Cc: Dan Williams Cc: Vishal Verma Cc: Dave Jiang Cc: Andrew Morton Cc: Jason Gunthorpe Cc: Ira Weiny Cc: "Aneesh Kumar K.V" Cc: Johannes Thumshirn Cc: Logan Gunthorpe Cc: linux-nvdimm@lists.01.org Cc: xen-devel@lists.xenproject.org Cc: linux-mm@kvack.org --- drivers/dax/device.c | 2 +- include/linux/memremap.h | 9 ++++----- mm/memremap.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 4c0af2eb7e19..1e89513f3c59 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -429,7 +429,7 @@ int dev_dax_probe(struct device *dev) return -EBUSY; } - dev_dax->pgmap.type = MEMORY_DEVICE_DEVDAX; + dev_dax->pgmap.type = MEMORY_DEVICE_GENERIC; addr = devm_memremap_pages(dev, &dev_dax->pgmap); if (IS_ERR(addr)) return PTR_ERR(addr); diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 5f5b2df06e61..e5862746751b 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -46,11 +46,10 @@ struct vmem_altmap { * wakeup is used to coordinate physical address space management (ex: * fs truncate/hole punch) vs pinned pages (ex: device dma). * - * MEMORY_DEVICE_DEVDAX: + * MEMORY_DEVICE_GENERIC: * Host memory that has similar access semantics as System RAM i.e. DMA - * coherent and supports page pinning. In contrast to - * MEMORY_DEVICE_FS_DAX, this memory is access via a device-dax - * character device. + * coherent and supports page pinning. This is for example used by DAX devices + * that expose memory using a character device. * * MEMORY_DEVICE_PCI_P2PDMA: * Device memory residing in a PCI BAR intended for use with Peer-to-Peer @@ -60,7 +59,7 @@ enum memory_type { /* 0 is reserved to catch uninitialized type fields */ MEMORY_DEVICE_PRIVATE = 1, MEMORY_DEVICE_FS_DAX, - MEMORY_DEVICE_DEVDAX, + MEMORY_DEVICE_GENERIC, MEMORY_DEVICE_PCI_P2PDMA, }; diff --git a/mm/memremap.c b/mm/memremap.c index 03e38b7a38f1..006dace60b1a 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -216,7 +216,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) return ERR_PTR(-EINVAL); } break; - case MEMORY_DEVICE_DEVDAX: + case MEMORY_DEVICE_GENERIC: need_devmap_managed = false; break; case MEMORY_DEVICE_PCI_P2PDMA: -- 2.28.0