pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patch for NFSv4.1 session renewal thread+winfstest test suite, 2024-01-06
Posted by Anonymous on Sat 6th Jan 2024 19:39
raw | new post

  1. From cd1684df588eecc508a3b34d623b6c9d7031c9f4 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Sat, 6 Jan 2024 19:48:30 +0100
  4. Subject: [PATCH 1/3] daemon: |TerminateThread()| while thread is in
  5.  |nfs41_send_sequence()| causes corruption
  6.  
  7. Calling |TerminateThread()| for the NFSv4.1 session renewal thread
  8. causes corruption when the thread is executing |nfs41_send_sequence()|.
  9.  
  10. The fix is simply to inform (via |SetEvent()|) the session renewal
  11. thread to end itself, and let the caller wait until the thread exists.
  12.  
  13. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  14. ---
  15. daemon/nfs41.h         |   8 ++--
  16.  daemon/nfs41_session.c | 102 +++++++++++++++++++++++++++++++++--------
  17.  2 files changed, 87 insertions(+), 23 deletions(-)
  18.  
  19. diff --git a/daemon/nfs41.h b/daemon/nfs41.h
  20. index 3902393..1dc88a7 100644
  21. --- a/daemon/nfs41.h
  22. +++ b/daemon/nfs41.h
  23. @@ -258,9 +258,11 @@ typedef struct __nfs41_session {
  24.      nfs41_channel_attrs fore_chan_attrs;
  25.      nfs41_channel_attrs back_chan_attrs;
  26.      uint32_t lease_time;
  27. -    nfs41_slot_table table;
  28. -    // array of slots
  29. -    HANDLE renew_thread;
  30. +    nfs41_slot_table table; /* array of slots */
  31. +    struct {
  32. +        HANDLE thread_handle;
  33. +        HANDLE cancel_event;
  34. +    } renew;
  35.      bool_t isValidState;
  36.      uint32_t flags;
  37.      nfs41_cb_session cb_session;
  38. diff --git a/daemon/nfs41_session.c b/daemon/nfs41_session.c
  39. index 4ecf3f6..a52af26 100644
  40. --- a/daemon/nfs41_session.c
  41. +++ b/daemon/nfs41_session.c
  42. @@ -3,6 +3,7 @@
  43.   *
  44.   * Olga Kornievskaia <aglo@umich.edu>
  45.   * Casey Bodley <cbodley@umich.edu>
  46. + * Roland Mainz <roland.mainz@nrubsig.org>
  47.   *
  48.   * This library is free software; you can redistribute it and/or modify it
  49.   * under the terms of the GNU Lesser General Public License as published by
  50. @@ -224,22 +225,57 @@ void nfs41_session_sequence(
  51.  
  52.  
  53.  /* session renewal */
  54. -static unsigned int WINAPI renew_session(void *args)
  55. +static unsigned int WINAPI renew_session_thread(void *args)
  56.  {
  57. -    int status = NO_ERROR;
  58.      nfs41_session *session = (nfs41_session *)args;
  59. +    int status = NO_ERROR;
  60. +    int event_status;
  61. +
  62. +    dprintf(1, "renew_session_thread(session=%p): started thread %p\n",
  63. +        session, session->renew.thread_handle);
  64. +
  65.      /* sleep for 2/3 of lease_time */
  66. -    const uint32_t sleep_time = (2 * session->lease_time*1000)/3;
  67. +    const uint32_t sleep_time = (2UL * session->lease_time*1000UL)/3UL;
  68. +
  69. +    EASSERT(sleep_time > 100UL);
  70. +    EASSERT(sleep_time < (60*60*1000UL));
  71.  
  72. -    dprintf(1, "Creating renew_session thread: %p\n", session->renew_thread);
  73.      while(1) {
  74. -        dprintf(1, "Going to sleep for %dmsecs\n", sleep_time);
  75. -        Sleep(sleep_time);
  76. -        status = nfs41_send_sequence(session);
  77. -        if (status)
  78. -            dprintf(1, "renewal thread: nfs41_send_sequence failed %d\n", status);
  79. +        dprintf(1, "renew_session_thread(session=%p): "
  80. +            "Going to sleep for %dmsecs\n",
  81. +            session, (int)sleep_time);
  82. +
  83. +        /*
  84. +         * sleep for |sleep_time| milliseconds, or until someone
  85. +         * sends an event
  86. +         */
  87. +        event_status = WaitForSingleObjectEx(session->renew.cancel_event,
  88. +            sleep_time, FALSE);
  89. +        if (event_status == WAIT_TIMEOUT) {
  90. +            dprintf(1, "renew_session_thread(session=%p): "
  91. +                "renewing session...\n",
  92. +                session);
  93. +            status = nfs41_send_sequence(session);
  94. +            if (status) {
  95. +                eprintf("renew_session_thread(session=%p): "
  96. +                    "nfs41_send_sequence() failed status=%d\n",
  97. +                    session, status);
  98. +            }
  99. +        }
  100. +        else if (event_status == WAIT_OBJECT_0) {
  101. +            /* event received, renew thread should exit */
  102. +            break;
  103. +        }
  104. +        else {
  105. +            eprintf("renew_session_thread(session=%p): "
  106. +                "unexpected event_status=0x%x\n",
  107. +                session, (int)event_status);
  108. +        }
  109.      }
  110. -    return status;
  111. +
  112. +    dprintf(1, "renew_session_thread(session=%p): thread %p exiting\n",
  113. +        session, session->renew.thread_handle);
  114. +    return 0;
  115.  }
  116.  
  117.  /* session creation */
  118. @@ -256,7 +292,8 @@ static int session_alloc(
  119.          goto out;
  120.      }
  121.      session->client = client;
  122. -    session->renew_thread = INVALID_HANDLE_VALUE;
  123. +    session->renew.thread_handle = INVALID_HANDLE_VALUE;
  124. +    session->renew.cancel_event = INVALID_HANDLE_VALUE;
  125.      session->isValidState = FALSE;
  126.  
  127.      InitializeCriticalSection(&session->table.lock);
  128. @@ -329,6 +366,24 @@ int nfs41_session_renew(
  129.      return status;
  130.  }
  131.  
  132. +static
  133. +void cancel_renew_thread(
  134. +    IN nfs41_session *session)
  135. +{
  136. +    dprintf(1, "cancel_renew_thread(session=%p): "
  137. +        "signal thread to exit\n", session);
  138. +    (void)SetEvent(session->renew.cancel_event);
  139. +
  140. +    dprintf(1, "cancel_renew_thread(session=%p): "
  141. +        "waiting for thread to exit\n", session);
  142. +    (void)WaitForSingleObjectEx(session->renew.thread_handle,
  143. +        INFINITE, FALSE);
  144. +
  145. +    dprintf(1, "cancel_renew_thread(session=%p): thread done\n",
  146. +        session);
  147. +    (void)CloseHandle(session->renew.cancel_event);
  148. +}
  149. +
  150.  int nfs41_session_set_lease(
  151.      IN nfs41_session *session,
  152.      IN uint32_t lease_time)
  153. @@ -336,7 +391,7 @@ int nfs41_session_set_lease(
  154.      int status = NO_ERROR;
  155.      uint32_t thread_id;
  156.  
  157. -    if (valid_handle(session->renew_thread)) {
  158. +    if (valid_handle(session->renew.thread_handle)) {
  159.          eprintf("nfs41_session_set_lease(): session "
  160.              "renewal thread already started!\n");
  161.          goto out;
  162. @@ -349,11 +404,20 @@ int nfs41_session_set_lease(
  163.      }
  164.  
  165.      session->lease_time = lease_time;
  166. -    session->renew_thread = (HANDLE)_beginthreadex(NULL,
  167. -        0, renew_session, session, 0, &thread_id);
  168. -    if (!valid_handle(session->renew_thread)) {
  169. +    session->renew.cancel_event = CreateEventA(NULL, TRUE, FALSE,
  170. +        "renew.cancel_event");
  171. +    if (!valid_handle(session->renew.cancel_event)) {
  172. +        status = GetLastError();
  173. +        eprintf("nfs41_session_set_lease: CreateEventA() failed %d\n",
  174. +            status);
  175. +        goto out;
  176. +    }
  177. +    session->renew.thread_handle = (HANDLE)_beginthreadex(NULL,
  178. +        0, renew_session_thread, session, 0, &thread_id);
  179. +    if (!valid_handle(session->renew.thread_handle)) {
  180.          status = GetLastError();
  181. -        eprintf("_beginthreadex failed %d\n", status);
  182. +        eprintf("nfs41_session_set_lease: _beginthreadex() failed %d\n",
  183. +            status);
  184.          goto out;
  185.      }
  186.  out:
  187. @@ -364,11 +428,9 @@ void nfs41_session_free(
  188.      IN nfs41_session *session)
  189.  {
  190.      AcquireSRWLockExclusive(&session->client->session_lock);
  191. -    if (valid_handle(session->renew_thread)) {
  192. +    if (valid_handle(session->renew.thread_handle)) {
  193.          dprintf(1, "nfs41_session_free: terminating session renewal thread\n");
  194. -        if (!TerminateThread(session->renew_thread, NO_ERROR))
  195. -            eprintf("failed to terminate renewal thread %p\n",
  196. -                session->renew_thread);
  197. +        cancel_renew_thread(session);
  198.      }
  199.  
  200.      if (session->isValidState) {
  201. --
  202. 2.42.1
  203.  
  204. From 7de2d31956ee0e937f496ed3aea656f075fed553 Mon Sep 17 00:00:00 2001
  205. From: Roland Mainz <roland.mainz@nrubsig.org>
  206. Date: Sat, 6 Jan 2024 19:54:34 +0100
  207. Subject: [PATCH 2/3] tests: Update manual testing instructions
  208.  
  209. Update manual testing instructions to match newer ksh93/bash/gcc/clang
  210. versions.
  211.  
  212. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  213. ---
  214. tests/manual_testing.txt | 13 +++++++++++--
  215.  1 file changed, 11 insertions(+), 2 deletions(-)
  216.  
  217. diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt
  218. index c23d337..761ea98 100644
  219. --- a/tests/manual_testing.txt
  220. +++ b/tests/manual_testing.txt
  221. @@ -1,5 +1,5 @@
  222.  #
  223. -# ms-nfs41-client manual testing sequence, 2023-11-20
  224. +# ms-nfs41-client manual testing sequence, 2024-01-05
  225.  #
  226.  # Draft version, needs to be turned into automated tests
  227.  # if possible
  228. @@ -30,7 +30,7 @@ git config --global --add safe.directory "$PWD"
  229.  sed -i -r 's/mkfifo.+?(-m [[:digit:]]+)/mkfifo /g' ./src/cmd/INIT/package.sh ./bin/package
  230.  # repeat:
  231.  rm -Rf arch
  232. -time ksh93 -c 'export SHELL=/bin/bash HOSTTYPE="cygwin.i386-64"; /bin/bash ./bin/package make CC="/usr/bin/cc -std=gnu11" CCFLAGS="-Os -g" SHELL="$SHELL" HOSTTYPE="$HOSTTYPE"' 2>&1 | tee buildlog.log
  233. +time ksh93 -c 'export SHELL=/bin/bash HOSTTYPE="cygwin.i386-64"; /bin/bash ./bin/package make CC="/usr/bin/cc -std=gnu17" CCFLAGS="-Os -g" SHELL="$SHELL" HOSTTYPE="$HOSTTYPE"' 2>&1 | tee buildlog.log
  234.  
  235.  
  236.  #
  237. @@ -49,6 +49,14 @@ printf "path_len=%d\n" "${#PWD}"
  238.  
  239.  git clone https://git.savannah.gnu.org/git/bash.git
  240.  cd bash/
  241. +# Cygwin: workaround for configure using cp -p where ln -s should be used
  242. +# (this is an automake/autoconf issue, they should trust Cygwin and not use
  243. +# ancient workarounds for issues which no longer exists)
  244. +(set -o xtrace ; sed -i "s/as_ln_s='cp -pR'/as_ln_s='ln -s'/g" $(find . -name configure) )
  245. +./configure
  246. +# workaround for $ cp -p # failing with "Function not implemented"
  247. +(set -o xtrace ; sed -i -r 's/(cp.*)([[:space:]]+-p[[:space:]]+)/\2--no-preserve=ownership /g' $(find . -name Makefile -o -name Makefile.in) )
  248. +# run configure
  249.  ./configure --with-curses
  250.  # repeat:
  251.  make clean && make -j4 all
  252. @@ -89,6 +97,7 @@ cd gcc/
  253.  # (this is an automake/autoconf issue, they should trust Cygwin and not use
  254.  # ancient workarounds for issues which no longer exists)
  255.  (set -o xtrace ; sed -i "s/as_ln_s='cp -pR'/as_ln_s='ln -s'/g" $(find . -name configure) )
  256. +# run configure
  257.  ./configure
  258.  # workaround for $ cp -p # failing with "Function not implemented"
  259.  (set -o xtrace ; sed -i -r 's/(cp.*)([[:space:]]+-p[[:space:]]+)/\1\2--no-preserve=ownership /g' $(find . -name Makefile -o -name Makefile.in) )
  260. --
  261. 2.42.1
  262.  
  263. From 5f8125c9ccbca76dc4ef4a87dcd38b61d29b257d Mon Sep 17 00:00:00 2001
  264. From: Roland Mainz <roland.mainz@nrubsig.org>
  265. Date: Sat, 6 Jan 2024 20:26:19 +0100
  266. Subject: [PATCH 3/3] tests: Add "winfstest" test suite patches and usage
  267.  documentation
  268.  
  269. Add "winfstest" test suite patches and usage documentation.
  270.  
  271. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  272. ---
  273. cygwin/README.txt                             |  3 +
  274.  ...-VS-project-file-to-VS19-and-make-fi.patch | 85 +++++++++++++++++++
  275.  tests/winfstest/README.txt                    | 33 +++++++
  276.  3 files changed, 121 insertions(+)
  277.  create mode 100644 tests/winfstest/0001-winfstest-Update-VS-project-file-to-VS19-and-make-fi.patch
  278.  create mode 100644 tests/winfstest/README.txt
  279.  
  280. diff --git a/cygwin/README.txt b/cygwin/README.txt
  281. index 52332d3..39dd517 100644
  282. --- a/cygwin/README.txt
  283. +++ b/cygwin/README.txt
  284. @@ -101,6 +101,9 @@ mkdir testdir1
  285.  ./runtests -a -t "$PWD/testdir1" 2>&1 | tee testrun.log
  286.  
  287.  
  288. +** "winfstest" test suite:
  289. +See tests/winfstest/README.txt
  290. +
  291.  
  292.  #### ToDo:
  293.  - Makefile/script support for release blob generaetion, local test installation, running cthon4 etc
  294. diff --git a/tests/winfstest/0001-winfstest-Update-VS-project-file-to-VS19-and-make-fi.patch b/tests/winfstest/0001-winfstest-Update-VS-project-file-to-VS19-and-make-fi.patch
  295. new file mode 100644
  296. index 0000000..8d843bb
  297. --- /dev/null
  298. +++ b/tests/winfstest/0001-winfstest-Update-VS-project-file-to-VS19-and-make-fi.patch
  299. @@ -0,0 +1,85 @@
  300. +From 1774b2b23a49a1a5d672b624fe3750b6f04b818d Mon Sep 17 00:00:00 2001
  301. +From: Roland Mainz <roland.mainz@nrubsig.org>
  302. +Date: Sat, 6 Jan 2024 20:02:20 +0100
  303. +Subject: [PATCH] winfstest: Update VS project file to VS19 and make files
  304. + executable
  305. +
  306. +Update Visual Studio project file to Visual Studio 19 and make
  307. +script files executable
  308. +
  309. +(requires https://github.com/dimov-cz/winfstest.git commit
  310. +id #525f878c06c585619eadd769c8ed9dcdf175b026)
  311. +
  312. +Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  313. +---
  314. + TestSuite/run-winfstest     |  3 +++
  315. + TestSuite/simpletap.py      |  0
  316. + TestSuite/winfstest.py      |  0
  317. + winfstest/winfstest.vcxproj | 10 +++++-----
  318. + 4 files changed, 8 insertions(+), 5 deletions(-)
  319. + mode change 100644 => 100755 TestSuite/run-winfstest
  320. + mode change 100644 => 100755 TestSuite/simpletap.py
  321. + mode change 100644 => 100755 TestSuite/winfstest.py
  322. +
  323. +diff --git a/TestSuite/run-winfstest b/TestSuite/run-winfstest
  324. +old mode 100644
  325. +new mode 100755
  326. +index c7cc19f..8783703
  327. +--- a/TestSuite/run-winfstest
  328. ++++ b/TestSuite/run-winfstest
  329. +@@ -1,5 +1,8 @@
  330. + #!/bin/bash
  331. +
  332. ++set -o xtrace
  333. ++set -o nounset
  334. ++
  335. + case $(uname) in
  336. + CYGWIN*) ;;
  337. + *) echo "can only be run on Cygwin" 1>&2; exit 1
  338. +diff --git a/TestSuite/simpletap.py b/TestSuite/simpletap.py
  339. +old mode 100644
  340. +new mode 100755
  341. +diff --git a/TestSuite/winfstest.py b/TestSuite/winfstest.py
  342. +old mode 100644
  343. +new mode 100755
  344. +diff --git a/winfstest/winfstest.vcxproj b/winfstest/winfstest.vcxproj
  345. +index 6c8cbce..f13facf 100644
  346. +--- a/winfstest/winfstest.vcxproj
  347. ++++ b/winfstest/winfstest.vcxproj
  348. +@@ -21,28 +21,28 @@
  349. +   <PropertyGroup Label="Globals">
  350. +     <ProjectGuid>{71483DEC-695B-4EC8-9007-6E0CA9A0010C}</ProjectGuid>
  351. +     <Keyword>MakeFileProj</Keyword>
  352. +-    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
  353. ++    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
  354. +   </PropertyGroup>
  355. +   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  356. +   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
  357. +     <ConfigurationType>Application</ConfigurationType>
  358. +     <UseDebugLibraries>true</UseDebugLibraries>
  359. +-    <PlatformToolset>v140</PlatformToolset>
  360. ++    <PlatformToolset>v142</PlatformToolset>
  361. +   </PropertyGroup>
  362. +   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
  363. +     <ConfigurationType>Makefile</ConfigurationType>
  364. +     <UseDebugLibraries>false</UseDebugLibraries>
  365. +-    <PlatformToolset>v140</PlatformToolset>
  366. ++    <PlatformToolset>v142</PlatformToolset>
  367. +   </PropertyGroup>
  368. +   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
  369. +     <ConfigurationType>Application</ConfigurationType>
  370. +     <UseDebugLibraries>true</UseDebugLibraries>
  371. +-    <PlatformToolset>v140</PlatformToolset>
  372. ++    <PlatformToolset>v142</PlatformToolset>
  373. +   </PropertyGroup>
  374. +   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
  375. +     <ConfigurationType>Application</ConfigurationType>
  376. +     <UseDebugLibraries>false</UseDebugLibraries>
  377. +-    <PlatformToolset>v140</PlatformToolset>
  378. ++    <PlatformToolset>v142</PlatformToolset>
  379. +   </PropertyGroup>
  380. +   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  381. +   <ImportGroup Label="ExtensionSettings">
  382. +--
  383. +2.42.1
  384. +
  385. diff --git a/tests/winfstest/README.txt b/tests/winfstest/README.txt
  386. new file mode 100644
  387. index 0000000..a6b35b3
  388. --- /dev/null
  389. +++ b/tests/winfstest/README.txt
  390. @@ -0,0 +1,33 @@
  391. +#
  392. +# winfstest testsuite usage instructions
  393. +# for ms-nfs41-client
  394. +#
  395. +
  396. +set -o xtrace
  397. +set -o nounset
  398. +set -o errexit
  399. +
  400. +git clone https://github.com/kofemann/ms-nfs41-client.git
  401. +git clone https://github.com/dimov-cz/winfstest.git
  402. +cd winfstest/
  403. +
  404. +# switch to commit which is known to work (with our patches)
  405. +git checkout '525f878c06c585619eadd769c8ed9dcdf175b026'
  406. +git am --ignore-whitespace <'../ms-nfs41-client/tests/winfstest/0001-winfstest-Update-VS-project-file-to-VS19-and-make-fi.patch'
  407. +
  408. +# build test suite binaries
  409. +export PATH+=":/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/MSBuild/Current/Bin/"
  410. +MSBuild.exe winfstest.sln -t:Build -p:Configuration=Debug -p:Platform=x64
  411. +
  412. +# get testsuite binary path
  413. +cd TestSuite
  414. +winfstest_testsuite_path="$(pwd)"
  415. +
  416. +# create test dir on NFSv4.1 filesystem
  417. +mkdir -p /cygdrive/t/winfstesttmp
  418. +cd /cygdrive/t/winfstesttmp
  419. +
  420. +# run testsuite
  421. +${winfstest_testsuite_path}/run-winfstest
  422. +
  423. +# EOF.
  424. --
  425. 2.42.1

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:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




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