keep iocb_flags() result cached in struct file

* calculate at the time we set FMODE_OPENED (do_dentry_open() for normal
opens, alloc_file() for pipe()/socket()/etc.)
* update when handling F_SETFL
* keep in a new field - file->f_iocb_flags; since that thing is needed only
before the refcount reaches zero, we can put it into the same anon union
where ->f_rcuhead and ->f_llist live - those are used only after refcount
reaches zero.

Reviewed-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/nvme/target/io-cmd-file.c b/drivers/nvme/target/io-cmd-file.c
index f3d58abf11e047b15e7d017f30edf569cfab5e5a..64b47e2a46330b35deffe0d04cfb48e31169293b 100644 (file)
--- a/drivers/nvme/target/io-cmd-file.c
+++ b/drivers/nvme/target/io-cmd-file.c
@@ -112,7 +112,7 @@ static ssize_t nvmet_file_submit_bvec(struct nvmet_req *req, loff_t pos,
 
        iocb->ki_pos = pos;
        iocb->ki_filp = req->ns->file;
-       iocb->ki_flags = ki_flags | iocb_flags(req->ns->file);
+       iocb->ki_flags = ki_flags | iocb->ki_filp->f_iocb_flags;
 
        return call_iter(iocb, &iter);
 }

diff --git a/fs/aio.c b/fs/aio.c
index 3c249b93863274ccb6b1d10c05fa901861e5c848..2bdd444d408b7629d59a97802a2f4d2323b3b757 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1475,7 +1475,7 @@ static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb)
        req->ki_complete = aio_complete_rw;
        req->private = NULL;
        req->ki_pos = iocb->aio_offset;
-       req->ki_flags = iocb_flags(req->ki_filp);
+       req->ki_flags = req->ki_filp->f_iocb_flags;
        if (iocb->aio_flags & IOCB_FLAG_RESFD)
                req->ki_flags |= IOCB_EVENTFD;
        if (iocb->aio_flags & IOCB_FLAG_IOPRIO) {

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 34a3faa4886dcbf5413694b9917d0ccfa1980ed8..146c9ab0cd4b7c81e6f661205e79ae562da11cee 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -78,6 +78,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
        }
        spin_lock(&filp->f_lock);
        filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK);
+       filp->f_iocb_flags = iocb_flags(filp);
        spin_unlock(&filp->f_lock);
 
  out:

diff --git a/fs/file_table.c b/fs/file_table.c
index b989e33aacda4c3d2b139b8333813afbe875369f..905792b0521c1318bfab19bc217956825254dd9f 100644 (file)
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -241,6 +241,7 @@ static struct file *alloc_file(const struct path *path, int flags,
        if ((file->f_mode & FMODE_WRITE) &&
             likely(fop->write || fop->write_iter))
                file->f_mode |= FMODE_CAN_WRITE;
+       file->f_iocb_flags = iocb_flags(file);
        file->f_mode |= FMODE_OPENED;
        file->f_op = fop;
        if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 3aab4182fd892173e16b900fa437d47094195db0..53424b1f019f6337333aa4a6078880ede5e13412 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -4330,7 +4330,7 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode)
        if (!io_req_ffs_set(req))
                req->flags |= io_file_get_flags(file) << REQ_F_SUPPORT_NOWAIT_BIT;
 
-       kiocb->ki_flags = iocb_flags(file);
+       kiocb->ki_flags = file->f_iocb_flags;
        ret = kiocb_set_rw_flags(kiocb, req->rw.flags);
        if (unlikely(ret))
                return ret;

diff --git a/fs/open.c b/fs/open.c
index 1d57fbde2feb1c27e7bd059731abb31477eb6ba4..d80441a0bf171bdcb16f3cec4010d2a45518fc3f 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -862,6 +862,7 @@ static int do_dentry_open(struct file *f,
                f->f_mode |= FMODE_CAN_ODIRECT;
 
        f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
+       f->f_iocb_flags = iocb_flags(f);
 
        file_ra_state_init(&f->f_ra, f->f_mapping->host->i_mapping);
 

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 380a1292f4f9a2bc35cfe2553aa30014e8659b00..c82b9d442f561c97f8912fee51c16fbdeafb5a65 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -926,6 +926,7 @@ struct file {
        union {
                struct llist_node       f_llist;
                struct rcu_head         f_rcuhead;
+               unsigned int            f_iocb_flags;
        };
        struct path             f_path;
        struct inode            *f_inode;       /* cached value */
@@ -2199,13 +2200,11 @@ static inline bool HAS_UNMAPPED_ID(struct user_namespace *mnt_userns,
               !gid_valid(i_gid_into_mnt(mnt_userns, inode));
 }
 
-static inline int iocb_flags(struct file *file);
-
 static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)
 {
        *kiocb = (struct kiocb) {
                .ki_filp = filp,
-               .ki_flags = iocb_flags(filp),
+               .ki_flags = filp->f_iocb_flags,
                .ki_ioprio = get_current_ioprio(),
        };
 }