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 DD33E2129DBAD for ; Mon, 17 Jun 2019 05:28:13 -0700 (PDT) From: Christoph Hellwig Subject: [PATCH 15/25] device-dax: use the dev_pagemap internal refcount Date: Mon, 17 Jun 2019 14:27:23 +0200 Message-Id: <20190617122733.22432-16-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: 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: The functionality is identical to the one currently open coded in device-dax. Signed-off-by: Christoph Hellwig --- drivers/dax/dax-private.h | 4 ---- drivers/dax/device.c | 43 --------------------------------------- 2 files changed, 47 deletions(-) diff --git a/drivers/dax/dax-private.h b/drivers/dax/dax-private.h index a45612148ca0..ed04a18a35be 100644 --- a/drivers/dax/dax-private.h +++ b/drivers/dax/dax-private.h @@ -51,8 +51,6 @@ struct dax_region { * @target_node: effective numa node if dev_dax memory range is onlined * @dev - device core * @pgmap - pgmap for memmap setup / lifetime (driver owned) - * @ref: pgmap reference count (driver owned) - * @cmp: @ref final put completion (driver owned) */ struct dev_dax { struct dax_region *region; @@ -60,8 +58,6 @@ struct dev_dax { int target_node; struct device dev; struct dev_pagemap pgmap; - struct percpu_ref ref; - struct completion cmp; }; static inline struct dev_dax *to_dev_dax(struct device *dev) diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 17b46c1a76b4..a9d7c90ecf1e 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -14,36 +14,6 @@ #include "dax-private.h" #include "bus.h" -static struct dev_dax *ref_to_dev_dax(struct percpu_ref *ref) -{ - return container_of(ref, struct dev_dax, ref); -} - -static void dev_dax_percpu_release(struct percpu_ref *ref) -{ - struct dev_dax *dev_dax = ref_to_dev_dax(ref); - - dev_dbg(&dev_dax->dev, "%s\n", __func__); - complete(&dev_dax->cmp); -} - -static void dev_dax_percpu_exit(struct dev_pagemap *pgmap) -{ - struct dev_dax *dev_dax = container_of(pgmap, struct dev_dax, pgmap); - - dev_dbg(&dev_dax->dev, "%s\n", __func__); - wait_for_completion(&dev_dax->cmp); - percpu_ref_exit(pgmap->ref); -} - -static void dev_dax_percpu_kill(struct dev_pagemap *pgmap) -{ - struct dev_dax *dev_dax = container_of(pgmap, struct dev_dax, pgmap); - - dev_dbg(&dev_dax->dev, "%s\n", __func__); - percpu_ref_kill(pgmap->ref); -} - static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma, const char *func) { @@ -441,11 +411,6 @@ static void dev_dax_kill(void *dev_dax) kill_dev_dax(dev_dax); } -static const struct dev_pagemap_ops dev_dax_pagemap_ops = { - .kill = dev_dax_percpu_kill, - .cleanup = dev_dax_percpu_exit, -}; - int dev_dax_probe(struct device *dev) { struct dev_dax *dev_dax = to_dev_dax(dev); @@ -463,14 +428,6 @@ int dev_dax_probe(struct device *dev) return -EBUSY; } - init_completion(&dev_dax->cmp); - rc = percpu_ref_init(&dev_dax->ref, dev_dax_percpu_release, 0, - GFP_KERNEL); - if (rc) - return rc; - - dev_dax->pgmap.ref = &dev_dax->ref; - dev_dax->pgmap.ops = &dev_dax_pagemap_ops; addr = devm_memremap_pages(dev, &dev_dax->pgmap); if (IS_ERR(addr)) return PTR_ERR(addr); -- 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.5 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,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 AC4F0C46477 for ; Mon, 17 Jun 2019 12:28:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8553B208C0 for ; Mon, 17 Jun 2019 12:28:19 +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="cfjnQSuk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728052AbfFQM2R (ORCPT ); Mon, 17 Jun 2019 08:28:17 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:42736 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728007AbfFQM2O (ORCPT ); Mon, 17 Jun 2019 08:28:14 -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=WoytrCxG5kt017Mi4r+qftdCcpzSPco9CT8jAnxV7AA=; b=cfjnQSuk0OePqkBqt1Zoo6BJSv YWzVaKyyvXJvGwKvelhIJkGt4h1MS45yu0wtaVOrOQWYQW9eQdRpwlluWo02xjodmYnwZgSZZt8+1 jzywQKVxgLg1An5u3r79qC0eTU+LiFdbrO0B+smIqOb9mh1Yv64a7TiGQAYJn6+yuTiEu6beGOzX4 PblogVq3IxXTL4MGO1JlQa7eryDUGRdrwy+ePIEKe0/njOwiXsi5TDAP2I6bETcHeOvI5IfFmsXAV It0kb/wuRPja6yBoYSJjboYG1k7cI0Koq9jvoZvICMYV+7UkSgs7yAO310r+FQswO/ZeVYTphiBrn eZrWu20w==; 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 1hcqk6-0000Fs-Fr; Mon, 17 Jun 2019 12:28:10 +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 Subject: [PATCH 15/25] device-dax: use the dev_pagemap internal refcount Date: Mon, 17 Jun 2019 14:27:23 +0200 Message-Id: <20190617122733.22432-16-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 The functionality is identical to the one currently open coded in device-dax. Signed-off-by: Christoph Hellwig --- drivers/dax/dax-private.h | 4 ---- drivers/dax/device.c | 43 --------------------------------------- 2 files changed, 47 deletions(-) diff --git a/drivers/dax/dax-private.h b/drivers/dax/dax-private.h index a45612148ca0..ed04a18a35be 100644 --- a/drivers/dax/dax-private.h +++ b/drivers/dax/dax-private.h @@ -51,8 +51,6 @@ struct dax_region { * @target_node: effective numa node if dev_dax memory range is onlined * @dev - device core * @pgmap - pgmap for memmap setup / lifetime (driver owned) - * @ref: pgmap reference count (driver owned) - * @cmp: @ref final put completion (driver owned) */ struct dev_dax { struct dax_region *region; @@ -60,8 +58,6 @@ struct dev_dax { int target_node; struct device dev; struct dev_pagemap pgmap; - struct percpu_ref ref; - struct completion cmp; }; static inline struct dev_dax *to_dev_dax(struct device *dev) diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 17b46c1a76b4..a9d7c90ecf1e 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -14,36 +14,6 @@ #include "dax-private.h" #include "bus.h" -static struct dev_dax *ref_to_dev_dax(struct percpu_ref *ref) -{ - return container_of(ref, struct dev_dax, ref); -} - -static void dev_dax_percpu_release(struct percpu_ref *ref) -{ - struct dev_dax *dev_dax = ref_to_dev_dax(ref); - - dev_dbg(&dev_dax->dev, "%s\n", __func__); - complete(&dev_dax->cmp); -} - -static void dev_dax_percpu_exit(struct dev_pagemap *pgmap) -{ - struct dev_dax *dev_dax = container_of(pgmap, struct dev_dax, pgmap); - - dev_dbg(&dev_dax->dev, "%s\n", __func__); - wait_for_completion(&dev_dax->cmp); - percpu_ref_exit(pgmap->ref); -} - -static void dev_dax_percpu_kill(struct dev_pagemap *pgmap) -{ - struct dev_dax *dev_dax = container_of(pgmap, struct dev_dax, pgmap); - - dev_dbg(&dev_dax->dev, "%s\n", __func__); - percpu_ref_kill(pgmap->ref); -} - static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma, const char *func) { @@ -441,11 +411,6 @@ static void dev_dax_kill(void *dev_dax) kill_dev_dax(dev_dax); } -static const struct dev_pagemap_ops dev_dax_pagemap_ops = { - .kill = dev_dax_percpu_kill, - .cleanup = dev_dax_percpu_exit, -}; - int dev_dax_probe(struct device *dev) { struct dev_dax *dev_dax = to_dev_dax(dev); @@ -463,14 +428,6 @@ int dev_dax_probe(struct device *dev) return -EBUSY; } - init_completion(&dev_dax->cmp); - rc = percpu_ref_init(&dev_dax->ref, dev_dax_percpu_release, 0, - GFP_KERNEL); - if (rc) - return rc; - - dev_dax->pgmap.ref = &dev_dax->ref; - dev_dax->pgmap.ops = &dev_dax_pagemap_ops; addr = devm_memremap_pages(dev, &dev_dax->pgmap); if (IS_ERR(addr)) return PTR_ERR(addr); -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 15/25] device-dax: use the dev_pagemap internal refcount Date: Mon, 17 Jun 2019 14:27:23 +0200 Message-ID: <20190617122733.22432-16-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 VGhlIGZ1bmN0aW9uYWxpdHkgaXMgaWRlbnRpY2FsIHRvIHRoZSBvbmUgY3VycmVudGx5IG9wZW4g Y29kZWQgaW4KZGV2aWNlLWRheC4KClNpZ25lZC1vZmYtYnk6IENocmlzdG9waCBIZWxsd2lnIDxo Y2hAbHN0LmRlPgotLS0KIGRyaXZlcnMvZGF4L2RheC1wcml2YXRlLmggfCAgNCAtLS0tCiBkcml2 ZXJzL2RheC9kZXZpY2UuYyAgICAgIHwgNDMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDQ3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZGF4L2RheC1wcml2YXRlLmggYi9kcml2ZXJzL2RheC9kYXgtcHJpdmF0ZS5oCmlu ZGV4IGE0NTYxMjE0OGNhMC4uZWQwNGExOGEzNWJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2RheC9k YXgtcHJpdmF0ZS5oCisrKyBiL2RyaXZlcnMvZGF4L2RheC1wcml2YXRlLmgKQEAgLTUxLDggKzUx LDYgQEAgc3RydWN0IGRheF9yZWdpb24gewogICogQHRhcmdldF9ub2RlOiBlZmZlY3RpdmUgbnVt YSBub2RlIGlmIGRldl9kYXggbWVtb3J5IHJhbmdlIGlzIG9ubGluZWQKICAqIEBkZXYgLSBkZXZp Y2UgY29yZQogICogQHBnbWFwIC0gcGdtYXAgZm9yIG1lbW1hcCBzZXR1cCAvIGxpZmV0aW1lIChk cml2ZXIgb3duZWQpCi0gKiBAcmVmOiBwZ21hcCByZWZlcmVuY2UgY291bnQgKGRyaXZlciBvd25l ZCkKLSAqIEBjbXA6IEByZWYgZmluYWwgcHV0IGNvbXBsZXRpb24gKGRyaXZlciBvd25lZCkKICAq Lwogc3RydWN0IGRldl9kYXggewogCXN0cnVjdCBkYXhfcmVnaW9uICpyZWdpb247CkBAIC02MCw4 ICs1OCw2IEBAIHN0cnVjdCBkZXZfZGF4IHsKIAlpbnQgdGFyZ2V0X25vZGU7CiAJc3RydWN0IGRl dmljZSBkZXY7CiAJc3RydWN0IGRldl9wYWdlbWFwIHBnbWFwOwotCXN0cnVjdCBwZXJjcHVfcmVm IHJlZjsKLQlzdHJ1Y3QgY29tcGxldGlvbiBjbXA7CiB9OwogCiBzdGF0aWMgaW5saW5lIHN0cnVj dCBkZXZfZGF4ICp0b19kZXZfZGF4KHN0cnVjdCBkZXZpY2UgKmRldikKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZGF4L2RldmljZS5jIGIvZHJpdmVycy9kYXgvZGV2aWNlLmMKaW5kZXggMTdiNDZjMWE3 NmI0Li5hOWQ3YzkwZWNmMWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZGF4L2RldmljZS5jCisrKyBi L2RyaXZlcnMvZGF4L2RldmljZS5jCkBAIC0xNCwzNiArMTQsNiBAQAogI2luY2x1ZGUgImRheC1w cml2YXRlLmgiCiAjaW5jbHVkZSAiYnVzLmgiCiAKLXN0YXRpYyBzdHJ1Y3QgZGV2X2RheCAqcmVm X3RvX2Rldl9kYXgoc3RydWN0IHBlcmNwdV9yZWYgKnJlZikKLXsKLQlyZXR1cm4gY29udGFpbmVy X29mKHJlZiwgc3RydWN0IGRldl9kYXgsIHJlZik7Ci19Ci0KLXN0YXRpYyB2b2lkIGRldl9kYXhf cGVyY3B1X3JlbGVhc2Uoc3RydWN0IHBlcmNwdV9yZWYgKnJlZikKLXsKLQlzdHJ1Y3QgZGV2X2Rh eCAqZGV2X2RheCA9IHJlZl90b19kZXZfZGF4KHJlZik7Ci0KLQlkZXZfZGJnKCZkZXZfZGF4LT5k ZXYsICIlc1xuIiwgX19mdW5jX18pOwotCWNvbXBsZXRlKCZkZXZfZGF4LT5jbXApOwotfQotCi1z dGF0aWMgdm9pZCBkZXZfZGF4X3BlcmNwdV9leGl0KHN0cnVjdCBkZXZfcGFnZW1hcCAqcGdtYXAp Ci17Ci0Jc3RydWN0IGRldl9kYXggKmRldl9kYXggPSBjb250YWluZXJfb2YocGdtYXAsIHN0cnVj dCBkZXZfZGF4LCBwZ21hcCk7Ci0KLQlkZXZfZGJnKCZkZXZfZGF4LT5kZXYsICIlc1xuIiwgX19m dW5jX18pOwotCXdhaXRfZm9yX2NvbXBsZXRpb24oJmRldl9kYXgtPmNtcCk7Ci0JcGVyY3B1X3Jl Zl9leGl0KHBnbWFwLT5yZWYpOwotfQotCi1zdGF0aWMgdm9pZCBkZXZfZGF4X3BlcmNwdV9raWxs KHN0cnVjdCBkZXZfcGFnZW1hcCAqcGdtYXApCi17Ci0Jc3RydWN0IGRldl9kYXggKmRldl9kYXgg PSBjb250YWluZXJfb2YocGdtYXAsIHN0cnVjdCBkZXZfZGF4LCBwZ21hcCk7Ci0KLQlkZXZfZGJn KCZkZXZfZGF4LT5kZXYsICIlc1xuIiwgX19mdW5jX18pOwotCXBlcmNwdV9yZWZfa2lsbChwZ21h cC0+cmVmKTsKLX0KLQogc3RhdGljIGludCBjaGVja192bWEoc3RydWN0IGRldl9kYXggKmRldl9k YXgsIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLAogCQljb25zdCBjaGFyICpmdW5jKQogewpA QCAtNDQxLDExICs0MTEsNiBAQCBzdGF0aWMgdm9pZCBkZXZfZGF4X2tpbGwodm9pZCAqZGV2X2Rh eCkKIAlraWxsX2Rldl9kYXgoZGV2X2RheCk7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZGV2 X3BhZ2VtYXBfb3BzIGRldl9kYXhfcGFnZW1hcF9vcHMgPSB7Ci0JLmtpbGwJCT0gZGV2X2RheF9w ZXJjcHVfa2lsbCwKLQkuY2xlYW51cAk9IGRldl9kYXhfcGVyY3B1X2V4aXQsCi19OwotCiBpbnQg ZGV2X2RheF9wcm9iZShzdHJ1Y3QgZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRldl9kYXggKmRl dl9kYXggPSB0b19kZXZfZGF4KGRldik7CkBAIC00NjMsMTQgKzQyOCw2IEBAIGludCBkZXZfZGF4 X3Byb2JlKHN0cnVjdCBkZXZpY2UgKmRldikKIAkJcmV0dXJuIC1FQlVTWTsKIAl9CiAKLQlpbml0 X2NvbXBsZXRpb24oJmRldl9kYXgtPmNtcCk7Ci0JcmMgPSBwZXJjcHVfcmVmX2luaXQoJmRldl9k YXgtPnJlZiwgZGV2X2RheF9wZXJjcHVfcmVsZWFzZSwgMCwKLQkJCUdGUF9LRVJORUwpOwotCWlm IChyYykKLQkJcmV0dXJuIHJjOwotCi0JZGV2X2RheC0+cGdtYXAucmVmID0gJmRldl9kYXgtPnJl ZjsKLQlkZXZfZGF4LT5wZ21hcC5vcHMgPSAmZGV2X2RheF9wYWdlbWFwX29wczsKIAlhZGRyID0g ZGV2bV9tZW1yZW1hcF9wYWdlcyhkZXYsICZkZXZfZGF4LT5wZ21hcCk7CiAJaWYgKElTX0VSUihh ZGRyKSkKIAkJcmV0dXJuIFBUUl9FUlIoYWRkcik7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5v dXZlYXVAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vbm91dmVhdQ==