From 5000640bf449be27e138a1fb86561d589953c83c Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Wed, 1 Apr 2009 18:44:15 -0700 Subject: s4 torture: Add new streams oplock test --- source4/torture/raw/oplock.c | 176 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) (limited to 'source4') diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index 0aeded8664..3493a552c3 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/torture/raw/oplock.c @@ -2855,6 +2855,181 @@ done: return ret; } +/* Test how oplocks work on streams. */ +static bool test_raw_oplock_stream1(struct torture_context *tctx, + struct smbcli_state *cli1, + struct smbcli_state *cli2) +{ + NTSTATUS status; + union smb_open io; + const char *fname_base = BASEDIR "\\test_stream1.txt"; + const char *stream = "Stream One:$DATA"; + const char *fname_stream, *fname_default_stream; + const char *default_stream = "::$DATA"; + bool ret = true; + int fnum = -1; + int i; + int stream_fnum = -1; + uint32_t batch_req = NTCREATEX_FLAGS_REQUEST_OPLOCK | + NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK | NTCREATEX_FLAGS_EXTENDED; + uint32_t exclusive_req = NTCREATEX_FLAGS_REQUEST_OPLOCK | + NTCREATEX_FLAGS_EXTENDED; + + /* Only passes against windows at the moment. */ + if (torture_setting_bool(tctx, "samba3", false) || + torture_setting_bool(tctx, "samba4", false)) { + torture_skip(tctx, "STREAM1 disabled against samba3+4\n"); + } + + fname_stream = talloc_asprintf(tctx, "%s:%s", fname_base, stream); + fname_default_stream = talloc_asprintf(tctx, "%s%s", fname_base, + default_stream); + + if (!torture_setup_dir(cli1, BASEDIR)) { + return false; + } + smbcli_unlink(cli1->tree, fname_base); + + smbcli_oplock_handler(cli2->transport, oplock_handler_ack_to_given, cli2->tree); + smbcli_oplock_handler(cli1->transport, oplock_handler_ack_to_given, cli1->tree); + + /* Setup generic open parameters. */ + io.generic.level = RAW_OPEN_NTCREATEX; + io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.access_mask = (SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA| + SEC_FILE_APPEND_DATA|SEC_STD_READ_CONTROL); + io.ntcreatex.in.create_options = 0; + io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL; + io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ | + NTCREATEX_SHARE_ACCESS_WRITE; + io.ntcreatex.in.alloc_size = 0; + io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS; + io.ntcreatex.in.security_flags = 0; + + /* Create the file with a stream */ + io.ntcreatex.in.fname = fname_stream; + io.ntcreatex.in.flags = 0; + io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE; + status = smb_raw_open(cli1->tree, tctx, &io); + CHECK_STATUS(tctx, status, NT_STATUS_OK); + smbcli_close(cli1->tree, io.ntcreatex.out.file.fnum); + + /* Change the disposition to open now that the file has been created. */ + io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN; + + /* Try some permutations of taking oplocks on streams. */ +#define NSTREAM_OPLOCK_RESULTS 8 + struct { + const char *fname; + bool open_base_file; + uint32_t oplock_req; + uint32_t oplock_granted; + } stream_oplock_results[NSTREAM_OPLOCK_RESULTS] = { + /* Request oplock on stream without the base file open. */ + {fname_stream, false, batch_req, NO_OPLOCK_RETURN}, + {fname_default_stream, false, batch_req, NO_OPLOCK_RETURN}, + {fname_stream, false, exclusive_req, EXCLUSIVE_OPLOCK_RETURN}, + {fname_default_stream, false, exclusive_req, EXCLUSIVE_OPLOCK_RETURN}, + + /* Request oplock on stream with the base file open. */ + {fname_stream, true, batch_req, NO_OPLOCK_RETURN}, + {fname_default_stream, true, batch_req, NO_OPLOCK_RETURN}, + {fname_stream, true, exclusive_req, EXCLUSIVE_OPLOCK_RETURN}, + {fname_default_stream, true, exclusive_req, LEVEL_II_OPLOCK_RETURN}, + + }; + + for (i = 0; i < NSTREAM_OPLOCK_RESULTS; i++) { + const char *fname = stream_oplock_results[i].fname; + bool open_base_file = stream_oplock_results[i].open_base_file; + uint32_t oplock_req = stream_oplock_results[i].oplock_req; + uint32_t oplock_granted = + stream_oplock_results[i].oplock_granted; + int base_fnum = -1; + + if (open_base_file) { + torture_comment(tctx, "Opening base file: %s with " + "%d\n", fname_base, oplock_req); + io.ntcreatex.in.fname = fname_base; + io.ntcreatex.in.flags = batch_req; + status = smb_raw_open(cli2->tree, tctx, &io); + CHECK_STATUS(tctx, status, NT_STATUS_OK); + CHECK_VAL(io.ntcreatex.out.oplock_level, + BATCH_OPLOCK_RETURN); + base_fnum = io.ntcreatex.out.file.fnum; + } + + torture_comment(tctx, "%d: Opening stream: %s with %d\n", i, + fname, oplock_req); + io.ntcreatex.in.fname = fname; + io.ntcreatex.in.flags = oplock_req; + + /* Do the open with the desired oplock on the stream. */ + status = smb_raw_open(cli1->tree, tctx, &io); + CHECK_STATUS(tctx, status, NT_STATUS_OK); + CHECK_VAL(io.ntcreatex.out.oplock_level, oplock_granted); + smbcli_close(cli1->tree, io.ntcreatex.out.file.fnum); + + /* Cleanup the base file if it was opened. */ + if (base_fnum != -1) { + smbcli_close(cli2->tree, base_fnum); + } + } + + /* Open the stream with an exclusive oplock. */ + torture_comment(tctx, "Opening stream: %s with %d\n", + fname_stream, exclusive_req); + io.ntcreatex.in.fname = fname_stream; + io.ntcreatex.in.flags = exclusive_req; + status = smb_raw_open(cli1->tree, tctx, &io); + CHECK_STATUS(tctx, status, NT_STATUS_OK); + CHECK_VAL(io.ntcreatex.out.oplock_level, EXCLUSIVE_OPLOCK_RETURN); + stream_fnum = io.ntcreatex.out.file.fnum; + + /* Open the base file and see if it contends. */ + ZERO_STRUCT(break_info); + torture_comment(tctx, "Opening base file: %s with " + "%d\n", fname_base, batch_req); + io.ntcreatex.in.fname = fname_base; + io.ntcreatex.in.flags = batch_req; + status = smb_raw_open(cli2->tree, tctx, &io); + CHECK_STATUS(tctx, status, NT_STATUS_OK); + CHECK_VAL(io.ntcreatex.out.oplock_level, + BATCH_OPLOCK_RETURN); + smbcli_close(cli2->tree, io.ntcreatex.out.file.fnum); + + CHECK_VAL(break_info.count, 0); + CHECK_VAL(break_info.failures, 0); + + /* Open the stream again to see if it contends. */ + ZERO_STRUCT(break_info); + torture_comment(tctx, "Opening stream again: %s with " + "%d\n", fname_base, batch_req); + io.ntcreatex.in.fname = fname_stream; + io.ntcreatex.in.flags = exclusive_req; + status = smb_raw_open(cli2->tree, tctx, &io); + CHECK_STATUS(tctx, status, NT_STATUS_OK); + CHECK_VAL(io.ntcreatex.out.oplock_level, + LEVEL_II_OPLOCK_RETURN); + smbcli_close(cli2->tree, io.ntcreatex.out.file.fnum); + + CHECK_VAL(break_info.count, 1); + CHECK_VAL(break_info.level, OPLOCK_BREAK_TO_LEVEL_II); + CHECK_VAL(break_info.failures, 0); + + /* Close the stream. */ + if (stream_fnum != -1) { + smbcli_close(cli1->tree, stream_fnum); + } + + done: + smbcli_close(cli1->tree, fnum); + smb_raw_exit(cli1->session); + smb_raw_exit(cli2->session); + smbcli_deltree(cli1->tree, BASEDIR); + return ret; +} + /* basic testing of oplocks */ @@ -2893,6 +3068,7 @@ struct torture_suite *torture_raw_oplock(TALLOC_CTX *mem_ctx) torture_suite_add_2smb_test(suite, "BATCH23", test_raw_oplock_batch23); torture_suite_add_2smb_test(suite, "BATCH24", test_raw_oplock_batch24); torture_suite_add_2smb_test(suite, "BATCH25", test_raw_oplock_batch25); + torture_suite_add_2smb_test(suite, "STREAM1", test_raw_oplock_stream1); return suite; } -- cgit From f92140b71623ecb0eb7238a550ae9d8d488a4c90 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Wed, 1 Apr 2009 18:55:52 -0700 Subject: s4 torture: Remove unused parameter --- source4/torture/raw/streams.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'source4') diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c index d0d21ccc06..818eb402dd 100644 --- a/source4/torture/raw/streams.c +++ b/source4/torture/raw/streams.c @@ -1309,7 +1309,6 @@ static bool test_stream_rename2(struct torture_context *tctx, static bool create_file_with_stream(struct torture_context *tctx, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, - const char *base_fname, const char *stream) { NTSTATUS status; @@ -1359,8 +1358,7 @@ static bool test_stream_create_disposition(struct torture_context *tctx, stream_list[0] = talloc_asprintf(mem_ctx, ":%s", stream); stream_list[1] = default_stream_name; - if (!create_file_with_stream(tctx, cli, mem_ctx, fname, - fname_stream)) { + if (!create_file_with_stream(tctx, cli, mem_ctx, fname_stream)) { goto done; } @@ -1407,8 +1405,7 @@ static bool test_stream_create_disposition(struct torture_context *tctx, */ printf("(%s) Checking ntcreatex disp: overwrite_if\n", __location__); smbcli_unlink(cli->tree, fname); - if (!create_file_with_stream(tctx, cli, mem_ctx, fname, - fname_stream)) { + if (!create_file_with_stream(tctx, cli, mem_ctx, fname_stream)) { goto done; } @@ -1425,8 +1422,7 @@ static bool test_stream_create_disposition(struct torture_context *tctx, */ printf("(%s) Checking ntcreatex disp: supersede\n", __location__); smbcli_unlink(cli->tree, fname); - if (!create_file_with_stream(tctx, cli, mem_ctx, fname, - fname_stream)) { + if (!create_file_with_stream(tctx, cli, mem_ctx, fname_stream)) { goto done; } @@ -1444,8 +1440,7 @@ static bool test_stream_create_disposition(struct torture_context *tctx, printf("(%s) Checking ntcreatex disp: overwrite_if on stream\n", __location__); smbcli_unlink(cli->tree, fname); - if (!create_file_with_stream(tctx, cli, mem_ctx, fname, - fname_stream)) { + if (!create_file_with_stream(tctx, cli, mem_ctx, fname_stream)) { goto done; } @@ -1463,8 +1458,7 @@ static bool test_stream_create_disposition(struct torture_context *tctx, */ printf("(%s) Checking openx disp: overwrite_if\n", __location__); smbcli_unlink(cli->tree, fname); - if (!create_file_with_stream(tctx, cli, mem_ctx, fname, - fname_stream)) { + if (!create_file_with_stream(tctx, cli, mem_ctx, fname_stream)) { goto done; } @@ -1517,7 +1511,7 @@ static bool test_stream_large_streaminfo(struct torture_context *tctx, for (i = 0; i < 10000; i++) { fname_stream = talloc_asprintf(mem_ctx, "%s:%s%d", fname, lstream_name, i); - ret = create_file_with_stream(tctx, cli, mem_ctx, fname, + ret = create_file_with_stream(tctx, cli, mem_ctx, fname_stream); if (!ret) { goto done; @@ -1556,8 +1550,7 @@ static bool test_stream_attributes(struct torture_context *tctx, fname_stream = talloc_asprintf(mem_ctx, "%s:%s", fname, stream); /* Create a file with a stream with attribute FILE_ATTRIBUTE_ARCHIVE. */ - ret = create_file_with_stream(tctx, cli, mem_ctx, fname, - fname_stream); + ret = create_file_with_stream(tctx, cli, mem_ctx, fname_stream); if (!ret) { goto done; } -- cgit From 9d95f8704d4dab70d50290ebd1e3c0b8800261a7 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 1 Apr 2009 11:06:51 -0700 Subject: s/NT_STATUS_WIN7_INVALID_RANGE/NT_STATUS_INVALID_LOCK_RANGE/g --- source4/libcli/util/nterr.c | 2 +- source4/torture/raw/lock.c | 4 ++-- source4/torture/smb2/lock.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source4') diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c index 7f544b5922..c196433710 100644 --- a/source4/libcli/util/nterr.c +++ b/source4/libcli/util/nterr.c @@ -549,7 +549,7 @@ static const nt_err_code_struct nt_errs[] = { "NT_STATUS_OBJECTID_NOT_FOUND", NT_STATUS_OBJECTID_NOT_FOUND }, { "NT_STATUS_DOWNGRADE_DETECTED", NT_STATUS_DOWNGRADE_DETECTED }, { "NT_STATUS_DS_BUSY", NT_STATUS_DS_BUSY }, - { "XXX_INVALID_RANGE", NT_STATUS_WIN7_INVALID_RANGE }, + { "NT_STATUS_INVALID_LOCK_RANGE", NT_STATUS_INVALID_LOCK_RANGE }, { "STATUS_MORE_ENTRIES", STATUS_MORE_ENTRIES }, { "STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED }, { "STATUS_NOTIFY_CLEANUP", STATUS_NOTIFY_CLEANUP }, diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index 72a03e1623..7e3ac29809 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -364,7 +364,7 @@ static bool test_lockx(struct torture_context *tctx, struct smbcli_state *cli) lock[0].count = 2; status = smb_raw_lock(cli->tree, &io); if (TARGET_IS_WIN7(tctx)) - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); else CHECK_STATUS(status, NT_STATUS_OK); lock[0].pid--; @@ -376,7 +376,7 @@ static bool test_lockx(struct torture_context *tctx, struct smbcli_state *cli) /* XXX This is very strange - Win7 gives us an invalid range when we * unlock the range even though the range is locked! Win7 bug? */ if (TARGET_IS_WIN7(tctx)) - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); else { CHECK_STATUS(status, NT_STATUS_OK); status = smb_raw_lock(cli->tree, &io); diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c index 5f0293c681..844309efd4 100644 --- a/source4/torture/smb2/lock.c +++ b/source4/torture/smb2/lock.c @@ -101,7 +101,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree el[0].flags = SMB2_LOCK_FLAG_EXCLUSIVE|SMB2_LOCK_FLAG_FAIL_IMMEDIATELY; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else { CHECK_STATUS(status, NT_STATUS_OK); } @@ -110,7 +110,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree lck.in.reserved = 0x123ab2; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else { CHECK_STATUS(status, NT_STATUS_OK); } @@ -118,7 +118,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree lck.in.reserved = 0x123ab3; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else if (TARGET_IS_WINDOWS(torture)) { CHECK_STATUS(status, NT_STATUS_OK); } else { @@ -129,7 +129,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree lck.in.reserved = 0x123ab4; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else { CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED); } @@ -137,7 +137,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree lck.in.reserved = 0x123ab5; status = smb2_lock(tree, &lck); if (TARGET_IS_WIN7(torture)) { - CHECK_STATUS(status, NT_STATUS_WIN7_INVALID_RANGE); + CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE); } else if (TARGET_IS_WINDOWS(torture)) { CHECK_STATUS(status, NT_STATUS_OK); } else { -- cgit From 108cf27bb1fe0e602d00a8cc0b54c1d72a1630c8 Mon Sep 17 00:00:00 2001 From: Zack Kirsch Date: Wed, 1 Apr 2009 17:46:40 -0700 Subject: s4 torture: Addition to RAW-BENCH-LOCK to take a configurable number of locks before starting the test This can be useful for benchmarking as well as stress testing. --- source4/torture/raw/lockbench.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'source4') diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c index d20175a018..c7f99aeb3c 100644 --- a/source4/torture/raw/lockbench.c +++ b/source4/torture/raw/lockbench.c @@ -317,13 +317,15 @@ bool torture_bench_lock(struct torture_context *torture) { bool ret = true; TALLOC_CTX *mem_ctx = talloc_new(torture); - int i; + int i, j; int timelimit = torture_setting_int(torture, "timelimit", 10); struct timeval tv; struct benchlock_state *state; int total = 0, minops=0; struct smbcli_state *cli; bool progress; + off_t offset; + int initial_locks = torture_setting_int(torture, "initial_locks", 0); progress = torture_setting_bool(torture, "progress", true); @@ -371,6 +373,21 @@ bool torture_bench_lock(struct torture_context *torture) goto failed; } + /* Optionally, lock initial_locks for each proc beforehand. */ + if (i == 0 && initial_locks > 0) { + printf("Initializing %d locks on each proc.\n", + initial_locks); + } + + for (j = 0; j < initial_locks; j++) { + offset = (0xFFFFFED8LLU * (i+2)) + j; + if (!NT_STATUS_IS_OK(smbcli_lock64(state[i].tree, + state[i].fnum, offset, 1, 0, WRITE_LOCK))) { + printf("Failed initializing, lock=%d\n", j); + goto failed; + } + } + state[i].stage = LOCK_INITIAL; lock_send(&state[i]); } @@ -413,6 +430,7 @@ bool torture_bench_lock(struct torture_context *torture) return ret; failed: + smbcli_deltree(state[0].tree, BASEDIR); talloc_free(mem_ctx); return false; } -- cgit