Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp10691570pxu; Wed, 30 Dec 2020 09:02:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPXzFfjV75qOeKEBqo4oaJAVHzeQjVlDN+zeKa/qmqaIQBr4qyLAt2oc6vVp/cB9NZ4pMX X-Received: by 2002:a05:6402:312c:: with SMTP id dd12mr52290772edb.327.1609347748339; Wed, 30 Dec 2020 09:02:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609347748; cv=none; d=google.com; s=arc-20160816; b=L3dumpWyycKZhyPmx2I9t1i/+rx9NWwfNjfTjNqccwvHXuVcyPehrqRJ83ckbazRFO F5X/QUDuDr7S6W9Xgqmy11DTglx2gNaEQQHNEtMAhRWGrX/qUg3MB5uD3E8rpCZ3sQWZ t41G6krYGLn3xniw61Pj/5Ze/i5l+QQuKiVbVRL9V8qzjKmN0gqDVMHSEcs+eicU15SH 9ajOsrvIv8tnbIQAq5jT/KZZzmiadv4+Lkk6XiOIo4pSOZPtj1YbM5w4+4NJVbKA3454 QaP+CW/HC5mPrO9zHbOMeSNDq8ifk7jKuaJZuYst0AeIs9d8YjJ8rsI/vDVDtdDKSrSU Z9tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=JGKMhFbw1zauDiFtq/5ucoSMMkoi3To2TXxuQSxvYnI=; b=QRb84w40u8Zfkg22vufSiYtkZDSEZtusDA5XJaJ0oGPju5Ua8YmWXGEt4QHq4P476y 1G7RL1dwySjKHrCNOQvsB83/KxXpk8MyPaHrsNJX90ROsEnd64D0kgWbhMtkc0yEptCi qqwJqe8VsnpXW9vOP4ShxTAnsU29Dico96DOOUYsNEIGJIOtyifRnFLI1DUHCQpMuVaA bvFJQ7UWZ3nQyaPFO+pTtAUinhLZO5Z4N+uM+qFDb6nJurrUguwMRZNs/+fe29ui2vgc ntk5Jvk7DKFZys1sakkCH1cKMECzituQvxShq2+FXcLnBFyYc08FG61KfeW3+gL0IIxl Ejlg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hk16si21317774ejb.8.2020.12.30.09.02.05; Wed, 30 Dec 2020 09:02:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbgL3RAp (ORCPT + 99 others); Wed, 30 Dec 2020 12:00:45 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:58640 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726949AbgL3RAo (ORCPT ); Wed, 30 Dec 2020 12:00:44 -0500 X-IronPort-AV: E=Sophos;i="5.78,461,1599494400"; d="scan'208";a="103085837" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 31 Dec 2020 00:58:45 +0800 Received: from G08CNEXMBPEKD06.g08.fujitsu.local (unknown [10.167.33.206]) by cn.fujitsu.com (Postfix) with ESMTP id 04B1F4CE601E; Thu, 31 Dec 2020 00:58:40 +0800 (CST) Received: from G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.200) by G08CNEXMBPEKD06.g08.fujitsu.local (10.167.33.206) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 31 Dec 2020 00:58:40 +0800 Received: from irides.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; Thu, 31 Dec 2020 00:58:39 +0800 From: Shiyang Ruan To: , , , CC: , , , , , , , , , Subject: [PATCH 06/10] pmem: Implement ->corrupted_range() for pmem driver Date: Thu, 31 Dec 2020 00:55:57 +0800 Message-ID: <20201230165601.845024-7-ruansy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201230165601.845024-1-ruansy.fnst@cn.fujitsu.com> References: <20201230165601.845024-1-ruansy.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-yoursite-MailScanner-ID: 04B1F4CE601E.AFEA7 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@cn.fujitsu.com X-Spam-Status: No Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 *disk, int partno) } EXPORT_SYMBOL(bdget_disk); +struct block_device *bdget_disk_sector(struct gendisk *disk, sector_t sector) +{ + struct block_device *bdev = NULL; + struct hd_struct *part = disk_map_sector_rcu(disk, sector); + + if (part) + bdev = bdget_part(part); + + return bdev; +} +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 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, 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 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 gendisk *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, sector_t sector); extern void set_device_ro(struct block_device *bdev, int flag); extern void set_disk_ro(struct gendisk *disk, int flag); -- 2.29.2