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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 917E6C34021 for ; Mon, 17 Feb 2020 18:17:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70219207FD for ; Mon, 17 Feb 2020 18:17:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VWFAcVIa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729859AbgBQSRS (ORCPT ); Mon, 17 Feb 2020 13:17:18 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42682 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729858AbgBQSRR (ORCPT ); Mon, 17 Feb 2020 13:17:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581963437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YoSsSA4Jfem1NcQMAMBXseJ9qYa7uipfbgZR4YI9nAk=; b=VWFAcVIaBxuNJnhq8q0zn37McydUlBLRcTgutVoizSE352OUaP4aUk8BJyepl7/4YtqeqP UgXX3IarRuvtjK23KipxtG290tmfoA6JNGoyJPim/rI11j9JE6XH2YZ6KlsX6cPDcOkw64 kADiIGTFeVKKgb1XUaiop9NzO8PLP/4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-104-giAsTjKhN3mIiafvyYdJoQ-1; Mon, 17 Feb 2020 13:17:12 -0500 X-MC-Unique: giAsTjKhN3mIiafvyYdJoQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 723FF100DFC2; Mon, 17 Feb 2020 18:17:11 +0000 (UTC) Received: from horse.redhat.com (unknown [10.18.25.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66CBC5DA2C; Mon, 17 Feb 2020 18:17:08 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 051462257D4; Mon, 17 Feb 2020 13:17:08 -0500 (EST) From: Vivek Goyal To: linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, hch@infradead.org, dan.j.williams@intel.com Cc: dm-devel@redhat.com, vishal.l.verma@intel.com, vgoyal@redhat.com Subject: [PATCH v4 2/7] pmem: Enable pmem_do_write() to deal with arbitrary ranges Date: Mon, 17 Feb 2020 13:16:48 -0500 Message-Id: <20200217181653.4706-3-vgoyal@redhat.com> In-Reply-To: <20200217181653.4706-1-vgoyal@redhat.com> References: <20200217181653.4706-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Content-Transfer-Encoding: quoted-printable Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Currently pmem_do_write() is written with assumption that all I/O is sector aligned. Soon I want to use this function in zero_page_range() where range passed in does not have to be sector aligned. Modify this function to be able to deal with an arbitrary range. Which is specified by pmem_off and len. Signed-off-by: Vivek Goyal --- drivers/nvdimm/pmem.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 075b11682192..fae8f67da9de 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -154,15 +154,23 @@ static blk_status_t pmem_do_read(struct pmem_device= *pmem, =20 static blk_status_t pmem_do_write(struct pmem_device *pmem, struct page *page, unsigned int page_off, - sector_t sector, unsigned int len) + u64 pmem_off, unsigned int len) { blk_status_t rc =3D BLK_STS_OK; bool bad_pmem =3D false; - phys_addr_t pmem_off =3D sector * 512 + pmem->data_offset; - void *pmem_addr =3D pmem->virt_addr + pmem_off; - - if (unlikely(is_bad_pmem(&pmem->bb, sector, len))) - bad_pmem =3D true; + phys_addr_t pmem_real_off =3D pmem_off + pmem->data_offset; + void *pmem_addr =3D pmem->virt_addr + pmem_real_off; + sector_t sector_start, sector_end; + unsigned nr_sectors; + + sector_start =3D DIV_ROUND_UP(pmem_off, SECTOR_SIZE); + sector_end =3D (pmem_off + len) >> SECTOR_SHIFT; + if (sector_end > sector_start) { + nr_sectors =3D sector_end - sector_start; + if (is_bad_pmem(&pmem->bb, sector_start, + nr_sectors << SECTOR_SHIFT)) + bad_pmem =3D true; + } =20 /* * Note that we write the data both before and after @@ -181,7 +189,13 @@ static blk_status_t pmem_do_write(struct pmem_device= *pmem, flush_dcache_page(page); write_pmem(pmem_addr, page, page_off, len); if (unlikely(bad_pmem)) { - rc =3D pmem_clear_poison(pmem, pmem_off, len); + /* + * Pass sector aligned offset and length. That seems + * to work as of now. Other finer grained alignment + * cases can be addressed later if need be. + */ + rc =3D pmem_clear_poison(pmem, ALIGN(pmem_real_off, SECTOR_SIZE), + nr_sectors << SECTOR_SHIFT); write_pmem(pmem_addr, page, page_off, len); } =20 @@ -206,7 +220,7 @@ static blk_qc_t pmem_make_request(struct request_queu= e *q, struct bio *bio) bio_for_each_segment(bvec, bio, iter) { if (op_is_write(bio_op(bio))) rc =3D pmem_do_write(pmem, bvec.bv_page, bvec.bv_offset, - iter.bi_sector, bvec.bv_len); + iter.bi_sector << SECTOR_SHIFT, bvec.bv_len); else rc =3D pmem_do_read(pmem, bvec.bv_page, bvec.bv_offset, iter.bi_sector, bvec.bv_len); @@ -235,7 +249,7 @@ static int pmem_rw_page(struct block_device *bdev, se= ctor_t sector, blk_status_t rc; =20 if (op_is_write(op)) - rc =3D pmem_do_write(pmem, page, 0, sector, + rc =3D pmem_do_write(pmem, page, 0, sector << SECTOR_SHIFT, hpage_nr_pages(page) * PAGE_SIZE); else rc =3D pmem_do_read(pmem, page, 0, sector, --=20 2.20.1