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: Patch for more mount options, bigger name cache&testing, 2023-11-20
Posted by Anonymous on Mon 20th Nov 2023 17:41
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 7d74fb25c36603a664c27a273f97c77f5c8f3100 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Mon, 20 Nov 2023 16:34:45 +0100 Subject: [PATCH 1/4] mount, sys/nfs41_driver: Add rw, nowritethru, cache mount options Add { "rw", "nowritethru", "cache" } mount options to nfs_mount.exe and nfs41_driver.sys, so people can use this like in the traditional UNIX/Linux mount(1M). Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- mount/mount.c | 4 ++++ sys/nfs41_driver.c | 23 ++++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/mount/mount.c b/mount/mount.c index 23aea32..9bad01d 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -3,6 +3,7 @@ * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> + * Roland Mainz <roland.mainz@nrubsig.org> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by @@ -66,11 +67,14 @@ static VOID PrintUsage(LPTSTR pProcess) TEXT("\t-o <comma-separated mount options>\n") TEXT("* Mount options:\n") TEXT("\tro\tmount as read-only\n") + TEXT("\trw\tmount as read-write (default)\n") TEXT("\tport=#\tTCP port to use (defaults to 2049)\n") TEXT("\trsize=#\tread buffer size in bytes\n") TEXT("\twsize=#\twrite buffer size in bytes\n") TEXT("\tsec=sys:krb5:krb5i:krb5p\tspecify (gss) security flavor\n") TEXT("\twritethru\tturns off rdbss caching for writes\n") + TEXT("\tnowritethru\tturns on rdbss caching for writes (default)\n") + TEXT("\tcache\tturns on rdbss caching (default)\n") TEXT("\tnocache\tturns off rdbss caching\n") TEXT("\ttimeout=#\tspecify upcall timeout value in seconds (default 120s)\n") TEXT("* Hostname:\n") diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c index 4831b17..7b8f2b9 100644 --- a/sys/nfs41_driver.c +++ b/sys/nfs41_driver.c @@ -2687,6 +2687,7 @@ void nfs41_MountConfig_InitDefaults( NTSTATUS nfs41_MountConfig_ParseBoolean( IN PFILE_FULL_EA_INFORMATION Option, IN PUNICODE_STRING usValue, + IN BOOLEAN negate_val, OUT PBOOLEAN Value) { NTSTATUS status = STATUS_SUCCESS; @@ -2694,9 +2695,9 @@ NTSTATUS nfs41_MountConfig_ParseBoolean( /* if no value is specified, assume TRUE * if a value is specified, it must be a '1' */ if (Option->EaValueLength == 0 || *usValue->Buffer == L'1') - *Value = TRUE; + *Value = negate_val?FALSE:TRUE; else - *Value = FALSE; + *Value = negate_val?TRUE:FALSE; DbgP(" '%ls' -> '%wZ' -> %u\n", (LPWSTR)Option->EaName, usValue, *Value); @@ -2753,15 +2754,27 @@ NTSTATUS nfs41_MountConfig_ParseOptions( if (wcsncmp(L"ro", Name, NameLen) == 0) { status = nfs41_MountConfig_ParseBoolean(Option, &usValue, - &Config->ReadOnly); + FALSE, &Config->ReadOnly); + } else if (wcsncmp(L"rw", Name, NameLen) == 0) { + /* opposite of "ro", so negate */ + status = nfs41_MountConfig_ParseBoolean(Option, &usValue, + TRUE, &Config->ReadOnly); } else if (wcsncmp(L"writethru", Name, NameLen) == 0) { status = nfs41_MountConfig_ParseBoolean(Option, &usValue, - &Config->write_thru); + FALSE, &Config->write_thru); + } + else if (wcsncmp(L"nowritethru", Name, NameLen) == 0) { + status = nfs41_MountConfig_ParseBoolean(Option, &usValue, + TRUE, &Config->write_thru); + } + else if (wcsncmp(L"cache", Name, NameLen) == 0) { + status = nfs41_MountConfig_ParseBoolean(Option, &usValue, + TRUE, &Config->nocache); } else if (wcsncmp(L"nocache", Name, NameLen) == 0) { status = nfs41_MountConfig_ParseBoolean(Option, &usValue, - &Config->nocache); + FALSE, &Config->nocache); } else if (wcsncmp(L"timeout", Name, NameLen) == 0) { status = nfs41_MountConfig_ParseDword(Option, &usValue, -- 2.42.1 From f2e6958c553eaf3e3f467592f64da94ee98375b3 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Mon, 20 Nov 2023 16:41:09 +0100 Subject: [PATCH 2/4] daemon: Increase name cache size from 256K to 8M daemon: Increase name cache size from 256K to 8M to fix. This should fix performance issues with slow git clone and /usr/bin/find caused by name cache thrashing. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/name_cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/name_cache.c b/daemon/name_cache.c index 99ea6b1..c607735 100644 --- a/daemon/name_cache.c +++ b/daemon/name_cache.c @@ -40,8 +40,8 @@ enum { #define NAME_CACHE_EXPIRATION 20 /* TODO: get from configuration */ -/* allow up to 256K of memory for name and attribute cache entries */ -#define NAME_CACHE_MAX_SIZE 262144 +/* allow up to 8M of memory for name and attribute cache entries */ +#define NAME_CACHE_MAX_SIZE (8*1024*1024L) /* negative lookup caching * -- 2.42.1 From 2fea1529dac005112a5f20acc0ed3181fec3daa5 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Mon, 20 Nov 2023 16:46:02 +0100 Subject: [PATCH 3/4] tests/manual_testing.txt: Add gcc cp -p/ln -s workarounds Add gcc cp -p/ln -s workarounds for configure/Makefile, currently needed by gcc Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- tests/manual_testing.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt index 07ffcf2..5f4b74a 100644 --- a/tests/manual_testing.txt +++ b/tests/manual_testing.txt @@ -62,7 +62,11 @@ MSBuild.exe build.vc19/nfs41-client.sln -t:Build -p:Configuration=Release -p:Pl # git clone -b 'releases/gcc-13.2.0' git://gcc.gnu.org/git/gcc.git cd gcc/ +# Cygwin: workaround for configure using cp -p where ln -s should be used +sed -i "s/as_ln_s='cp -pR'/as_ln_s='ln -s'/g" configure ./configure +# workaround for $ cp -p # failing with "Function not implemented" +(set -o xtrace ; sed -i -r 's/(cp.*)([[:space:]]+-p[[:space:]]+)/\1\2--no-preserve=ownership /g' $(find . -name Makefile) ) # repeat: make -j4 clean (yes | make -j32 all) -- 2.42.1 From 6ea1ef354fa5a499eebdf3b70d3010a995669a28 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Mon, 20 Nov 2023 16:53:53 +0100 Subject: [PATCH 4/4] msnfs41client.bash: Enable line numbers for WinDBG cdb Enable line numbers for WinDBG's "cdb" mode in cygwin/devel/msnfs41client.bash Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/devel/msnfs41client.bash | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash index 9677663..478f7f6 100644 --- a/cygwin/devel/msnfs41client.bash +++ b/cygwin/devel/msnfs41client.bash @@ -2,7 +2,7 @@ # # msnfs41client.bash - simple Cygwin frontent for the msnfsv41 -# NFSv4.1 filesystem driver +# NFSv4.1 filesystem driver development # # @@ -129,6 +129,10 @@ function nfsclient_rundeamon # gdb: bt cdb: kp # gdb: quit cdb: q # + # other useful commands: + # .lines -e # enable source code line numbers + # ~*kp # print stack traces of all threads + # if false ; then nfsd_args=( @@ -143,7 +147,7 @@ function nfsclient_rundeamon # use '!gflag +full;g' for heap tests, eats lots of memory nfsd_args=( 'cdb' - '-c' '!gflag +soe;sxe -c "kp;gn" *;g' + '-c' '!gflag +soe;sxe -c "kp;gn" *;.lines -e;g' "$(cygpath -w "$PWD/${nfsd_args[0]}")" "${nfsd_args[@]:1}" ) @@ -205,6 +209,10 @@ function nfsclient_system_rundeamon # gdb: bt cdb: kp # gdb: quit cdb: q # + # other useful commands: + # .lines -e # enable source code line numbers + # ~*kp # print stack traces of all threads + # if false ; then nfsd_args=( @@ -219,7 +227,7 @@ function nfsclient_system_rundeamon # use '!gflag +full;g' for heap tests, eats lots of memory nfsd_args=( 'cdb' - '-c' '!gflag +soe;sxe -c "kp;gn" *;g' + '-c' '!gflag +soe;sxe -c "kp;gn" *;.lines -e;g' "$(cygpath -w "$PWD/${nfsd_args[0]}")" "${nfsd_args[@]:1}" ) -- 2.42.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