korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

ceph: add a dedicated private data for netfs rreq

Browse Source 
We need to save the 'f_ra.ra_pages' to expand the readahead window
later.

Cc: stable@vger.kernel.org
Fixes: 4987005600 ("ceph: convert ceph_readpages to ceph_readahead")
Link: https://lore.kernel.org/ceph-devel/20230504082510.247-1-sehuww@mail.scut.edu.cn
Link: https://www.spinics.net/lists/ceph-users/msg76183.html
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Hu Weiwen <sehuww@mail.scut.edu.cn>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Xiubo Li 2023-05-10 19:55:46 +08:00 committed by Ilya Dryomov
parent d9d00f71ab
commit 23ee27dce3
2 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
fs/ceph/addr.c
View File

@ -362,18 +362,28 @@ static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)
{ {
struct inode *inode = rreq->inode; struct inode *inode = rreq->inode;
int got = 0, want = CEPH_CAP_FILE_CACHE; int got = 0, want = CEPH_CAP_FILE_CACHE;
struct ceph_netfs_request_data *priv;
int ret = 0; int ret = 0;
if (rreq->origin != NETFS_READAHEAD) if (rreq->origin != NETFS_READAHEAD)
return 0; return 0;
priv = kzalloc(sizeof(*priv), GFP_NOFS);
if (!priv)
return -ENOMEM;
if (file) { if (file) {
struct ceph_rw_context *rw_ctx; struct ceph_rw_context *rw_ctx;
struct ceph_file_info *fi = file->private_data; struct ceph_file_info *fi = file->private_data;
priv->file_ra_pages = file->f_ra.ra_pages;
priv->file_ra_disabled = file->f_mode & FMODE_RANDOM;
rw_ctx = ceph_find_rw_context(fi); rw_ctx = ceph_find_rw_context(fi);
if (rw_ctx) if (rw_ctx) {
rreq->netfs_priv = priv;
return 0; return 0;
}
} }
/* /*
@ -383,27 +393,40 @@ static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)
ret = ceph_try_get_caps(inode, CEPH_CAP_FILE_RD, want, true, &got); ret = ceph_try_get_caps(inode, CEPH_CAP_FILE_RD, want, true, &got);
if (ret < 0) { if (ret < 0) {
dout("start_read %p, error getting cap\n", inode); dout("start_read %p, error getting cap\n", inode);
return ret; goto out;
} }
if (!(got & want)) { if (!(got & want)) {
dout("start_read %p, no cache cap\n", inode); dout("start_read %p, no cache cap\n", inode);
return -EACCES; ret = -EACCES;
goto out;
}
if (ret == 0) {
ret = -EACCES;
goto out;
} }
if (ret == 0)
return -EACCES;
rreq->netfs_priv = (void *)(uintptr_t)got; priv->caps = got;
return 0; rreq->netfs_priv = priv;
out:
if (ret < 0)
kfree(priv);
return ret;
} }
static void ceph_netfs_free_request(struct netfs_io_request *rreq) static void ceph_netfs_free_request(struct netfs_io_request *rreq)
{ {
struct ceph_inode_info *ci = ceph_inode(rreq->inode); struct ceph_netfs_request_data *priv = rreq->netfs_priv;
int got = (uintptr_t)rreq->netfs_priv;
if (got) if (!priv)
ceph_put_cap_refs(ci, got); return;
if (priv->caps)
ceph_put_cap_refs(ceph_inode(rreq->inode), priv->caps);
kfree(priv);
rreq->netfs_priv = NULL;
} }
const struct netfs_request_ops ceph_netfs_ops = { const struct netfs_request_ops ceph_netfs_ops = {

13
fs/ceph/super.h
View File

@ -451,6 +451,19 @@ struct ceph_inode_info {
unsigned long i_work_mask; unsigned long i_work_mask;
}; };
struct ceph_netfs_request_data {
int caps;
/*
* Maximum size of a file readahead request.
* The fadvise could update the bdi's default ra_pages.
*/
unsigned int file_ra_pages;
/* Set it if fadvise disables file readahead entirely */
bool file_ra_disabled;
};
static inline struct ceph_inode_info * static inline struct ceph_inode_info *
ceph_inode(const struct inode *inode) ceph_inode(const struct inode *inode)
{ {