From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [nacked] dax-enable-iostat-for-read-write.patch removed from -mm tree Date: Wed, 25 Jan 2017 15:45:49 -0800 Message-ID: <588938ad.E1VAdLz5Ato5l3q9%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:51390 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751344AbdAYXpu (ORCPT ); Wed, 25 Jan 2017 18:45:50 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: toshi.kani@hpe.com, dan.j.williams@intel.com, david@fromorbit.com, hch@infradead.org, jmoyer@redhat.com, joe@perches.com, ross.zwisler@linux.intel.com, viro@zeniv.linux.org.uk, mm-commits@vger.kernel.org The patch titled Subject: DAX: enable iostat for read/write has been removed from the -mm tree. Its filename was dax-enable-iostat-for-read-write.patch This patch was dropped because it was nacked ------------------------------------------------------ From: Toshi Kani Subject: DAX: enable iostat for read/write DAX IO path does not support iostat, but its metadata IO path does. Therefore, iostat shows metadata IO statistics only, which has been confusing to users. Add iostat support to the DAX read/write path. Note, iostat still does not support the DAX mmap path as it allows user applications to access directly. [akpm@linux-foundation.org: make do_acct a bool] Link: http://lkml.kernel.org/r/20170113233418.32252-1-toshi.kani@hpe.com Signed-off-by: Toshi Kani Cc: Dan Williams Cc: Alexander Viro Cc: Dave Chinner Cc: Ross Zwisler Cc: Joe Perches Cc: Christoph Hellwig Cc: Jeff Moyer Signed-off-by: Andrew Morton --- fs/dax.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff -puN fs/dax.c~dax-enable-iostat-for-read-write fs/dax.c --- a/fs/dax.c~dax-enable-iostat-for-read-write +++ a/fs/dax.c @@ -1081,12 +1081,24 @@ dax_iomap_rw(struct kiocb *iocb, struct { struct address_space *mapping = iocb->ki_filp->f_mapping; struct inode *inode = mapping->host; + struct gendisk *disk = inode->i_sb->s_bdev->bd_disk; loff_t pos = iocb->ki_pos, ret = 0, done = 0; unsigned flags = 0; + unsigned long start = 0; + bool do_acct = blk_queue_io_stat(disk->queue); if (iov_iter_rw(iter) == WRITE) flags |= IOMAP_WRITE; + if (do_acct) { + size_t sec = iov_iter_count(iter) >> 9; + + start = jiffies; + generic_start_io_acct(iov_iter_rw(iter), + max_t(unsigned long, 1, sec), + &disk->part0); + } + while (iov_iter_count(iter)) { ret = iomap_apply(inode, pos, iov_iter_count(iter), flags, ops, iter, dax_iomap_actor); @@ -1096,6 +1108,9 @@ dax_iomap_rw(struct kiocb *iocb, struct done += ret; } + if (do_acct) + generic_end_io_acct(iov_iter_rw(iter), &disk->part0, start); + iocb->ki_pos += done; return done ? done : ret; } _ Patches currently in -mm which might be from toshi.kani@hpe.com are