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 lookup ca_maxop rounding, debug messages+misc, 2024-03-18
Posted by Anonymous on Mon 18th Mar 2024 16:09
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 971a08e70d03a723b3db29f62c37dcb1c6dbcff0 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Mon, 18 Mar 2024 13:31:37 +0100 Subject: [PATCH 1/4] daemon: Lookup should not send more operations than negotiated Lookup should not send more operations than negotiated at session creation. Turns out this is simply a rounding issue, we should round the number of operations down, not round them up. Originally reported client-side error message for Linux kernel 6.6 LTS (reproduced with Linux 6.6.20-rt25), with |ca_maxoperations==50|: ---- snip ---- 28a4: successful reply with only 50 operations, sent 52! 28a4: clnt_call returned rpc_status = 'RPC_CANTDECODERES' 28a4: UNHANDLED RPC_ERROR: 2 28a4: [session] sr_sessionid != sa_sessionid ---- snip ---- Reported-by: Martin Wege <martin.l.wege@gmail.com> Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/lookup.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/daemon/lookup.c b/daemon/lookup.c index e15046a..b93609a 100644 --- a/daemon/lookup.c +++ b/daemon/lookup.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 @@ -45,6 +46,7 @@ * MAX_LOOKUP_COMPONENTS)|), see |max_lookup_components()| below. * * Linux 5.10.0-22-rt uses |ca_maxoperations==16| + * Linux 6.6.20-rt25 uses |ca_maxoperations==50| * simplenfs/nfs4j uses |ca_maxoperations==128| * */ @@ -290,12 +292,16 @@ out: static uint32_t max_lookup_components( IN const nfs41_session *session) { -#define ROUNDUPDIV(x, y) (((x)+((y)-1))/(y)) const uint32_t comps = min( session->fore_chan_attrs.ca_maxoperations, MAX_LOOKUP_COMPONENTS); - return ROUNDUPDIV(comps-4, 3); + /* + * Make sure we round this value down, otherwise not all + * our requests will fit into the + * |session->fore_chan_attrs.ca_maxoperations| limit + */ + return ((comps-4) / 3); } static uint32_t get_component_array( -- 2.43.0 From 6c3abfc65cd261d21814c36b684e6d4ef5588764 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Mon, 18 Mar 2024 13:38:33 +0100 Subject: [PATCH 2/4] cygwin: Bump Cygwin version in bintarball README Bump Cygwin version in bintarball README to Cygwin 3.5.1+3.6.x Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/README.bintarball.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt index 26cc9c3..a5ea187 100644 --- a/cygwin/README.bintarball.txt +++ b/cygwin/README.bintarball.txt @@ -62,7 +62,7 @@ NFSv4.1 client and filesystem driver for Windows 10/11 # 3. Requirements: # - Windows 10 or Windows 11 -- Cygwin 3.5.0 +- Cygwin 3.5.1 (or 3.6.x-devel) - Packages (required): cygwin cygwin-devel -- 2.43.0 From e6dff639b3a2abd1ba9ee4d5b410ea551cde8da0 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Mon, 18 Mar 2024 13:41:02 +0100 Subject: [PATCH 3/4] daemon: More debug output for |ca_*| values+warning if |ca_maxoperations| too small Add more debug output for |ca_*| values at session creation time, plus add a warning if |ca_maxoperations| too small for handling long paths with out splitting requests. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/nfs41_ops.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/daemon/nfs41_ops.c b/daemon/nfs41_ops.c index 5d0bb20..cec58ad 100644 --- a/daemon/nfs41_ops.c +++ b/daemon/nfs41_ops.c @@ -141,6 +141,9 @@ int nfs41_create_session(nfs41_client *clnt, nfs41_session *session, bool_t try_ nfs41_create_session_args req = { 0 }; nfs41_create_session_res reply = { 0 }; + DPRINTF(1, ("--> nfs41_create_session(clnt=0x%p,session=0x%p,try_recovery=%d)\n", + clnt, session, (int)try_recovery)); + compound_init(&compound, &argop, &resop, "create_session"); compound_add_op(&compound, OP_CREATE_SESSION, &req, &reply); @@ -166,6 +169,13 @@ int nfs41_create_session(nfs41_client *clnt, nfs41_session *session, bool_t try_ reply.csr_fore_chan_attrs = &session->fore_chan_attrs; reply.csr_back_chan_attrs = &session->back_chan_attrs; + DPRINTF(1, ("nfs41_create_session: " + "Requested req.csa_fore_chan_attrs." + "(ca_maxoperations=%d,ca_maxrequests=%d)\n", + (int)req.csa_fore_chan_attrs.ca_maxoperations, + (int)req.csa_fore_chan_attrs.ca_maxrequests)); + + status = compound_encode_send_decode(session, &compound, try_recovery); if (status) goto out; @@ -173,6 +183,19 @@ int nfs41_create_session(nfs41_client *clnt, nfs41_session *session, bool_t try_ if (compound_error(status = compound.res.status)) goto out; + DPRINTF(1, ("nfs41_create_session: " + "Response from server: session->fore_chan_attrs->" + "(ca_maxoperations=%d,ca_maxrequests=%d)\n", + (int)session->fore_chan_attrs.ca_maxoperations, + (int)session->fore_chan_attrs.ca_maxrequests)); + + if (session->fore_chan_attrs.ca_maxoperations < 64) { + eprintf("WARNING: Server returned ca_maxoperations(=%d) " + "< 64, this will lead to bad performance for deeply " + "nested dirs\n", + session->fore_chan_attrs.ca_maxoperations); + } + print_hexbuf(1, (unsigned char *)"session id: ", session->session_id, NFS4_SESSIONID_SIZE); // check that csa_sequence is same as csr_sequence if (reply.csr_sequence != clnt->seq_id) { @@ -214,6 +237,9 @@ int nfs41_create_session(nfs41_client *clnt, nfs41_session *session, bool_t try_ session->fore_chan_attrs.ca_maxrequests); status = 0; out: + DPRINTF(1, ("<-- nfs41_create_session() returning %d\n", + status)); + return status; } -- 2.43.0 From 86107466341720d6d647a0110b811189233354f4 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Mon, 18 Mar 2024 14:19:31 +0100 Subject: [PATCH 4/4] daemon: Fix |handle_readdir()| debug enter/leave message+better debug output Fix |handle_readdir()| debug enter/leave message (e.g. "->" ---> "-->" and "<-" ---> "<--") and improve debug output. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/readdir.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/daemon/readdir.c b/daemon/readdir.c index f4780e8..11186bf 100644 --- a/daemon/readdir.c +++ b/daemon/readdir.c @@ -643,8 +643,8 @@ static int handle_readdir(void *deamon_context, nfs41_upcall *upcall) const uint32_t max_buf_len = max(args->buf_len, sizeof(nfs41_readdir_entry) + NFS41_MAX_COMPONENT_LEN); - DPRINTF(1, ("-> handle_nfs41_dirquery('%s',%d,%d,%d)\n", - args->filter, args->initial, args->restart, args->single)); + DPRINTF(1, ("--> handle_nfs41_dirquery(filter='%s',initial=%d,restart=%d,single=%d)\n", + args->filter, (int)args->initial, (int)args->restart, (int)args->single)); args->query_reply_len = 0; @@ -795,27 +795,33 @@ fetch_entries: out_free_entry: free(entry_buf); out: - DPRINTF(1, ("<- handle_nfs41_dirquery('%s',%d,%d,%d) returning ", - args->filter, args->initial, args->restart, args->single)); + const char *debug_status_msg = "<NULL>"; + if (status) { switch (status) { case ERROR_FILE_NOT_FOUND: - DPRINTF(1, ("ERROR_FILE_NOT_FOUND.\n")); + debug_status_msg = "ERROR_FILE_NOT_FOUND"; break; case ERROR_NO_MORE_FILES: - DPRINTF(1, ("ERROR_NO_MORE_FILES.\n")); + debug_status_msg = "ERROR_NO_MORE_FILES"; break; case ERROR_BUFFER_OVERFLOW: upcall->last_error = status; status = ERROR_SUCCESS; - break; - default: - DPRINTF(1, ("error code %d.\n", status)); + debug_status_msg = "ERROR_BUFFER_OVERFLOW==SUCCESS"; break; } - } else { - DPRINTF(1, ("success!\n")); } + else { + debug_status_msg = "SUCCESS"; + } + + DPRINTF(1, ("<-- handle_nfs41_dirquery(" + "filter='%s',initial=%d,restart=%d,single=%d) " + "returning %d ('%s')\n", + args->filter, (int)args->initial, (int)args->restart, + (int)args->single, status, debug_status_msg)); + return status; out_free_cookie: state->cookie.cookie = 0; -- 2.43.0

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