From: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com> To: <linux-kernel@vger.kernel.org>, <linux-xfs@vger.kernel.org>, <linux-nvdimm@lists.01.org>, <linux-mm@kvack.org>, <linux-fsdevel@vger.kernel.org>, <dm-devel@redhat.com> Cc: <darrick.wong@oracle.com>, <dan.j.williams@intel.com>, <david@fromorbit.com>, <hch@lst.de>, <agk@redhat.com>, <snitzer@redhat.com>, <rgoldwyn@suse.de>, <qi.fuli@fujitsu.com>, <y-goto@fujitsu.com> Subject: [PATCH RESEND v2 06/10] pmem: Implement ->corrupted_range() for pmem driver Date: Fri, 29 Jan 2021 14:27:53 +0800 [thread overview] Message-ID: <20210129062757.1594130-7-ruansy.fnst@cn.fujitsu.com> (raw) In-Reply-To: <20210129062757.1594130-1-ruansy.fnst@cn.fujitsu.com> Obtain the superblock of a pmem disk, and call filesystem's ->corrupted_range() to handle the corrupted data. Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com> --- block/genhd.c | 6 ++++++ drivers/nvdimm/pmem.c | 24 ++++++++++++++++++++++++ include/linux/genhd.h | 1 + 3 files changed, 31 insertions(+) diff --git a/block/genhd.c b/block/genhd.c index 419548e92d82..fd7cf03b65a8 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -936,6 +936,12 @@ struct block_device *bdget_disk(struct gendisk *disk, int partno) return bdev; } +struct block_device *bdget_disk_sector(struct gendisk *disk, sector_t sector) +{ + return disk_map_sector_rcu(disk, sector); +} +EXPORT_SYMBOL(bdget_disk_sector); + /* * print a full list of all partitions - intended for places where the root * filesystem can't be mounted and thus to give the victim some idea of what diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index c9e4fb38f94a..501959947d48 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -253,6 +253,29 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector, return blk_status_to_errno(rc); } +static int pmem_corrupted_range(struct gendisk *disk, struct block_device *bdev, + loff_t disk_offset, size_t len, void *data) +{ + struct super_block *sb; + loff_t bdev_offset; + sector_t disk_sector = disk_offset >> SECTOR_SHIFT; + int rc = 0; + + bdev = bdget_disk_sector(disk, disk_sector); + if (!bdev) + return -ENODEV; + + bdev_offset = (disk_sector - get_start_sect(bdev)) << SECTOR_SHIFT; + sb = get_super(bdev); + if (sb && sb->s_op->corrupted_range) { + rc = sb->s_op->corrupted_range(sb, bdev, bdev_offset, len, data); + drop_super(sb); + } + + bdput(bdev); + return rc; +} + /* see "strong" declaration in tools/testing/nvdimm/pmem-dax.c */ __weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn) @@ -281,6 +304,7 @@ static const struct block_device_operations pmem_fops = { .owner = THIS_MODULE, .submit_bio = pmem_submit_bio, .rw_page = pmem_rw_page, + .corrupted_range = pmem_corrupted_range, }; static int pmem_dax_zero_page_range(struct dax_device *dax_dev, pgoff_t pgoff, diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 809aaa32d53c..4da480798955 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -248,6 +248,7 @@ static inline void add_disk_no_queue_reg(struct gendisk *disk) extern void del_gendisk(struct gendisk *gp); extern struct block_device *bdget_disk(struct gendisk *disk, int partno); +extern struct block_device *bdget_disk_sector(struct gendisk *disk, sector_t sector); extern void set_disk_ro(struct gendisk *disk, int flag); -- 2.30.0
next prev parent reply other threads:[~2021-01-29 6:28 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-29 6:27 [PATCH RESEND v2 00/10] fsdax: introduce fs query to support reflink Shiyang Ruan 2021-01-29 6:27 ` [PATCH RESEND v2 01/10] pagemap: Introduce ->memory_failure() Shiyang Ruan 2021-01-29 6:27 ` [PATCH RESEND v2 02/10] blk: Introduce ->corrupted_range() for block device Shiyang Ruan 2021-01-29 6:27 ` [PATCH RESEND v2 03/10] fs: Introduce ->corrupted_range() for superblock Shiyang Ruan 2021-01-29 6:27 ` [PATCH RESEND v2 04/10] mm, fsdax: Refactor memory-failure handler for dax mapping Shiyang Ruan 2021-01-29 6:27 ` [PATCH RESEND v2 05/10] mm, pmem: Implement ->memory_failure() in pmem driver Shiyang Ruan 2021-01-29 6:27 ` Shiyang Ruan [this message] 2021-01-29 6:27 ` [PATCH RESEND v2 07/10] dm: Introduce ->rmap() to find bdev offset Shiyang Ruan 2021-01-29 6:27 ` [PATCH RESEND v2 08/10] md: Implement ->corrupted_range() Shiyang Ruan 2021-02-02 3:17 ` Darrick J. Wong 2021-02-03 1:51 ` Ruan Shiyang 2021-01-29 6:27 ` [PATCH RESEND v2 09/10] xfs: Implement ->corrupted_range() for XFS Shiyang Ruan 2021-02-02 2:41 ` Darrick J. Wong 2021-02-02 12:48 ` Ruan Shiyang 2021-01-29 6:27 ` [PATCH RESEND v2 10/10] fs/dax: Remove useless functions Shiyang Ruan
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=20210129062757.1594130-7-ruansy.fnst@cn.fujitsu.com \ --to=ruansy.fnst@cn.fujitsu.com \ --cc=agk@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=dm-devel@redhat.com \ --cc=hch@lst.de \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=linux-xfs@vger.kernel.org \ --cc=qi.fuli@fujitsu.com \ --cc=rgoldwyn@suse.de \ --cc=snitzer@redhat.com \ --cc=y-goto@fujitsu.com \ --subject='Re: [PATCH RESEND v2 06/10] pmem: Implement ->corrupted_range() for pmem driver' \ /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: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).