From: Kanchan Joshi <[email protected]>
To: [email protected], [email protected], [email protected]
Cc: [email protected], [email protected], [email protected],
[email protected], [email protected],
[email protected], [email protected],
[email protected], [email protected],
Selvakumar S <[email protected]>,
Kanchan Joshi <[email protected]>,
Nitesh Shetty <[email protected]>,
Javier Gonzalez <[email protected]>
Subject: [PATCH v3 4/4] io_uring: add support for zone-append
Date: Mon, 6 Jul 2020 00:17:50 +0530 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
From: Selvakumar S <[email protected]>
For zone-append, block-layer will return zone-relative offset via ret2
of ki_complete interface. Make changes to collect it, and send to
user-space using cqe->flags.
Signed-off-by: Selvakumar S <[email protected]>
Signed-off-by: Kanchan Joshi <[email protected]>
Signed-off-by: Nitesh Shetty <[email protected]>
Signed-off-by: Javier Gonzalez <[email protected]>
---
fs/io_uring.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 155f3d8..cbde4df 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -402,6 +402,8 @@ struct io_rw {
struct kiocb kiocb;
u64 addr;
u64 len;
+ /* zone-relative offset for append, in sectors */
+ u32 append_offset;
};
struct io_connect {
@@ -541,6 +543,7 @@ enum {
REQ_F_NO_FILE_TABLE_BIT,
REQ_F_QUEUE_TIMEOUT_BIT,
REQ_F_WORK_INITIALIZED_BIT,
+ REQ_F_ZONE_APPEND_BIT,
/* not a real bit, just to check we're not overflowing the space */
__REQ_F_LAST_BIT,
@@ -598,6 +601,8 @@ enum {
REQ_F_QUEUE_TIMEOUT = BIT(REQ_F_QUEUE_TIMEOUT_BIT),
/* io_wq_work is initialized */
REQ_F_WORK_INITIALIZED = BIT(REQ_F_WORK_INITIALIZED_BIT),
+ /* to return zone relative offset for zone append*/
+ REQ_F_ZONE_APPEND = BIT(REQ_F_ZONE_APPEND_BIT),
};
struct async_poll {
@@ -1745,6 +1750,8 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events,
if (req->flags & REQ_F_BUFFER_SELECTED)
cflags = io_put_kbuf(req);
+ if (req->flags & REQ_F_ZONE_APPEND)
+ cflags = req->rw.append_offset;
__io_cqring_fill_event(req, req->result, cflags);
(*nr_events)++;
@@ -1943,7 +1950,7 @@ static inline void req_set_fail_links(struct io_kiocb *req)
req->flags |= REQ_F_FAIL_LINK;
}
-static void io_complete_rw_common(struct kiocb *kiocb, long res)
+static void io_complete_rw_common(struct kiocb *kiocb, long res, long res2)
{
struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw.kiocb);
int cflags = 0;
@@ -1955,6 +1962,10 @@ static void io_complete_rw_common(struct kiocb *kiocb, long res)
req_set_fail_links(req);
if (req->flags & REQ_F_BUFFER_SELECTED)
cflags = io_put_kbuf(req);
+ /* use cflags to return zone append completion result */
+ if (req->flags & REQ_F_ZONE_APPEND)
+ cflags = res2;
+
__io_cqring_add_event(req, res, cflags);
}
@@ -1962,7 +1973,7 @@ static void io_complete_rw(struct kiocb *kiocb, long res, long res2)
{
struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw.kiocb);
- io_complete_rw_common(kiocb, res);
+ io_complete_rw_common(kiocb, res, res2);
io_put_req(req);
}
@@ -1975,6 +1986,9 @@ static void io_complete_rw_iopoll(struct kiocb *kiocb, long res, long res2)
if (res != req->result)
req_set_fail_links(req);
+ if (req->flags & REQ_F_ZONE_APPEND)
+ req->rw.append_offset = res2;
+
req->result = res;
if (res != -EAGAIN)
WRITE_ONCE(req->iopoll_completed, 1);
@@ -2739,6 +2753,9 @@ static int io_write(struct io_kiocb *req, bool force_nonblock)
SB_FREEZE_WRITE);
}
kiocb->ki_flags |= IOCB_WRITE;
+ /* zone-append requires few extra steps during completion */
+ if (kiocb->ki_flags & IOCB_ZONE_APPEND)
+ req->flags |= REQ_F_ZONE_APPEND;
if (!force_nonblock)
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = req->fsize;
--
2.7.4
next prev parent reply other threads:[~2020-07-05 18:52 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200705185204epcas5p3adeb4fc3473c5fc0472a7396783c5267@epcas5p3.samsung.com>
2020-07-05 18:47 ` [PATCH v3 0/4] zone-append support in io-uring and aio Kanchan Joshi
[not found] ` <CGME20200705185211epcas5p4059d05d2fcedb91829300a7a7d03fda3@epcas5p4.samsung.com>
2020-07-05 18:47 ` [PATCH v3 1/4] fs: introduce FMODE_ZONE_APPEND and IOCB_ZONE_APPEND Kanchan Joshi
[not found] ` <CGME20200705185217epcas5p1cc12d4b892f057a1fe06d73a00869daa@epcas5p1.samsung.com>
2020-07-05 18:47 ` [PATCH v3 2/4] block: add zone append handling for direct I/O path Kanchan Joshi
[not found] ` <CGME20200705185221epcas5p28b6d060df829b751109265222285da0e@epcas5p2.samsung.com>
2020-07-05 18:47 ` [PATCH v3 3/4] block: enable zone-append for iov_iter of bvec type Kanchan Joshi
[not found] ` <CGME20200705185227epcas5p16fba3cb92561794b960184c89fdf2bb7@epcas5p1.samsung.com>
2020-07-05 18:47 ` Kanchan Joshi [this message]
2020-07-05 21:00 ` [PATCH v3 4/4] io_uring: add support for zone-append Jens Axboe
2020-07-05 21:09 ` Matthew Wilcox
2020-07-05 21:12 ` Jens Axboe
2020-07-06 14:10 ` Matthew Wilcox
2020-07-06 14:27 ` Jens Axboe
2020-07-06 14:32 ` Matthew Wilcox
2020-07-06 14:33 ` Jens Axboe
2020-07-07 15:11 ` Kanchan Joshi
2020-07-07 15:52 ` Matthew Wilcox
2020-07-07 16:00 ` Christoph Hellwig
2020-07-07 20:23 ` Kanchan Joshi
2020-07-07 20:40 ` Jens Axboe
2020-07-07 22:18 ` Matthew Wilcox
2020-07-07 22:37 ` Jens Axboe
2020-07-08 12:58 ` Kanchan Joshi
2020-07-08 14:22 ` Matthew Wilcox
2020-07-08 16:41 ` Kanchan Joshi
2020-07-08 14:54 ` Jens Axboe
2020-07-08 14:58 ` Matthew Wilcox
2020-07-08 14:59 ` Jens Axboe
2020-07-08 15:02 ` Matthew Wilcox
2020-07-08 15:06 ` Jens Axboe
2020-07-08 16:08 ` Javier González
2020-07-08 16:33 ` Matthew Wilcox
2020-07-08 16:38 ` Jens Axboe
2020-07-08 17:13 ` Kanchan Joshi
2020-07-08 16:43 ` Javier González
2020-07-06 13:58 ` Kanchan Joshi
2020-07-09 10:15 ` Christoph Hellwig
2020-07-09 13:58 ` Jens Axboe
2020-07-09 14:00 ` Christoph Hellwig
2020-07-09 14:05 ` Jens Axboe
2020-07-09 18:36 ` Kanchan Joshi
2020-07-09 18:50 ` Pavel Begunkov
2020-07-09 18:53 ` Pavel Begunkov
2020-07-09 18:50 ` Jens Axboe
2020-07-09 19:05 ` Kanchan Joshi
2020-07-10 13:10 ` Christoph Hellwig
2020-07-10 13:48 ` Matthew Wilcox
2020-07-10 13:49 ` Christoph Hellwig
2020-07-10 13:51 ` Matthew Wilcox
2020-07-10 14:11 ` Kanchan Joshi
2020-07-20 16:49 ` Kanchan Joshi
2020-07-20 17:14 ` Matthew Wilcox
2020-07-20 20:17 ` Kanchan Joshi
2020-07-21 0:59 ` Damien Le Moal
2020-07-21 1:15 ` Matthew Wilcox
2020-07-21 1:29 ` Jens Axboe
2020-07-21 2:19 ` Damien Le Moal
2020-07-10 14:09 ` Jens Axboe
2020-07-20 16:46 ` Kanchan Joshi
2020-07-10 13:09 ` Christoph Hellwig
2020-07-10 13:29 ` Kanchan Joshi
2020-07-10 13:43 ` Christoph Hellwig
2020-07-20 17:02 ` Kanchan Joshi
2020-07-10 13:57 ` Kanchan Joshi
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=1593974870-18919-5-git-send-email-joshi.k@samsung.com \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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: link
Be 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