From: Murphy Zhou <jencce.kernel@gmail.com>
To: Frank van der Linden <fllinden@amazon.com>
Cc: linux-nfs <linux-nfs@vger.kernel.org>,
Anna Schumaker <anna.schumaker@netapp.com>,
Trond Myklebust <trond.myklebust@hammerspace.com>
Subject: Re: [PATCH v3 12/13] NFSv4.2: hook in the user extended attribute handlers
Date: Fri, 21 Aug 2020 14:50:59 +0800 [thread overview]
Message-ID: <CADJHv_tVZ3KzO_RZ18V=e6QBYEFnX5SbyVU6yhh6yCqYMmvmRQ@mail.gmail.com> (raw)
In-Reply-To: <20200623223904.31643-13-fllinden@amazon.com>
Hi,
On Wed, Jun 24, 2020 at 6:51 AM Frank van der Linden
<fllinden@amazon.com> wrote:
>
> Now that all the lower level code is there to make the RPC calls, hook
> it in to the xattr handlers and the listxattr entry point, to make them
> available.
>
> Signed-off-by: Frank van der Linden <fllinden@amazon.com>
> ---
> fs/nfs/nfs4proc.c | 123 +++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 121 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 0fbd2925a828..92a07956f07b 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -66,6 +66,7 @@
> #include "nfs4idmap.h"
> #include "nfs4session.h"
> #include "fscache.h"
> +#include "nfs42.h"
>
> #include "nfs4trace.h"
>
> @@ -7440,6 +7441,103 @@ nfs4_listxattr_nfs4_label(struct inode *inode, char *list, size_t list_len)
>
> #endif
>
> +#ifdef CONFIG_NFS_V4_2
> +static int nfs4_xattr_set_nfs4_user(const struct xattr_handler *handler,
> + struct dentry *unused, struct inode *inode,
> + const char *key, const void *buf,
> + size_t buflen, int flags)
> +{
> + struct nfs_access_entry cache;
> +
> + if (!nfs_server_capable(inode, NFS_CAP_XATTR))
> + return -EOPNOTSUPP;
> +
> + /*
> + * There is no mapping from the MAY_* flags to the NFS_ACCESS_XA*
> + * flags right now. Handling of xattr operations use the normal
> + * file read/write permissions.
> + *
> + * Just in case the server has other ideas (which RFC 8276 allows),
> + * do a cached access check for the XA* flags to possibly avoid
> + * doing an RPC and getting EACCES back.
> + */
> + if (!nfs_access_get_cached(inode, current_cred(), &cache, true)) {
> + if (!(cache.mask & NFS_ACCESS_XAWRITE))
> + return -EACCES;
> + }
> +
> + if (buf == NULL)
> + return nfs42_proc_removexattr(inode, key);
> + else
> + return nfs42_proc_setxattr(inode, key, buf, buflen, flags);
> +}
> +
> +static int nfs4_xattr_get_nfs4_user(const struct xattr_handler *handler,
> + struct dentry *unused, struct inode *inode,
> + const char *key, void *buf, size_t buflen)
> +{
> + struct nfs_access_entry cache;
> +
> + if (!nfs_server_capable(inode, NFS_CAP_XATTR))
> + return -EOPNOTSUPP;
> +
> + if (!nfs_access_get_cached(inode, current_cred(), &cache, true)) {
> + if (!(cache.mask & NFS_ACCESS_XAREAD))
> + return -EACCES;
> + }
> +
> + return nfs42_proc_getxattr(inode, key, buf, buflen);
> +}
> +
> +static ssize_t
> +nfs4_listxattr_nfs4_user(struct inode *inode, char *list, size_t list_len)
> +{
> + u64 cookie;
> + bool eof;
> + int ret, size;
> + char *buf;
> + size_t buflen;
> + struct nfs_access_entry cache;
> +
> + if (!nfs_server_capable(inode, NFS_CAP_XATTR))
> + return 0;
> +
> + if (!nfs_access_get_cached(inode, current_cred(), &cache, true)) {
> + if (!(cache.mask & NFS_ACCESS_XALIST))
> + return 0;
> + }
> +
> + cookie = 0;
> + eof = false;
> + buflen = list_len ? list_len : XATTR_LIST_MAX;
> + buf = list_len ? list : NULL;
> + size = 0;
> +
> + while (!eof) {
> + ret = nfs42_proc_listxattrs(inode, buf, buflen,
> + &cookie, &eof);
> + if (ret < 0)
> + return ret;
> +
> + if (list_len) {
> + buf += ret;
> + buflen -= ret;
> + }
> + size += ret;
> + }
> +
> + return size;
> +}
> +
> +#else
> +
> +static ssize_t
> +nfs4_listxattr_nfs4_user(struct inode *inode, char *list, size_t list_len)
> +{
> + return 0;
> +}
> +#endif /* CONFIG_NFS_V4_2 */
> +
> /*
> * nfs_fhget will use either the mounted_on_fileid or the fileid
> */
> @@ -10045,7 +10143,7 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {
>
> static ssize_t nfs4_listxattr(struct dentry *dentry, char *list, size_t size)
> {
> - ssize_t error, error2;
> + ssize_t error, error2, error3;
>
> error = generic_listxattr(dentry, list, size);
> if (error < 0)
> @@ -10058,7 +10156,17 @@ static ssize_t nfs4_listxattr(struct dentry *dentry, char *list, size_t size)
> error2 = nfs4_listxattr_nfs4_label(d_inode(dentry), list, size);
> if (error2 < 0)
> return error2;
> - return error + error2;
> +
> + if (list) {
> + list += error2;
> + size -= error2;
> + }
> +
> + error3 = nfs4_listxattr_nfs4_user(d_inode(dentry), list, size);
> + if (error3 < 0)
> + return error3;
> +
> + return error + error2 + error3;
> }
>
> static const struct inode_operations nfs4_dir_inode_operations = {
> @@ -10146,10 +10254,21 @@ static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = {
> .set = nfs4_xattr_set_nfs4_acl,
> };
>
> +#ifdef CONFIG_NFS_V4_2
> +static const struct xattr_handler nfs4_xattr_nfs4_user_handler = {
> + .prefix = XATTR_USER_PREFIX,
> + .get = nfs4_xattr_get_nfs4_user,
> + .set = nfs4_xattr_set_nfs4_user,
> +};
> +#endif
> +
Any plan to support XATTR_TRUSTED_PREFIX ?
Thanks.
> const struct xattr_handler *nfs4_xattr_handlers[] = {
> &nfs4_xattr_nfs4_acl_handler,
> #ifdef CONFIG_NFS_V4_SECURITY_LABEL
> &nfs4_xattr_nfs4_label_handler,
> +#endif
> +#ifdef CONFIG_NFS_V4_2
> + &nfs4_xattr_nfs4_user_handler,
> #endif
> NULL
> };
> --
> 2.17.2
>
next prev parent reply other threads:[~2020-08-21 6:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 22:38 [PATCH v3 00/13] client side user xattr (RFC8276) support Frank van der Linden
2020-06-23 22:38 ` [PATCH v3 01/13] nfs,nfsd: NFSv4.2 extended attribute protocol definitions Frank van der Linden
2020-06-23 22:38 ` [PATCH v3 02/13] nfs: add client side only definitions for user xattrs Frank van der Linden
2020-06-23 22:38 ` [PATCH v3 03/13] NFSv4.2: define limits and sizes for user xattr handling Frank van der Linden
2020-06-23 22:38 ` [PATCH v3 04/13] NFSv4.2: query the server for extended attribute support Frank van der Linden
2020-06-23 22:38 ` [PATCH v3 05/13] NFSv4.2: add client side XDR handling for extended attributes Frank van der Linden
2020-06-23 22:38 ` [PATCH v3 06/13] nfs: define nfs_access_get_cached function Frank van der Linden
2020-06-23 22:38 ` [PATCH v3 07/13] NFSv4.2: query the extended attribute access bits Frank van der Linden
2020-06-23 22:38 ` [PATCH v3 08/13] nfs: modify update_changeattr to deal with regular files Frank van der Linden
2020-06-23 22:39 ` [PATCH v3 09/13] nfs: define and use the NFS_INO_INVALID_XATTR flag Frank van der Linden
2020-06-23 22:39 ` [PATCH v3 10/13] nfs: make the buf_to_pages_noslab function available to the nfs code Frank van der Linden
2020-06-23 22:39 ` [PATCH v3 11/13] NFSv4.2: add the extended attribute proc functions Frank van der Linden
2020-06-23 22:39 ` [PATCH v3 12/13] NFSv4.2: hook in the user extended attribute handlers Frank van der Linden
2020-08-21 6:50 ` Murphy Zhou [this message]
2020-08-21 16:03 ` Frank van der Linden
2020-08-21 16:41 ` Trond Myklebust
2020-08-24 0:13 ` Murphy Zhou
2020-08-24 16:16 ` Frank van der Linden
2020-08-25 0:14 ` Murphy Zhou
2020-06-23 22:39 ` [PATCH v3 13/13] NFSv4.2: add client side xattr caching Frank van der Linden
2020-07-14 17:20 ` [PATCH v3 00/13] client side user xattr (RFC8276) support van der Linden, Frank
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='CADJHv_tVZ3KzO_RZ18V=e6QBYEFnX5SbyVU6yhh6yCqYMmvmRQ@mail.gmail.com' \
--to=jencce.kernel@gmail.com \
--cc=anna.schumaker@netapp.com \
--cc=fllinden@amazon.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
/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;
as well as URLs for NNTP newsgroup(s).