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,URIBL_BLOCKED,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 4B2F1C433E0 for ; Fri, 29 Jan 2021 06:28:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CD6B064DFB for ; Fri, 29 Jan 2021 06:28:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD6B064DFB 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 293B96B0071; Fri, 29 Jan 2021 01:28:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F9146B0072; Fri, 29 Jan 2021 01:28:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BD8E6B0073; Fri, 29 Jan 2021 01:28:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0006.hostedemail.com [216.40.44.6]) by kanga.kvack.org (Postfix) with ESMTP id E29876B0071 for ; Fri, 29 Jan 2021 01:28:23 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B20BA180AD806 for ; Fri, 29 Jan 2021 06:28:23 +0000 (UTC) X-FDA: 77757833286.26.worm77_3d0f870275a6 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 8C2C01804B661 for ; Fri, 29 Jan 2021 06:28:23 +0000 (UTC) X-HE-Tag: worm77_3d0f870275a6 X-Filterd-Recvd-Size: 4867 Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Fri, 29 Jan 2021 06:28:20 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.79,384,1602518400"; d="scan'208";a="103973625" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 29 Jan 2021 14:28:11 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id E2EC44CE6782; Fri, 29 Jan 2021 14:28:09 +0800 (CST) Received: from G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.200) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 29 Jan 2021 14:28:10 +0800 Received: from irides.mr.mr.mr (10.167.225.141) by G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 29 Jan 2021 14:28:09 +0800 From: Shiyang Ruan To: , , , , , CC: , , , , , , , , Subject: [PATCH RESEND v2 06/10] pmem: Implement ->corrupted_range() for pmem driver Date: Fri, 29 Jan 2021 14:27:53 +0800 Message-ID: <20210129062757.1594130-7-ruansy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210129062757.1594130-1-ruansy.fnst@cn.fujitsu.com> References: <20210129062757.1594130-1-ruansy.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-yoursite-MailScanner-ID: E2EC44CE6782.AF815 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 | 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; } =20 +struct block_device *bdget_disk_sector(struct gendisk *disk, sector_t se= ctor) +{ + return disk_map_sector_rcu(disk, sector); +} +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 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, 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 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 gendi= sk *disk) =20 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, sect= or_t sector); =20 extern void set_disk_ro(struct gendisk *disk, int flag); =20 --=20 2.30.0