Re: [PATCH 17/20] block: rename generic_make_request to submit_bio_noacct

2020-07-02 Thread Coly Li
On 2020/7/1 16:59, Christoph Hellwig wrote:
> generic_make_request has always been very confusingly misnamed, so rename
> it to submit_bio_noacct to make it clear that it is submit_bio minus
> accounting and a few checks.
> 
> Signed-off-by: Christoph Hellwig 

I will miss generic_make_request(). Anyway, if it is decided, for bcache
part,

Acked-by: Coly Li 

> ---
>  Documentation/block/biodoc.rst|  2 +-
>  .../fault-injection/fault-injection.rst   |  2 +-
>  Documentation/trace/ftrace.rst|  4 +--
>  block/bio.c   | 14 
>  block/blk-core.c  | 32 +--
>  block/blk-crypto-fallback.c   |  2 +-
>  block/blk-crypto.c|  2 +-
>  block/blk-merge.c |  2 +-
>  block/blk-throttle.c  |  4 +--
>  block/bounce.c|  2 +-
>  drivers/block/drbd/drbd_int.h |  6 ++--
>  drivers/block/drbd/drbd_main.c|  2 +-
>  drivers/block/drbd/drbd_receiver.c|  2 +-
>  drivers/block/drbd/drbd_req.c |  2 +-
>  drivers/block/drbd/drbd_worker.c  |  2 +-
>  drivers/block/pktcdvd.c   |  2 +-
>  drivers/lightnvm/pblk-read.c  |  2 +-
>  drivers/md/bcache/bcache.h|  2 +-
>  drivers/md/bcache/btree.c |  2 +-
>  drivers/md/bcache/request.c   |  7 ++--
>  drivers/md/dm-cache-target.c  |  6 ++--
>  drivers/md/dm-clone-target.c  | 10 +++---
>  drivers/md/dm-crypt.c |  6 ++--
>  drivers/md/dm-delay.c |  2 +-
>  drivers/md/dm-era-target.c|  2 +-
>  drivers/md/dm-integrity.c |  4 +--
>  drivers/md/dm-mpath.c |  2 +-
>  drivers/md/dm-raid1.c |  2 +-
>  drivers/md/dm-snap-persistent.c   |  2 +-
>  drivers/md/dm-snap.c  |  6 ++--
>  drivers/md/dm-thin.c  |  4 +--
>  drivers/md/dm-verity-target.c |  2 +-
>  drivers/md/dm-writecache.c|  2 +-
>  drivers/md/dm-zoned-target.c  |  2 +-
>  drivers/md/dm.c   | 10 +++---
>  drivers/md/md-faulty.c|  4 +--
>  drivers/md/md-linear.c|  4 +--
>  drivers/md/md-multipath.c |  4 +--
>  drivers/md/raid0.c|  8 ++---
>  drivers/md/raid1.c| 14 
>  drivers/md/raid10.c   | 28 
>  drivers/md/raid5.c| 10 +++---
>  drivers/nvme/host/multipath.c |  2 +-
>  include/linux/blkdev.h|  2 +-
>  44 files changed, 115 insertions(+), 118 deletions(-)
> 

[snipped]

> diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c
> index 140927ebf41e9a..c28537a489bc10 100644
> --- a/drivers/lightnvm/pblk-read.c
> +++ b/drivers/lightnvm/pblk-read.c
> @@ -320,7 +320,7 @@ void pblk_submit_read(struct pblk *pblk, struct bio *bio)
>   split_bio = bio_split(bio, nr_secs * NR_PHY_IN_LOG, GFP_KERNEL,
>   _bio_set);
>   bio_chain(split_bio, bio);
> - generic_make_request(bio);
> + submit_bio_noacct(bio);
>  
>   /* New bio contains first N sectors of the previous one, so
>* we can continue to use existing rqd, but we need to shrink
> diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
> index 221e0191b6870f..3c708e8b5e2d34 100644
> --- a/drivers/md/bcache/bcache.h
> +++ b/drivers/md/bcache/bcache.h
> @@ -929,7 +929,7 @@ static inline void closure_bio_submit(struct cache_set *c,
>   bio_endio(bio);
>   return;
>   }
> - generic_make_request(bio);
> + submit_bio_noacct(bio);
>  }
>  
>  /*
> diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
> index 6548a601edf0e4..d5c51e33204679 100644
> --- a/drivers/md/bcache/btree.c
> +++ b/drivers/md/bcache/btree.c
> @@ -959,7 +959,7 @@ static struct btree *mca_alloc(struct cache_set *c, 
> struct btree_op *op,
>   * bch_btree_node_get - find a btree node in the cache and lock it, reading 
> it
>   * in from disk if necessary.
>   *
> - * If IO is necessary and running under generic_make_request, returns 
> -EAGAIN.
> + * If IO is necessary and running under submit_bio_noacct, returns -EAGAIN.
>   *
>   * The btree node will have either a read or a write lock held, depending on
>   * level and op->lock.
> diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
> index fc5702b10074d6..dd012ebface012 100644
> --- a/drivers/md/bcache/request.c
> +++ 

Re: [PATCH 17/20] block: rename generic_make_request to submit_bio_noacct

2020-07-02 Thread Song Liu
On Wed, Jul 1, 2020 at 2:01 AM Christoph Hellwig  wrote:
>
> generic_make_request has always been very confusingly misnamed, so rename
> it to submit_bio_noacct to make it clear that it is submit_bio minus
> accounting and a few checks.
>
> Signed-off-by: Christoph Hellwig 
> ---
[...]

>  drivers/md/md-faulty.c|  4 +--
>  drivers/md/md-linear.c|  4 +--
>  drivers/md/md-multipath.c |  4 +--
>  drivers/md/raid0.c|  8 ++---
>  drivers/md/raid1.c| 14 
>  drivers/md/raid10.c   | 28 
>  drivers/md/raid5.c| 10 +++---

For md part:

Acked-by: Song Liu 


[PATCH 17/20] block: rename generic_make_request to submit_bio_noacct

2020-07-01 Thread Christoph Hellwig
generic_make_request has always been very confusingly misnamed, so rename
it to submit_bio_noacct to make it clear that it is submit_bio minus
accounting and a few checks.

Signed-off-by: Christoph Hellwig 
---
 Documentation/block/biodoc.rst|  2 +-
 .../fault-injection/fault-injection.rst   |  2 +-
 Documentation/trace/ftrace.rst|  4 +--
 block/bio.c   | 14 
 block/blk-core.c  | 32 +--
 block/blk-crypto-fallback.c   |  2 +-
 block/blk-crypto.c|  2 +-
 block/blk-merge.c |  2 +-
 block/blk-throttle.c  |  4 +--
 block/bounce.c|  2 +-
 drivers/block/drbd/drbd_int.h |  6 ++--
 drivers/block/drbd/drbd_main.c|  2 +-
 drivers/block/drbd/drbd_receiver.c|  2 +-
 drivers/block/drbd/drbd_req.c |  2 +-
 drivers/block/drbd/drbd_worker.c  |  2 +-
 drivers/block/pktcdvd.c   |  2 +-
 drivers/lightnvm/pblk-read.c  |  2 +-
 drivers/md/bcache/bcache.h|  2 +-
 drivers/md/bcache/btree.c |  2 +-
 drivers/md/bcache/request.c   |  7 ++--
 drivers/md/dm-cache-target.c  |  6 ++--
 drivers/md/dm-clone-target.c  | 10 +++---
 drivers/md/dm-crypt.c |  6 ++--
 drivers/md/dm-delay.c |  2 +-
 drivers/md/dm-era-target.c|  2 +-
 drivers/md/dm-integrity.c |  4 +--
 drivers/md/dm-mpath.c |  2 +-
 drivers/md/dm-raid1.c |  2 +-
 drivers/md/dm-snap-persistent.c   |  2 +-
 drivers/md/dm-snap.c  |  6 ++--
 drivers/md/dm-thin.c  |  4 +--
 drivers/md/dm-verity-target.c |  2 +-
 drivers/md/dm-writecache.c|  2 +-
 drivers/md/dm-zoned-target.c  |  2 +-
 drivers/md/dm.c   | 10 +++---
 drivers/md/md-faulty.c|  4 +--
 drivers/md/md-linear.c|  4 +--
 drivers/md/md-multipath.c |  4 +--
 drivers/md/raid0.c|  8 ++---
 drivers/md/raid1.c| 14 
 drivers/md/raid10.c   | 28 
 drivers/md/raid5.c| 10 +++---
 drivers/nvme/host/multipath.c |  2 +-
 include/linux/blkdev.h|  2 +-
 44 files changed, 115 insertions(+), 118 deletions(-)

diff --git a/Documentation/block/biodoc.rst b/Documentation/block/biodoc.rst
index 267384159bf793..afda5e30a82e5a 100644
--- a/Documentation/block/biodoc.rst
+++ b/Documentation/block/biodoc.rst
@@ -1036,7 +1036,7 @@ Now the generic block layer performs partition-remapping 
early and thus
 provides drivers with a sector number relative to whole device, rather than
 having to take partition number into account in order to arrive at the true
 sector number. The routine blk_partition_remap() is invoked by
-generic_make_request even before invoking the queue specific ->submit_bio,
+submit_bio_noacct even before invoking the queue specific ->submit_bio,
 so the i/o scheduler also gets to operate on whole disk sector numbers. This
 should typically not require changes to block drivers, it just never gets
 to invoke its own partition sector offset calculations since all bios
diff --git a/Documentation/fault-injection/fault-injection.rst 
b/Documentation/fault-injection/fault-injection.rst
index f51bb21d20e44b..f850ad018b70a8 100644
--- a/Documentation/fault-injection/fault-injection.rst
+++ b/Documentation/fault-injection/fault-injection.rst
@@ -24,7 +24,7 @@ Available fault injection capabilities
 
   injects disk IO errors on devices permitted by setting
   /sys/block//make-it-fail or
-  /sys/block///make-it-fail. (generic_make_request())
+  /sys/block///make-it-fail. (submit_bio_noacct())
 
 - fail_mmc_request
 
diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
index 430a16283103d4..80ba765a82379e 100644
--- a/Documentation/trace/ftrace.rst
+++ b/Documentation/trace/ftrace.rst
@@ -1453,7 +1453,7 @@ function-trace, we get a much larger output::
=> __blk_run_queue_uncond
=> __blk_run_queue
=> blk_queue_bio
-   => generic_make_request
+   => submit_bio_noacct
=> submit_bio
=> submit_bh
=> __ext3_get_inode_loc
@@ -1738,7 +1738,7 @@ tracers.
=> __blk_run_queue_uncond
=> __blk_run_queue
=> blk_queue_bio
-   => generic_make_request
+   => submit_bio_noacct
=> submit_bio
=> submit_bh
=> ext3_bread
diff --git a/block/bio.c b/block/bio.c
index fc1299f9d86a24..ef91782fd668ce 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -358,7 +358,7 @@ 

[PATCH 17/20] block: rename generic_make_request to submit_bio_noacct

2020-06-29 Thread Christoph Hellwig
generic_make_request has always been very confusingly misnamed, so rename
it to submit_bio_noacct to make it clear that it is submit_bio minus
accounting and a few checks.

Signed-off-by: Christoph Hellwig 
---
 Documentation/block/biodoc.rst|  2 +-
 .../fault-injection/fault-injection.rst   |  2 +-
 Documentation/trace/ftrace.rst|  4 +--
 block/bio.c   | 14 +-
 block/blk-core.c  | 23 ---
 block/blk-crypto-fallback.c   |  2 +-
 block/blk-crypto.c|  2 +-
 block/blk-merge.c |  2 +-
 block/blk-throttle.c  |  4 +--
 block/bounce.c|  2 +-
 drivers/block/drbd/drbd_int.h |  6 ++--
 drivers/block/drbd/drbd_main.c|  2 +-
 drivers/block/drbd/drbd_receiver.c|  2 +-
 drivers/block/drbd/drbd_req.c |  2 +-
 drivers/block/drbd/drbd_worker.c  |  2 +-
 drivers/block/pktcdvd.c   |  2 +-
 drivers/lightnvm/pblk-read.c  |  2 +-
 drivers/md/bcache/bcache.h|  2 +-
 drivers/md/bcache/btree.c |  2 +-
 drivers/md/bcache/request.c   |  7 ++---
 drivers/md/dm-cache-target.c  |  6 ++--
 drivers/md/dm-clone-target.c  | 10 +++
 drivers/md/dm-crypt.c |  6 ++--
 drivers/md/dm-delay.c |  2 +-
 drivers/md/dm-era-target.c|  2 +-
 drivers/md/dm-integrity.c |  4 +--
 drivers/md/dm-mpath.c |  2 +-
 drivers/md/dm-raid1.c |  2 +-
 drivers/md/dm-snap-persistent.c   |  2 +-
 drivers/md/dm-snap.c  |  6 ++--
 drivers/md/dm-thin.c  |  4 +--
 drivers/md/dm-verity-target.c |  2 +-
 drivers/md/dm-writecache.c|  2 +-
 drivers/md/dm-zoned-target.c  |  2 +-
 drivers/md/dm.c   | 10 +++
 drivers/md/md-faulty.c|  4 +--
 drivers/md/md-linear.c|  4 +--
 drivers/md/md-multipath.c |  4 +--
 drivers/md/raid0.c|  8 +++---
 drivers/md/raid1.c| 14 +-
 drivers/md/raid10.c   | 28 +--
 drivers/md/raid5.c| 10 +++
 drivers/nvme/host/multipath.c |  2 +-
 include/linux/blkdev.h|  2 +-
 44 files changed, 111 insertions(+), 113 deletions(-)

diff --git a/Documentation/block/biodoc.rst b/Documentation/block/biodoc.rst
index 267384159bf793..afda5e30a82e5a 100644
--- a/Documentation/block/biodoc.rst
+++ b/Documentation/block/biodoc.rst
@@ -1036,7 +1036,7 @@ Now the generic block layer performs partition-remapping 
early and thus
 provides drivers with a sector number relative to whole device, rather than
 having to take partition number into account in order to arrive at the true
 sector number. The routine blk_partition_remap() is invoked by
-generic_make_request even before invoking the queue specific ->submit_bio,
+submit_bio_noacct even before invoking the queue specific ->submit_bio,
 so the i/o scheduler also gets to operate on whole disk sector numbers. This
 should typically not require changes to block drivers, it just never gets
 to invoke its own partition sector offset calculations since all bios
diff --git a/Documentation/fault-injection/fault-injection.rst 
b/Documentation/fault-injection/fault-injection.rst
index f51bb21d20e44b..f850ad018b70a8 100644
--- a/Documentation/fault-injection/fault-injection.rst
+++ b/Documentation/fault-injection/fault-injection.rst
@@ -24,7 +24,7 @@ Available fault injection capabilities
 
   injects disk IO errors on devices permitted by setting
   /sys/block//make-it-fail or
-  /sys/block///make-it-fail. (generic_make_request())
+  /sys/block///make-it-fail. (submit_bio_noacct())
 
 - fail_mmc_request
 
diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
index 430a16283103d4..80ba765a82379e 100644
--- a/Documentation/trace/ftrace.rst
+++ b/Documentation/trace/ftrace.rst
@@ -1453,7 +1453,7 @@ function-trace, we get a much larger output::
=> __blk_run_queue_uncond
=> __blk_run_queue
=> blk_queue_bio
-   => generic_make_request
+   => submit_bio_noacct
=> submit_bio
=> submit_bh
=> __ext3_get_inode_loc
@@ -1738,7 +1738,7 @@ tracers.
=> __blk_run_queue_uncond
=> __blk_run_queue
=> blk_queue_bio
-   => generic_make_request
+   => submit_bio_noacct
=> submit_bio
=> submit_bh
=> ext3_bread
diff --git a/block/bio.c b/block/bio.c
index fc1299f9d86a24..ef91782fd668ce 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -358,7