From: Jeff Layton <jlayton@kernel.org>
To: Martin Kaiser <martin@kaiser.cx>,
Anna Schumaker <Anna.Schumaker@Netapp.com>,
Trond Myklebust <trond.myklebust@hammerspace.com>,
David Howells <dhowells@redhat.com>
Cc: NeilBrown <neilb@suse.de>, Josef Bacik <josef@toxicpanda.com>,
Chuck Lever <chuck.lever@oracle.com>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] nfs: keep server info for remounts
Date: Mon, 15 Apr 2024 07:17:59 -0400 [thread overview]
Message-ID: <d12c4998028014829713093ceccdbb521e34f05c.camel@kernel.org> (raw)
In-Reply-To: <20240414170109.137696-1-martin@kaiser.cx>
On Sun, 2024-04-14 at 19:01 +0200, Martin Kaiser wrote:
> With newer kernels that use fs_context for nfs mounts, remounts fail with
> -EINVAL.
>
> $ mount -t nfs -o nolock 10.0.0.1:/tmp/test /mnt/test/
> $ mount -t nfs -o remount /mnt/test/
> mount: mounting 10.0.0.1:/tmp/test on /mnt/test failed: Invalid argument
>
> For remounts, the nfs server address and port are populated by
> nfs_init_fs_context and later overwritten with 0x00 bytes by
> nfs23_parse_monolithic. The remount then fails as the server address is
> invalid.
>
> Fix this by not overwriting nfs server info in nfs23_parse_monolithic if
> we're doing a remount.
>
> Fixes: f2aedb713c28 ("NFS: Add fs_context support.")
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
> v3:
> - rebased against linux-next from 12th April 2024
>
> v2:
> - rebased against linux-next from 26th February 2024
>
> Dear all,
> I'm resending this patch again. The problem that I'm trying to fix is still
> present in linux-next. Thanks in advance for any reviews and comments.
>
> I guess that we're taking this path for remounts
>
> do_remount
> fs_context_for_reconfigure
> alloc_fs_context
> init_fs_context == nfs_init_fs_context
> fc->root is set for remounts
> ctx->nfs_server is populated
> parse_monolithic_mount_data
> nfs_fs_context_parse_monolithic
> nfs23_parse_monolithic
> ctx->nfs_server is overwritten with data from mount request
>
> An alternative to checking for !is_remount_fc(fc) would be to check
> if (ctx->nfs_server.addrlen == 0)
>
> fs/nfs/fs_context.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
> index d0a0956f8a13..cac1157be2c2 100644
> --- a/fs/nfs/fs_context.c
> +++ b/fs/nfs/fs_context.c
> @@ -1112,9 +1112,12 @@ static int nfs23_parse_monolithic(struct fs_context *fc,
> ctx->acdirmax = data->acdirmax;
> ctx->need_mount = false;
>
> - memcpy(sap, &data->addr, sizeof(data->addr));
> - ctx->nfs_server.addrlen = sizeof(data->addr);
> - ctx->nfs_server.port = ntohs(data->addr.sin_port);
> + if (!is_remount_fc(fc)) {
> + memcpy(sap, &data->addr, sizeof(data->addr));
> + ctx->nfs_server.addrlen = sizeof(data->addr);
> + ctx->nfs_server.port = ntohs(data->addr.sin_port);
> + }
> +
> if (sap->ss_family != AF_INET ||
> !nfs_verify_server_address(sap))
> goto out_no_address;
Doesn't nfs4_parse_monolithic need the same fix?
--
Jeff Layton <jlayton@kernel.org>
next prev parent reply other threads:[~2024-04-15 11:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-14 17:01 [PATCH v3] nfs: keep server info for remounts Martin Kaiser
2024-04-15 11:17 ` Jeff Layton [this message]
2024-04-22 22:33 ` Martin Kaiser
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=d12c4998028014829713093ceccdbb521e34f05c.camel@kernel.org \
--to=jlayton@kernel.org \
--cc=Anna.Schumaker@Netapp.com \
--cc=chuck.lever@oracle.com \
--cc=dhowells@redhat.com \
--cc=josef@toxicpanda.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=martin@kaiser.cx \
--cc=neilb@suse.de \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).