X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fpcc.c;h=9f176b5ea92fa825d0167d27158fa916962014ae;hp=9b006446447c4d135a51fd8d8dc2840f491c7abf;hb=0feec5a3c7d4518d5c563739124b202a6a0a99f7;hpb=c5a311781fc60c9a91483b737d3f59096949439e diff --git a/lustre/llite/pcc.c b/lustre/llite/pcc.c index 9b00644..9f176b5 100644 --- a/lustre/llite/pcc.c +++ b/lustre/llite/pcc.c @@ -1057,18 +1057,18 @@ void pcc_inode_free(struct inode *inode) * reduce overhead: * (fid->f_oid >> 16 & oxFFFF)/FID */ -#define MAX_PCC_DATABASE_PATH (6 * 5 + FID_NOBRACE_LEN + 1) +#define PCC_DATASET_MAX_PATH (6 * 5 + FID_NOBRACE_LEN + 1) static int pcc_fid2dataset_path(char *buf, int sz, struct lu_fid *fid) { - return snprintf(buf, sz, "%04x/%04x/%04x/%04x/%04x/%04x/" - DFID_NOBRACE, - (fid)->f_oid & 0xFFFF, - (fid)->f_oid >> 16 & 0xFFFF, - (unsigned int)((fid)->f_seq & 0xFFFF), - (unsigned int)((fid)->f_seq >> 16 & 0xFFFF), - (unsigned int)((fid)->f_seq >> 32 & 0xFFFF), - (unsigned int)((fid)->f_seq >> 48 & 0xFFFF), - PFID(fid)); + return scnprintf(buf, sz, "%04x/%04x/%04x/%04x/%04x/%04x/" + DFID_NOBRACE, + (fid)->f_oid & 0xFFFF, + (fid)->f_oid >> 16 & 0xFFFF, + (unsigned int)((fid)->f_seq & 0xFFFF), + (unsigned int)((fid)->f_seq >> 16 & 0xFFFF), + (unsigned int)((fid)->f_seq >> 32 & 0xFFFF), + (unsigned int)((fid)->f_seq >> 48 & 0xFFFF), + PFID(fid)); } static inline const struct cred *pcc_super_cred(struct super_block *sb) @@ -1129,27 +1129,12 @@ static int pcc_get_layout_info(struct inode *inode, struct cl_layout *clt) RETURN(PTR_ERR(env)); rc = cl_object_layout_get(env, lli->lli_clob, clt); - if (rc) + if (rc < 0) CDEBUG(D_INODE, "Cannot get layout for "DFID"\n", PFID(ll_inode2fid(inode))); cl_env_put(env, &refcheck); - RETURN(rc); -} - -static int pcc_fid2dataset_fullpath(char *buf, int sz, struct lu_fid *fid, - struct pcc_dataset *dataset) -{ - return snprintf(buf, sz, "%s/%04x/%04x/%04x/%04x/%04x/%04x/" - DFID_NOBRACE, - dataset->pccd_pathname, - (fid)->f_oid & 0xFFFF, - (fid)->f_oid >> 16 & 0xFFFF, - (unsigned int)((fid)->f_seq & 0xFFFF), - (unsigned int)((fid)->f_seq >> 16 & 0xFFFF), - (unsigned int)((fid)->f_seq >> 32 & 0xFFFF), - (unsigned int)((fid)->f_seq >> 48 & 0xFFFF), - PFID(fid)); + RETURN(rc < 0 ? rc : 0); } /* Must be called with pcci->pcci_lock held */ @@ -1198,6 +1183,72 @@ static inline bool pcc_inode_has_layout(struct pcc_inode *pcci) return pcci->pcci_layout_gen != CL_LAYOUT_GEN_NONE; } +static struct dentry *pcc_lookup(struct dentry *base, char *pathname) +{ + char *ptr = NULL, *component; + struct dentry *parent; + struct dentry *child = ERR_PTR(-ENOENT); + + ptr = pathname; + + /* move past any initial '/' to the start of the first path component*/ + while (*ptr == '/') + ptr++; + + /* store the start of the first path component */ + component = ptr; + + parent = dget(base); + while (ptr) { + /* find the start of the next component - if we don't find it, + * the current component is the last component + */ + ptr = strchr(ptr, '/'); + /* put a NUL char in place of the '/' before the next compnent + * so we can treat this component as a string; note the full + * path string is NUL terminated to this is not needed for the + * last component + */ + if (ptr) + *ptr = '\0'; + + /* look up the current component */ + inode_lock(parent->d_inode); + child = lookup_one_len(component, parent, strlen(component)); + inode_unlock(parent->d_inode); + + /* repair the path string: put '/' back in place of the NUL */ + if (ptr) + *ptr = '/'; + + dput(parent); + + if (IS_ERR_OR_NULL(child)) + break; + + /* we may find a cached negative dentry */ + if (!d_is_positive(child)) { + dput(child); + child = NULL; + break; + } + + /* descend in to the next level of the path */ + parent = child; + + /* move the pointer past the '/' to the next component */ + if (ptr) + ptr++; + component = ptr; + } + + /* NULL child means we didn't find anything */ + if (!child) + child = ERR_PTR(-ENOENT); + + return child; +} + static int pcc_try_dataset_attach(struct inode *inode, __u32 gen, enum lu_pcc_type type, struct pcc_dataset *dataset, @@ -1206,9 +1257,8 @@ static int pcc_try_dataset_attach(struct inode *inode, __u32 gen, struct ll_inode_info *lli = ll_i2info(inode); struct pcc_inode *pcci = lli->lli_pcc_inode; const struct cred *old_cred; - struct dentry *pcc_dentry; - struct path path; - char *pathname; + struct dentry *pcc_dentry = NULL; + char pathname[PCC_DATASET_MAX_PATH]; __u32 pcc_gen; int rc; @@ -1218,24 +1268,25 @@ static int pcc_try_dataset_attach(struct inode *inode, __u32 gen, !(dataset->pccd_flags & PCC_DATASET_RWPCC)) RETURN(0); - OBD_ALLOC(pathname, PATH_MAX); - if (pathname == NULL) - RETURN(-ENOMEM); - - pcc_fid2dataset_fullpath(pathname, PATH_MAX, &lli->lli_fid, dataset); + rc = pcc_fid2dataset_path(pathname, PCC_DATASET_MAX_PATH, + &lli->lli_fid); old_cred = override_creds(pcc_super_cred(inode->i_sb)); - rc = kern_path(pathname, LOOKUP_FOLLOW, &path); - if (rc) + pcc_dentry = pcc_lookup(dataset->pccd_path.dentry, pathname); + if (IS_ERR(pcc_dentry)) { + rc = PTR_ERR(pcc_dentry); + CDEBUG(D_CACHE, "%s: path lookup error on "DFID":%s: rc = %d\n", + ll_i2sbi(inode)->ll_fsname, PFID(&lli->lli_fid), + pathname, rc); /* ignore this error */ GOTO(out, rc = 0); + } - pcc_dentry = path.dentry; rc = ll_vfs_getxattr(pcc_dentry, pcc_dentry->d_inode, pcc_xattr_layout, &pcc_gen, sizeof(pcc_gen)); if (rc < 0) /* ignore this error */ - GOTO(out_put_path, rc = 0); + GOTO(out_put_pcc_dentry, rc = 0); rc = 0; /* The file is still valid cached in PCC, attach it immediately. */ @@ -1245,7 +1296,7 @@ static int pcc_try_dataset_attach(struct inode *inode, __u32 gen, if (!pcci) { OBD_SLAB_ALLOC_PTR_GFP(pcci, pcc_inode_slab, GFP_NOFS); if (pcci == NULL) - GOTO(out_put_path, rc = -ENOMEM); + GOTO(out_put_pcc_dentry, rc = -ENOMEM); pcc_inode_init(pcci, lli); dget(pcc_dentry); @@ -1267,11 +1318,10 @@ static int pcc_try_dataset_attach(struct inode *inode, __u32 gen, pcc_layout_gen_set(pcci, gen); *cached = true; } -out_put_path: - path_put(&path); +out_put_pcc_dentry: + dput(pcc_dentry); out: revert_creds(old_cred); - OBD_FREE(pathname, PATH_MAX); RETURN(rc); } @@ -1443,7 +1493,6 @@ int pcc_file_open(struct inode *inode, struct file *file) struct pcc_file *pccf = &fd->fd_pcc_file; struct file *pcc_file; struct path *path; - struct qstr *dname; bool cached = false; int rc = 0; @@ -1452,6 +1501,9 @@ int pcc_file_open(struct inode *inode, struct file *file) if (!S_ISREG(inode->i_mode)) RETURN(0); + if (IS_ENCRYPTED(inode)) + RETURN(0); + pcc_inode_lock(inode); pcci = ll_i2pcci(inode); @@ -1473,9 +1525,7 @@ int pcc_file_open(struct inode *inode, struct file *file) WARN_ON(pccf->pccf_file); path = &pcci->pcci_path; - dname = &path->dentry->d_name; - CDEBUG(D_CACHE, "opening pcc file '%.*s'\n", dname->len, - dname->name); + CDEBUG(D_CACHE, "opening pcc file '%pd'\n", path->dentry); pcc_file = dentry_open(path, file->f_flags, pcc_super_cred(inode->i_sb)); @@ -1498,7 +1548,6 @@ void pcc_file_release(struct inode *inode, struct file *file) struct ll_file_data *fd = file->private_data; struct pcc_file *pccf; struct path *path; - struct qstr *dname; ENTRY; @@ -1513,9 +1562,7 @@ void pcc_file_release(struct inode *inode, struct file *file) pcci = ll_i2pcci(inode); LASSERT(pcci); path = &pcci->pcci_path; - dname = &path->dentry->d_name; - CDEBUG(D_CACHE, "releasing pcc file \"%.*s\"\n", dname->len, - dname->name); + CDEBUG(D_CACHE, "releasing pcc file \"%pd\"\n", path->dentry); pcc_inode_put(pcci); fput(pccf->pccf_file); pccf->pccf_file = NULL; @@ -1554,7 +1601,7 @@ static void pcc_io_fini(struct inode *inode) LASSERT(pcci && atomic_read(&pcci->pcci_active_ios) > 0); if (atomic_dec_and_test(&pcci->pcci_active_ios)) - wake_up_all(&pcci->pcci_waitq); + wake_up(&pcci->pcci_waitq); } @@ -1728,7 +1775,12 @@ int pcc_inode_setattr(struct inode *inode, struct iattr *attr, pcc_dentry = pcci->pcci_path.dentry; inode_lock(pcc_dentry->d_inode); old_cred = override_creds(pcc_super_cred(inode->i_sb)); +#ifdef HAVE_USER_NAMESPACE_ARG + rc = pcc_dentry->d_inode->i_op->setattr(&init_user_ns, pcc_dentry, + &attr2); +#else rc = pcc_dentry->d_inode->i_op->setattr(pcc_dentry, &attr2); +#endif revert_creds(old_cred); inode_unlock(pcc_dentry->d_inode); @@ -1736,7 +1788,8 @@ int pcc_inode_setattr(struct inode *inode, struct iattr *attr, RETURN(rc); } -int pcc_inode_getattr(struct inode *inode, bool *cached) +int pcc_inode_getattr(struct inode *inode, u32 request_mask, + unsigned int flags, bool *cached) { struct ll_inode_info *lli = ll_i2info(inode); const struct cred *old_cred; @@ -1758,13 +1811,14 @@ int pcc_inode_getattr(struct inode *inode, bool *cached) RETURN(0); old_cred = override_creds(pcc_super_cred(inode->i_sb)); - rc = ll_vfs_getattr(&ll_i2pcci(inode)->pcci_path, &stat); + rc = ll_vfs_getattr(&ll_i2pcci(inode)->pcci_path, &stat, request_mask, + flags); revert_creds(old_cred); if (rc) GOTO(out, rc); ll_inode_size_lock(inode); - if (ll_file_test_and_clear_flag(lli, LLIF_UPDATE_ATIME) || + if (test_and_clear_bit(LLIF_UPDATE_ATIME, &lli->lli_flags) || inode->i_atime.tv_sec < lli->lli_atime) inode->i_atime.tv_sec = lli->lli_atime; @@ -1797,36 +1851,34 @@ out: RETURN(rc); } +#ifdef HAVE_DEFAULT_FILE_SPLICE_READ_EXPORT ssize_t pcc_file_splice_read(struct file *in_file, loff_t *ppos, struct pipe_inode_info *pipe, - size_t count, unsigned int flags, - bool *cached) + size_t count, unsigned int flags) { struct inode *inode = file_inode(in_file); struct ll_file_data *fd = in_file->private_data; struct file *pcc_file = fd->fd_pcc_file.pccf_file; + bool cached = false; ssize_t result; ENTRY; - *cached = false; if (!pcc_file) - RETURN(0); + RETURN(default_file_splice_read(in_file, ppos, pipe, + count, flags)); - if (!file_inode(pcc_file)->i_fop->splice_read) - RETURN(-ENOTSUPP); - - pcc_io_init(inode, PIT_SPLICE_READ, cached); - if (!*cached) - RETURN(0); + pcc_io_init(inode, PIT_SPLICE_READ, &cached); + if (!cached) + RETURN(default_file_splice_read(in_file, ppos, pipe, + count, flags)); - result = file_inode(pcc_file)->i_fop->splice_read(pcc_file, - ppos, pipe, count, - flags); + result = default_file_splice_read(pcc_file, ppos, pipe, count, flags); pcc_io_fini(inode); RETURN(result); } +#endif /* HAVE_DEFAULT_FILE_SPLICE_READ_EXPORT */ int pcc_fsync(struct file *file, loff_t start, loff_t end, int datasync, bool *cached) @@ -1960,7 +2012,7 @@ int pcc_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, "%s: PCC backend fs not support ->page_mkwrite()\n", ll_i2sbi(inode)->ll_fsname); pcc_ioctl_detach(inode, PCC_DETACH_OPT_UNCACHE); - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); *cached = true; RETURN(VM_FAULT_RETRY | VM_FAULT_NOPAGE); } @@ -1987,7 +2039,7 @@ int pcc_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, */ if (page->mapping == pcc_file->f_mapping) { *cached = true; - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); RETURN(VM_FAULT_RETRY | VM_FAULT_NOPAGE); } @@ -2001,7 +2053,7 @@ int pcc_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, if (OBD_FAIL_CHECK(OBD_FAIL_LLITE_PCC_DETACH_MKWRITE)) { pcc_io_fini(inode); pcc_ioctl_detach(inode, PCC_DETACH_OPT_UNCACHE); - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); RETURN(VM_FAULT_RETRY | VM_FAULT_NOPAGE); } @@ -2089,11 +2141,11 @@ static int pcc_inode_remove(struct inode *inode, struct dentry *pcc_dentry) { int rc; - rc = ll_vfs_unlink(pcc_dentry->d_parent->d_inode, pcc_dentry); + rc = vfs_unlink(&init_user_ns, + pcc_dentry->d_parent->d_inode, pcc_dentry); if (rc) - CWARN("%s: failed to unlink PCC file %.*s, rc = %d\n", - ll_i2sbi(inode)->ll_fsname, pcc_dentry->d_name.len, - pcc_dentry->d_name.name, rc); + CWARN("%s: failed to unlink PCC file %pd, rc = %d\n", + ll_i2sbi(inode)->ll_fsname, pcc_dentry, rc); return rc; } @@ -2114,7 +2166,7 @@ pcc_mkdir(struct dentry *base, const char *name, umode_t mode) if (d_is_positive(dentry)) goto out; - rc = vfs_mkdir(dir, dentry, mode); + rc = vfs_mkdir(&init_user_ns, dir, dentry, mode); if (rc) { dput(dentry); dentry = ERR_PTR(rc); @@ -2170,7 +2222,7 @@ pcc_create(struct dentry *base, const char *name, umode_t mode) if (d_is_positive(dentry)) goto out; - rc = vfs_create(dir, dentry, mode, false); + rc = vfs_create(&init_user_ns, dir, dentry, mode, false); if (rc) { dput(dentry); dentry = ERR_PTR(rc); @@ -2190,11 +2242,11 @@ static int __pcc_inode_create(struct pcc_dataset *dataset, struct dentry *child; int rc = 0; - OBD_ALLOC(path, MAX_PCC_DATABASE_PATH); + OBD_ALLOC(path, PCC_DATASET_MAX_PATH); if (path == NULL) return -ENOMEM; - pcc_fid2dataset_path(path, MAX_PCC_DATABASE_PATH, fid); + pcc_fid2dataset_path(path, PCC_DATASET_MAX_PATH, fid); base = pcc_mkdir_p(dataset->pccd_path.dentry, path, 0); if (IS_ERR(base)) { @@ -2202,7 +2254,7 @@ static int __pcc_inode_create(struct pcc_dataset *dataset, GOTO(out, rc); } - snprintf(path, MAX_PCC_DATABASE_PATH, DFID_NOBRACE, PFID(fid)); + snprintf(path, PCC_DATASET_MAX_PATH, DFID_NOBRACE, PFID(fid)); child = pcc_create(base, path, 0); if (IS_ERR(child)) { rc = PTR_ERR(child); @@ -2213,7 +2265,7 @@ static int __pcc_inode_create(struct pcc_dataset *dataset, out_base: dput(base); out: - OBD_FREE(path, MAX_PCC_DATABASE_PATH); + OBD_FREE(path, PCC_DATASET_MAX_PATH); return rc; } @@ -2236,7 +2288,7 @@ int pcc_inode_reset_iattr(struct dentry *dentry, unsigned int valid, attr.ia_size = size; inode_lock(inode); - rc = notify_change(dentry, &attr, NULL); + rc = notify_change(&init_user_ns, dentry, &attr, NULL); inode_unlock(inode); RETURN(rc); @@ -2324,12 +2376,12 @@ void pcc_create_attach_cleanup(struct super_block *sb, int rc; old_cred = override_creds(pcc_super_cred(sb)); - rc = ll_vfs_unlink(pca->pca_dentry->d_parent->d_inode, - pca->pca_dentry); + rc = vfs_unlink(&init_user_ns, + pca->pca_dentry->d_parent->d_inode, + pca->pca_dentry); if (rc) - CWARN("failed to unlink PCC file %.*s, rc = %d\n", - pca->pca_dentry->d_name.len, - pca->pca_dentry->d_name.name, rc); + CWARN("%s: failed to unlink PCC file %pd: rc = %d\n", + ll_s2sbi(sb)->ll_fsname, pca->pca_dentry, rc); /* ignore the unlink failure */ revert_creds(old_cred); dput(pca->pca_dentry);