From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 C7D8A21296B26 for ; Mon, 17 Jun 2019 05:27:46 -0700 (PDT) From: Christoph Hellwig Subject: [PATCH 03/25] mm: remove hmm_devmem_add_resource Date: Mon, 17 Jun 2019 14:27:11 +0200 Message-Id: <20190617122733.22432-4-hch@lst.de> In-Reply-To: <20190617122733.22432-1-hch@lst.de> References: <20190617122733.22432-1-hch@lst.de> MIME-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: John Hubbard , linux-nvdimm@lists.01.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, nouveau@lists.freedesktop.org List-ID: This function has never been used since it was first added to the kernel more than a year and a half ago, and if we ever grow a consumer of the MEMORY_DEVICE_PUBLIC infrastructure it can easily use devm_memremap_pages directly. Signed-off-by: Christoph Hellwig Reviewed-by: Jason Gunthorpe Reviewed-by: John Hubbard --- include/linux/hmm.h | 3 --- mm/hmm.c | 50 --------------------------------------------- 2 files changed, 53 deletions(-) diff --git a/include/linux/hmm.h b/include/linux/hmm.h index c92f353d701a..31e1c5347331 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -724,9 +724,6 @@ struct hmm_devmem { struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, struct device *device, unsigned long size); -struct hmm_devmem *hmm_devmem_add_resource(const struct hmm_devmem_ops *ops, - struct device *device, - struct resource *res); /* * hmm_devmem_page_set_drvdata - set per-page driver data field diff --git a/mm/hmm.c b/mm/hmm.c index f3350fc567ab..dc251c51803a 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -1475,54 +1475,4 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, return devmem; } EXPORT_SYMBOL_GPL(hmm_devmem_add); - -struct hmm_devmem *hmm_devmem_add_resource(const struct hmm_devmem_ops *ops, - struct device *device, - struct resource *res) -{ - struct hmm_devmem *devmem; - void *result; - int ret; - - if (res->desc != IORES_DESC_DEVICE_PUBLIC_MEMORY) - return ERR_PTR(-EINVAL); - - dev_pagemap_get_ops(); - - devmem = devm_kzalloc(device, sizeof(*devmem), GFP_KERNEL); - if (!devmem) - return ERR_PTR(-ENOMEM); - - init_completion(&devmem->completion); - devmem->pfn_first = -1UL; - devmem->pfn_last = -1UL; - devmem->resource = res; - devmem->device = device; - devmem->ops = ops; - - ret = percpu_ref_init(&devmem->ref, &hmm_devmem_ref_release, - 0, GFP_KERNEL); - if (ret) - return ERR_PTR(ret); - - devmem->pfn_first = devmem->resource->start >> PAGE_SHIFT; - devmem->pfn_last = devmem->pfn_first + - (resource_size(devmem->resource) >> PAGE_SHIFT); - devmem->page_fault = hmm_devmem_fault; - - devmem->pagemap.type = MEMORY_DEVICE_PUBLIC; - devmem->pagemap.res = *devmem->resource; - devmem->pagemap.page_free = hmm_devmem_free; - devmem->pagemap.altmap_valid = false; - devmem->pagemap.ref = &devmem->ref; - devmem->pagemap.data = devmem; - devmem->pagemap.kill = hmm_devmem_ref_kill; - devmem->pagemap.cleanup = hmm_devmem_ref_exit; - - result = devm_memremap_pages(devmem->device, &devmem->pagemap); - if (IS_ERR(result)) - return result; - return devmem; -} -EXPORT_SYMBOL_GPL(hmm_devmem_add_resource); #endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */ -- 2.20.1 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm 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=-8.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 97865C31E59 for ; Mon, 17 Jun 2019 12:27:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70E82208C0 for ; Mon, 17 Jun 2019 12:27:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="FbRn9tnx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727631AbfFQM1v (ORCPT ); Mon, 17 Jun 2019 08:27:51 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:42432 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726834AbfFQM1q (ORCPT ); Mon, 17 Jun 2019 08:27:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type: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=7iZXhGqknpU44tD1MPjuSqDckdpKS/nLGoa4L7/1O94=; b=FbRn9tnxZ5wWW5q5U1pZRBVxXs CxGwGMXKAq/9Ihv+awdUqjfKfebfLDdbVNObc0HyuE8WXKatstvj5dw/HK/igbfwoSFPnkwWo7ebj rUGor0jqTaP/NW3YZeZfVSnvBwAlo3Lo8EiyGtMu2ND6pJBqRtA/O5D4bGF6fo8S0K5psWYBY5XxU 2c+lcusAC9Bxse0Kr01AZ9/JkVgMHxvoDiwKVC1jNIBFfo+VKR+KrNeDEBaA0xzhkfYUvWAgWPrWC Lfcmv9DujdDUWC5tNLBcO6Ok6TTvo8HvDhBnnc9rcvR5/dgumLg41lBugJqDsgZ6cxqqK5EVO2485 CgZI5zyQ==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hcqjf-0008Kt-OO; Mon, 17 Jun 2019 12:27:44 +0000 From: Christoph Hellwig To: Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: linux-mm@kvack.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-nvdimm@lists.01.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, John Hubbard Subject: [PATCH 03/25] mm: remove hmm_devmem_add_resource Date: Mon, 17 Jun 2019 14:27:11 +0200 Message-Id: <20190617122733.22432-4-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190617122733.22432-1-hch@lst.de> References: <20190617122733.22432-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function has never been used since it was first added to the kernel more than a year and a half ago, and if we ever grow a consumer of the MEMORY_DEVICE_PUBLIC infrastructure it can easily use devm_memremap_pages directly. Signed-off-by: Christoph Hellwig Reviewed-by: Jason Gunthorpe Reviewed-by: John Hubbard --- include/linux/hmm.h | 3 --- mm/hmm.c | 50 --------------------------------------------- 2 files changed, 53 deletions(-) diff --git a/include/linux/hmm.h b/include/linux/hmm.h index c92f353d701a..31e1c5347331 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -724,9 +724,6 @@ struct hmm_devmem { struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, struct device *device, unsigned long size); -struct hmm_devmem *hmm_devmem_add_resource(const struct hmm_devmem_ops *ops, - struct device *device, - struct resource *res); /* * hmm_devmem_page_set_drvdata - set per-page driver data field diff --git a/mm/hmm.c b/mm/hmm.c index f3350fc567ab..dc251c51803a 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -1475,54 +1475,4 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, return devmem; } EXPORT_SYMBOL_GPL(hmm_devmem_add); - -struct hmm_devmem *hmm_devmem_add_resource(const struct hmm_devmem_ops *ops, - struct device *device, - struct resource *res) -{ - struct hmm_devmem *devmem; - void *result; - int ret; - - if (res->desc != IORES_DESC_DEVICE_PUBLIC_MEMORY) - return ERR_PTR(-EINVAL); - - dev_pagemap_get_ops(); - - devmem = devm_kzalloc(device, sizeof(*devmem), GFP_KERNEL); - if (!devmem) - return ERR_PTR(-ENOMEM); - - init_completion(&devmem->completion); - devmem->pfn_first = -1UL; - devmem->pfn_last = -1UL; - devmem->resource = res; - devmem->device = device; - devmem->ops = ops; - - ret = percpu_ref_init(&devmem->ref, &hmm_devmem_ref_release, - 0, GFP_KERNEL); - if (ret) - return ERR_PTR(ret); - - devmem->pfn_first = devmem->resource->start >> PAGE_SHIFT; - devmem->pfn_last = devmem->pfn_first + - (resource_size(devmem->resource) >> PAGE_SHIFT); - devmem->page_fault = hmm_devmem_fault; - - devmem->pagemap.type = MEMORY_DEVICE_PUBLIC; - devmem->pagemap.res = *devmem->resource; - devmem->pagemap.page_free = hmm_devmem_free; - devmem->pagemap.altmap_valid = false; - devmem->pagemap.ref = &devmem->ref; - devmem->pagemap.data = devmem; - devmem->pagemap.kill = hmm_devmem_ref_kill; - devmem->pagemap.cleanup = hmm_devmem_ref_exit; - - result = devm_memremap_pages(devmem->device, &devmem->pagemap); - if (IS_ERR(result)) - return result; - return devmem; -} -EXPORT_SYMBOL_GPL(hmm_devmem_add_resource); #endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */ -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 03/25] mm: remove hmm_devmem_add_resource Date: Mon, 17 Jun 2019 14:27:11 +0200 Message-ID: <20190617122733.22432-4-hch@lst.de> References: <20190617122733.22432-1-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190617122733.22432-1-hch-jcswGhMUV9g@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org VGhpcyBmdW5jdGlvbiBoYXMgbmV2ZXIgYmVlbiB1c2VkIHNpbmNlIGl0IHdhcyBmaXJzdCBhZGRl ZCB0byB0aGUga2VybmVsCm1vcmUgdGhhbiBhIHllYXIgYW5kIGEgaGFsZiBhZ28sIGFuZCBpZiB3 ZSBldmVyIGdyb3cgYSBjb25zdW1lciBvZiB0aGUKTUVNT1JZX0RFVklDRV9QVUJMSUMgaW5mcmFz dHJ1Y3R1cmUgaXQgY2FuIGVhc2lseSB1c2UgZGV2bV9tZW1yZW1hcF9wYWdlcwpkaXJlY3RseS4K ClNpZ25lZC1vZmYtYnk6IENocmlzdG9waCBIZWxsd2lnIDxoY2hAbHN0LmRlPgpSZXZpZXdlZC1i eTogSmFzb24gR3VudGhvcnBlIDxqZ2dAbWVsbGFub3guY29tPgpSZXZpZXdlZC1ieTogSm9obiBI dWJiYXJkIDxqaHViYmFyZEBudmlkaWEuY29tPgotLS0KIGluY2x1ZGUvbGludXgvaG1tLmggfCAg MyAtLS0KIG1tL2htbS5jICAgICAgICAgICAgfCA1MCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNTMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9obW0uaCBiL2luY2x1ZGUvbGludXgvaG1tLmgKaW5k ZXggYzkyZjM1M2Q3MDFhLi4zMWUxYzUzNDczMzEgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgv aG1tLmgKKysrIGIvaW5jbHVkZS9saW51eC9obW0uaApAQCAtNzI0LDkgKzcyNCw2IEBAIHN0cnVj dCBobW1fZGV2bWVtIHsKIHN0cnVjdCBobW1fZGV2bWVtICpobW1fZGV2bWVtX2FkZChjb25zdCBz dHJ1Y3QgaG1tX2Rldm1lbV9vcHMgKm9wcywKIAkJCQkgIHN0cnVjdCBkZXZpY2UgKmRldmljZSwK IAkJCQkgIHVuc2lnbmVkIGxvbmcgc2l6ZSk7Ci1zdHJ1Y3QgaG1tX2Rldm1lbSAqaG1tX2Rldm1l bV9hZGRfcmVzb3VyY2UoY29uc3Qgc3RydWN0IGhtbV9kZXZtZW1fb3BzICpvcHMsCi0JCQkJCSAg IHN0cnVjdCBkZXZpY2UgKmRldmljZSwKLQkJCQkJICAgc3RydWN0IHJlc291cmNlICpyZXMpOwog CiAvKgogICogaG1tX2Rldm1lbV9wYWdlX3NldF9kcnZkYXRhIC0gc2V0IHBlci1wYWdlIGRyaXZl ciBkYXRhIGZpZWxkCmRpZmYgLS1naXQgYS9tbS9obW0uYyBiL21tL2htbS5jCmluZGV4IGYzMzUw ZmM1NjdhYi4uZGMyNTFjNTE4MDNhIDEwMDY0NAotLS0gYS9tbS9obW0uYworKysgYi9tbS9obW0u YwpAQCAtMTQ3NSw1NCArMTQ3NSw0IEBAIHN0cnVjdCBobW1fZGV2bWVtICpobW1fZGV2bWVtX2Fk ZChjb25zdCBzdHJ1Y3QgaG1tX2Rldm1lbV9vcHMgKm9wcywKIAlyZXR1cm4gZGV2bWVtOwogfQog RVhQT1JUX1NZTUJPTF9HUEwoaG1tX2Rldm1lbV9hZGQpOwotCi1zdHJ1Y3QgaG1tX2Rldm1lbSAq aG1tX2Rldm1lbV9hZGRfcmVzb3VyY2UoY29uc3Qgc3RydWN0IGhtbV9kZXZtZW1fb3BzICpvcHMs Ci0JCQkJCSAgIHN0cnVjdCBkZXZpY2UgKmRldmljZSwKLQkJCQkJICAgc3RydWN0IHJlc291cmNl ICpyZXMpCi17Ci0Jc3RydWN0IGhtbV9kZXZtZW0gKmRldm1lbTsKLQl2b2lkICpyZXN1bHQ7Ci0J aW50IHJldDsKLQotCWlmIChyZXMtPmRlc2MgIT0gSU9SRVNfREVTQ19ERVZJQ0VfUFVCTElDX01F TU9SWSkKLQkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7Ci0KLQlkZXZfcGFnZW1hcF9nZXRfb3Bz KCk7Ci0KLQlkZXZtZW0gPSBkZXZtX2t6YWxsb2MoZGV2aWNlLCBzaXplb2YoKmRldm1lbSksIEdG UF9LRVJORUwpOwotCWlmICghZGV2bWVtKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLQot CWluaXRfY29tcGxldGlvbigmZGV2bWVtLT5jb21wbGV0aW9uKTsKLQlkZXZtZW0tPnBmbl9maXJz dCA9IC0xVUw7Ci0JZGV2bWVtLT5wZm5fbGFzdCA9IC0xVUw7Ci0JZGV2bWVtLT5yZXNvdXJjZSA9 IHJlczsKLQlkZXZtZW0tPmRldmljZSA9IGRldmljZTsKLQlkZXZtZW0tPm9wcyA9IG9wczsKLQot CXJldCA9IHBlcmNwdV9yZWZfaW5pdCgmZGV2bWVtLT5yZWYsICZobW1fZGV2bWVtX3JlZl9yZWxl YXNlLAotCQkJICAgICAgMCwgR0ZQX0tFUk5FTCk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIEVSUl9Q VFIocmV0KTsKLQotCWRldm1lbS0+cGZuX2ZpcnN0ID0gZGV2bWVtLT5yZXNvdXJjZS0+c3RhcnQg Pj4gUEFHRV9TSElGVDsKLQlkZXZtZW0tPnBmbl9sYXN0ID0gZGV2bWVtLT5wZm5fZmlyc3QgKwot CQkJICAgKHJlc291cmNlX3NpemUoZGV2bWVtLT5yZXNvdXJjZSkgPj4gUEFHRV9TSElGVCk7Ci0J ZGV2bWVtLT5wYWdlX2ZhdWx0ID0gaG1tX2Rldm1lbV9mYXVsdDsKLQotCWRldm1lbS0+cGFnZW1h cC50eXBlID0gTUVNT1JZX0RFVklDRV9QVUJMSUM7Ci0JZGV2bWVtLT5wYWdlbWFwLnJlcyA9ICpk ZXZtZW0tPnJlc291cmNlOwotCWRldm1lbS0+cGFnZW1hcC5wYWdlX2ZyZWUgPSBobW1fZGV2bWVt X2ZyZWU7Ci0JZGV2bWVtLT5wYWdlbWFwLmFsdG1hcF92YWxpZCA9IGZhbHNlOwotCWRldm1lbS0+ cGFnZW1hcC5yZWYgPSAmZGV2bWVtLT5yZWY7Ci0JZGV2bWVtLT5wYWdlbWFwLmRhdGEgPSBkZXZt ZW07Ci0JZGV2bWVtLT5wYWdlbWFwLmtpbGwgPSBobW1fZGV2bWVtX3JlZl9raWxsOwotCWRldm1l bS0+cGFnZW1hcC5jbGVhbnVwID0gaG1tX2Rldm1lbV9yZWZfZXhpdDsKLQotCXJlc3VsdCA9IGRl dm1fbWVtcmVtYXBfcGFnZXMoZGV2bWVtLT5kZXZpY2UsICZkZXZtZW0tPnBhZ2VtYXApOwotCWlm IChJU19FUlIocmVzdWx0KSkKLQkJcmV0dXJuIHJlc3VsdDsKLQlyZXR1cm4gZGV2bWVtOwotfQot RVhQT1JUX1NZTUJPTF9HUEwoaG1tX2Rldm1lbV9hZGRfcmVzb3VyY2UpOwogI2VuZGlmIC8qIENP TkZJR19ERVZJQ0VfUFJJVkFURSB8fCBDT05GSUdfREVWSUNFX1BVQkxJQyAqLwotLSAKMi4yMC4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1 IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXU=