sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code
77,833 Commits 60 Branches 1,145 Tags 452 MiB
8a83464216
Commit Graph

89 Commits

Author SHA1 Message Date
Jeremy Allison
c4763385a8 Remove unneeded NULL check. 2011-11-15 22:44:25 +01:00
Stefan Metzmacher
31cd1fbd2b s3:smbd/aio: handle_aio_completed() should do nothing if aio_ex->fsp is NULL 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Nov 15 18:47:55 CET 2011 on sn-devel-104
 2011-11-15 18:47:55 +01:00
Stefan Metzmacher
21eb1450cc s3:smbd/aio: pass ECANCELED to the smb2 aio handlers 
metze
 2011-11-15 17:14:13 +01:00
Stefan Metzmacher
2802be75e3 s3:smbd/aio: add cancel_smb2_aio() 
metze
 2011-11-15 17:14:13 +01:00
Volker Lendecke
5068a0d14d s3: Fix smb2 handling error returns from aio 
Found when reading with aio_fork beyond the end of file.

Metze, Jeremy, please check!

Without this we get

[2011/08/02 21:02:54.082661,  0] lib/util.c:778(smb_panic_s3)
  PANIC (pid 2302): smbd/smb2_read.c:593: Type mismatch: name[NULL] expected[struct smbd_smb2_read_state]
[2011/08/02 21:02:54.094316,  0] lib/util.c:882(log_stack_trace)
  BACKTRACE: 23 stack frames:
   #0 bin/smbd(log_stack_trace+0x2d) [0xb72873d8]
   #1 bin/smbd(smb_panic_s3+0x7c) [0xb7287529]
   #2 bin/smbd(smb_panic+0x2f) [0xb7277e1f]
   #3 /root/git/s3-work/source3/bin/libtalloc.so.2 [0xb6c6bc48]
   #4 /root/git/s3-work/source3/bin/libtalloc.so.2 [0xb6c6ec79]
   #5 /root/git/s3-work/source3/bin/libtalloc.so.2(_talloc_get_type_abort+0x34) [0xb6c6ecb3]
   #6 bin/smbd [0xb6fbc405]
   #7 bin/smbd(_tevent_req_notify_callback+0x4a) [0xb729a85a]
   #8 bin/smbd [0xb729a888]
   #9 bin/smbd(_tevent_req_done+0x19) [0xb729aa73]
   #10 bin/smbd [0xb6fae517]
   #11 bin/smbd [0xb6fad258]
   #12 bin/smbd(smbd_aio_complete_aio_ex+0xf5) [0xb6fad6e8]
   #13 /root/git/inst/modules/vfs/aio_fork.so [0xb66d4992]
   #14 bin/smbd(run_events_poll+0x400) [0xb7297df2]
   #15 bin/smbd(smbd_process+0xd75) [0xb6f9d3a7]
   #16 bin/smbd [0xb756f07b]
   #17 bin/smbd(run_events_poll+0x400) [0xb7297df2]
   #18 bin/smbd [0xb7298254]
   #19 bin/smbd(_tevent_loop_once+0x9e) [0xb72986ac]
   #20 bin/smbd(main+0x185c) [0xb7570e59]
   #21 /lib/i686/cmov/libc.so.6(__libc_start_main+0xe5) [0xb6b08455]
   #22 bin/smbd [0xb6f14e01]

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Aug  2 22:33:15 CEST 2011 on sn-devel-104
 2011-08-02 22:33:15 +02:00
Andrew Bartlett
ad0a07c531 s3-talloc Change TALLOC_ZERO_P() to talloc_zero() 
Using the standard macro makes it easier to move code into common, as
TALLOC_ZERO_P isn't standard talloc.
 2011-06-09 12:40:08 +02:00
Andrew Bartlett
e5dd03d199 s3-globals Remove smbd_event_context() (use server_event_context()) 
This has been a wrapper around server_event_context() for some time
now, and removing this from dummmysmbd.c assists with library
dependencies.

Andrew Bartlett
 2011-05-31 00:32:07 +02:00
Jeremy Allison
38492b16fe Fixup build without --with-aio. 
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu May  5 21:38:23 CEST 2011 on sn-devel-104
 2011-05-05 21:38:23 +02:00
Jeremy Allison
4f41be356a Fix many const compiler warnings. 2011-05-05 10:41:59 -07:00
Günther Deschner
50883cfeb4 s3-tevent: only include ../lib/util/tevent wrappers where needed. 
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Apr 29 14:00:30 CEST 2011 on sn-devel-104
 2011-04-29 14:00:30 +02:00
Günther Deschner
8c24ebf371 s3: include smbd/smbd.h where needed. 
Guenther
 2011-03-30 01:13:08 +02:00
Jeremy Allison
14c70346fc Change interface of schedule_smb2_aio_read() to allocate the return DATA_BLOB. 
Change smb2_read code to allocate return DATA_BLOB just before the read.

Preparing for SMB2 sendfile change which will not need to allocate
return buffer.

Jeremy
 2010-12-15 01:38:16 +01:00
Björn Jacke
f69085e5ff s3: use monotonic clock for aio timeout 2010-09-07 20:29:13 +02:00
Volker Lendecke
1808dd0a85 s3: Make srv_send_smb take an sconn instead of a sock fd 2010-08-24 21:06:41 +02:00
Volker Lendecke
c9458a756c s3: Remove smbd_server_fd from handle_aio_read/write_complete 2010-08-16 22:39:16 +02:00
Volker Lendecke
bda7c70bc0 s3: Remove smbd_server_fd from schedule_aio_write_and_X 2010-08-16 22:39:16 +02:00
Volker Lendecke
ad871b73a2 s3: Fix some error messages 2010-08-13 22:53:06 +02:00
Jeremy Allison
f5def289d3 Fix warning - no return value for a non-void fn. 
Jeremy.
 2010-07-20 09:34:32 -07:00
Volker Lendecke
55512f4791 s3: Work better without the aio sighandler 
Refuse async I/O if we can't set up the signal handler
 2010-07-18 21:22:41 +02:00
Jeremy Allison
aeb25ad0b8 Fix the build in the non WITH_AIO case (sorry). 2010-06-10 14:28:55 -07:00
Jeremy Allison
321d7a6303 Implement AIO in SMB2. Doesn't allow cancel calls yet (to be added). 
Jeremy.
 2010-06-10 13:20:37 -07:00
Jeremy Allison
096a3d3eea Make aio_ex owned by a talloc context, not neccessarily on the null context. 2010-06-07 16:26:30 -07:00
Jeremy Allison
d70413fa0c Move "write_though" into aio_ex struct. 2010-06-07 16:25:18 -07:00
Jeremy Allison
b12409a480 wait_for_aio_completion() should return 0 on non-aio compiled case. 2010-06-04 11:41:57 -07:00
Jeremy Allison
be5133f1e0 Rename req -> smbreq. 2010-06-04 11:41:38 -07:00
Jeremy Allison
e0acee4919 Change smbd_aio_complete_mid() -> smbd_aio_complete_aio_ex(). Simplifies 
the code and eliminates find_aio_ex().

Jeremy.
 2010-06-04 11:30:46 -07:00
Jeremy Allison
fbfc60fac1 Move to using a DATA_BLOB inside of struct aio_extra, not a char *. 
Will make using AIO in SMB2 easier.

Jeremy.
 2010-06-02 10:25:56 -07:00
Jeremy Allison
e9ff32c6c3 Don't use sigev_value.sival_int to just store the mid, use sigev_value.sival_ptr to store the private data structure. 
This allows easier use from SMB2. Ensure aio is initialized before the
aio_pending_size check else aio will never be used.

Jeremy.
 2010-06-01 16:05:44 -07:00
Jeremy Allison
adf4833792 This patch looks bigger than it is. It does 2 things. 1). Renames smbpid -> smblctx in our locking code. 2). Widens smblctx to 64-bits internally. Preparing to use the SMB2 handle as the locking context. 
Jeremy.
 2010-05-07 06:20:50 -07:00
Jeremy Allison
7984243768 Move to using 64-bit mid values in our internal open file database. 
This will allow us to share logic much easier between SMB1 and SMB2
servers.

Jeremy
 2010-04-12 21:40:28 -07:00
Jeremy Allison
c75184b8a1 Fix issue with aio where r/w lock wasn't kept across aio read operations. 
Change schedule_aio_read_and_X/schedule_aio_write_and_X to
return NTSTATUS. Move the grant and release of the lock into
the aio code.

Jeremy
 2010-04-05 14:16:21 -07:00
Jeremy Allison
bf90969892 Move initialize_async_io_handler() inside of smbd/aio.c. 
Call from actual aio read or write. No reason to call this globally on startup.

Jeremy.
 2010-04-01 16:47:59 -07:00
Jeremy Allison
3f5c077f2d Remove use of "int ret" when we already have errcode. 
Jeremy.
 2009-10-13 13:28:57 -07:00
Jeremy Allison
df22f8dbd9 Catch one more erroneous use of errno. 
Jeremy.
 2009-10-13 13:03:39 -07:00
Olaf Flebbe
367cb714a3 correctly handle aio_error() and errno 2009-10-13 12:59:23 -07:00
Olaf Flebbe
087ba21b41 allow for outstanding_aio_calls to be decremented 2009-09-30 15:20:09 -07:00
Jeremy Allison
325baf37ff Don't defer a talloc_move'd pointer. 
Jeremy.
 2009-09-28 21:36:15 -07:00
Tim Prouty
5a8d70d465 s3: Change fsp->fsp_name to be an smb_filename struct! 2009-07-20 17:26:56 -07:00
Timur I. Bakeyev
ab88f9017c Set SIGRTMIN to NSIG 
In the includes we define SIGRTMIN to 32 if it's not defined already. This
value could be fairly low and it's better to use NSIG(number of defined
signals) as the lower mark for the available signals.

We have similar defenition in the source3/smbd/aio.c, which can be safely
removed, as it comes from includes.h then.

With regards,
Timur Bakeyev.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2009-06-08 13:20:52 +02:00
Volker Lendecke
5fb3b8e377 Move down the become_root()/unbecome_root() calls into the VFS modules 
The aio_fork module does not need this, as it does not communicate via signals
but with pipes. Watching a strace log with those become_root() calls in aio.c
is absolutely awful, and it does affect performance.
 2009-05-18 13:38:56 +02:00
Stefan Metzmacher
c16c90a1cb s3:smbd: use new simplified snb_signing code in the server 
We keep the seqnum/mid mapping in the smb_request structure.

This also moves one global variable into the
smbd_server_connection struct.

metze
 2009-03-23 12:21:13 +01:00
Stefan Metzmacher
196a5d0388 s3:signing: the seqnum should only be decremented by 1 for ntcancel requests 
[MS-SMB] 3.3.5.1 Receiving Any Message says that the seqnum
is incremented by only for ntcancel requests for any other
request it's by incremented by 2, even if it doesn't expect
a response.

metze
 2009-03-06 16:37:20 +01:00
Tim Prouty
c6f1f055fd s3 oplocks: Make the level2 oplock contention API more granular 
This replaces release_level2_oplocks_on_change with
contend_level2_oplock_begin/end in order to contend level2 oplocks
throughout an operation rather than just at the begining.  This is
necessary for some kernel oplock implementations, and also lays the
groundwork for better correctness in Samba's standard level2 oplock
handling.  The next step for non-kernel oplocks is to add additional
state to the share mode lock struct that prevents any new opens from
granting oplocks while a contending operation is in progress.

All operations that contend level 2 oplocks are now correctly spanned
except for aio and synchronous writes.  The two write paths both have
non-trivial error paths that need extra care to get right.

RAW-OPLOCK and the rest of 'make test' are still passing with this
change.
 2009-02-09 23:47:45 -08:00
todd stecher
54c51a66e3 S3: New module interface for SMB message statistics gathering 
This changelist allows for the addition of custom performance
monitoring modules through smb.conf. Entrypoints in the main message
processing code have been added to capture the command, subop, ioctl,
identity and message size statistics.
 2009-02-09 13:23:44 -08:00
Volker Lendecke
d94e9c802c Remove the global variable "chain_size" 2009-01-31 11:09:39 +01:00
Stefan Metzmacher
b8c416fe2a s3:smbd: convert aio to use tevent_signal 
metze
 2009-01-27 15:28:09 +01:00
Stefan Metzmacher
3dde0cbb76 s3:smbd: move all globals and static variables in globals.[ch] 
The goal is to move all this variables into a big context structure.

metze
 2009-01-08 12:22:21 +01:00
Volker Lendecke
52958ea115 Remove a direct inbuf reference (should have been removed with 8987641d...) 2008-11-08 10:42:28 +01:00
Volker Lendecke
8987641db8 Rewrite aio.c to keep the whole smb_request structure, not just the inbuf 2008-11-04 20:52:06 +01:00
Volker Lendecke
e4897a5376 Add construct_reply_common_req wrapper 
The goal is to remove the remaining direct calls to construct_reply_common.
 2008-11-04 20:52:06 +01:00