Home
My Posts

Archive
Login
Signup

Recent Posts

Free subdomains

Want your own xyz.kpaste.net sub-domain for your community? Just type the address into your browser address bar (foo.xyz.kpaste.net is also supported).

Suggestions/Bugs?

Email us at . Try to include as much info as possible.

About

Pastebin is a tool for collaborative debugging or editing.

 

msnfs41client: Patches for Linux nfsd SEEK bug, |FSCTL_QUERY_ALLOCATED_RANGES |+misc, 2025-01-30
Posted by Anonymous on Thu 30th Jan 2025 16:18
raw | new post

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting: None Bash C C++ CSS Diff HTML mIRC Script Perl PHP Python Smarty XML ---------------------------- ABAP Actionscript ADA Apache Log AppleScript APT sources.list ASM ASP AutoIT Bash C C# C++ C++ (with QT) CSS Diff HTML INI (Config Files) Java Javascript Lua Make mIRC Script MySQL NSIS Perl PHP Python Q(uick)BASIC robots Ruby Ruby on Rails SDLBasic Smarty SQL TCL Text VB.NET Visual BASIC Visual Fox Pro Visual Prolog Windows Registry Files XML Xorg.conf

To highlight particular lines, prefix each line with {%HIGHLIGHT}
From 610744d3c1f21c63bc45714f85db5fe55c0f017f Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 30 Jan 2025 11:53:58 +0100 Subject: [PATCH 1/6] daemon: Add comment about Linux nfsd SEEK bug, which returns |NFS4ERR_NXIO| instead of |sr_eof = TRUE| Add comment about Linux nfsd SEEK bug, which returns |NFS4ERR_NXIO| instead of |sr_eof = TRUE|. Reported-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/daemon_debug.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/daemon/daemon_debug.c b/daemon/daemon_debug.c index 16efbd9..cb56e92 100644 --- a/daemon/daemon_debug.c +++ b/daemon/daemon_debug.c @@ -1165,7 +1165,29 @@ void debug_list_sparsefile_holes(nfs41_open_state *state) NFS4_CONTENT_DATA, &seek_sr_eof, &seek_sr_offset); - if (seek_status && (seek_status != NFS4ERR_NXIO)) { + + /* + * 1. Note that Linux returns |NFS4ERR_NXIO| if it cannot find + * a data block, but + * https://datatracker.ietf.org/doc/html/rfc7862#section-15.11.3 + * says "... If the server cannot find a corresponding sa_what, + * then the status will still be NFS4_OK, but sr_eof would be + * TRUE. ..." + * 2. NFSv4.2 spec bug: + * https://datatracker.ietf.org/doc/html/rfc7862#section-11.2 + * section "SEEK" does not list |NFS4ERR_NXIO| as valid error + * for SEEK, but + * https://datatracker.ietf.org/doc/html/rfc7862#section-15.11.3 + * states "If the sa_offset is beyond the end of the file, then + * SEEK MUST return NFS4ERR_NXIO." + */ +#define LINUX_NFSD_SEEK_NXIO_BUG_WORKAROUND 1 + + if ((seek_status) +#ifdef LINUX_NFSD_SEEK_NXIO_BUG_WORKAROUND + && (seek_status != NFS4ERR_NXIO) +#endif + ) { dprintf_out("initial SEEL_DATA failed " "OP_SEEK(sa_offset=%llu,sa_what=SEEK_DATA) " "failed with %d(='%s')\n", @@ -1175,8 +1197,11 @@ void debug_list_sparsefile_holes(nfs41_open_state *state) goto out; } - - if (seek_status == NFS4ERR_NXIO) { + if (((seek_status == 0) && (seek_sr_eof != FALSE)) +#ifdef LINUX_NFSD_SEEK_NXIO_BUG_WORKAROUND + || (seek_status == NFS4ERR_NXIO) +#endif + ) { file_has_data_blocks = false; offset_of_first_data = ~0ULL; } -- 2.45.1 From 5eba533fae76cb06d2776b5d4b7f3fe816ff7f43 Mon Sep 17 00:00:00 2001 From: Dan Shelton <dan.f.shelton@gmail.com> Date: Thu, 30 Jan 2025 12:21:41 +0100 Subject: [PATCH 2/6] sys: NFS41_SYSOP_WRITE requests should map kernel buffer read-only into daemon address space NFS41_SYSOP_WRITE requests should map kernel buffer read-only into daemon address space. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- sys/nfs41sys_readwrite.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/nfs41sys_readwrite.c b/sys/nfs41sys_readwrite.c index 050819c..4afa8e4 100644 --- a/sys/nfs41sys_readwrite.c +++ b/sys/nfs41sys_readwrite.c @@ -118,9 +118,19 @@ NTSTATUS marshal_nfs41_rw( #pragma warning (disable : 28145) entry->u.ReadWrite.MdlAddress->MdlFlags |= MDL_MAPPING_CAN_FAIL; #pragma warning( pop ) + ULONG prio_writeflags = 0; + + /* + * The userland daemon will only read from this memory for + * "write" requests, so make it read-only + */ + if (entry->opcode == NFS41_SYSOP_WRITE) + prio_writeflags |= MdlMappingNoWrite; + entry->buf = MmMapLockedPagesSpecifyCache(entry->u.ReadWrite.MdlAddress, - UserMode, MmCached, NULL, FALSE, NormalPagePriority); + UserMode, MmCached, NULL, FALSE, + (NormalPagePriority|prio_writeflags)); if (entry->buf == NULL) { print_error("marshal_nfs41_rw: " "MmMapLockedPagesSpecifyCache() failed to map pages\n"); -- 2.45.1 From ccf5f01d6b7916aeb979155383a9f37bc3a701f8 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 30 Jan 2025 14:21:48 +0100 Subject: [PATCH 3/6] sys: Implement dummy version of |FSCTL_QUERY_ALLOCATED_RANGES| for testing Implement dummy version of |FSCTL_QUERY_ALLOCATED_RANGES| for testing, which just returns { 0, filesize } so we can do testing with Cygwin >= 3.6.x |lseek(..., SEEK_HOLE/SEEK_DATA, ...)| and Windows $ fsutil sparse queryrange mysparsefile.txt #. ToDo: Full support will require a new upcall into the userland daemon, which should fill the |FILE_ALLOCATED_RANGE_BUFFER| array with data from NFSv4.2 SEEK. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- sys/nfs41sys_fsctl.c | 107 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/sys/nfs41sys_fsctl.c b/sys/nfs41sys_fsctl.c index adb8837..2937d8c 100644 --- a/sys/nfs41sys_fsctl.c +++ b/sys/nfs41sys_fsctl.c @@ -68,6 +68,110 @@ #include "nfs41sys_driver.h" #include "nfs41sys_util.h" +static +NTSTATUS check_nfs41_queryallocatedranges_args( + PRX_CONTEXT RxContext) +{ + NTSTATUS status = STATUS_SUCCESS; + XXCTL_LOWIO_COMPONENT *FsCtl = + &RxContext->LowIoContext.ParamsFor.FsCtl; + const USHORT HeaderLen = sizeof(FILE_ALLOCATED_RANGE_BUFFER); + + /* + * Must have a filename longer than vnetroot name, + * or it's trying to operate on the volume itself + */ + if (is_root_directory(RxContext)) { + status = STATUS_INVALID_PARAMETER; + goto out; + } + + if (!FsCtl->pOutputBuffer) { + status = STATUS_INVALID_USER_BUFFER; + goto out; + } + + if (FsCtl->OutputBufferLength < HeaderLen) { + RxContext->InformationToReturn = HeaderLen; + status = STATUS_BUFFER_TOO_SMALL; + goto out; + } +out: + return status; +} + +static +NTSTATUS nfs41_QueryAllocatedRanges( + IN OUT PRX_CONTEXT RxContext) +{ + NTSTATUS status = STATUS_INVALID_DEVICE_REQUEST; + __notnull XXCTL_LOWIO_COMPONENT *FsCtl = + &RxContext->LowIoContext.ParamsFor.FsCtl; + __notnull PFILE_ALLOCATED_RANGE_BUFFER in_range_buffer = + (PFILE_ALLOCATED_RANGE_BUFFER)FsCtl->pInputBuffer; + __notnull PFILE_ALLOCATED_RANGE_BUFFER out_range_buffer = + (PFILE_ALLOCATED_RANGE_BUFFER)FsCtl->pOutputBuffer; + __notnull PNFS41_FCB nfs41_fcb = + NFS41GetFcbExtension(RxContext->pFcb); + + DbgEn(); + + RxContext->IoStatusBlock.Information = 0; + + status = check_nfs41_queryallocatedranges_args(RxContext); + if (status) + goto out; + + if (FsCtl->InputBufferLength < + sizeof(FILE_ALLOCATED_RANGE_BUFFER)) { + DbgP("nfs41_QueryAllocatedRanges: " + "in_range_buffer to small\n"); + status = STATUS_BUFFER_TOO_SMALL; + goto out; + } + +/* + * FIXME: For now we implement |FSCTL_QUERY_ALLOCATED_RANGES| using + * a dummy implementation which just returns { 0, filesize } + * so we can do testing with Cygwin >= 3.6.x + * |lseek(..., SEEK_HOLE/SEEK_DATA, ...)| and + * Windows $ fsutil sparse queryrange mysparsefile.txt #. + * + * We really need an upcall which issues NFSv4.2 SEEK to enumerate the + * data/hole sections and fill an array of + * |FILE_ALLOCATED_RANGE_BUFFER|s with the positions of tha SEEK_DATA + * results. + */ +#define NFS41SYS_FSCTL_QUERY_ALLOCATED_RANGES_PLACEHOLDER_DUMMY_IMPL 1 + +#ifdef NFS41SYS_FSCTL_QUERY_ALLOCATED_RANGES_PLACEHOLDER_DUMMY_IMPL + DbgP("nfs41_QueryAllocatedRanges: " + "in_range_buffer=(FileOffset=%lld,Length=%lld)\n", + (long long)in_range_buffer->FileOffset.QuadPart, + (long long)in_range_buffer->Length.QuadPart); + + if (FsCtl->OutputBufferLength < + (1*sizeof(FILE_ALLOCATED_RANGE_BUFFER))) { + DbgP("nfs41_QueryAllocatedRanges: " + "FsCtl->OutputBufferLength too small\n"); + status = STATUS_BUFFER_TOO_SMALL; + goto out; + } + + out_range_buffer->FileOffset.QuadPart = 0; + out_range_buffer->Length.QuadPart = + nfs41_fcb->StandardInfo.EndOfFile.QuadPart; + + RxContext->IoStatusBlock.Information = + (ULONG_PTR)1*sizeof(FILE_ALLOCATED_RANGE_BUFFER); + + status = STATUS_SUCCESS; +#endif /* NFS41SYS_FSCTL_QUERY_ALLOCATED_RANGES_PLACEHOLDER_DUMMY_IMPL */ + +out: + DbgEx(); + return status; +} NTSTATUS nfs41_FsCtl( IN OUT PRX_CONTEXT RxContext) @@ -87,6 +191,9 @@ NTSTATUS nfs41_FsCtl( case FSCTL_GET_REPARSE_POINT: status = nfs41_GetReparsePoint(RxContext); break; + case FSCTL_QUERY_ALLOCATED_RANGES: + status = nfs41_QueryAllocatedRanges(RxContext); + break; default: break; } -- 2.45.1 From 0875aae17b1fb79b4596fb3e047101551372cb56 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 30 Jan 2025 16:19:18 +0100 Subject: [PATCH 4/6] sys: |map_close_errors()| should map |ERROR_FILE_NOT_FOUND| to |STATUS_NO_SUCH_FILE| |map_close_errors()| should map |ERROR_FILE_NOT_FOUND| to |STATUS_NO_SUCH_FILE| - this can happen in cases like someone deletes files on the native filesystem exported by the NFS server. Reported-by: Josh Hurst <joshhurst@gmail.com> Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- sys/nfs41sys_openclose.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/nfs41sys_openclose.c b/sys/nfs41sys_openclose.c index 4398d2a..19b2c3d 100644 --- a/sys/nfs41sys_openclose.c +++ b/sys/nfs41sys_openclose.c @@ -1018,6 +1018,7 @@ NTSTATUS map_close_errors( { switch (status) { case NO_ERROR: return STATUS_SUCCESS; + case ERROR_FILE_NOT_FOUND: return STATUS_NO_SUCH_FILE; case ERROR_NETNAME_DELETED: return STATUS_NETWORK_NAME_DELETED; case ERROR_NOT_EMPTY: return STATUS_DIRECTORY_NOT_EMPTY; case ERROR_FILE_INVALID: return STATUS_FILE_INVALID; -- 2.45.1 From f00fc3456f6709dd7ee632043f76163b146e15f3 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 30 Jan 2025 16:22:18 +0100 Subject: [PATCH 5/6] daemon: Improve error messages in |handle_getattr()|&co. Improve error messages in |handle_getattr()|&co. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/getattr.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/daemon/getattr.c b/daemon/getattr.c index 93a23e4..e4388f3 100644 --- a/daemon/getattr.c +++ b/daemon/getattr.c @@ -50,7 +50,8 @@ int nfs41_cached_getattr( status = nfs41_getattr(session, file, &attr_request, info); if (status) { - eprintf("nfs41_getattr() failed with '%s'\n", + eprintf("nfs41_cached_getattr: " + "nfs41_getattr() failed with '%s'\n", nfs_error_string(status)); status = nfs_to_windows_error(status, ERROR_BAD_NET_RESP); } @@ -153,7 +154,10 @@ static int handle_getattr(void *daemon_context, nfs41_upcall *upcall) status = nfs41_cached_getattr(state->session, &state->file, &info); if (status) { - eprintf("nfs41_cached_getattr() failed with %d\n", status); + eprintf("handle_getattr(state->path.path='%s'): " + "nfs41_cached_getattr() failed with %d\n", + state->path.path, + status); goto out; } @@ -213,7 +217,10 @@ static int handle_getattr(void *daemon_context, nfs41_upcall *upcall) break; #endif /* NFS41_DRIVER_WSL_SUPPORT */ default: - eprintf("unhandled file query class %d\n", args->query_class); + eprintf("handle_getattr(state->path.path='%s'): " + "unhandled file query class %d\n", + state->path.path, + args->query_class); status = ERROR_INVALID_PARAMETER; break; } @@ -280,7 +287,8 @@ static int marshall_getattr(unsigned char *buffer, uint32_t *length, nfs41_upcal break; #endif /* NFS41_DRIVER_WSL_SUPPORT */ default: - eprintf("unknown file query class %d\n", args->query_class); + eprintf("marshall_getattr: unknown file query class %d\n", + args->query_class); status = 103; goto out; } -- 2.45.1 From af75078ef9db90a9963ac106e4f29bf476c47587 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Thu, 30 Jan 2025 16:53:46 +0100 Subject: [PATCH 6/6] daemon,nfs41_build_features.h: Add build config to set the default NFSv4.x protocol minor version Add build config (|NFS41_DRIVER_DEFAULT_NFS4MINORVERSION|) to set the default NFSv4.x protocol minor version. Requested for site-specific builds. Reported-by: Lionel Cons <lionelcons1972@gmail.com> Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/namespace.c | 6 +++++- nfs41_build_features.h | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/daemon/namespace.c b/daemon/namespace.c index e034211..25cb94f 100644 --- a/daemon/namespace.c +++ b/daemon/namespace.c @@ -400,7 +400,11 @@ int nfs41_root_mount_addrs( * First try with 4.2, and if this fails try 4.1 */ if (root->nfsminorvers == NFS_VERSION_AUTONEGOTIATION) { - root->nfsminorvers = 2; +#if ((NFS41_DRIVER_DEFAULT_NFS4MINORVERSION > 2) || \ + (NFS41_DRIVER_DEFAULT_NFS4MINORVERSION < 1)) +#error Illegal NFS41_DRIVER_DEFAULT_NFS4MINORVERSION +#endif + root->nfsminorvers = NFS41_DRIVER_DEFAULT_NFS4MINORVERSION; nfsminorvers_autonegotiate = true; } diff --git a/nfs41_build_features.h b/nfs41_build_features.h index bcc765c..a127e40 100644 --- a/nfs41_build_features.h +++ b/nfs41_build_features.h @@ -173,4 +173,12 @@ */ #define NFS41_DRIVER_WS2022_HACKS 1 +/* + * NFS41_DRIVER_DEFAULT_NFS4MINORVERSION - set default NFSv4.x + * protocol minor version used by protocol autonegotiation if no + * minor version was given via $ nfs_mount -o vers= ... # + * Value can be |1| or |2| + */ +#define NFS41_DRIVER_DEFAULT_NFS4MINORVERSION 2 + #endif /* !_NFS41_DRIVER_BUILDFEATURES_ */ -- 2.45.1

Title:

Privacy: Public Private

How long should your post be retained?

15 mins an hour a day a week a month forever

All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at