From: Jens Axboe <axboe@kernel.dk> To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org, linux-arch@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe <axboe@kernel.dk> Subject: [PATCH 15/15] io_uring: add io_uring_event cache hit information Date: Wed, 16 Jan 2019 10:50:03 -0700 [thread overview] Message-ID: <20190116175003.17880-16-axboe@kernel.dk> (raw) In-Reply-To: <20190116175003.17880-1-axboe@kernel.dk> Add hint on whether a read was served out of the page cache, or if it hit media. This is useful for buffered async IO, O_DIRECT reads would never have this set (for obvious reasons). If the read hit page cache, cqe->flags will have IOCQE_FLAG_CACHEHIT set. Signed-off-by: Jens Axboe <axboe@kernel.dk> --- fs/io_uring.c | 7 ++++++- include/uapi/linux/io_uring.h | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index f73ee269f51b..c9be77c0bc85 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -516,11 +516,16 @@ static void io_fput(struct io_kiocb *req) static void io_complete_rw(struct kiocb *kiocb, long res, long res2) { struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw); + unsigned ev_flags = 0; kiocb_end_write(kiocb); io_fput(req); - io_cqring_fill_event(req->ctx, req->user_data, res, 0); + + if (res > 0 && (req->flags & REQ_F_FORCE_NONBLOCK)) + ev_flags = IOCQE_FLAG_CACHEHIT; + + io_cqring_fill_event(req->ctx, req->user_data, res, ev_flags); io_free_req(req); } diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 88ec687231be..9bb718168c86 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -66,6 +66,11 @@ struct io_uring_cqe { __u32 flags; }; +/* + * io_uring_event->flags + */ +#define IOCQE_FLAG_CACHEHIT (1 << 0) /* IO did not hit media */ + /* * Magic offsets for the application to mmap the data it needs */ -- 2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to majordomo@kvack.org. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"aart@kvack.org">aart@kvack.org</a>
WARNING: multiple messages have this Message-ID (diff)
From: Jens Axboe <axboe@kernel.dk> To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org, linux-arch@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe <axboe@kernel.dk> Subject: [PATCH 15/15] io_uring: add io_uring_event cache hit information Date: Wed, 16 Jan 2019 10:50:03 -0700 [thread overview] Message-ID: <20190116175003.17880-16-axboe@kernel.dk> (raw) Message-ID: <20190116175003.R-dKR1e9cBTiWLBK2EBCkwbIpgODw4MWzUuCBdVN468@z> (raw) In-Reply-To: <20190116175003.17880-1-axboe@kernel.dk> Add hint on whether a read was served out of the page cache, or if it hit media. This is useful for buffered async IO, O_DIRECT reads would never have this set (for obvious reasons). If the read hit page cache, cqe->flags will have IOCQE_FLAG_CACHEHIT set. Signed-off-by: Jens Axboe <axboe@kernel.dk> --- fs/io_uring.c | 7 ++++++- include/uapi/linux/io_uring.h | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index f73ee269f51b..c9be77c0bc85 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -516,11 +516,16 @@ static void io_fput(struct io_kiocb *req) static void io_complete_rw(struct kiocb *kiocb, long res, long res2) { struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw); + unsigned ev_flags = 0; kiocb_end_write(kiocb); io_fput(req); - io_cqring_fill_event(req->ctx, req->user_data, res, 0); + + if (res > 0 && (req->flags & REQ_F_FORCE_NONBLOCK)) + ev_flags = IOCQE_FLAG_CACHEHIT; + + io_cqring_fill_event(req->ctx, req->user_data, res, ev_flags); io_free_req(req); } diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 88ec687231be..9bb718168c86 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -66,6 +66,11 @@ struct io_uring_cqe { __u32 flags; }; +/* + * io_uring_event->flags + */ +#define IOCQE_FLAG_CACHEHIT (1 << 0) /* IO did not hit media */ + /* * Magic offsets for the application to mmap the data it needs */ -- 2.17.1
next prev parent reply other threads:[~2019-01-16 17:50 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-16 17:49 [PATCHSET v5] io_uring IO interface Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 01/15] fs: add an iopoll method to struct file_operations Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 02/15] block: wire up block device iopoll method Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 03/15] block: add bio_set_polled() helper Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 04/15] iomap: wire up the iopoll method Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 05/15] Add io_uring IO interface Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-17 12:02 ` Roman Penyaev 2019-01-17 12:02 ` Roman Penyaev 2019-01-17 13:54 ` Jens Axboe 2019-01-17 13:54 ` Jens Axboe 2019-01-17 14:34 ` Roman Penyaev 2019-01-17 14:34 ` Roman Penyaev 2019-01-17 14:54 ` Jens Axboe 2019-01-17 14:54 ` Jens Axboe 2019-01-17 15:19 ` Roman Penyaev 2019-01-17 15:19 ` Roman Penyaev 2019-01-17 12:48 ` Roman Penyaev 2019-01-17 12:48 ` Roman Penyaev 2019-01-17 14:01 ` Jens Axboe 2019-01-17 14:01 ` Jens Axboe 2019-01-17 20:03 ` Jeff Moyer 2019-01-17 20:03 ` Jeff Moyer 2019-01-17 20:09 ` Jens Axboe 2019-01-17 20:09 ` Jens Axboe 2019-01-17 20:14 ` Jens Axboe 2019-01-17 20:14 ` Jens Axboe 2019-01-17 20:50 ` Jeff Moyer 2019-01-17 20:50 ` Jeff Moyer 2019-01-17 20:53 ` Jens Axboe 2019-01-17 20:53 ` Jens Axboe 2019-01-17 21:02 ` Jeff Moyer 2019-01-17 21:02 ` Jeff Moyer 2019-01-17 21:17 ` Jens Axboe 2019-01-17 21:21 ` Jeff Moyer 2019-01-17 21:27 ` Jens Axboe 2019-01-18 8:23 ` Roman Penyaev 2019-01-16 17:49 ` [PATCH 06/15] io_uring: add fsync support Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 07/15] io_uring: support for IO polling Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 08/15] fs: add fget_many() and fput_many() Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 09/15] io_uring: use fget/fput_many() for file references Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 10/15] io_uring: batch io_kiocb allocation Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:49 ` [PATCH 11/15] block: implement bio helper to add iter bvec pages to bio Jens Axboe 2019-01-16 17:49 ` Jens Axboe 2019-01-16 17:50 ` [PATCH 12/15] io_uring: add support for pre-mapped user IO buffers Jens Axboe 2019-01-16 17:50 ` Jens Axboe 2019-01-16 20:53 ` Dave Chinner 2019-01-16 21:20 ` Jens Axboe 2019-01-16 21:20 ` Jens Axboe 2019-01-16 22:09 ` Dave Chinner 2019-01-16 22:21 ` Jens Axboe 2019-01-16 22:21 ` Jens Axboe 2019-01-16 23:09 ` Dave Chinner 2019-01-16 23:17 ` Jens Axboe 2019-01-16 23:17 ` Jens Axboe 2019-01-16 22:13 ` Jens Axboe 2019-01-16 22:13 ` Jens Axboe 2019-01-16 17:50 ` [PATCH 13/15] io_uring: add submission polling Jens Axboe 2019-01-16 17:50 ` Jens Axboe 2019-01-16 17:50 ` [PATCH 14/15] io_uring: add file registration Jens Axboe 2019-01-16 17:50 ` Jens Axboe 2019-01-16 17:50 ` Jens Axboe [this message] 2019-01-16 17:50 ` [PATCH 15/15] io_uring: add io_uring_event cache hit information Jens Axboe -- strict thread matches above, loose matches on Subject: below -- 2019-01-10 2:43 [PATCHSET v2] io_uring IO interface Jens Axboe 2019-01-10 2:44 ` [PATCH 15/15] io_uring: add io_uring_event cache hit information Jens Axboe 2019-01-10 2:44 ` Jens Axboe 2019-01-10 23:12 ` Jeff Moyer 2019-01-10 23:12 ` Jeff Moyer 2019-01-10 23:47 ` Jens Axboe 2019-01-10 23:47 ` Jens Axboe
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190116175003.17880-16-axboe@kernel.dk \ --to=axboe@kernel.dk \ --cc=avi@scylladb.com \ --cc=hch@lst.de \ --cc=jmoyer@redhat.com \ --cc=linux-aio@kvack.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).