| Message ID | 1497467134-6323-6-git-send-email-axboe@kernel.dk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> +static const unsigned int rwf_write_to_opf_flag[] = { > + 0, REQ_WRITE_SHORT, REQ_WRITE_MEDIUM, REQ_WRITE_LONG, REQ_WRITE_EXTREME > +}; > + > +/* > + * 'stream_flags' is one of RWF_WRITE_LIFE_* values > + */ > +void bio_set_streamid(struct bio *bio, unsigned int rwf_flags) > +{ > + if (WARN_ON_ONCE(rwf_flags >= ARRAY_SIZE(rwf_write_to_opf_flag))) > + return; > + > + bio->bi_opf |= rwf_write_to_opf_flag[rwf_flags]; > +} > +EXPORT_SYMBOL_GPL(bio_set_streamid); I'd move the bio->bi_opf assignment outş for a call like: bio->bi_opf |= bio_op_write_bucket(flags); and preferably move the flags masking / shifting into the helper as well. > }; > > +static inline bool blk_stream_valid(unsigned int opf) > +{ > + return (opf & REQ_WRITE_LIFE_MASK) != 0; > +} Replace the stream name here with lifetime or similar as well?
On 06/14/2017 02:28 PM, Christoph Hellwig wrote: >> +static const unsigned int rwf_write_to_opf_flag[] = { >> + 0, REQ_WRITE_SHORT, REQ_WRITE_MEDIUM, REQ_WRITE_LONG, REQ_WRITE_EXTREME >> +}; > > > >> + >> +/* >> + * 'stream_flags' is one of RWF_WRITE_LIFE_* values >> + */ >> +void bio_set_streamid(struct bio *bio, unsigned int rwf_flags) >> +{ >> + if (WARN_ON_ONCE(rwf_flags >= ARRAY_SIZE(rwf_write_to_opf_flag))) >> + return; >> + >> + bio->bi_opf |= rwf_write_to_opf_flag[rwf_flags]; >> +} >> +EXPORT_SYMBOL_GPL(bio_set_streamid); > > I'd move the bio->bi_opf assignment outş for a call like: > > bio->bi_opf |= bio_op_write_bucket(flags); > > and preferably move the flags masking / shifting into the helper as > well. OK, I can do that. >> +static inline bool blk_stream_valid(unsigned int opf) >> +{ >> + return (opf & REQ_WRITE_LIFE_MASK) != 0; >> +} > > Replace the stream name here with lifetime or similar as well? Yeah, I thought about that after sending v3 out. I should do that everywhere.
diff --git a/block/bio.c b/block/bio.c index 888e7801c638..25ea7c365aac 100644 --- a/block/bio.c +++ b/block/bio.c @@ -2082,6 +2082,22 @@ void bio_clone_blkcg_association(struct bio *dst, struct bio *src) #endif /* CONFIG_BLK_CGROUP */ +static const unsigned int rwf_write_to_opf_flag[] = { + 0, REQ_WRITE_SHORT, REQ_WRITE_MEDIUM, REQ_WRITE_LONG, REQ_WRITE_EXTREME +}; + +/* + * 'stream_flags' is one of RWF_WRITE_LIFE_* values + */ +void bio_set_streamid(struct bio *bio, unsigned int rwf_flags) +{ + if (WARN_ON_ONCE(rwf_flags >= ARRAY_SIZE(rwf_write_to_opf_flag))) + return; + + bio->bi_opf |= rwf_write_to_opf_flag[rwf_flags]; +} +EXPORT_SYMBOL_GPL(bio_set_streamid); + static void __init biovec_init_slabs(void) { int i; diff --git a/include/linux/bio.h b/include/linux/bio.h index d1b04b0e99cf..a1b3145020ad 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -443,6 +443,7 @@ extern struct bio *bio_copy_kern(struct request_queue *, void *, unsigned int, gfp_t, int); extern void bio_set_pages_dirty(struct bio *bio); extern void bio_check_pages_dirty(struct bio *bio); +extern void bio_set_streamid(struct bio *bio, unsigned int rwf_flags); void generic_start_io_acct(int rw, unsigned long sectors, struct hd_struct *part); diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 57d1eb530799..06c8c35f0288 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -323,4 +323,9 @@ struct blk_rq_stat { u64 batch; }; +static inline bool blk_stream_valid(unsigned int opf) +{ + return (opf & REQ_WRITE_LIFE_MASK) != 0; +} + #endif /* __LINUX_BLK_TYPES_H */
We map the RWF_WRITE_* life time flags to the internal flags. Drivers can then, in turn, map those flags to a suitable stream type. Signed-off-by: Jens Axboe <axboe@kernel.dk> --- block/bio.c | 16 ++++++++++++++++ include/linux/bio.h | 1 + include/linux/blk_types.h | 5 +++++ 3 files changed, 22 insertions(+)