From: Jane Chu <jane.chu@oracle.com> To: david@fromorbit.com, djwong@kernel.org, dan.j.williams@intel.com, hch@infradead.org, vishal.l.verma@intel.com, dave.jiang@intel.com, agk@redhat.com, snitzer@redhat.com, dm-devel@redhat.com, ira.weiny@intel.com, willy@infradead.org, vgoyal@redhat.com, linux-fsdevel@vger.kernel.org, nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH v5 6/7] dax: add recovery_write to dax_iomap_iter in failure path Date: Fri, 28 Jan 2022 14:31:49 -0700 [thread overview] Message-ID: <20220128213150.1333552-7-jane.chu@oracle.com> (raw) In-Reply-To: <20220128213150.1333552-1-jane.chu@oracle.com> dax_iomap_iter() fails if the destination range contains poison. Add recovery_write to the failure code path. Signed-off-by: Jane Chu <jane.chu@oracle.com> --- fs/dax.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index cd03485867a7..236675bd5946 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1199,6 +1199,8 @@ int dax_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, } EXPORT_SYMBOL_GPL(dax_truncate_page); +typedef size_t (*iter_func_t)(struct dax_device *dax_dev, pgoff_t pgoff, + void *addr, size_t bytes, struct iov_iter *i); static loff_t dax_iomap_iter(const struct iomap_iter *iomi, struct iov_iter *iter) { @@ -1210,6 +1212,7 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, ssize_t ret = 0; size_t xfer; int id; + iter_func_t write_func = dax_copy_from_iter; if (iov_iter_rw(iter) == READ) { end = min(end, i_size_read(iomi->inode)); @@ -1249,6 +1252,17 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, map_len = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, NULL); + if ((map_len == -EIO) && (iov_iter_rw(iter) == WRITE)) { + if (dax_prep_recovery(dax_dev, &kaddr) < 0) { + ret = map_len; + break; + } + map_len = dax_direct_access(dax_dev, pgoff, + PHYS_PFN(size), &kaddr, NULL); + if (map_len > 0) + write_func = dax_recovery_write; + } + if (map_len < 0) { ret = map_len; break; @@ -1261,12 +1275,17 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, map_len = end - pos; if (iov_iter_rw(iter) == WRITE) - xfer = dax_copy_from_iter(dax_dev, pgoff, kaddr, - map_len, iter); + xfer = write_func(dax_dev, pgoff, kaddr, map_len, iter); else xfer = dax_copy_to_iter(dax_dev, pgoff, kaddr, map_len, iter); + if (xfer == (ssize_t) -EIO) { + pr_warn("dax_ioma_iter: write_func returns -EIO\n"); + ret = -EIO; + break; + } + pos += xfer; length -= xfer; done += xfer; -- 2.18.4
WARNING: multiple messages have this Message-ID (diff)
From: Jane Chu <jane.chu@oracle.com> To: david@fromorbit.com, djwong@kernel.org, dan.j.williams@intel.com, hch@infradead.org, vishal.l.verma@intel.com, dave.jiang@intel.com, agk@redhat.com, snitzer@redhat.com, dm-devel@redhat.com, ira.weiny@intel.com, willy@infradead.org, vgoyal@redhat.com, linux-fsdevel@vger.kernel.org, nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [dm-devel] [PATCH v5 6/7] dax: add recovery_write to dax_iomap_iter in failure path Date: Fri, 28 Jan 2022 14:31:49 -0700 [thread overview] Message-ID: <20220128213150.1333552-7-jane.chu@oracle.com> (raw) In-Reply-To: <20220128213150.1333552-1-jane.chu@oracle.com> dax_iomap_iter() fails if the destination range contains poison. Add recovery_write to the failure code path. Signed-off-by: Jane Chu <jane.chu@oracle.com> --- fs/dax.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index cd03485867a7..236675bd5946 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1199,6 +1199,8 @@ int dax_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, } EXPORT_SYMBOL_GPL(dax_truncate_page); +typedef size_t (*iter_func_t)(struct dax_device *dax_dev, pgoff_t pgoff, + void *addr, size_t bytes, struct iov_iter *i); static loff_t dax_iomap_iter(const struct iomap_iter *iomi, struct iov_iter *iter) { @@ -1210,6 +1212,7 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, ssize_t ret = 0; size_t xfer; int id; + iter_func_t write_func = dax_copy_from_iter; if (iov_iter_rw(iter) == READ) { end = min(end, i_size_read(iomi->inode)); @@ -1249,6 +1252,17 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, map_len = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, NULL); + if ((map_len == -EIO) && (iov_iter_rw(iter) == WRITE)) { + if (dax_prep_recovery(dax_dev, &kaddr) < 0) { + ret = map_len; + break; + } + map_len = dax_direct_access(dax_dev, pgoff, + PHYS_PFN(size), &kaddr, NULL); + if (map_len > 0) + write_func = dax_recovery_write; + } + if (map_len < 0) { ret = map_len; break; @@ -1261,12 +1275,17 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, map_len = end - pos; if (iov_iter_rw(iter) == WRITE) - xfer = dax_copy_from_iter(dax_dev, pgoff, kaddr, - map_len, iter); + xfer = write_func(dax_dev, pgoff, kaddr, map_len, iter); else xfer = dax_copy_to_iter(dax_dev, pgoff, kaddr, map_len, iter); + if (xfer == (ssize_t) -EIO) { + pr_warn("dax_ioma_iter: write_func returns -EIO\n"); + ret = -EIO; + break; + } + pos += xfer; length -= xfer; done += xfer; -- 2.18.4 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2022-01-28 21:32 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-28 21:31 [PATCH v5 0/7] DAX poison recovery Jane Chu 2022-01-28 21:31 ` [dm-devel] " Jane Chu 2022-01-28 21:31 ` [PATCH v5 1/7] mce: fix set_mce_nospec to always unmap the whole page Jane Chu 2022-01-28 21:31 ` [dm-devel] " Jane Chu 2022-02-02 13:21 ` Christoph Hellwig 2022-02-02 13:21 ` [dm-devel] " Christoph Hellwig 2022-02-02 21:20 ` Jane Chu 2022-02-02 21:20 ` [dm-devel] " Jane Chu 2022-02-02 23:07 ` Jane Chu 2022-02-02 23:07 ` [dm-devel] " Jane Chu 2022-02-03 13:42 ` Christoph Hellwig 2022-02-03 13:42 ` [dm-devel] " Christoph Hellwig 2022-02-04 5:23 ` Dan Williams 2022-02-04 5:23 ` [dm-devel] " Dan Williams 2022-02-06 8:30 ` Jane Chu 2022-02-06 8:30 ` [dm-devel] " Jane Chu 2022-01-28 21:31 ` [PATCH v5 2/7] dax: introduce dax device flag DAXDEV_RECOVERY Jane Chu 2022-01-28 21:31 ` [dm-devel] " Jane Chu 2022-02-02 13:23 ` Christoph Hellwig 2022-02-02 13:23 ` [dm-devel] " Christoph Hellwig 2022-02-02 21:27 ` Jane Chu 2022-02-02 21:27 ` [dm-devel] " Jane Chu 2022-02-03 13:43 ` Christoph Hellwig 2022-02-03 13:43 ` [dm-devel] " Christoph Hellwig 2022-02-04 5:17 ` Dan Williams 2022-02-04 5:17 ` [dm-devel] " Dan Williams 2022-02-04 5:32 ` Dan Williams 2022-02-04 5:32 ` [dm-devel] " Dan Williams 2022-02-06 8:29 ` Jane Chu 2022-02-06 8:29 ` [dm-devel] " Jane Chu 2022-01-28 21:31 ` [PATCH v5 3/7] dm: make dm aware of target's DAXDEV_RECOVERY capability Jane Chu 2022-01-28 21:31 ` [dm-devel] " Jane Chu 2022-02-04 5:34 ` Dan Williams 2022-02-04 5:34 ` [dm-devel] " Dan Williams 2022-02-06 8:27 ` Jane Chu 2022-02-06 8:27 ` [dm-devel] " Jane Chu 2022-01-28 21:31 ` [PATCH v5 4/7] dax: add dax_recovery_write to dax_op and dm target type Jane Chu 2022-01-28 21:31 ` [dm-devel] " Jane Chu 2022-02-02 13:34 ` Christoph Hellwig 2022-02-02 13:34 ` [dm-devel] " Christoph Hellwig 2022-02-02 22:03 ` Jane Chu 2022-02-02 22:03 ` [dm-devel] " Jane Chu 2022-02-04 6:03 ` Dan Williams 2022-02-04 6:03 ` [dm-devel] " Dan Williams 2022-02-06 8:25 ` Jane Chu 2022-02-06 8:25 ` [dm-devel] " Jane Chu 2022-01-28 21:31 ` [PATCH v5 5/7] pmem: add pmem_recovery_write() dax op Jane Chu 2022-01-28 21:31 ` [dm-devel] " Jane Chu 2022-01-29 7:34 ` kernel test robot 2022-01-29 7:34 ` kernel test robot 2022-02-02 13:43 ` Christoph Hellwig 2022-02-02 13:43 ` [dm-devel] " Christoph Hellwig 2022-02-02 22:13 ` Jane Chu 2022-02-02 22:13 ` [dm-devel] " Jane Chu 2022-02-04 6:21 ` Dan Williams 2022-02-04 6:21 ` [dm-devel] " Dan Williams 2022-02-06 8:08 ` Jane Chu 2022-02-06 8:08 ` [dm-devel] " Jane Chu 2022-01-28 21:31 ` Jane Chu [this message] 2022-01-28 21:31 ` [dm-devel] [PATCH v5 6/7] dax: add recovery_write to dax_iomap_iter in failure path Jane Chu 2022-02-02 13:44 ` Christoph Hellwig 2022-02-02 13:44 ` [dm-devel] " Christoph Hellwig 2022-02-02 22:18 ` Jane Chu 2022-02-02 22:18 ` [dm-devel] " Jane Chu 2022-01-28 21:31 ` [PATCH v5 7/7] pmem: fix pmem_do_write() avoid writing to 'np' page Jane Chu 2022-01-28 21:31 ` [dm-devel] " Jane Chu 2022-02-02 13:28 ` Christoph Hellwig 2022-02-02 13:28 ` [dm-devel] " Christoph Hellwig 2022-02-02 21:31 ` Jane Chu 2022-02-02 21:31 ` [dm-devel] " Jane Chu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220128213150.1333552-7-jane.chu@oracle.com \ --to=jane.chu@oracle.com \ --cc=agk@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=dave.jiang@intel.com \ --cc=david@fromorbit.com \ --cc=djwong@kernel.org \ --cc=dm-devel@redhat.com \ --cc=hch@infradead.org \ --cc=ira.weiny@intel.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=nvdimm@lists.linux.dev \ --cc=snitzer@redhat.com \ --cc=vgoyal@redhat.com \ --cc=vishal.l.verma@intel.com \ --cc=willy@infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.