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 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E1D64C433F5 for ; Tue, 23 Nov 2021 22:37:00 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-399-djaG2REQO3iJipZBisiszw-1; Tue, 23 Nov 2021 17:36:56 -0500 X-MC-Unique: djaG2REQO3iJipZBisiszw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F2681B18BC0; Tue, 23 Nov 2021 22:36:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DD94B418E; Tue, 23 Nov 2021 22:36:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 712A81832E7F; Tue, 23 Nov 2021 22:36:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1ANManJ2024693 for ; Tue, 23 Nov 2021 17:36:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id 595F14010FFC; Tue, 23 Nov 2021 22:36:49 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54ACC40CFD04 for ; Tue, 23 Nov 2021 22:36:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C5CC85A5B9 for ; Tue, 23 Nov 2021 22:36:49 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-74-me3MCyPGMpS0V_gdLuoysA-1; Tue, 23 Nov 2021 17:36:44 -0500 X-MC-Unique: me3MCyPGMpS0V_gdLuoysA-1 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5F09F60F5B; Tue, 23 Nov 2021 22:36:43 +0000 (UTC) Date: Tue, 23 Nov 2021 14:36:42 -0800 From: "Darrick J. Wong" To: Christoph Hellwig Message-ID: <20211123223642.GI266024@magnolia> References: <20211109083309.584081-1-hch@lst.de> <20211109083309.584081-15-hch@lst.de> MIME-Version: 1.0 In-Reply-To: <20211109083309.584081-15-hch@lst.de> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-loop: dm-devel@redhat.com Cc: nvdimm@lists.linux.dev, Mike Snitzer , linux-s390@vger.kernel.org, linux-erofs@lists.ozlabs.org, virtualization@lists.linux-foundation.org, linux-xfs@vger.kernel.org, dm-devel@redhat.com, linux-fsdevel@vger.kernel.org, Dan Williams , linux-ext4@vger.kernel.org, Ira Weiny Subject: Re: [dm-devel] [PATCH 14/29] fsdax: simplify the pgoff calculation X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Tue, Nov 09, 2021 at 09:32:54AM +0100, Christoph Hellwig wrote: > Replace the two steps of dax_iomap_sector and bdev_dax_pgoff with a > single dax_iomap_pgoff helper that avoids lots of cumbersome sector > conversions. > > Signed-off-by: Christoph Hellwig > --- > drivers/dax/super.c | 14 -------------- > fs/dax.c | 35 ++++++++++------------------------- > include/linux/dax.h | 1 - > 3 files changed, 10 insertions(+), 40 deletions(-) > > diff --git a/drivers/dax/super.c b/drivers/dax/super.c > index 803942586d1b6..c0910687fbcb2 100644 > --- a/drivers/dax/super.c > +++ b/drivers/dax/super.c > @@ -67,20 +67,6 @@ void dax_remove_host(struct gendisk *disk) > } > EXPORT_SYMBOL_GPL(dax_remove_host); > > -int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size, > - pgoff_t *pgoff) > -{ > - sector_t start_sect = bdev ? get_start_sect(bdev) : 0; > - phys_addr_t phys_off = (start_sect + sector) * 512; > - > - if (pgoff) > - *pgoff = PHYS_PFN(phys_off); > - if (phys_off % PAGE_SIZE || size % PAGE_SIZE) AFAICT, we're relying on fs_dax_get_by_bdev to have validated this previously, which is why the error return stuff goes away? If so, Reviewed-by: Darrick J. Wong --D > - return -EINVAL; > - return 0; > -} > -EXPORT_SYMBOL(bdev_dax_pgoff); > - > /** > * dax_get_by_host() - temporary lookup mechanism for filesystem-dax > * @bdev: block device to find a dax_device for > diff --git a/fs/dax.c b/fs/dax.c > index e51b4129d1b65..5364549d67a48 100644 > --- a/fs/dax.c > +++ b/fs/dax.c > @@ -709,23 +709,22 @@ int dax_invalidate_mapping_entry_sync(struct address_space *mapping, > return __dax_invalidate_entry(mapping, index, false); > } > > -static sector_t dax_iomap_sector(const struct iomap *iomap, loff_t pos) > +static pgoff_t dax_iomap_pgoff(const struct iomap *iomap, loff_t pos) > { > - return (iomap->addr + (pos & PAGE_MASK) - iomap->offset) >> 9; > + phys_addr_t paddr = iomap->addr + (pos & PAGE_MASK) - iomap->offset; > + > + if (iomap->bdev) > + paddr += (get_start_sect(iomap->bdev) << SECTOR_SHIFT); > + return PHYS_PFN(paddr); > } > > static int copy_cow_page_dax(struct vm_fault *vmf, const struct iomap_iter *iter) > { > - sector_t sector = dax_iomap_sector(&iter->iomap, iter->pos); > + pgoff_t pgoff = dax_iomap_pgoff(&iter->iomap, iter->pos); > void *vto, *kaddr; > - pgoff_t pgoff; > long rc; > int id; > > - rc = bdev_dax_pgoff(iter->iomap.bdev, sector, PAGE_SIZE, &pgoff); > - if (rc) > - return rc; > - > id = dax_read_lock(); > rc = dax_direct_access(iter->iomap.dax_dev, pgoff, 1, &kaddr, NULL); > if (rc < 0) { > @@ -1013,14 +1012,10 @@ EXPORT_SYMBOL_GPL(dax_writeback_mapping_range); > static int dax_iomap_pfn(const struct iomap *iomap, loff_t pos, size_t size, > pfn_t *pfnp) > { > - const sector_t sector = dax_iomap_sector(iomap, pos); > - pgoff_t pgoff; > + pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); > int id, rc; > long length; > > - rc = bdev_dax_pgoff(iomap->bdev, sector, size, &pgoff); > - if (rc) > - return rc; > id = dax_read_lock(); > length = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(size), > NULL, pfnp); > @@ -1129,7 +1124,7 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf, > s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap) > { > sector_t sector = iomap_sector(iomap, pos & PAGE_MASK); > - pgoff_t pgoff; > + pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); > long rc, id; > void *kaddr; > bool page_aligned = false; > @@ -1140,10 +1135,6 @@ s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap) > (size == PAGE_SIZE)) > page_aligned = true; > > - rc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff); > - if (rc) > - return rc; > - > id = dax_read_lock(); > > if (page_aligned) > @@ -1169,7 +1160,6 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, > const struct iomap *iomap = &iomi->iomap; > loff_t length = iomap_length(iomi); > loff_t pos = iomi->pos; > - struct block_device *bdev = iomap->bdev; > struct dax_device *dax_dev = iomap->dax_dev; > loff_t end = pos + length, done = 0; > ssize_t ret = 0; > @@ -1203,9 +1193,8 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, > while (pos < end) { > unsigned offset = pos & (PAGE_SIZE - 1); > const size_t size = ALIGN(length + offset, PAGE_SIZE); > - const sector_t sector = dax_iomap_sector(iomap, pos); > + pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); > ssize_t map_len; > - pgoff_t pgoff; > void *kaddr; > > if (fatal_signal_pending(current)) { > @@ -1213,10 +1202,6 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, > break; > } > > - ret = bdev_dax_pgoff(bdev, sector, size, &pgoff); > - if (ret) > - break; > - > map_len = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), > &kaddr, NULL); > if (map_len < 0) { > diff --git a/include/linux/dax.h b/include/linux/dax.h > index 439c3c70e347b..324363b798ecd 100644 > --- a/include/linux/dax.h > +++ b/include/linux/dax.h > @@ -107,7 +107,6 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, > #endif > > struct writeback_control; > -int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff); > #if IS_ENABLED(CONFIG_FS_DAX) > int dax_add_host(struct dax_device *dax_dev, struct gendisk *disk); > void dax_remove_host(struct gendisk *disk); > -- > 2.30.2 > -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel 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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1ABF8C433F5 for ; Tue, 23 Nov 2021 22:36:51 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4HzJsY1lxjz2ynf for ; Wed, 24 Nov 2021 09:36:49 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=jDHh/PvR; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=djwong@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=jDHh/PvR; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4HzJsT4yGbz2xsv for ; Wed, 24 Nov 2021 09:36:45 +1100 (AEDT) Received: by mail.kernel.org (Postfix) with ESMTPSA id 5F09F60F5B; Tue, 23 Nov 2021 22:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637707003; bh=bOY7PlvM6pcQWZ3UNlBRTihQtXnra2WRCOI0KEbvobY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jDHh/PvRhoc0dsnMCoRlEawcQqYX9l7nG3empo4CGp7Clo5sR3g+vIGFIm2GuLIm7 xdjTPMBjfndFglgrMGttwCIVr22VGr7ZWtTZRrYHCG144EXPuqZ9kixVHDthxnpHTI SFVS7st7bWRUrkI7Kiozh4HfTgZqyGSgzYFrVRxFYWpxcJKDRb+056VcSBUW4fcQvH IjItjxrxEpAXexObS9z2rsUw43xwA4Dm8I3U+yI3/juqKp8XyycF65i0VEm9MM/0BY ITBe6B0I19xHUv2uxzXoU6QxzB5wkZLDovV6nQrYM7YWb7eMWzg9/GgK3vO8+Smddz tOMOnoDjaEPUg== Date: Tue, 23 Nov 2021 14:36:42 -0800 From: "Darrick J. Wong" To: Christoph Hellwig Subject: Re: [PATCH 14/29] fsdax: simplify the pgoff calculation Message-ID: <20211123223642.GI266024@magnolia> References: <20211109083309.584081-1-hch@lst.de> <20211109083309.584081-15-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211109083309.584081-15-hch@lst.de> X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nvdimm@lists.linux.dev, Mike Snitzer , linux-s390@vger.kernel.org, linux-erofs@lists.ozlabs.org, virtualization@lists.linux-foundation.org, linux-xfs@vger.kernel.org, dm-devel@redhat.com, linux-fsdevel@vger.kernel.org, Dan Williams , linux-ext4@vger.kernel.org, Ira Weiny Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" On Tue, Nov 09, 2021 at 09:32:54AM +0100, Christoph Hellwig wrote: > Replace the two steps of dax_iomap_sector and bdev_dax_pgoff with a > single dax_iomap_pgoff helper that avoids lots of cumbersome sector > conversions. > > Signed-off-by: Christoph Hellwig > --- > drivers/dax/super.c | 14 -------------- > fs/dax.c | 35 ++++++++++------------------------- > include/linux/dax.h | 1 - > 3 files changed, 10 insertions(+), 40 deletions(-) > > diff --git a/drivers/dax/super.c b/drivers/dax/super.c > index 803942586d1b6..c0910687fbcb2 100644 > --- a/drivers/dax/super.c > +++ b/drivers/dax/super.c > @@ -67,20 +67,6 @@ void dax_remove_host(struct gendisk *disk) > } > EXPORT_SYMBOL_GPL(dax_remove_host); > > -int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size, > - pgoff_t *pgoff) > -{ > - sector_t start_sect = bdev ? get_start_sect(bdev) : 0; > - phys_addr_t phys_off = (start_sect + sector) * 512; > - > - if (pgoff) > - *pgoff = PHYS_PFN(phys_off); > - if (phys_off % PAGE_SIZE || size % PAGE_SIZE) AFAICT, we're relying on fs_dax_get_by_bdev to have validated this previously, which is why the error return stuff goes away? If so, Reviewed-by: Darrick J. Wong --D > - return -EINVAL; > - return 0; > -} > -EXPORT_SYMBOL(bdev_dax_pgoff); > - > /** > * dax_get_by_host() - temporary lookup mechanism for filesystem-dax > * @bdev: block device to find a dax_device for > diff --git a/fs/dax.c b/fs/dax.c > index e51b4129d1b65..5364549d67a48 100644 > --- a/fs/dax.c > +++ b/fs/dax.c > @@ -709,23 +709,22 @@ int dax_invalidate_mapping_entry_sync(struct address_space *mapping, > return __dax_invalidate_entry(mapping, index, false); > } > > -static sector_t dax_iomap_sector(const struct iomap *iomap, loff_t pos) > +static pgoff_t dax_iomap_pgoff(const struct iomap *iomap, loff_t pos) > { > - return (iomap->addr + (pos & PAGE_MASK) - iomap->offset) >> 9; > + phys_addr_t paddr = iomap->addr + (pos & PAGE_MASK) - iomap->offset; > + > + if (iomap->bdev) > + paddr += (get_start_sect(iomap->bdev) << SECTOR_SHIFT); > + return PHYS_PFN(paddr); > } > > static int copy_cow_page_dax(struct vm_fault *vmf, const struct iomap_iter *iter) > { > - sector_t sector = dax_iomap_sector(&iter->iomap, iter->pos); > + pgoff_t pgoff = dax_iomap_pgoff(&iter->iomap, iter->pos); > void *vto, *kaddr; > - pgoff_t pgoff; > long rc; > int id; > > - rc = bdev_dax_pgoff(iter->iomap.bdev, sector, PAGE_SIZE, &pgoff); > - if (rc) > - return rc; > - > id = dax_read_lock(); > rc = dax_direct_access(iter->iomap.dax_dev, pgoff, 1, &kaddr, NULL); > if (rc < 0) { > @@ -1013,14 +1012,10 @@ EXPORT_SYMBOL_GPL(dax_writeback_mapping_range); > static int dax_iomap_pfn(const struct iomap *iomap, loff_t pos, size_t size, > pfn_t *pfnp) > { > - const sector_t sector = dax_iomap_sector(iomap, pos); > - pgoff_t pgoff; > + pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); > int id, rc; > long length; > > - rc = bdev_dax_pgoff(iomap->bdev, sector, size, &pgoff); > - if (rc) > - return rc; > id = dax_read_lock(); > length = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(size), > NULL, pfnp); > @@ -1129,7 +1124,7 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf, > s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap) > { > sector_t sector = iomap_sector(iomap, pos & PAGE_MASK); > - pgoff_t pgoff; > + pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); > long rc, id; > void *kaddr; > bool page_aligned = false; > @@ -1140,10 +1135,6 @@ s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap) > (size == PAGE_SIZE)) > page_aligned = true; > > - rc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff); > - if (rc) > - return rc; > - > id = dax_read_lock(); > > if (page_aligned) > @@ -1169,7 +1160,6 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, > const struct iomap *iomap = &iomi->iomap; > loff_t length = iomap_length(iomi); > loff_t pos = iomi->pos; > - struct block_device *bdev = iomap->bdev; > struct dax_device *dax_dev = iomap->dax_dev; > loff_t end = pos + length, done = 0; > ssize_t ret = 0; > @@ -1203,9 +1193,8 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, > while (pos < end) { > unsigned offset = pos & (PAGE_SIZE - 1); > const size_t size = ALIGN(length + offset, PAGE_SIZE); > - const sector_t sector = dax_iomap_sector(iomap, pos); > + pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); > ssize_t map_len; > - pgoff_t pgoff; > void *kaddr; > > if (fatal_signal_pending(current)) { > @@ -1213,10 +1202,6 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, > break; > } > > - ret = bdev_dax_pgoff(bdev, sector, size, &pgoff); > - if (ret) > - break; > - > map_len = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), > &kaddr, NULL); > if (map_len < 0) { > diff --git a/include/linux/dax.h b/include/linux/dax.h > index 439c3c70e347b..324363b798ecd 100644 > --- a/include/linux/dax.h > +++ b/include/linux/dax.h > @@ -107,7 +107,6 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, > #endif > > struct writeback_control; > -int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff); > #if IS_ENABLED(CONFIG_FS_DAX) > int dax_add_host(struct dax_device *dax_dev, struct gendisk *disk); > void dax_remove_host(struct gendisk *disk); > -- > 2.30.2 > 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C24A9C4332F for ; Tue, 23 Nov 2021 22:36:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237388AbhKWWjw (ORCPT ); Tue, 23 Nov 2021 17:39:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:43298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234838AbhKWWjw (ORCPT ); Tue, 23 Nov 2021 17:39:52 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5F09F60F5B; Tue, 23 Nov 2021 22:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637707003; bh=bOY7PlvM6pcQWZ3UNlBRTihQtXnra2WRCOI0KEbvobY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jDHh/PvRhoc0dsnMCoRlEawcQqYX9l7nG3empo4CGp7Clo5sR3g+vIGFIm2GuLIm7 xdjTPMBjfndFglgrMGttwCIVr22VGr7ZWtTZRrYHCG144EXPuqZ9kixVHDthxnpHTI SFVS7st7bWRUrkI7Kiozh4HfTgZqyGSgzYFrVRxFYWpxcJKDRb+056VcSBUW4fcQvH IjItjxrxEpAXexObS9z2rsUw43xwA4Dm8I3U+yI3/juqKp8XyycF65i0VEm9MM/0BY ITBe6B0I19xHUv2uxzXoU6QxzB5wkZLDovV6nQrYM7YWb7eMWzg9/GgK3vO8+Smddz tOMOnoDjaEPUg== Date: Tue, 23 Nov 2021 14:36:42 -0800 From: "Darrick J. Wong" To: Christoph Hellwig Cc: Dan Williams , Mike Snitzer , Ira Weiny , dm-devel@redhat.com, linux-xfs@vger.kernel.org, nvdimm@lists.linux.dev, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH 14/29] fsdax: simplify the pgoff calculation Message-ID: <20211123223642.GI266024@magnolia> References: <20211109083309.584081-1-hch@lst.de> <20211109083309.584081-15-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211109083309.584081-15-hch@lst.de> Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Tue, Nov 09, 2021 at 09:32:54AM +0100, Christoph Hellwig wrote: > Replace the two steps of dax_iomap_sector and bdev_dax_pgoff with a > single dax_iomap_pgoff helper that avoids lots of cumbersome sector > conversions. > > Signed-off-by: Christoph Hellwig > --- > drivers/dax/super.c | 14 -------------- > fs/dax.c | 35 ++++++++++------------------------- > include/linux/dax.h | 1 - > 3 files changed, 10 insertions(+), 40 deletions(-) > > diff --git a/drivers/dax/super.c b/drivers/dax/super.c > index 803942586d1b6..c0910687fbcb2 100644 > --- a/drivers/dax/super.c > +++ b/drivers/dax/super.c > @@ -67,20 +67,6 @@ void dax_remove_host(struct gendisk *disk) > } > EXPORT_SYMBOL_GPL(dax_remove_host); > > -int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size, > - pgoff_t *pgoff) > -{ > - sector_t start_sect = bdev ? get_start_sect(bdev) : 0; > - phys_addr_t phys_off = (start_sect + sector) * 512; > - > - if (pgoff) > - *pgoff = PHYS_PFN(phys_off); > - if (phys_off % PAGE_SIZE || size % PAGE_SIZE) AFAICT, we're relying on fs_dax_get_by_bdev to have validated this previously, which is why the error return stuff goes away? If so, Reviewed-by: Darrick J. Wong --D > - return -EINVAL; > - return 0; > -} > -EXPORT_SYMBOL(bdev_dax_pgoff); > - > /** > * dax_get_by_host() - temporary lookup mechanism for filesystem-dax > * @bdev: block device to find a dax_device for > diff --git a/fs/dax.c b/fs/dax.c > index e51b4129d1b65..5364549d67a48 100644 > --- a/fs/dax.c > +++ b/fs/dax.c > @@ -709,23 +709,22 @@ int dax_invalidate_mapping_entry_sync(struct address_space *mapping, > return __dax_invalidate_entry(mapping, index, false); > } > > -static sector_t dax_iomap_sector(const struct iomap *iomap, loff_t pos) > +static pgoff_t dax_iomap_pgoff(const struct iomap *iomap, loff_t pos) > { > - return (iomap->addr + (pos & PAGE_MASK) - iomap->offset) >> 9; > + phys_addr_t paddr = iomap->addr + (pos & PAGE_MASK) - iomap->offset; > + > + if (iomap->bdev) > + paddr += (get_start_sect(iomap->bdev) << SECTOR_SHIFT); > + return PHYS_PFN(paddr); > } > > static int copy_cow_page_dax(struct vm_fault *vmf, const struct iomap_iter *iter) > { > - sector_t sector = dax_iomap_sector(&iter->iomap, iter->pos); > + pgoff_t pgoff = dax_iomap_pgoff(&iter->iomap, iter->pos); > void *vto, *kaddr; > - pgoff_t pgoff; > long rc; > int id; > > - rc = bdev_dax_pgoff(iter->iomap.bdev, sector, PAGE_SIZE, &pgoff); > - if (rc) > - return rc; > - > id = dax_read_lock(); > rc = dax_direct_access(iter->iomap.dax_dev, pgoff, 1, &kaddr, NULL); > if (rc < 0) { > @@ -1013,14 +1012,10 @@ EXPORT_SYMBOL_GPL(dax_writeback_mapping_range); > static int dax_iomap_pfn(const struct iomap *iomap, loff_t pos, size_t size, > pfn_t *pfnp) > { > - const sector_t sector = dax_iomap_sector(iomap, pos); > - pgoff_t pgoff; > + pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); > int id, rc; > long length; > > - rc = bdev_dax_pgoff(iomap->bdev, sector, size, &pgoff); > - if (rc) > - return rc; > id = dax_read_lock(); > length = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(size), > NULL, pfnp); > @@ -1129,7 +1124,7 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf, > s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap) > { > sector_t sector = iomap_sector(iomap, pos & PAGE_MASK); > - pgoff_t pgoff; > + pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); > long rc, id; > void *kaddr; > bool page_aligned = false; > @@ -1140,10 +1135,6 @@ s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap) > (size == PAGE_SIZE)) > page_aligned = true; > > - rc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff); > - if (rc) > - return rc; > - > id = dax_read_lock(); > > if (page_aligned) > @@ -1169,7 +1160,6 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, > const struct iomap *iomap = &iomi->iomap; > loff_t length = iomap_length(iomi); > loff_t pos = iomi->pos; > - struct block_device *bdev = iomap->bdev; > struct dax_device *dax_dev = iomap->dax_dev; > loff_t end = pos + length, done = 0; > ssize_t ret = 0; > @@ -1203,9 +1193,8 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, > while (pos < end) { > unsigned offset = pos & (PAGE_SIZE - 1); > const size_t size = ALIGN(length + offset, PAGE_SIZE); > - const sector_t sector = dax_iomap_sector(iomap, pos); > + pgoff_t pgoff = dax_iomap_pgoff(iomap, pos); > ssize_t map_len; > - pgoff_t pgoff; > void *kaddr; > > if (fatal_signal_pending(current)) { > @@ -1213,10 +1202,6 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi, > break; > } > > - ret = bdev_dax_pgoff(bdev, sector, size, &pgoff); > - if (ret) > - break; > - > map_len = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), > &kaddr, NULL); > if (map_len < 0) { > diff --git a/include/linux/dax.h b/include/linux/dax.h > index 439c3c70e347b..324363b798ecd 100644 > --- a/include/linux/dax.h > +++ b/include/linux/dax.h > @@ -107,7 +107,6 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, > #endif > > struct writeback_control; > -int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff); > #if IS_ENABLED(CONFIG_FS_DAX) > int dax_add_host(struct dax_device *dax_dev, struct gendisk *disk); > void dax_remove_host(struct gendisk *disk); > -- > 2.30.2 >