Attachment 17545 Details for Bug 15182 – git-am fix for 4.17.next, 4.16.next

[patch] git-am fix for 4.17.next, 4.16.next

bug-15182-4.17 (text/plain), 10.84 KB, created by Jeremy Allison on 2022-10-06 23:55:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2022-10-06 23:55:36 UTC

Size: 10.84 KB

patch

obsolete

>From 448febb0eb35c2df4c7ddd43ba30d1401ed52395 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 20 Sep 2022 12:08:29 -0700
>Subject: [PATCH 1/3] s4: smbtorture: Add fsync_resource_fork test to fruit
> tests.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This shows we currently hang when sending an SMB2_OP_FLUSH on
>an AFP_Resource fork.
>
>Adds knownfail.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15182
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Ralph BÃ¶hme <slow@samba.org>
>(cherry picked from commit 1b8a8732848169c632af12b7c2b4cd3ee73be244)
>---
> selftest/knownfail.d/fruit_fsync |  3 ++
> source4/torture/vfs/fruit.c      | 80 ++++++++++++++++++++++++++++++++
> 2 files changed, 83 insertions(+)
> create mode 100644 selftest/knownfail.d/fruit_fsync
>
>diff --git a/selftest/knownfail.d/fruit_fsync b/selftest/knownfail.d/fruit_fsync
>new file mode 100644
>index 00000000000..15745bdae0e
>--- /dev/null
>+++ b/selftest/knownfail.d/fruit_fsync
>@@ -0,0 +1,3 @@
>+^samba3.vfs.fruit\ metadata_stream.fsync_resource_fork.nt4_dc
>+^samba3.vfs.fruit\ metadata_netatalk.fsync_resource_fork.nt4_dc
>+^samba3.vfs.fruit\ fruit_delete_empty_adfiles.fsync_resource_fork.nt4_dc
>diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
>index fa758794368..3621fec460c 100644
>--- a/source4/torture/vfs/fruit.c
>+++ b/source4/torture/vfs/fruit.c
>@@ -2718,6 +2718,85 @@ done:
> 	return ret;
> }
> 
>+/*
>+ * BUG: https://bugzilla.samba.org/show_bug.cgi?id=15182
>+ */
>+
>+static bool test_rfork_fsync(struct torture_context *tctx,
>+			      struct smb2_tree *tree)
>+{
>+	TALLOC_CTX *mem_ctx = talloc_new(tctx);
>+	const char *fname = BASEDIR "\\torture_rfork_fsync";
>+	const char *rfork = BASEDIR "\\torture_rfork_fsync" AFPRESOURCE_STREAM;
>+	NTSTATUS status;
>+	struct smb2_handle testdirh;
>+	bool ret = true;
>+	struct smb2_create create;
>+	struct smb2_handle fh1;
>+	struct smb2_flush f;
>+
>+	ZERO_STRUCT(fh1);
>+
>+	ret = enable_aapl(tctx, tree);
>+	torture_assert_goto(tctx, ret == true, ret, done, "enable_aapl failed");
>+
>+	smb2_util_unlink(tree, fname);
>+
>+	status = torture_smb2_testdir(tree, BASEDIR, &testdirh);
>+	torture_assert_ntstatus_ok_goto(tctx,
>+					status,
>+					ret,
>+					done,
>+					"torture_smb2_testdir");
>+	smb2_util_close(tree, testdirh);
>+
>+	ret = torture_setup_file(mem_ctx, tree, fname, false);
>+	if (ret == false) {
>+		goto done;
>+	}
>+
>+	torture_comment(tctx, "(%s) create resource fork %s\n",
>+		__location__,
>+		rfork);
>+
>+	ZERO_STRUCT(create);
>+	create.in.create_disposition  = NTCREATEX_DISP_OPEN_IF;
>+	create.in.desired_access      = SEC_STD_READ_CONTROL | SEC_FILE_ALL;
>+	create.in.file_attributes     = FILE_ATTRIBUTE_NORMAL;
>+	create.in.fname               = rfork;
>+	create.in.share_access        = NTCREATEX_SHARE_ACCESS_DELETE |
>+		NTCREATEX_SHARE_ACCESS_READ |
>+		NTCREATEX_SHARE_ACCESS_WRITE;
>+	status = smb2_create(tree, mem_ctx, &create);
>+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done, "smb2_create");
>+	fh1 = create.out.file.handle;
>+
>+	torture_comment(tctx, "(%s) Write 10 bytes to resource fork %s\n",
>+		__location__,
>+		rfork);
>+
>+	status = smb2_util_write(tree, fh1, "1234567890", 0, 10);
>+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
>+					"smb2_util_write failed\n");
>+
>+	torture_comment(tctx, "(%s) fsync on resource fork %s\n",
>+		__location__,
>+		rfork);
>+
>+	f.in.file.handle = fh1;
>+	status = smb2_flush(tree, &f);
>+	torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
>+					"smb2_flush failed\n");
>+
>+done:
>+
>+	smb2_util_close(tree, fh1);
>+	smb2_util_unlink(tree, fname);
>+	smb2_deltree(tree, BASEDIR);
>+	talloc_free(mem_ctx);
>+	return ret;
>+}
>+
> static bool test_rfork_create_ro(struct torture_context *tctx,
> 				 struct smb2_tree *tree)
> {
>@@ -6961,6 +7040,7 @@ struct torture_suite *torture_vfs_fruit(TALLOC_CTX *ctx)
> 	torture_suite_add_1smb2_test(suite, "stream names", test_stream_names);
> 	torture_suite_add_1smb2_test(suite, "truncate resource fork to 0 bytes", test_rfork_truncate);
> 	torture_suite_add_1smb2_test(suite, "opening and creating resource fork", test_rfork_create);
>+	torture_suite_add_1smb2_test(suite, "fsync_resource_fork", test_rfork_fsync);
> 	torture_suite_add_1smb2_test(suite, "rename_dir_openfile", test_rename_dir_openfile);
> 	torture_suite_add_1smb2_test(suite, "File without AFP_AfpInfo", test_afpinfo_enoent);
> 	torture_suite_add_1smb2_test(suite, "create delete-on-close AFP_AfpInfo", test_create_delete_on_close);
>-- 
>2.34.1
>
>
>From 59cfe5f2763991298031d4647f554ff9f201ad1c Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 20 Sep 2022 13:25:22 -0700
>Subject: [PATCH 2/3] s3: VFS: fruit. Implement fsync_send()/fsync_recv().
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>For type == ADOUBLE_META, fio->fake_fd is true so
>writes are already synchronous, just call tevent_req_post().
>
>For type == ADOUBLE_RSRC we know we are configured
>with FRUIT_RSRC_ADFILE (because fruit_must_handle_aio_stream()
>returned true), so we can just call SMB_VFS_NEXT_FSYNC_SEND()
>after replacing fsp with fio->ad_fsp.
>
>Remove knownfail.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15182
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Ralph BÃ¶hme <slow@samba.org>
>(cherry picked from commit 35c637f2e6c671acf8fb9c2a67774bd5e74dd7d0)
>---
> selftest/knownfail.d/fruit_fsync |   3 -
> source3/modules/vfs_fruit.c      | 102 +++++++++++++++++++++++++++++++
> 2 files changed, 102 insertions(+), 3 deletions(-)
> delete mode 100644 selftest/knownfail.d/fruit_fsync
>
>diff --git a/selftest/knownfail.d/fruit_fsync b/selftest/knownfail.d/fruit_fsync
>deleted file mode 100644
>index 15745bdae0e..00000000000
>--- a/selftest/knownfail.d/fruit_fsync
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-^samba3.vfs.fruit\ metadata_stream.fsync_resource_fork.nt4_dc
>-^samba3.vfs.fruit\ metadata_netatalk.fsync_resource_fork.nt4_dc
>-^samba3.vfs.fruit\ fruit_delete_empty_adfiles.fsync_resource_fork.nt4_dc
>diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
>index 13033096dc9..3b657f92b3d 100644
>--- a/source3/modules/vfs_fruit.c
>+++ b/source3/modules/vfs_fruit.c
>@@ -3071,6 +3071,106 @@ static ssize_t fruit_pwrite_recv(struct tevent_req *req,
> 	return state->nwritten;
> }
> 
>+struct fruit_fsync_state {
>+	int ret;
>+	struct vfs_aio_state vfs_aio_state;
>+};
>+
>+static void fruit_fsync_done(struct tevent_req *subreq);
>+
>+static struct tevent_req *fruit_fsync_send(
>+	struct vfs_handle_struct *handle,
>+	TALLOC_CTX *mem_ctx,
>+	struct tevent_context *ev,
>+	struct files_struct *fsp)
>+{
>+	struct tevent_req *req = NULL;
>+	struct tevent_req *subreq = NULL;
>+	struct fruit_fsync_state *state = NULL;
>+	struct fio *fio = fruit_get_complete_fio(handle, fsp);
>+
>+	req = tevent_req_create(mem_ctx, &state,
>+				struct fruit_fsync_state);
>+	if (req == NULL) {
>+		return NULL;
>+	}
>+
>+	if (fruit_must_handle_aio_stream(fio)) {
>+		struct adouble *ad = NULL;
>+
>+		if (fio->type == ADOUBLE_META) {
>+			/*
>+			 * We must never pass a fake_fd
>+			 * to lower level fsync calls.
>+			 * Everything is already done
>+			 * synchronously, so just return
>+			 * true.
>+			 */
>+			SMB_ASSERT(fio->fake_fd);
>+			tevent_req_done(req);
>+			return tevent_req_post(req, ev);
>+		}
>+
>+		/*
>+		 * We know the following must be true,
>+		 * as it's the condition for fruit_must_handle_aio_stream()
>+		 * to return true if fio->type == ADOUBLE_RSRC.
>+		 */
>+		SMB_ASSERT(fio->config->rsrc == FRUIT_RSRC_ADFILE);
>+		if (fio->ad_fsp == NULL) {
>+			tevent_req_error(req, EBADF);
>+			return tevent_req_post(req, ev);
>+		}
>+		ad = ad_fget(talloc_tos(), handle, fio->ad_fsp, ADOUBLE_RSRC);
>+		if (ad == NULL) {
>+			tevent_req_error(req, ENOMEM);
>+			return tevent_req_post(req, ev);
>+		}
>+		fsp = fio->ad_fsp;
>+	}
>+
>+	subreq = SMB_VFS_NEXT_FSYNC_SEND(state, ev, handle, fsp);
>+	if (tevent_req_nomem(req, subreq)) {
>+		return tevent_req_post(req, ev);
>+	}
>+	tevent_req_set_callback(subreq, fruit_fsync_done, req);
>+	return req;
>+}
>+
>+static void fruit_fsync_done(struct tevent_req *subreq)
>+{
>+	struct tevent_req *req = tevent_req_callback_data(
>+		subreq, struct tevent_req);
>+	struct fruit_fsync_state *state = tevent_req_data(
>+		req, struct fruit_fsync_state);
>+
>+	state->ret = SMB_VFS_FSYNC_RECV(subreq, &state->vfs_aio_state);
>+	TALLOC_FREE(subreq);
>+	if (state->ret != 0) {
>+		tevent_req_error(req, errno);
>+		return;
>+	}
>+	tevent_req_done(req);
>+}
>+
>+static int fruit_fsync_recv(struct tevent_req *req,
>+					struct vfs_aio_state *vfs_aio_state)
>+{
>+	struct fruit_fsync_state *state = tevent_req_data(
>+		req, struct fruit_fsync_state);
>+	int retval = -1;
>+
>+	if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
>+		tevent_req_received(req);
>+		return -1;
>+	}
>+
>+	*vfs_aio_state = state->vfs_aio_state;
>+	retval = state->ret;
>+	tevent_req_received(req);
>+	return retval;
>+}
>+
> /**
>  * Helper to stat/lstat the base file of an smb_fname.
>  */
>@@ -5305,6 +5405,8 @@ static struct vfs_fn_pointers vfs_fruit_fns = {
> 	.pread_recv_fn = fruit_pread_recv,
> 	.pwrite_send_fn = fruit_pwrite_send,
> 	.pwrite_recv_fn = fruit_pwrite_recv,
>+	.fsync_send_fn = fruit_fsync_send,
>+	.fsync_recv_fn = fruit_fsync_recv,
> 	.stat_fn = fruit_stat,
> 	.lstat_fn = fruit_lstat,
> 	.fstat_fn = fruit_fstat,
>-- 
>2.34.1
>
>
>From 778c2f1d7690ade700e2093fd0b2d9592b7145fe Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Thu, 6 Oct 2022 14:31:08 +0200
>Subject: [PATCH 3/3] vfs_fruit: add missing calls to tevent_req_received()
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15182
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Ralph BÃ¶hme <slow@samba.org>
>(cherry picked from commit a7fba3ff5996330158d3cc6bc24746a59492b690)
>---
> source3/modules/vfs_fruit.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
>index 3b657f92b3d..4058d4834e7 100644
>--- a/source3/modules/vfs_fruit.c
>+++ b/source3/modules/vfs_fruit.c
>@@ -2635,13 +2635,17 @@ static ssize_t fruit_pread_recv(struct tevent_req *req,
> {
> 	struct fruit_pread_state *state = tevent_req_data(
> 		req, struct fruit_pread_state);
>+	ssize_t retval = -1;
> 
> 	if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
>+		tevent_req_received(req);
> 		return -1;
> 	}
> 
> 	*vfs_aio_state = state->vfs_aio_state;
>-	return state->nread;
>+	retval = state->nread;
>+	tevent_req_received(req);
>+	return retval;
> }
> 
> static ssize_t fruit_pwrite_meta_stream(vfs_handle_struct *handle,
>@@ -3062,13 +3066,17 @@ static ssize_t fruit_pwrite_recv(struct tevent_req *req,
> {
> 	struct fruit_pwrite_state *state = tevent_req_data(
> 		req, struct fruit_pwrite_state);
>+	ssize_t retval = -1;
> 
> 	if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
>+		tevent_req_received(req);
> 		return -1;
> 	}
> 
> 	*vfs_aio_state = state->vfs_aio_state;
>-	return state->nwritten;
>+	retval = state->nwritten;
>+	tevent_req_received(req);
>+	return retval;
> }
> 
> struct fruit_fsync_state {
>-- 
>2.34.1
>

Flags:

slow: review+

Actions: View

Attachments on bug 15182: 17520 | 17524 | 17525 | 17545