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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 21A0EC4361B for ; Tue, 15 Dec 2020 12:15:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AB8172246B for ; Tue, 15 Dec 2020 12:15:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB8172246B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 460446B0081; Tue, 15 Dec 2020 07:15:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 436B66B0082; Tue, 15 Dec 2020 07:15:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 374B08D0005; Tue, 15 Dec 2020 07:15:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0251.hostedemail.com [216.40.44.251]) by kanga.kvack.org (Postfix) with ESMTP id 2142F6B0081 for ; Tue, 15 Dec 2020 07:15:04 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id E54F6180AD830 for ; Tue, 15 Dec 2020 12:15:03 +0000 (UTC) X-FDA: 77595410886.21.ice32_3b0b3a327423 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id B9947180442CB for ; Tue, 15 Dec 2020 12:15:03 +0000 (UTC) X-HE-Tag: ice32_3b0b3a327423 X-Filterd-Recvd-Size: 5113 Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Dec 2020 12:15:02 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.78,420,1599494400"; d="scan'208";a="102420200" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 Dec 2020 20:15:00 +0800 Received: from G08CNEXMBPEKD05.g08.fujitsu.local (unknown [10.167.33.204]) by cn.fujitsu.com (Postfix) with ESMTP id 5EFE84CE600E; Tue, 15 Dec 2020 20:14:57 +0800 (CST) Received: from G08CNEXCHPEKD05.g08.fujitsu.local (10.167.33.203) by G08CNEXMBPEKD05.g08.fujitsu.local (10.167.33.204) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 15 Dec 2020 20:14:56 +0800 Received: from localhost.localdomain (10.167.225.141) by G08CNEXCHPEKD05.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 15 Dec 2020 20:14:56 +0800 From: Shiyang Ruan To: , , , CC: , , , , , , , , , Subject: [RFC PATCH v3 6/9] pmem: Implement ->corrupted_range() for pmem driver Date: Tue, 15 Dec 2020 20:14:11 +0800 Message-ID: <20201215121414.253660-7-ruansy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201215121414.253660-1-ruansy.fnst@cn.fujitsu.com> References: <20201215121414.253660-1-ruansy.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-yoursite-MailScanner-ID: 5EFE84CE600E.AEF68 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@cn.fujitsu.com Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Obtain the superblock of a pmem disk, and call filesystem's ->corrupted_range() to handle the corrupted data. Signed-off-by: Shiyang Ruan --- block/genhd.c | 12 ++++++++++++ drivers/nvdimm/pmem.c | 24 ++++++++++++++++++++++++ include/linux/genhd.h | 1 + 3 files changed, 37 insertions(+) diff --git a/block/genhd.c b/block/genhd.c index 9387f050c248..436adce123b2 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1058,6 +1058,18 @@ struct block_device *bdget_disk(struct gendisk *di= sk, int partno) } EXPORT_SYMBOL(bdget_disk); =20 +struct block_device *bdget_disk_sector(struct gendisk *disk, sector_t se= ctor) +{ + struct block_device *bdev =3D NULL; + struct hd_struct *part =3D disk_map_sector_rcu(disk, sector); + + if (part) + bdev =3D bdget_part(part); + + return bdev; +} +EXPORT_SYMBOL(bdget_disk_sector); + /* * print a full list of all partitions - intended for places where the r= oot * 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 4a114937c43b..4688bff19c20 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -253,6 +253,29 @@ static int pmem_rw_page(struct block_device *bdev, s= ector_t sector, return blk_status_to_errno(rc); } =20 +static int pmem_corrupted_range(struct gendisk *disk, struct block_devic= e *bdev, + loff_t disk_offset, size_t len, void *data) +{ + struct super_block *sb; + loff_t bdev_offset; + sector_t disk_sector =3D disk_offset >> SECTOR_SHIFT; + int rc =3D 0; + + bdev =3D bdget_disk_sector(disk, disk_sector); + if (!bdev) + return -ENODEV; + + bdev_offset =3D (disk_sector - get_start_sect(bdev)) << SECTOR_SHIFT; + sb =3D get_super(bdev); + if (sb && sb->s_op->corrupted_range) { + rc =3D 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= =3D { .owner =3D THIS_MODULE, .submit_bio =3D pmem_submit_bio, .rw_page =3D pmem_rw_page, + .corrupted_range =3D pmem_corrupted_range, }; =20 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 03da3f603d30..ed06209008b8 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -303,6 +303,7 @@ static inline void add_disk_no_queue_reg(struct gendi= sk *disk) extern void del_gendisk(struct gendisk *gp); extern struct gendisk *get_gendisk(dev_t dev, int *partno); extern struct block_device *bdget_disk(struct gendisk *disk, int partno)= ; +extern struct block_device *bdget_disk_sector(struct gendisk *disk, sect= or_t sector); =20 extern void set_device_ro(struct block_device *bdev, int flag); extern void set_disk_ro(struct gendisk *disk, int flag); --=20 2.29.2