From nobody Wed Nov 5 16:36:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539407053617949.6334307952438; Fri, 12 Oct 2018 22:04:13 -0700 (PDT) Received: from localhost ([::1]:43699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBC60-0005CS-FT for importer@patchew.org; Sat, 13 Oct 2018 01:04:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBC39-0003W0-1o for qemu-devel@nongnu.org; Sat, 13 Oct 2018 01:01:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBC31-0008C9-Am for qemu-devel@nongnu.org; Sat, 13 Oct 2018 01:01:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54806) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gBC2z-0008A8-C8 for qemu-devel@nongnu.org; Sat, 13 Oct 2018 01:01:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 091093D95F; Sat, 13 Oct 2018 05:01:02 +0000 (UTC) Received: from dhcp201-121.englab.pnq.redhat.com (dhcp193-42.pnq.redhat.com [10.65.193.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E57C1C920; Sat, 13 Oct 2018 05:00:43 +0000 (UTC) From: Pankaj Gupta To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, qemu-devel@nongnu.org, linux-nvdimm@ml01.01.org Date: Sat, 13 Oct 2018 10:30:20 +0530 Message-Id: <20181013050021.11962-2-pagupta@redhat.com> In-Reply-To: <20181013050021.11962-1-pagupta@redhat.com> References: <20181013050021.11962-1-pagupta@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sat, 13 Oct 2018 05:01:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/2] libnvdimm: nd_region flush callback support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pagupta@redhat.com, jack@suse.cz, xiaoguangrong.eric@gmail.com, riel@surriel.com, vishal.l.verma@intel.com, david@redhat.com, dave.jiang@intel.com, lcapitulino@redhat.com, hch@infradead.org, imammedo@redhat.com, mst@redhat.com, stefanha@redhat.com, zwisler@kernel.org, pbonzini@redhat.com, dan.j.williams@intel.com, nilal@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch adds functionality to perform flush from guest to host over VIRTIO. We are registering a callback based on 'nd_region' type. virtio_pmem driver requires this special flush function. For rest of the region types we are registering existing flush function. Report error returned by host fsync failure to userspace.=20 This also handles asynchronous flush requests from the block layer=20 by creating a child bio and chaining it with parent bio. Signed-off-by: Pankaj Gupta --- drivers/acpi/nfit/core.c | 4 ++-- drivers/nvdimm/claim.c | 6 ++++-- drivers/nvdimm/nd.h | 1 + drivers/nvdimm/pmem.c | 12 ++++++++---- drivers/nvdimm/region_devs.c | 38 ++++++++++++++++++++++++++++++++++++-- include/linux/libnvdimm.h | 5 ++++- 6 files changed, 55 insertions(+), 11 deletions(-) diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index b072cfc..f154852 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -2234,7 +2234,7 @@ static void write_blk_ctl(struct nfit_blk *nfit_blk, = unsigned int bw, offset =3D to_interleave_offset(offset, mmio); =20 writeq(cmd, mmio->addr.base + offset); - nvdimm_flush(nfit_blk->nd_region); + nvdimm_flush(nfit_blk->nd_region, NULL, false); =20 if (nfit_blk->dimm_flags & NFIT_BLK_DCR_LATCH) readq(mmio->addr.base + offset); @@ -2283,7 +2283,7 @@ static int acpi_nfit_blk_single_io(struct nfit_blk *n= fit_blk, } =20 if (rw) - nvdimm_flush(nfit_blk->nd_region); + nvdimm_flush(nfit_blk->nd_region, NULL, false); =20 rc =3D read_blk_stat(nfit_blk, lane) ? -EIO : 0; return rc; diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c index fb667bf..a1dfa06 100644 --- a/drivers/nvdimm/claim.c +++ b/drivers/nvdimm/claim.c @@ -263,7 +263,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *nd= ns, struct nd_namespace_io *nsio =3D to_nd_namespace_io(&ndns->dev); unsigned int sz_align =3D ALIGN(size + (offset & (512 - 1)), 512); sector_t sector =3D offset >> 9; - int rc =3D 0; + int rc =3D 0, ret =3D 0; =20 if (unlikely(!size)) return 0; @@ -301,7 +301,9 @@ static int nsio_rw_bytes(struct nd_namespace_common *nd= ns, } =20 memcpy_flushcache(nsio->addr + offset, buf, size); - nvdimm_flush(to_nd_region(ndns->dev.parent)); + ret =3D nvdimm_flush(to_nd_region(ndns->dev.parent), NULL, false); + if (ret) + rc =3D ret; =20 return rc; } diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index 98317e7..d53a2d1 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -160,6 +160,7 @@ struct nd_region { struct nd_interleave_set *nd_set; struct nd_percpu_lane __percpu *lane; struct nd_mapping mapping[0]; + int (*flush)(struct nd_region *nd_region); }; =20 struct nd_blk_region { diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 6071e29..5d6a4a1 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -192,6 +192,7 @@ static blk_status_t pmem_do_bvec(struct pmem_device *pm= em, struct page *page, =20 static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio) { + int ret =3D 0; blk_status_t rc =3D 0; bool do_acct; unsigned long start; @@ -201,7 +202,7 @@ static blk_qc_t pmem_make_request(struct request_queue = *q, struct bio *bio) struct nd_region *nd_region =3D to_region(pmem); =20 if (bio->bi_opf & REQ_PREFLUSH) - nvdimm_flush(nd_region); + ret =3D nvdimm_flush(nd_region, bio, true); =20 do_acct =3D nd_iostat_start(bio, &start); bio_for_each_segment(bvec, bio, iter) { @@ -216,7 +217,10 @@ static blk_qc_t pmem_make_request(struct request_queue= *q, struct bio *bio) nd_iostat_end(bio, start); =20 if (bio->bi_opf & REQ_FUA) - nvdimm_flush(nd_region); + ret =3D nvdimm_flush(nd_region, bio, true); + + if (ret) + bio->bi_status =3D errno_to_blk_status(ret); =20 bio_endio(bio); return BLK_QC_T_NONE; @@ -528,14 +532,14 @@ static int nd_pmem_remove(struct device *dev) sysfs_put(pmem->bb_state); pmem->bb_state =3D NULL; } - nvdimm_flush(to_nd_region(dev->parent)); + nvdimm_flush(to_nd_region(dev->parent), NULL, false); =20 return 0; } =20 static void nd_pmem_shutdown(struct device *dev) { - nvdimm_flush(to_nd_region(dev->parent)); + nvdimm_flush(to_nd_region(dev->parent), NULL, false); } =20 static void nd_pmem_notify(struct device *dev, enum nvdimm_event event) diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c index fa37afc..5508727 100644 --- a/drivers/nvdimm/region_devs.c +++ b/drivers/nvdimm/region_devs.c @@ -290,7 +290,9 @@ static ssize_t deep_flush_store(struct device *dev, str= uct device_attribute *att return rc; if (!flush) return -EINVAL; - nvdimm_flush(nd_region); + rc =3D nvdimm_flush(nd_region, NULL, false); + if (rc) + return rc; =20 return len; } @@ -1065,6 +1067,11 @@ static struct nd_region *nd_region_create(struct nvd= imm_bus *nvdimm_bus, dev->of_node =3D ndr_desc->of_node; nd_region->ndr_size =3D resource_size(ndr_desc->res); nd_region->ndr_start =3D ndr_desc->res->start; + if (ndr_desc->flush) + nd_region->flush =3D ndr_desc->flush; + else + nd_region->flush =3D generic_nvdimm_flush; + nd_device_register(dev); =20 return nd_region; @@ -1105,11 +1112,36 @@ struct nd_region *nvdimm_volatile_region_create(str= uct nvdimm_bus *nvdimm_bus, } EXPORT_SYMBOL_GPL(nvdimm_volatile_region_create); =20 +int nvdimm_flush(struct nd_region *nd_region, struct bio *bio, bool async) +{ + int rc =3D 0; + + /* Create child bio for asynchronous flush and chain with + * parent bio. Otherwise directly call nd_region flush. + */ + if (async && bio->bi_iter.bi_sector !=3D -1) { + + struct bio *child =3D bio_alloc(GFP_ATOMIC, 0); + + if (!child) + return -ENOMEM; + bio_copy_dev(child, bio); + child->bi_opf =3D REQ_PREFLUSH; + child->bi_iter.bi_sector =3D -1; + bio_chain(child, bio); + submit_bio(child); + } else { + if (nd_region->flush(nd_region)) + rc =3D -EIO; + } + + return rc; +} /** * nvdimm_flush - flush any posted write queues between the cpu and pmem m= edia * @nd_region: blk or interleaved pmem region */ -void nvdimm_flush(struct nd_region *nd_region) +int generic_nvdimm_flush(struct nd_region *nd_region) { struct nd_region_data *ndrd =3D dev_get_drvdata(&nd_region->dev); int i, idx; @@ -1133,6 +1165,8 @@ void nvdimm_flush(struct nd_region *nd_region) if (ndrd_get_flush_wpq(ndrd, i, 0)) writeq(1, ndrd_get_flush_wpq(ndrd, i, idx)); wmb(); + + return 0; } EXPORT_SYMBOL_GPL(nvdimm_flush); =20 diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h index 097072c..b49632c 100644 --- a/include/linux/libnvdimm.h +++ b/include/linux/libnvdimm.h @@ -115,6 +115,7 @@ struct nd_mapping_desc { int position; }; =20 +struct nd_region; struct nd_region_desc { struct resource *res; struct nd_mapping_desc *mapping; @@ -126,6 +127,7 @@ struct nd_region_desc { int numa_node; unsigned long flags; struct device_node *of_node; + int (*flush)(struct nd_region *nd_region); }; =20 struct device; @@ -201,7 +203,8 @@ unsigned long nd_blk_memremap_flags(struct nd_blk_regio= n *ndbr); unsigned int nd_region_acquire_lane(struct nd_region *nd_region); void nd_region_release_lane(struct nd_region *nd_region, unsigned int lane= ); u64 nd_fletcher64(void *addr, size_t len, bool le); -void nvdimm_flush(struct nd_region *nd_region); +int nvdimm_flush(struct nd_region *nd_region, struct bio *bio, bool async); +int generic_nvdimm_flush(struct nd_region *nd_region); int nvdimm_has_flush(struct nd_region *nd_region); int nvdimm_has_cache(struct nd_region *nd_region); =20 --=20 2.9.3