rovema.kpaste.net RSS- From 7ab1a731a8e8912cd15b27f5f0cc52c9ff6ebef3 Mon Sep 17 00:00:00 2001
- From: Roland Mainz <roland.mainz@nrubsig.org>
- Date: Fri, 19 Jul 2024 11:26:15 +0200
- Subject: [PATCH 1/2] Backout "sys: Driver code should use |NTSTATUS()| to test
- for success", needs mor work
- Backout commit #79da3c97ec17d1dc59212f9be01d10392c943540 ("sys: Driver
- code should use |NTSTATUS()| to test for success"), this seems
- to cause kernel crashes.
- Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
- ---
- sys/nfs41_driver.c | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
- diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c
- index 50f7342..8a92bdb 100644
- --- a/sys/nfs41_driver.c
- +++ b/sys/nfs41_driver.c
- @@ -1464,7 +1464,7 @@ NTSTATUS handle_upcall(
- #else
- status = SeImpersonateClientEx(entry->psec_ctx, NULL);
- #endif /* NFS41_DRIVER_STABILITY_HACKS */
- - if (!NT_SUCCESS(status)) {
- + if (status != STATUS_SUCCESS) {
- print_error("handle_upcall: "
- "SeImpersonateClientEx() failed 0x%x\n", status);
- goto out;
- @@ -1532,10 +1532,8 @@ NTSTATUS handle_upcall(
- print_error("Unknown nfs41 ops %d\n", entry->opcode);
- }
- -#if 0
- - if (NT_SUCCESS(status))
- + if (status == STATUS_SUCCESS)
- print_hexbuf(0, (unsigned char *)"upcall buffer", pbOut, *len);
- -#endif
- out:
- return status;
- @@ -1593,7 +1591,7 @@ NTSTATUS nfs41_UpcallCreate(
- */
- status = SeCreateClientSecurityFromSubjectContext(&sec_ctx, &sec_qos,
- FALSE, entry->psec_ctx);
- - if (!NT_SUCCESS(status)) {
- + if (status != STATUS_SUCCESS) {
- print_error("nfs41_UpcallCreate: "
- "SeCreateClientSecurityFromSubjectContext() "
- "failed with 0x%x\n",
- @@ -1713,8 +1711,8 @@ process_upcall:
- ExAcquireFastMutex(&entry->lock);
- nfs41_AddEntry(downcallLock, downcall, entry);
- status = handle_upcall(RxContext, entry, &len);
- - if (NT_SUCCESS(status) &&
- - (entry->state == NFS41_WAITING_FOR_UPCALL))
- + if (status == STATUS_SUCCESS &&
- + entry->state == NFS41_WAITING_FOR_UPCALL)
- entry->state = NFS41_WAITING_FOR_DOWNCALL;
- ExReleaseFastMutex(&entry->lock);
- if (status) {
- @@ -2144,7 +2142,7 @@ NTSTATUS nfs41_downcall(
- }
- ExReleaseFastMutex(&cur->lock);
- if (cur->async_op) {
- - if (NT_SUCCESS(cur->status)) {
- + if (cur->status == STATUS_SUCCESS) {
- cur->u.ReadWrite.rxcontext->StoredStatus = STATUS_SUCCESS;
- cur->u.ReadWrite.rxcontext->InformationToReturn =
- cur->buf_len;
- @@ -2397,7 +2395,7 @@ NTSTATUS nfs41_CreateConnection(
- status = nfs41_GetConnectionInfoFromBuffer(Buffer, BufferLen,
- &FileName, &EaBuffer, &EaLength);
- - if (!NT_SUCCESS(status))
- + if (status != STATUS_SUCCESS)
- goto out;
- status = GetConnectionHandle(&FileName, EaBuffer, EaLength, &Handle);
- @@ -2502,7 +2500,7 @@ NTSTATUS nfs41_DeleteConnection (
- FileName.MaximumLength = (USHORT) ConnectNameLen;
- status = GetConnectionHandle(&FileName, NULL, 0, &Handle);
- - if (!NT_SUCCESS(status))
- + if (status != STATUS_SUCCESS)
- goto out;
- status = ObReferenceObjectByHandle(Handle, 0L, NULL, KernelMode,
- --
- 2.45.1
- From 774dec64c24594f543d4eb3aa1d19b7b56e5b055 Mon Sep 17 00:00:00 2001
- From: Roland Mainz <roland.mainz@nrubsig.org>
- Date: Fri, 19 Jul 2024 14:50:08 +0200
- Subject: [PATCH 2/2] cygwin,tests: Add
- tests/fstest_make_numtree1/fstest_make_numtree1.ksh93+bmake dependicy
- Add tests/fstest_make_numtree1/fstest_make_numtree1.ksh93
- and bmake (BSD make) dependicy
- Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
- ---
- cygwin/README.bintarball.txt | 5 +-
- .../fstest_make_numtree1.ksh93 | 165 ++++++++++++++++++
- tests/manual_testing.txt | 7 +
- 3 files changed, 175 insertions(+), 2 deletions(-)
- create mode 100644 tests/fstest_make_numtree1/fstest_make_numtree1.ksh93
- diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt
- index 8101f2b..8cca4cc 100644
- --- a/cygwin/README.bintarball.txt
- +++ b/cygwin/README.bintarball.txt
- @@ -117,6 +117,7 @@ NFSv4.1 client and filesystem driver for Windows 10/11
- - Packages (recommended):
- libnfs-utils (for /usr/bin/nfs-ls)
- make
- + bmake
- git
- gcc-core
- gcc-g++
- @@ -148,7 +149,7 @@ echo %PROCESSOR_ARCHITECTURE%
- # 1. Get installer from https://cygwin.com/setup-x86_64.exe
- curl --remote-name "https://www.cygwin.com/setup-x86_64.exe"
- # 2. Run installer with these arguments:
- -setup-x86_64.exe -q --site "https://mirrors.kernel.org/sourceware/cygwin" -P cygwin,cygwin-devel,cygrunsrv,cygutils,cygutils-extra,bash,bzip2,coreutils,getent,gdb,grep,hostname,less,libiconv,libiconv2,pax,pbzip2,procps-ng,sed,tar,time,util-linux,wget,libnfs-utils,make,git,dos2unix,unzip
- +setup-x86_64.exe -q --site "https://mirrors.kernel.org/sourceware/cygwin" -P cygwin,cygwin-devel,cygrunsrv,cygutils,cygutils-extra,bash,bzip2,coreutils,getent,gdb,grep,hostname,less,libiconv,libiconv2,pax,pbzip2,procps-ng,sed,tar,time,util-linux,wget,libnfs-utils,make,bmake,git,dos2unix,unzip
- # ---- snip ----
- @@ -159,7 +160,7 @@ setup-x86_64.exe -q --site "https://mirrors.kernel.org/sourceware/cygwin" -P cyg
- # 1. Get installer from https://www.cygwin.com/setup-x86.exe
- curl --remote-name "https://www.cygwin.com/setup-x86.exe"
- # 2. Run installer with these arguments:
- -setup-x86.exe --allow-unsupported-windows -q --no-verify --site "http://ctm.crouchingtigerhiddenfruitbat.org/pub/cygwin/circa/2022/11/23/063457" -P cygwin,cygwin-devel,cygrunsrv,cygutils,cygutils-extra,bash,bzip2,coreutils,getent,gdb,grep,hostname,less,libiconv,libiconv2,pax,pbzip2,procps-ng,sed,tar,time,util-linux,wget,libnfs-utils,make,git,dos2unix,unzip
- +setup-x86.exe --allow-unsupported-windows -q --no-verify --site "http://ctm.crouchingtigerhiddenfruitbat.org/pub/cygwin/circa/2022/11/23/063457" -P cygwin,cygwin-devel,cygrunsrv,cygutils,cygutils-extra,bash,bzip2,coreutils,getent,gdb,grep,hostname,less,libiconv,libiconv2,pax,pbzip2,procps-ng,sed,tar,time,util-linux,wget,libnfs-utils,make,bmake,git,dos2unix,unzip
- # ---- snip ----
- diff --git a/tests/fstest_make_numtree1/fstest_make_numtree1.ksh93 b/tests/fstest_make_numtree1/fstest_make_numtree1.ksh93
- new file mode 100644
- index 0000000..ccfbe94
- --- /dev/null
- +++ b/tests/fstest_make_numtree1/fstest_make_numtree1.ksh93
- @@ -0,0 +1,165 @@
- +#!/bin/ksh93
- +
- +#
- +# fstest_make_numtree1.ksh93 - filesystem stress test using parallel makefile
- +#
- +# The script builds a makefile to generate number sequence
- +# The resulting Makefile is intended to be used with
- +# $ bmake -j128 all # as filesystem test
- +#
- +# Written by Roland Mainz <roland.mainz@nrubsig.org>
- +#
- +
- +function genmakefile_make_number_seq
- +{
- + set -o nounset
- + nameref out_maketarget=$1
- + integer start_i=$2
- + integer stop_i=$3
- + typeset payload=$4
- + integer i
- + typeset -a make_targets
- +
- + if (( (stop_i - start_i) > 10 )) ; then
- + (( i=(stop_i - start_i)/2 ))
- + genmakefile_make_number_seq make_targets[0] $start_i $(( start_i+i )) "$payload"
- + genmakefile_make_number_seq make_targets[1] $(( start_i+i )) $stop_i "$payload"
- + else
- + for ((i=start_i ; i < stop_i ; i++ )) ; do
- + printf 'i_%d:\n' i
- + printf '\t@printf "%d\\t%s\\n" >"i_%d"\n' i "$payload" i
- + make_targets+=( "i_$i" )
- + done
- + fi
- +
- + out_maketarget="i_${start_i}_${stop_i}"
- + printf 'i_%d_%d: %s\n' start_i stop_i "${make_targets[*]}"
- +
- + printf '\tcat '
- + printf '%q ' "${make_targets[@]}"
- + printf ' >"%s"\n' "$out_maketarget"
- +
- + return 0
- +}
- +
- +function genmakefile
- +{
- + set -o nounset
- + typeset make_target
- + integer max_num=$1
- + typeset string_payload=$2
- +
- + genmakefile_make_number_seq make_target 0 ${max_num} "${string_payload}"
- +
- + printf 'all: %s\n' "$make_target"
- +
- + return 0
- +}
- +
- +function parallal_make
- +{
- + if true ; then
- + # BSD make
- + bmake -j 128 "$@"
- + else
- + # GNU make
- + make --load-average 128 -j 128 "$@"
- + fi
- +}
- +
- +function main
- +{
- + set -o nounset
- + typeset subcmd="$1"
- +
- + compound config=(
- + # workdir
- + typeset workdir="$PWD/fstest_make_numtree1_workdir"
- + # max number of iterations
- + integer max_num=4000
- + # 8192 bytes of payload
- + typeset string_payload="$(
- + integer p ;
- + for ((p=0 ; p < 8192 ; p++ )) ; do
- + printf '%x' $((p%0x10)) ;
- + done)"
- + )
- +
- + #
- + # We need BSD make, as GNU make -j128 somehow does not
- + # yield parallism
- + #
- + if [[ "$(which 'bmake' 2>'/dev/null')" == '' ]] ; then
- + print -u2 -f $"%s: bmake (BSD make) required\n" "${.sh.file}"
- + return 1
- + fi
- + if [[ "$(which 'seq' 2>'/dev/null')" == '' ]] ; then
- + print -u2 -f $"%s: seq required\n" "${.sh.file}"
- + return 1
- + fi
- +
- + #
- + # subcmd dispatch
- + #
- + case "$subcmd" in
- + 'generate')
- + set -o xtrace
- + mkdir -p -- "${config.workdir}"
- + cd -- "${config.workdir}" || return $?
- +
- + genmakefile ${config.max_num} "${config.string_payload}" >"make_numtree1.Makefile"
- + set +o xtrace
- + ;;
- + 'run')
- + set -o xtrace
- + cd -- "${config.workdir}" || return $?
- +
- + time parallal_make -f "make_numtree1.Makefile" all
- + set +o xtrace
- + ;;
- + 'clean')
- + set -o xtrace
- + rm -rf -- "${config.workdir}"
- + set +o xtrace
- + ;;
- + # all-in-one
- + 'all')
- + set -o xtrace
- + (
- + set -o errexit
- + rm -rf -- "${config.workdir}"
- + mkdir -p -- "${config.workdir}"
- + cd -- "${config.workdir}" || return $?
- +
- + genmakefile ${config.max_num} "${config.string_payload}" >"make_numtree1.Makefile"
- +
- + time parallal_make -f "make_numtree1.Makefile" all
- + ls -l "i_0_${config.max_num}"
- +
- + # compare results (minus payload) with output of /usr/bin/seq
- + diff -u <(awk '{ print $1 }' "i_0_${config.max_num}") <(seq 0 $(( config.max_num-1 )))
- + set +o xtrace
- +
- + # we only reach this if we did not leave the
- + # subshell via errexit
- + printf $"#### Run OK ####\n"
- + )
- + return $?
- + ;;
- +
- + *)
- + print -u2 -f \
- + $"%s: Unknown subcmd, supported are 'generate', 'run', 'clean', 'all'\n" \
- + "${.sh.file}"
- + return 1
- + ;;
- + esac
- +
- + return 0
- +}
- +
- +builtin mkdir
- +builtin printf
- +
- +main "$@"
- +# EOF.
- diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt
- index 9a66289..27da444 100644
- --- a/tests/manual_testing.txt
- +++ b/tests/manual_testing.txt
- @@ -16,6 +16,7 @@
- # mingw64-x86_64-clang
- # gdb
- # make
- +# bmake
- # netpbm
- # git
- # subversion
- @@ -334,4 +335,10 @@ chmod a+rx setup-x86_64.exe
- svn checkout https://svn.FreeBSD.org/base/head/share/man
- +#
- +# Run parallel make job on NFSv4.1 filesystem (/cygdrive/n/xxx/)
- +#
- +cd /cygdrive/n/xxx/
- +time ksh93 $msnfs41clientgitroot/tests/fstest_make_numtree1/fstest_make_numtree1.ksh93 all
- +
- # EOF.
- --
- 2.45.1
msnfs41client: Patches for testing+misc, 2024-07-19
Posted by Anonymous on Fri 19th Jul 2024 16:37
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.