Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1e78707 authored by Pankaj Gupta's avatar Pankaj Gupta Committed by Alistair Delva
Browse files

UPSTREAM: libnvdimm: nd_region flush callback support 



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.

Signed-off-by: default avatarPankaj Gupta <pagupta@redhat.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
(cherry picked from commit c5d4355d10d414a96ca870b731756b89d068d57a)
Bug: 146400078
Bug: 148297388
Change-Id: Icf6ff5327b3c74455a4d53d2d37ac7fef7fbda85
Signed-off-by: default avatarAlistair Delva <adelva@google.com>
parent 4921f557

drivers/acpi/nfit/core.c

+2 −2
Original line number Diff line number Diff line
@@ -2282,7 +2282,7 @@ static void write_blk_ctl(struct nfit_blk *nfit_blk, unsigned int bw, 
		offset = to_interleave_offset(offset, mmio);



	writeq(cmd, mmio->addr.base + offset);

	nvdimm_flush(nfit_blk->nd_region);

	nvdimm_flush(nfit_blk->nd_region, NULL);



	if (nfit_blk->dimm_flags & NFIT_BLK_DCR_LATCH)

		readq(mmio->addr.base + offset);
@@ -2331,7 +2331,7 @@ static int acpi_nfit_blk_single_io(struct nfit_blk *nfit_blk, 
	}



	if (rw)

		nvdimm_flush(nfit_blk->nd_region);

		nvdimm_flush(nfit_blk->nd_region, NULL);



	rc = read_blk_stat(nfit_blk, lane) ? -EIO : 0;

	return rc;

drivers/nvdimm/claim.c

+4 −2
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, 
	struct nd_namespace_io *nsio = to_nd_namespace_io(&ndns->dev);

	unsigned int sz_align = ALIGN(size + (offset & (512 - 1)), 512);

	sector_t sector = offset >> 9;

	int rc = 0;

	int rc = 0, ret = 0;



	if (unlikely(!size))

		return 0;
@@ -301,7 +301,9 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, 
	}



	memcpy_flushcache(nsio->addr + offset, buf, size);

	nvdimm_flush(to_nd_region(ndns->dev.parent));

	ret = nvdimm_flush(to_nd_region(ndns->dev.parent), NULL);

	if (ret)

		rc = ret;



	return rc;

}

drivers/nvdimm/nd.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ struct nd_region { 
	struct badblocks bb;

	struct nd_interleave_set *nd_set;

	struct nd_percpu_lane __percpu *lane;

	int (*flush)(struct nd_region *nd_region, struct bio *bio);

	struct nd_mapping mapping[0];

};

drivers/nvdimm/pmem.c

+8 −5
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ static blk_status_t pmem_do_bvec(struct pmem_device *pmem, struct page *page, 


static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)

{

	int ret = 0;

	blk_status_t rc = 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 = to_region(pmem);



	if (bio->bi_opf & REQ_PREFLUSH)

		nvdimm_flush(nd_region);

		ret = nvdimm_flush(nd_region, bio);



	do_acct = 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);



	if (bio->bi_opf & REQ_FUA)

		nvdimm_flush(nd_region);

		ret = nvdimm_flush(nd_region, bio);



	if (ret)

		bio->bi_status = errno_to_blk_status(ret);



	bio_endio(bio);

	return BLK_QC_T_NONE;
@@ -475,7 +479,6 @@ static int pmem_attach_disk(struct device *dev, 
	}

	dax_write_cache(dax_dev, nvdimm_has_cache(nd_region));

	pmem->dax_dev = dax_dev;



	gendev = disk_to_dev(disk);

	gendev->groups = pmem_attribute_groups;
@@ -533,14 +536,14 @@ static int nd_pmem_remove(struct device *dev) 
		sysfs_put(pmem->bb_state);

		pmem->bb_state = NULL;

	}

	nvdimm_flush(to_nd_region(dev->parent));

	nvdimm_flush(to_nd_region(dev->parent), NULL);



	return 0;

}



static void nd_pmem_shutdown(struct device *dev)

{

	nvdimm_flush(to_nd_region(dev->parent));

	nvdimm_flush(to_nd_region(dev->parent), NULL);

}



static void nd_pmem_notify(struct device *dev, enum nvdimm_event event)

drivers/nvdimm/region_devs.c

+24 −2
Original line number Diff line number Diff line
@@ -290,7 +290,9 @@ static ssize_t deep_flush_store(struct device *dev, struct device_attribute *att 
		return rc;

	if (!flush)

		return -EINVAL;

	nvdimm_flush(nd_region);

	rc = nvdimm_flush(nd_region, NULL);

	if (rc)

		return rc;



	return len;

}
@@ -1076,6 +1078,11 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, 
	dev->of_node = ndr_desc->of_node;

	nd_region->ndr_size = resource_size(ndr_desc->res);

	nd_region->ndr_start = ndr_desc->res->start;

	if (ndr_desc->flush)

		nd_region->flush = ndr_desc->flush;

	else

		nd_region->flush = NULL;



	nd_device_register(dev);



	return nd_region;
@@ -1116,11 +1123,24 @@ struct nd_region *nvdimm_volatile_region_create(struct nvdimm_bus *nvdimm_bus, 
}

EXPORT_SYMBOL_GPL(nvdimm_volatile_region_create);



int nvdimm_flush(struct nd_region *nd_region, struct bio *bio)

{

	int rc = 0;



	if (!nd_region->flush)

		rc = generic_nvdimm_flush(nd_region);

	else {

		if (nd_region->flush(nd_region, bio))

			rc = -EIO;

	}



	return rc;

}

/**

 * nvdimm_flush - flush any posted write queues between the cpu and pmem media

 * @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 = dev_get_drvdata(&nd_region->dev);

	int i, idx;
@@ -1144,6 +1164,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);