| Message ID | 20230817141337.1025891-5-amir73il@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kiocb_{start,end}_write() helpers | expand |
On Thu 17-08-23 17:13:34, Amir Goldstein wrote: > Use helpers instead of the open coded dance to silence lockdep warnings. > > Suggested-by: Jan Kara <jack@suse.cz> > Signed-off-by: Amir Goldstein <amir73il@gmail.com> Looks good to me. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > io_uring/rw.c | 23 ++++------------------- > 1 file changed, 4 insertions(+), 19 deletions(-) > > diff --git a/io_uring/rw.c b/io_uring/rw.c > index 749ebd565839..9581b90cb459 100644 > --- a/io_uring/rw.c > +++ b/io_uring/rw.c > @@ -222,15 +222,10 @@ static bool io_rw_should_reissue(struct io_kiocb *req) > > static void io_req_end_write(struct io_kiocb *req) > { > - /* > - * Tell lockdep we inherited freeze protection from submission > - * thread. > - */ > if (req->flags & REQ_F_ISREG) { > - struct super_block *sb = file_inode(req->file)->i_sb; > + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw); > > - __sb_writers_acquired(sb, SB_FREEZE_WRITE); > - sb_end_write(sb); > + kiocb_end_write(&rw->kiocb); > } > } > > @@ -902,18 +897,8 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags) > return ret; > } > > - /* > - * Open-code file_start_write here to grab freeze protection, > - * which will be released by another thread in > - * io_complete_rw(). Fool lockdep by telling it the lock got > - * released so that it doesn't complain about the held lock when > - * we return to userspace. > - */ > - if (req->flags & REQ_F_ISREG) { > - sb_start_write(file_inode(req->file)->i_sb); > - __sb_writers_release(file_inode(req->file)->i_sb, > - SB_FREEZE_WRITE); > - } > + if (req->flags & REQ_F_ISREG) > + kiocb_start_write(kiocb); > kiocb->ki_flags |= IOCB_WRITE; > > if (likely(req->file->f_op->write_iter)) > -- > 2.34.1 >
diff --git a/io_uring/rw.c b/io_uring/rw.c index 749ebd565839..9581b90cb459 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -222,15 +222,10 @@ static bool io_rw_should_reissue(struct io_kiocb *req) static void io_req_end_write(struct io_kiocb *req) { - /* - * Tell lockdep we inherited freeze protection from submission - * thread. - */ if (req->flags & REQ_F_ISREG) { - struct super_block *sb = file_inode(req->file)->i_sb; + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw); - __sb_writers_acquired(sb, SB_FREEZE_WRITE); - sb_end_write(sb); + kiocb_end_write(&rw->kiocb); } } @@ -902,18 +897,8 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags) return ret; } - /* - * Open-code file_start_write here to grab freeze protection, - * which will be released by another thread in - * io_complete_rw(). Fool lockdep by telling it the lock got - * released so that it doesn't complain about the held lock when - * we return to userspace. - */ - if (req->flags & REQ_F_ISREG) { - sb_start_write(file_inode(req->file)->i_sb); - __sb_writers_release(file_inode(req->file)->i_sb, - SB_FREEZE_WRITE); - } + if (req->flags & REQ_F_ISREG) + kiocb_start_write(kiocb); kiocb->ki_flags |= IOCB_WRITE; if (likely(req->file->f_op->write_iter))
Use helpers instead of the open coded dance to silence lockdep warnings. Suggested-by: Jan Kara <jack@suse.cz> Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- io_uring/rw.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)