From: Jeff Layton <jlayton@kernel.org>
To: Calum Mackay <calum.mackay@oracle.com>
Cc: Chuck Lever <chuck.lever@oracle.com>, NeilBrown <neil@brown.name>,
Olga Kornievskaia <okorniev@redhat.com>,
Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
Trond Myklebust <trondmy@kernel.org>,
Anna Schumaker <anna@kernel.org>,
linux-nfs@vger.kernel.org, Jeff Layton <jlayton@kernel.org>
Subject: [PATCH pynfs v2 03/25] server41tests: add a basic GET_DIR_DELEGATION test
Date: Thu, 16 Apr 2026 11:14:35 -0700 [thread overview]
Message-ID: <20260416-dir-deleg-v2-3-fad510db5941@kernel.org> (raw)
In-Reply-To: <20260416-dir-deleg-v2-0-fad510db5941@kernel.org>
Test basic dir delegation handout, recall and return
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
nfs4.1/nfs4client.py | 6 +++
nfs4.1/server41tests/__init__.py | 1 +
nfs4.1/server41tests/st_dir_deleg.py | 102 +++++++++++++++++++++++++++++++++++
3 files changed, 109 insertions(+)
diff --git a/nfs4.1/nfs4client.py b/nfs4.1/nfs4client.py
index 25d7fd16f12b..dbe7af761f16 100644
--- a/nfs4.1/nfs4client.py
+++ b/nfs4.1/nfs4client.py
@@ -283,6 +283,12 @@ class NFS4Client(rpc.Client, rpc.Server):
res = self.posthook(arg, env, res=NFS4_OK)
return encode_status(res)
+ def op_cb_notify(self, arg, env):
+ log_cb.info("In CB_NOTIFY")
+ self.prehook(arg, env)
+ res = self.posthook(arg, env, res=NFS4_OK)
+ return encode_status(res)
+
def op_cb_notify_lock(self, arg, env):
log_cb.info("In CB_NOTIFY_LOCK")
self.prehook(arg, env)
diff --git a/nfs4.1/server41tests/__init__.py b/nfs4.1/server41tests/__init__.py
index 156c5e3082eb..c654212c617e 100644
--- a/nfs4.1/server41tests/__init__.py
+++ b/nfs4.1/server41tests/__init__.py
@@ -28,4 +28,5 @@ __all__ = ["st_exchange_id.py", # draft 21
"st_xattr.py",
"st_courtesy.py",
"st_callback.py",
+ "st_dir_deleg.py",
]
diff --git a/nfs4.1/server41tests/st_dir_deleg.py b/nfs4.1/server41tests/st_dir_deleg.py
new file mode 100644
index 000000000000..ab4387f0bd9b
--- /dev/null
+++ b/nfs4.1/server41tests/st_dir_deleg.py
@@ -0,0 +1,102 @@
+from .st_create_session import create_session
+from .st_open import open_claim4
+from xdrdef.nfs4_const import *
+from xdrdef.nfs4_pack import NFS4Unpacker
+
+from .environment import check, fail, create_obj, use_obj
+from xdrdef.nfs4_type import *
+import nfs_ops
+op = nfs_ops.NFS4ops()
+import nfs4lib
+import threading
+
+zerotime = nfstime4(seconds=0, nseconds=0)
+
+def decode_notify_event(change):
+ """Decode a notify4 into its typed event structure."""
+ mask = nfs4lib.bitmap2list(change.notify_mask)
+ unpacker = NFS4Unpacker(change.notify_vals)
+ if NOTIFY4_REMOVE_ENTRY in mask:
+ return (NOTIFY4_REMOVE_ENTRY, unpacker.unpack_notify_remove4())
+ elif NOTIFY4_ADD_ENTRY in mask:
+ return (NOTIFY4_ADD_ENTRY, unpacker.unpack_notify_add4())
+ elif NOTIFY4_RENAME_ENTRY in mask:
+ return (NOTIFY4_RENAME_ENTRY, unpacker.unpack_notify_rename4())
+ elif NOTIFY4_CHANGE_DIR_ATTRS in mask:
+ return (NOTIFY4_CHANGE_DIR_ATTRS, unpacker.unpack_notify_attr4())
+ return (None, None)
+
+def bitmap4_to_int(bitmap):
+ """Convert a bitmap4 (list of uint32 words) to a single integer."""
+ result = 0
+ for i, word in enumerate(bitmap):
+ result |= word << (32 * i)
+ return result
+
+def _getDirDeleg(t, env, notify_mask, cb):
+ def recall_pre_hook(arg, env):
+ cb.stateid = arg.stateid # NOTE this must be done before set()
+ cb.cred = env.cred.raw_cred
+ cb.got_recall = True
+ env.notify = cb.set # This is called after compound sent to queue
+ def recall_post_hook(arg, env, res):
+ return res
+ def notify_pre_hook(arg, env):
+ cb.stateid = arg.cna_stateid
+ cb.fh = arg.cna_fh
+ cb.changes = arg.cna_changes
+ cb.got_notify = True
+ env.notify = cb.set # This is called after compound sent to queue
+ def notify_post_hook(arg, env, res):
+ return res
+
+ cb.got_recall = False
+ cb.got_notify = False
+
+ c = env.c1
+ sess1 = c.new_client_session(b"%s_1" % env.testname(t))
+ sess1.client.cb_pre_hook(OP_CB_RECALL, recall_pre_hook)
+ sess1.client.cb_post_hook(OP_CB_RECALL, recall_post_hook)
+ sess1.client.cb_pre_hook(OP_CB_NOTIFY, notify_pre_hook)
+ sess1.client.cb_post_hook(OP_CB_NOTIFY, notify_post_hook)
+
+ topdir = c.homedir + [t.code.encode('utf8')]
+ res = create_obj(sess1, topdir)
+ check(res)
+ fh = res.resarray[-1].object
+
+ ops = [ op.putfh(fh), op.get_dir_delegation(False,
+ nfs4lib.list2bitmap(notify_mask),
+ zerotime, zerotime,
+ nfs4lib.list2bitmap([]),
+ nfs4lib.list2bitmap([]))]
+ res = sess1.compound(ops)
+ check(res)
+ deleg = res.resarray[-1].gddrnf_resok4.gddr_stateid
+ return (sess1, fh, deleg)
+
+def testDirDelegSimple(t, env):
+ """Test basic dir delegation handout, recall and return
+
+ FLAGS: dirdeleg all
+ CODE: DIRDELEG1
+ """
+ c = env.c1
+ recall = threading.Event()
+ sess1, fh, deleg = _getDirDeleg(t, env, [], recall)
+
+ # new client -- create a file in the dir
+ sess2 = c.new_client_session(b"%s_2" % env.testname(t))
+ claim = open_claim4(CLAIM_NULL, env.testname(t))
+ owner = open_owner4(0, b"owner")
+ how = openflag4(OPEN4_CREATE, createhow4(GUARDED4, {FATTR4_SIZE:0}))
+ open_op = [ op.putfh(fh), op.open(0,
+ OPEN4_SHARE_ACCESS_WRITE | OPEN4_SHARE_ACCESS_WANT_NO_DELEG,
+ OPEN4_SHARE_DENY_NONE, owner, how, claim) ]
+ slot = sess2.compound_async(open_op)
+ completed = recall.wait(2)
+ env.sleep(.1)
+
+ ops = [ op.putfh(fh), op.delegreturn(deleg) ]
+ res = sess1.compound(ops)
+ check(res)
--
2.53.0
next prev parent reply other threads:[~2026-04-16 18:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-16 18:14 [PATCH pynfs v2 00/25] nfs4.1: add some directory delegation testcases Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 01/25] nfs4.1: add proposed NOTIFY4_GFLAG_EXTEND flag Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 02/25] nfs4.1: add a getfh() to the end of create_obj() compound Jeff Layton
2026-04-16 18:14 ` Jeff Layton [this message]
2026-04-16 18:14 ` [PATCH pynfs v2 04/25] server41tests: add a test for duplicate GET_DIR_DELEGATION requests Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 05/25] server41tests: pass_warn() when server doesn't support dir delegations Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 06/25] server41tests: test remove triggers dir delegation recall Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 07/25] server41tests: test rename " Jeff Layton
2026-04-17 0:40 ` Scott Mayhew
2026-04-17 15:42 ` Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 08/25] server41tests: test mkdir " Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 09/25] server41tests: test link " Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 10/25] server41tests: test no notifications without GFLAG_EXTEND Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 11/25] server41tests: test unrequested notification type triggers recall Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 12/25] server41tests: add a test for removal from dir with dir delegation Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 13/25] server41tests: add a test for directory add notifications Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 14/25] server41tests: add test for RENAME event notifications Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 15/25] server41tests: verify child attributes in ADD notification Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 16/25] server41tests: test CHANGE_DIR_ATTRS notification Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 17/25] server41tests: test mkdir triggers ADD notification Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 18/25] server41tests: test DELEGRETURN stops notifications Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 19/25] server41tests: verify filehandle in ADD notification Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 20/25] server41tests: test cross-directory rename REMOVE notification Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 21/25] server41tests: test cross-directory rename ADD notification on target Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 22/25] server41tests: test link triggers ADD notification Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 23/25] server41tests: test same-client changes don't trigger notifications Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 24/25] server41tests: test cross-directory rename-over nad_old_entry Jeff Layton
2026-04-16 18:14 ` [PATCH pynfs v2 25/25] server41tests: test within-directory " Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260416-dir-deleg-v2-3-fad510db5941@kernel.org \
--to=jlayton@kernel.org \
--cc=Dai.Ngo@oracle.com \
--cc=anna@kernel.org \
--cc=calum.mackay@oracle.com \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=neil@brown.name \
--cc=okorniev@redhat.com \
--cc=tom@talpey.com \
--cc=trondmy@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox