cifs: Miscellaneous prep patches for rewrite of I/O layer
David Howells
maintainerv5 cover cifs: Miscellaneous prep patches for rewrite of I/O layer
Hi Steve,
Could you take these patches extracted from my I/O layer rewrite for the upcoming merge window. The performance change should be neutral, but it cleans up the code a bit.
(1) Rename struct mid_q_entry to smb_message. In my rewrite, smb_message will get allocated in the marshalling functions in smb2pdu.c and cifssmb.c rather than in transport.c and used to hand parameters down
- and so I think it could be better named for that.
(2) Remove the RFC1002 header from the smb_hdr struct so that it's consistent with SMB2/3. This allows I/O routines to be simplified and shared.
(3) Make SMB1's SendReceive() wrap cifs_send_recv() and thus share code
with SMB2/3.
(4) Clean up a bunch of extra kvec[] that were required for RFC1002 headers from SMB1's header struct.
(5) Replace SendReceiveBlockingLock() with SendReceive() plus flags.
(6) Remove the server pointer from smb_message. It can be passed down from the caller to all places that need it.
(7) Don't need state locking in smb2_get_mid_entry() as we're just doing a single read inside the lock. READ_ONCE() should suffice instead.
(8) Add a tracepoint to log EIO errors and up to a couple of bits of info for each to make it easier to find out why an EIO error happened when the system is very busy without introducing printk delays.
(9) Make some minor code cleanups.
The patches will be found here also when the git server is accessible again:
https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=cifs-next
Thanks,
David
Changes
=======
ver #5)
- Rebased on the ksmbd-for-next branch.
- Drop the netfs_alloc patch as that's now taken.
- Added a warning check requested by Stefan Metzmacher.
- Switched to a branch without the header prototype cleanups.
- Add a patch to make some minor code cleanups.
- Don't do EIO changed in smbdirect.c as that interferes with Stefan's changes.
ver #4)
- Rebased on the ksmbd-for-next branch.
- The read tracepoint patch got merged, so drop it.
- Move the netfs_alloc, etc. patch first.
- Fix a couple of prototypes that need to be conditional (may need some post cleanup).
- Fixed another couple of headers that needed their own prototype lists.
- Fixed #include order in a couple of places.
ver #3)
- Rebased on the ksmbd-for-next branch.
- Add the patches to clean up the function prototypes in the headers.
- Don't touch smbdirect.
- Put prototypes into netlink.h and cached_dir.h rather than centralising them.
- Indent the arguments in the prototypes to the opening bracket + 1.
- Cleaned up most other checkpatch complaints.
- Added the EIO tracepoint patch to the end.
ver #2)
- Rebased on the ksmbd-for-next-next branch.
- Moved the patch to use netfs_alloc/free_folioq_buffer() down the stack.
David Howells (9):
cifs: Rename mid_q_entry to smb_message
cifs: Remove the RFC1002 header from smb_hdr
cifs: Make smb1's SendReceive() wrap cifs_send_recv()
cifs: Clean up some places where an extra kvec[] was required for
rfc1002
cifs: Replace SendReceiveBlockingLock() with SendReceive() plus flags
cifs: Remove the server pointer from smb_message
cifs: Don't need state locking in smb2_get_mid_entry()
cifs: Add a tracepoint to log EIO errors
cifs: Do some preparation prior to organising the function
declarations
fs/smb/client/cached_dir.c | 2 +- fs/smb/client/cifs_debug.c | 51 +- fs/smb/client/cifs_debug.h | 6 +- fs/smb/client/cifs_spnego.h | 2 - fs/smb/client/cifs_unicode.h | 3 - fs/smb/client/cifsacl.c | 10 +- fs/smb/client/cifsencrypt.c | 83 +-- fs/smb/client/cifsfs.c | 36 +- fs/smb/client/cifsglob.h | 197 +++---- fs/smb/client/cifspdu.h | 2 +- fs/smb/client/cifsproto.h | 200 ++++++-- fs/smb/client/cifssmb.c | 931 +++++++++++++++++++--------------- fs/smb/client/cifstransport.c | 438 +++------------- fs/smb/client/compress.c | 23 +- fs/smb/client/compress.h | 19 +- fs/smb/client/connect.c | 199 ++++---- fs/smb/client/dir.c | 8 +- fs/smb/client/dns_resolve.h | 4 - fs/smb/client/file.c | 6 +- fs/smb/client/fs_context.c | 2 +- fs/smb/client/inode.c | 14 +- fs/smb/client/link.c | 10 +- fs/smb/client/misc.c | 53 +- fs/smb/client/netmisc.c | 21 +- fs/smb/client/readdir.c | 2 +- fs/smb/client/reparse.c | 53 +- fs/smb/client/sess.c | 16 +- fs/smb/client/smb1ops.c | 114 +++-- fs/smb/client/smb2file.c | 9 +- fs/smb/client/smb2inode.c | 13 +- fs/smb/client/smb2maperror.c | 6 +- fs/smb/client/smb2misc.c | 11 +- fs/smb/client/smb2ops.c | 178 +++---- fs/smb/client/smb2pdu.c | 230 +++++---- fs/smb/client/smb2proto.h | 18 +- fs/smb/client/smb2transport.c | 113 ++--- fs/smb/client/trace.h | 149 ++++++ fs/smb/client/transport.c | 305 +++++------ fs/smb/client/xattr.c | 2 +- fs/smb/common/smb2pdu.h | 3 - fs/smb/common/smbglob.h | 1 - 41 files changed, 1800 insertions(+), 1743 deletions(-)
David Howells
maintainerPATCH v5 1/9 cifs: Rename mid_q_entry to smb_message
Rename mid_q_entry to smb_message as future development that will allocate it at a higher level in the marshalling code and then hand it down into the transport layer. It will also be used to pass parameters such as the send and receive data buffers, credits and other things.
--- fs/smb/client/cifs_debug.c | 43 +++--- fs/smb/client/cifsfs.c | 31 +++-- fs/smb/client/cifsglob.h | 70 +++++----- fs/smb/client/cifsproto.h | 39 +++--- fs/smb/client/cifssmb.c | 82 ++++++------ fs/smb/client/cifstransport.c | 168 ++++++++++++------------ fs/smb/client/connect.c | 152 +++++++++++----------- fs/smb/client/netmisc.c | 14 +- fs/smb/client/smb1ops.c | 46 +++---- fs/smb/client/smb2misc.c | 8 +- fs/smb/client/smb2ops.c | 122 ++++++++--------- fs/smb/client/smb2pdu.c | 47 ++++--- fs/smb/client/smb2proto.h | 14 +- fs/smb/client/smb2transport.c | 62 ++++----- fs/smb/client/transport.c | 238 +++++++++++++++++----------------- 15 files changed, 568 insertions(+), 568 deletions(-)
fs/smb/client/cifs_debug.c +21 -22
@@ -55,33 +55,32 @@ void cifs_dump_detail(void *buf, struct TCP_Server_Info *server)void cifs_dump_mids (struct TCP_Server_Info *server) {#ifdef CONFIG_CIFS_DEBUG2 -struct mid_q_entry *mid_entry; +struct smb_message *smb;if (server ==NULL )return ;cifs_dbg (VFS ,"Dump pending requests:\n" );spin_lock (&server->mid_queue_lock); -list_for_each_entry (mid_entry, &server->pending_mid_q, qhead) { +list_for_each_entry (smb, &server->pending_mid_q, qhead) {cifs_dbg (VFS ,"State: %d Cmd: %d Pid: %d Cbdata: %p Mid %llu\n" , - mid_entry->mid_state, -le16_to_cpu (mid_entry->command), - mid_entry->pid, - mid_entry->callback_data, - mid_entry->mid); + smb->mid_state, +le16_to_cpu (smb->command), + smb->pid, + smb->callback_data, + smb->mid);#ifdef CONFIG_CIFS_STATS2 cifs_dbg (VFS ,"IsLarge: %d buf: %p time rcv: %ld now: %ld\n" , - mid_entry->large_buf, - mid_entry->resp_buf, - mid_entry->when_received, + smb->large_buf, + smb->resp_buf, + smb->when_received, jiffies);#endif /* STATS2 */ cifs_dbg (VFS ,"IsMult: %d IsEnd: %d\n" , - mid_entry->multiRsp, mid_entry->multiEnd); -if (mid_entry->resp_buf) { -cifs_dump_detail (mid_entry->resp_buf, server); -cifs_dump_mem ("existing buf: " , - mid_entry->resp_buf,62 ); + smb->multiRsp, smb->multiEnd); +if (smb->resp_buf) { +cifs_dump_detail (smb->resp_buf, server); +cifs_dump_mem ("existing buf: " , smb->resp_buf,62 ); } }spin_unlock (&server->mid_queue_lock);
@@ -406,7 +405,7 @@ static __always_inline const char *cipher_alg_str(__le16 cipher)static int cifs_debug_data_proc_show (struct seq_file *m,void *v) { -struct mid_q_entry *mid_entry; +struct smb_message *smb;struct TCP_Server_Info *server;struct TCP_Server_Info *chan_server;struct cifs_ses *ses;
@@ -727,13 +726,13 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\n\tServer ConnectionId: 0x%llx" , chan_server->conn_id);spin_lock (&chan_server->mid_queue_lock); -list_for_each_entry (mid_entry, &chan_server->pending_mid_q, qhead) { +list_for_each_entry (smb, &chan_server->pending_mid_q, qhead) {seq_printf (m,"\n\t\tState: %d com: %d pid: %d cbdata: %p mid %llu" , - mid_entry->mid_state, -le16_to_cpu (mid_entry->command), - mid_entry->pid, - mid_entry->callback_data, - mid_entry->mid); + smb->mid_state, +le16_to_cpu (smb->command), + smb->pid, + smb->callback_data, + smb->mid); }spin_unlock (&chan_server->mid_queue_lock); }
fs/smb/client/cifsfs.c +15 -16
@@ -436,13 +436,13 @@ static int cifs_permission(struct mnt_idmap *idmap,static struct kmem_cache *cifs_inode_cachep;static struct kmem_cache *cifs_req_cachep; -static struct kmem_cache *cifs_mid_cachep; +static struct kmem_cache *smb_message_cachep;static struct kmem_cache *cifs_sm_req_cachep;static struct kmem_cache *cifs_io_request_cachep;static struct kmem_cache *cifs_io_subrequest_cachep;mempool_t *cifs_sm_req_poolp;mempool_t *cifs_req_poolp; -mempool_t *cifs_mid_poolp; +mempool_t smb_message_pool;mempool_t cifs_io_request_pool;mempool_t cifs_io_subrequest_pool;
@@ -1835,28 +1835,27 @@ cifs_destroy_request_bufs(void)kmem_cache_destroy (cifs_sm_req_cachep); } -static int init_mids (void ) +static int init_smb_message (void ) { - cifs_mid_cachep =kmem_cache_create ("cifs_mpx_ids" , -sizeof (struct mid_q_entry ),0 , -SLAB_HWCACHE_ALIGN ,NULL ); -if (cifs_mid_cachep ==NULL ) + smb_message_cachep =kmem_cache_create ("cifs_smb_message" , +sizeof (struct smb_message ),0 , +SLAB_HWCACHE_ALIGN ,NULL ); +if (smb_message_cachep ==NULL )return -ENOMEM ;/* 3 is a reasonable minimum number of simultaneous operations */ - cifs_mid_poolp =mempool_create_slab_pool (3 , cifs_mid_cachep); -if (cifs_mid_poolp ==NULL ) { -kmem_cache_destroy (cifs_mid_cachep); +if (mempool_init_slab_pool (&smb_message_pool,3 , smb_message_cachep) <0 ) { +kmem_cache_destroy (smb_message_cachep);return -ENOMEM ; }return 0 ; } -static void destroy_mids (void ) +static void destroy_smb_message (void ) { -mempool_destroy (cifs_mid_poolp); -kmem_cache_destroy (cifs_mid_cachep); +mempool_exit (&smb_message_pool); +kmem_cache_destroy (smb_message_cachep); }static int cifs_init_netfs (void )
@@ -2020,7 +2019,7 @@ init_cifs(void)if (rc) goto out_destroy_inodecache; - rc =init_mids (); + rc =init_smb_message ();if (rc) goto out_destroy_netfs;
@@ -2077,7 +2076,7 @@ init_cifs(void)#endif cifs_destroy_request_bufs (); out_destroy_mids: -destroy_mids (); +destroy_smb_message (); out_destroy_netfs:cifs_destroy_netfs (); out_destroy_inodecache:
@@ -2119,7 +2118,7 @@ exit_cifs(void)dfs_cache_destroy ();#endif cifs_destroy_request_bufs (); -destroy_mids (); +destroy_smb_message ();cifs_destroy_netfs ();cifs_destroy_inodecache ();destroy_workqueue (deferredclose_wq);
fs/smb/client/cifsglob.h +35 -35
163 lines not on this page · raw message
fs/smb/client/cifsproto.h +19 -20
@@ -84,11 +84,11 @@ extern char *cifs_build_path_to_root(struct smb3_fs_context *ctx, int add_treename);extern char *build_wildcard_path_from_dentry (struct dentry *direntry);char *cifs_build_devname (char *nodename,const char *prepath); -extern void delete_mid (struct mid_q_entry *mid); +extern void delete_mid (struct smb_message *smb);void __release_mid (struct kref *refcount); -extern void cifs_wake_up_task (struct mid_q_entry *mid); +extern void cifs_wake_up_task (struct smb_message *smb);extern int cifs_handle_standard (struct TCP_Server_Info *server, -struct mid_q_entry *mid); +struct smb_message *smb);extern char *smb3_fs_context_fullpath (const struct smb3_fs_context *ctx,char dirsep);extern int smb3_parse_devname (const char *devname,struct smb3_fs_context *ctx);
@@ -98,8 +98,8 @@ extern bool cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs);extern int cifs_discard_remaining_data (struct TCP_Server_Info *server);extern int cifs_call_async (struct TCP_Server_Info *server,struct smb_rqst *rqst, -mid_receive_t *receive,mid_callback_t *callback, -mid_handle_t *handle,void *cbdata,const int flags, +mid_receive_t receive,mid_callback_t callback, +mid_handle_t handle,void *cbdata,const int flags,const struct cifs_credits *exist_credits);extern struct TCP_Server_Info *cifs_pick_channel (struct cifs_ses *ses); extern int cifs_send_recv(const unsigned int xid, struct cifs_ses *ses,
@@ -117,15 +117,14 @@ extern int SendReceive(const unsigned int /* xid */ , struct cifs_ses *, int * /* bytes returned */ , const int);extern int SendReceiveNoRsp (const unsigned int xid,struct cifs_ses *ses,char *in_buf,int flags); -int cifs_sync_mid_result (struct mid_q_entry *mid,struct TCP_Server_Info *server); -extern struct mid_q_entry *cifs_setup_request (struct cifs_ses *, -struct TCP_Server_Info *, -struct smb_rqst *); -extern struct mid_q_entry *cifs_setup_async_request (struct TCP_Server_Info *, -struct smb_rqst *); +int cifs_sync_mid_result (struct smb_message *smb,struct TCP_Server_Info *server); +struct smb_message *cifs_setup_request (struct cifs_ses *ses,struct TCP_Server_Info *ignored, +struct smb_rqst *rqst); +struct smb_message *cifs_setup_async_request (struct TCP_Server_Info *server, +struct smb_rqst *rqst);int __smb_send_rqst (struct TCP_Server_Info *server,int num_rqst,struct smb_rqst *rqst); -extern int cifs_check_receive (struct mid_q_entry *mid, +extern int cifs_check_receive (struct smb_message *msg,struct TCP_Server_Info *server,bool log_error);int wait_for_free_request (struct TCP_Server_Info *server,const int flags,unsigned int *instance);
@@ -135,13 +134,13 @@ extern int cifs_wait_mtu_credits(struct TCP_Server_Info *server,static inline int send_cancel (struct TCP_Server_Info *server,struct smb_rqst *rqst, -struct mid_q_entry *mid) +struct smb_message *smb) {return server->ops->send_cancel ? - server->ops->send_cancel (server, rqst, mid) :0 ; + server->ops->send_cancel (server, rqst, smb) :0 ; } -int wait_for_response (struct TCP_Server_Info *server,struct mid_q_entry *midQ); +int wait_for_response (struct TCP_Server_Info *server,struct smb_message *smb); extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, struct kvec *, int /* nvec to send */, int * /* type of buf returned */, const int flags,
@@ -187,7 +186,7 @@ extern int decode_negTokenInit(unsigned char *security_blob, int length,extern int cifs_convert_address (struct sockaddr *dst,const char *src,int len);extern void cifs_set_port (struct sockaddr *addr,const unsigned short int port);extern int map_smb_to_linux_error (char *buf,bool logErr); -extern int map_and_check_smb_error (struct mid_q_entry *mid,bool logErr); +extern int map_and_check_smb_error (struct smb_message *smb,bool logErr);extern void header_assemble (struct smb_hdr *,char /* command */ ,const struct cifs_tcon *,int /* length of fixed section (word count) in two byte units */ );
@@ -270,7 +269,7 @@ extern unsigned int setup_special_mode_ACE(struct smb_ace *pace, __u64 nmode);extern unsigned int setup_special_user_owner_ACE (struct smb_ace *pace); -extern void dequeue_mid (struct mid_q_entry *mid,bool malformed); +extern void dequeue_mid (struct smb_message *smb,bool malformed);extern int cifs_read_from_socket (struct TCP_Server_Info *server,char *buf,unsigned int to_read); extern ssize_t cifs_discard_from_socket(struct TCP_Server_Info *server,
@@ -624,7 +623,7 @@ extern struct cifs_ses * cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx);int cifs_async_readv (struct cifs_io_subrequest *rdata); -int cifs_readv_receive (struct TCP_Server_Info *server,struct mid_q_entry *mid); +int cifs_readv_receive (struct TCP_Server_Info *server,struct smb_message *smb);void cifs_async_writev (struct cifs_io_subrequest *wdata); int cifs_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
@@ -777,9 +776,9 @@ static inline bool dfs_src_pathname_equal(const char *s1, const char *s2)return true; } -static inline void release_mid (struct mid_q_entry *mid) +static inline void release_mid (struct smb_message *smb) { -kref_put (&mid->refcount, __release_mid); +kref_put (&smb->refcount, __release_mid); }static inline void cifs_free_open_info (struct cifs_open_info_data *data)
fs/smb/client/cifssmb.c +41 -41
182 lines not on this page · raw message
fs/smb/client/cifstransport.c +85 -83
389 lines not on this page · raw message
fs/smb/client/connect.c +76 -76
304 lines not on this page · raw message
fs/smb/client/netmisc.c +7 -7
@@ -889,22 +889,22 @@ map_smb_to_linux_error(char *buf, bool logErr) }int -map_and_check_smb_error (struct mid_q_entry *mid,bool logErr) +map_and_check_smb_error (struct smb_message *smb,bool logErr) {int rc; -struct smb_hdr *smb = (struct smb_hdr *)mid->resp_buf; +struct smb_hdr *rhdr = (struct smb_hdr *)smb->resp_buf; - rc =map_smb_to_linux_error ((char *)smb, logErr); -if (rc == -EACCES && !(smb->Flags2 &SMBFLG2_ERR_STATUS )) { + rc =map_smb_to_linux_error ((char *)rhdr, logErr); +if (rc == -EACCES && !(rhdr->Flags2 &SMBFLG2_ERR_STATUS )) {/* possible ERRBaduid */ -__u8 class = smb->Status.DosError.ErrorClass; -__u16 code =le16_to_cpu (smb->Status.DosError.Error); +__u8 class = rhdr->Status.DosError.ErrorClass; +__u16 code =le16_to_cpu (rhdr->Status.DosError.Error);/* switch can be used to handle different errors */ if (class ==ERRSRV && code == ERRbaduid) {cifs_dbg (FYI ,"Server returned 0x%x, reconnecting session...\n" , code); -cifs_signal_cifsd_for_reconnect (mid->server, false); +cifs_signal_cifsd_for_reconnect (smb->server, false); } }
fs/smb/client/smb1ops.c +23 -23
111 lines not on this page · raw message
fs/smb/client/smb2misc.c +4 -4
@@ -851,14 +851,14 @@ smb2_handle_cancelled_close(struct cifs_tcon *tcon, __u64 persistent_fid, }int -smb2_handle_cancelled_mid (struct mid_q_entry *mid,struct TCP_Server_Info *server) +smb2_handle_cancelled_mid (struct smb_message *smb,struct TCP_Server_Info *server) { -struct smb2_hdr *hdr = mid->resp_buf; -struct smb2_create_rsp *rsp = mid->resp_buf; +struct smb2_hdr *hdr = smb->resp_buf; +struct smb2_create_rsp *rsp = smb->resp_buf;struct cifs_tcon *tcon;int rc; -if ((mid->optype &CIFS_CP_CREATE_CLOSE_OP ) || hdr->Command !=SMB2_CREATE || +if ((smb->optype &CIFS_CP_CREATE_CLOSE_OP ) || hdr->Command !=SMB2_CREATE || hdr->Status !=STATUS_SUCCESS )return 0 ;
fs/smb/client/smb2ops.c +61 -61
312 lines not on this page · raw message
fs/smb/client/smb2pdu.c +23 -24
118 lines not on this page · raw message
fs/smb/client/smb2proto.h +7 -7
@@ -30,12 +30,12 @@ extern __le16 *cifs_convert_path_to_utf16(const char *from, struct cifs_sb_info *cifs_sb);extern int smb2_verify_signature (struct smb_rqst *,struct TCP_Server_Info *); -extern int smb2_check_receive (struct mid_q_entry *mid, +extern int smb2_check_receive (struct smb_message *smb,struct TCP_Server_Info *server,bool log_error); -extern struct mid_q_entry *smb2_setup_request (struct cifs_ses *ses, -struct TCP_Server_Info *, -struct smb_rqst *rqst); -extern struct mid_q_entry *smb2_setup_async_request ( +struct smb_message *smb2_setup_request (struct cifs_ses *ses, +struct TCP_Server_Info *server, +struct smb_rqst *rqst); +extern struct smb_message *smb2_setup_async_request (struct TCP_Server_Info *server,struct smb_rqst *rqst);extern struct cifs_tcon *smb2_find_smb_tcon (struct TCP_Server_Info *server,__u64 ses_id,__u32 tid);
@@ -44,7 +44,7 @@ extern __le32 smb2_get_lease_state(struct cifsInodeInfo *cinode);extern bool smb2_is_valid_oplock_break (char *buffer,struct TCP_Server_Info *srv);extern int smb3_handle_read_data (struct TCP_Server_Info *server, -struct mid_q_entry *mid); +struct smb_message *smb);extern int smb2_query_reparse_tag (const unsigned int xid,struct cifs_tcon *tcon,struct cifs_sb_info *cifs_sb,const char *path,__u32 *reparse_tag);
@@ -251,7 +251,7 @@ extern int SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,extern int smb2_handle_cancelled_close (struct cifs_tcon *tcon,__u64 persistent_fid,__u64 volatile_fid); -extern int smb2_handle_cancelled_mid (struct mid_q_entry *mid,struct TCP_Server_Info *server); +extern int smb2_handle_cancelled_mid (struct smb_message *smb,struct TCP_Server_Info *server);void smb2_cancelled_close_fid (struct work_struct *work); extern int SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_file_id, u64 volatile_file_id,
fs/smb/client/smb2transport.c +31 -31
143 lines not on this page · raw message
fs/smb/client/transport.c +120 -118
516 lines not on this page · raw message
Re: [PATCH v5 1/9] cifs: Rename mid_q_entry to smb_message
I lean against the rename of the struct if it is going to still contain primarily the 'mid' (ie the 'multiplex identifier' - the thing used to track a request in flight). The rest of the patch seems fine
- but why do the extra rename of the struct if it is still primarily "the struct that tracks the info on the request in flight by its multiplex id" - wouldn't it be much smaller (and just as clear) if only the other part of this patch were included? No strong opinions but could make the patch smaller and easier to review
1684 struct smb_message {
1685 struct list_head qhead; /* mids waiting on reply from
this server */
1686 refcount_t refcount;
1687 __u64 mid; /* multiplex id */
Quoted 2,796 lines · David Howells
Rename
mid_q_entrytosmb_messageas future development that will allocate it at a higher level in the marshalling code and then hand it down into the transport layer. It will also be used to pass parameters such as the send and receive data buffers, credits and other things.Signed-off-by David Howells <[email protected]>cc Steve French <[email protected]>cc Paulo Alcantara <[email protected]>cc Shyam Prasad N <[email protected]>cc Tom Talpey <[email protected]>--- fs/smb/client/cifs_debug.c | 43 +++--- fs/smb/client/cifsfs.c | 31 +++-- fs/smb/client/cifsglob.h | 70 +++++----- fs/smb/client/cifsproto.h | 39 +++--- fs/smb/client/cifssmb.c | 82 ++++++------ fs/smb/client/cifstransport.c | 168 ++++++++++++------------ fs/smb/client/connect.c | 152 +++++++++++----------- fs/smb/client/netmisc.c | 14 +- fs/smb/client/smb1ops.c | 46 +++---- fs/smb/client/smb2misc.c | 8 +- fs/smb/client/smb2ops.c | 122 ++++++++--------- fs/smb/client/smb2pdu.c | 47 ++++--- fs/smb/client/smb2proto.h | 14 +- fs/smb/client/smb2transport.c | 62 ++++----- fs/smb/client/transport.c | 238 +++++++++++++++++----------------- 15 files changed, 568 insertions(+), 568 deletions(-)fs/smb/client/cifs_debug.c +21
-22@@ -55,33 +55,32 @@ void cifs_dump_detail(void *buf, struct TCP_Server_Info *server)void cifs_dump_mids (struct TCP_Server_Info *server) {#ifdef CONFIG_CIFS_DEBUG2 -struct mid_q_entry *mid_entry; +struct smb_message *smb;if (server ==NULL )return ;cifs_dbg (VFS ,"Dump pending requests:\n" );spin_lock (&server->mid_queue_lock); -list_for_each_entry (mid_entry, &server->pending_mid_q, qhead) { +list_for_each_entry (smb, &server->pending_mid_q, qhead) {cifs_dbg (VFS ,"State: %d Cmd: %d Pid: %d Cbdata: %p Mid %llu\n" , - mid_entry->mid_state, -le16_to_cpu (mid_entry->command), - mid_entry->pid, - mid_entry->callback_data, - mid_entry->mid); + smb->mid_state, +le16_to_cpu (smb->command), + smb->pid, + smb->callback_data, + smb->mid);#ifdef CONFIG_CIFS_STATS2 cifs_dbg (VFS ,"IsLarge: %d buf: %p time rcv: %ld now: %ld\n" , - mid_entry->large_buf, - mid_entry->resp_buf, - mid_entry->when_received, + smb->large_buf, + smb->resp_buf, + smb->when_received, jiffies);#endif /* STATS2 */ cifs_dbg (VFS ,"IsMult: %d IsEnd: %d\n" , - mid_entry->multiRsp, mid_entry->multiEnd); -if (mid_entry->resp_buf) { -cifs_dump_detail (mid_entry->resp_buf, server); -cifs_dump_mem ("existing buf: " , - mid_entry->resp_buf,62 ); + smb->multiRsp, smb->multiEnd); +if (smb->resp_buf) { +cifs_dump_detail (smb->resp_buf, server); +cifs_dump_mem ("existing buf: " , smb->resp_buf,62 ); } }spin_unlock (&server->mid_queue_lock);@@ -406,7 +405,7 @@ static __always_inline const char *cipher_alg_str(__le16 cipher)static int cifs_debug_data_proc_show (struct seq_file *m,void *v) { -struct mid_q_entry *mid_entry; +struct smb_message *smb;struct TCP_Server_Info *server;struct TCP_Server_Info *chan_server;struct cifs_ses *ses;@@ -727,13 +726,13 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\n\tServer ConnectionId: 0x%llx" , chan_server->conn_id);spin_lock (&chan_server->mid_queue_lock); -list_for_each_entry (mid_entry, &chan_server->pending_mid_q, qhead) { +list_for_each_entry (smb, &chan_server->pending_mid_q, qhead) {seq_printf (m,"\n\t\tState: %d com: %d pid: %d cbdata: %p mid %llu" , - mid_entry->mid_state, -le16_to_cpu (mid_entry->command), - mid_entry->pid, - mid_entry->callback_data, - mid_entry->mid); + smb->mid_state, +le16_to_cpu (smb->command), + smb->pid, + smb->callback_data, + smb->mid); }spin_unlock (&chan_server->mid_queue_lock); }fs/smb/client/cifsfs.c +15
-16@@ -436,13 +436,13 @@ static int cifs_permission(struct mnt_idmap *idmap,static struct kmem_cache *cifs_inode_cachep;static struct kmem_cache *cifs_req_cachep; -static struct kmem_cache *cifs_mid_cachep; +static struct kmem_cache *smb_message_cachep;static struct kmem_cache *cifs_sm_req_cachep;static struct kmem_cache *cifs_io_request_cachep;static struct kmem_cache *cifs_io_subrequest_cachep;mempool_t *cifs_sm_req_poolp;mempool_t *cifs_req_poolp; -mempool_t *cifs_mid_poolp; +mempool_t smb_message_pool;mempool_t cifs_io_request_pool;mempool_t cifs_io_subrequest_pool;@@ -1835,28 +1835,27 @@ cifs_destroy_request_bufs(void)kmem_cache_destroy (cifs_sm_req_cachep); } -static int init_mids (void ) +static int init_smb_message (void ) { - cifs_mid_cachep =kmem_cache_create ("cifs_mpx_ids" , -sizeof (struct mid_q_entry ),0 , -SLAB_HWCACHE_ALIGN ,NULL ); -if (cifs_mid_cachep ==NULL ) + smb_message_cachep =kmem_cache_create ("cifs_smb_message" , +sizeof (struct smb_message ),0 , +SLAB_HWCACHE_ALIGN ,NULL ); +if (smb_message_cachep ==NULL )return -ENOMEM ;/* 3 is a reasonable minimum number of simultaneous operations */ - cifs_mid_poolp =mempool_create_slab_pool (3 , cifs_mid_cachep); -if (cifs_mid_poolp ==NULL ) { -kmem_cache_destroy (cifs_mid_cachep); +if (mempool_init_slab_pool (&smb_message_pool,3 , smb_message_cachep) <0 ) { +kmem_cache_destroy (smb_message_cachep);return -ENOMEM ; }return 0 ; } -static void destroy_mids (void ) +static void destroy_smb_message (void ) { -mempool_destroy (cifs_mid_poolp); -kmem_cache_destroy (cifs_mid_cachep); +mempool_exit (&smb_message_pool); +kmem_cache_destroy (smb_message_cachep); }static int cifs_init_netfs (void )@@ -2020,7 +2019,7 @@ init_cifs(void)if (rc) goto out_destroy_inodecache; - rc =init_mids (); + rc =init_smb_message ();if (rc) goto out_destroy_netfs;@@ -2077,7 +2076,7 @@ init_cifs(void)#endif cifs_destroy_request_bufs (); out_destroy_mids: -destroy_mids (); +destroy_smb_message (); out_destroy_netfs:cifs_destroy_netfs (); out_destroy_inodecache:@@ -2119,7 +2118,7 @@ exit_cifs(void)dfs_cache_destroy ();#endif cifs_destroy_request_bufs (); -destroy_mids (); +destroy_smb_message ();cifs_destroy_netfs ();cifs_destroy_inodecache ();destroy_workqueue (deferredclose_wq);fs/smb/client/cifsglob.h +35
-35@@ -294,7 +294,7 @@ struct smb_rqst {struct folio_queue *rq_buffer;/* Buffer for encryption */ }; -struct mid_q_entry ; +struct smb_message ;struct TCP_Server_Info ;struct cifsFileInfo ;struct cifs_ses ;@@ -312,24 +312,24 @@ struct cifs_credits;struct smb_version_operations {int (*send_cancel)(struct TCP_Server_Info *,struct smb_rqst *, -struct mid_q_entry *); +struct smb_message *smb);bool (*compare_fids)(struct cifsFileInfo *,struct cifsFileInfo *);/* setup request: allocate mid, sign message */ -struct mid_q_entry *(*setup_request)(struct cifs_ses *, -struct TCP_Server_Info *, -struct smb_rqst *); +struct smb_message *(*setup_request)(struct cifs_ses *ses, +struct TCP_Server_Info *server, +struct smb_rqst *rqst);/* setup async request: allocate mid, sign message */ -struct mid_q_entry *(*setup_async_request)(struct TCP_Server_Info *, -struct smb_rqst *); +struct smb_message *(*setup_async_request)(struct TCP_Server_Info *server, +struct smb_rqst *rqst);/* check response: verify signature, map error */ -int (*check_receive)(struct mid_q_entry *,struct TCP_Server_Info *, -bool ); +int (*check_receive)(struct smb_message *mid,struct TCP_Server_Info *server, +bool log_error);void (*add_credits)(struct TCP_Server_Info *server,struct cifs_credits *credits,const int optype);void (*set_credits)(struct TCP_Server_Info *,const int );int * (*get_credits_field)(struct TCP_Server_Info *,const int ); -unsigned int (*get_credits)(struct mid_q_entry *); +unsigned int (*get_credits)(struct smb_message *smb);__u64 (*get_next_mid)(struct TCP_Server_Info *);void (*revert_current_mid)(struct TCP_Server_Info *server,const unsigned int val);@@ -346,7 +346,7 @@ struct smb_version_operations {/* map smb to linux error */ int (*map_error)(char *,bool );/* find mid corresponding to the response message */ -struct mid_q_entry * (*find_mid)(struct TCP_Server_Info *,char *); +struct smb_message * (*find_mid)(struct TCP_Server_Info *server,char *buf);void (*dump_detail)(void *buf,struct TCP_Server_Info *ptcp_info);void (*clear_stats)(struct cifs_tcon *);void (*print_stats)(struct seq_file *m,struct cifs_tcon *);@@ -354,13 +354,13 @@ struct smb_version_operations {/* verify the message */ int (*check_message)(char *,unsigned int ,struct TCP_Server_Info *);bool (*is_oplock_break)(char *,struct TCP_Server_Info *); -int (*handle_cancelled_mid)(struct mid_q_entry *,struct TCP_Server_Info *); +int (*handle_cancelled_mid)(struct smb_message *smb,struct TCP_Server_Info *server);void (*downgrade_oplock)(struct TCP_Server_Info *server,struct cifsInodeInfo *cinode,__u32 oplock,__u16 epoch,bool *purge_cache);/* process transaction2 response */ -bool (*check_trans2)(struct mid_q_entry *,struct TCP_Server_Info *, -char *,int ); +bool (*check_trans2)(struct smb_message *smb,struct TCP_Server_Info *server, +char *buf,int malformed);/* check if we need to negotiate */ bool (*need_neg)(struct TCP_Server_Info *);/* negotiate to the server */ @@ -594,7 +594,7 @@ struct smb_version_operations { struct smb_rqst *, struct smb_rqst *);int (*is_transform_hdr)(void *buf);int (*receive_transform)(struct TCP_Server_Info *, -struct mid_q_entry **,char **,int *); +struct smb_message **smb,char **,int *);enum securityEnum (*select_sectype)(struct TCP_Server_Info *,enum securityEnum ); int (*next_header)(struct TCP_Server_Info *server, char *buf,@@ -1659,8 +1659,8 @@ static inline void cifs_stats_bytes_read(struct cifs_tcon *tcon,* Returns zero on a successful receive, or an error. The receive state in * the TCP_Server_Info will also be updated. */ -typedef int (mid_receive_t )(struct TCP_Server_Info *server, -struct mid_q_entry *mid); +typedef int (*mid_receive_t )(struct TCP_Server_Info *server, +struct smb_message *msg);/* * This is the prototype for the mid callback function. This is called once the @@ -1670,17 +1670,17 @@ typedef int (mid_receive_t)(struct TCP_Server_Info *server,* - it will be called by cifsd, with no locks held * - the mid will be removed from any lists */ -typedef void (mid_callback_t )(struct mid_q_entry *mid); +typedef void (*mid_callback_t )(struct smb_message *smb);/* * This is the protopyte for mid handle function. This is called once the mid * has been recognized after decryption of the message. */ -typedef int (mid_handle_t )(struct TCP_Server_Info *server, -struct mid_q_entry *mid); +typedef int (*mid_handle_t )(struct TCP_Server_Info *server, +struct smb_message *smb);/* one of these for every pending CIFS request to the server */ -struct mid_q_entry { +struct smb_message {struct list_head qhead;/* mids waiting on reply from this server */ struct kref refcount;struct TCP_Server_Info *server;/* server corresponding to this mid */ @@ -1694,9 +1694,9 @@ struct mid_q_entry {unsigned long when_sent;/* time when smb send finished */ unsigned long when_received;/* when demux complete (taken off wire) */ #endif -mid_receive_t *receive;/* call receive callback */ -mid_callback_t *callback;/* call completion callback */ -mid_handle_t *handle;/* call handle mid callback */ +mid_receive_t receive;/* call receive callback */ +mid_callback_t callback;/* call completion callback */ +mid_handle_t handle;/* call handle mid callback */ void *callback_data;/* general purpose pointer for callback */ struct task_struct *creator;void *resp_buf;/* pointer to received SMB header */ @@ -1745,12 +1745,12 @@ static inline void cifs_num_waiters_dec(struct TCP_Server_Info *server) }#ifdef CONFIG_CIFS_STATS2 -static inline void cifs_save_when_sent (struct mid_q_entry *mid) +static inline void cifs_save_when_sent (struct smb_message *smb) { - mid->when_sent = jiffies; + smb->when_sent = jiffies; }#else -static inline void cifs_save_when_sent (struct mid_q_entry *mid) +static inline void cifs_save_when_sent (struct smb_message *smb) { }#endif @@ -2104,7 +2104,7 @@ extern __u32 cifs_lock_secret;extern mempool_t *cifs_sm_req_poolp;extern mempool_t *cifs_req_poolp; -extern mempool_t *cifs_mid_poolp; +extern mempool_t smb_message_pool;extern mempool_t cifs_io_request_pool;extern mempool_t cifs_io_subrequest_pool;@@ -2351,17 +2351,17 @@ static inline bool cifs_netbios_name(const char *name, size_t namelen)* Execute mid callback atomically - ensures callback runs exactly once * and prevents sleeping in atomic context. */ -static inline void mid_execute_callback (struct mid_q_entry *mid) +static inline void mid_execute_callback (struct smb_message *smb) { -void (*callback)(struct mid_q_entry *mid); +mid_callback_t callback; -spin_lock (&mid->mid_lock); - callback = mid->callback; - mid->callback =NULL ;/* Mark as executed, */ -spin_unlock (&mid->mid_lock); +spin_lock (&smb->mid_lock); + callback = smb->callback; + smb->callback =NULL ;/* Mark as executed, */ +spin_unlock (&smb->mid_lock);if (callback) -callback (mid); +callback (smb); }#define CIFS_REPARSE_SUPPORT (tcon) \fs/smb/client/cifsproto.h +19
-20@@ -84,11 +84,11 @@ extern char *cifs_build_path_to_root(struct smb3_fs_context *ctx, int add_treename);extern char *build_wildcard_path_from_dentry (struct dentry *direntry);char *cifs_build_devname (char *nodename,const char *prepath); -extern void delete_mid (struct mid_q_entry *mid); +extern void delete_mid (struct smb_message *smb);void __release_mid (struct kref *refcount); -extern void cifs_wake_up_task (struct mid_q_entry *mid); +extern void cifs_wake_up_task (struct smb_message *smb);extern int cifs_handle_standard (struct TCP_Server_Info *server, -struct mid_q_entry *mid); +struct smb_message *smb);extern char *smb3_fs_context_fullpath (const struct smb3_fs_context *ctx,char dirsep);extern int smb3_parse_devname (const char *devname,struct smb3_fs_context *ctx);@@ -98,8 +98,8 @@ extern bool cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs);extern int cifs_discard_remaining_data (struct TCP_Server_Info *server);extern int cifs_call_async (struct TCP_Server_Info *server,struct smb_rqst *rqst, -mid_receive_t *receive,mid_callback_t *callback, -mid_handle_t *handle,void *cbdata,const int flags, +mid_receive_t receive,mid_callback_t callback, +mid_handle_t handle,void *cbdata,const int flags,const struct cifs_credits *exist_credits);extern struct TCP_Server_Info *cifs_pick_channel (struct cifs_ses *ses); extern int cifs_send_recv(const unsigned int xid, struct cifs_ses *ses,@@ -117,15 +117,14 @@ extern int SendReceive(const unsigned int /* xid */ , struct cifs_ses *, int * /* bytes returned */ , const int);extern int SendReceiveNoRsp (const unsigned int xid,struct cifs_ses *ses,char *in_buf,int flags); -int cifs_sync_mid_result (struct mid_q_entry *mid,struct TCP_Server_Info *server); -extern struct mid_q_entry *cifs_setup_request (struct cifs_ses *, -struct TCP_Server_Info *, -struct smb_rqst *); -extern struct mid_q_entry *cifs_setup_async_request (struct TCP_Server_Info *, -struct smb_rqst *); +int cifs_sync_mid_result (struct smb_message *smb,struct TCP_Server_Info *server); +struct smb_message *cifs_setup_request (struct cifs_ses *ses,struct TCP_Server_Info *ignored, +struct smb_rqst *rqst); +struct smb_message *cifs_setup_async_request (struct TCP_Server_Info *server, +struct smb_rqst *rqst);int __smb_send_rqst (struct TCP_Server_Info *server,int num_rqst,struct smb_rqst *rqst); -extern int cifs_check_receive (struct mid_q_entry *mid, +extern int cifs_check_receive (struct smb_message *msg,struct TCP_Server_Info *server,bool log_error);int wait_for_free_request (struct TCP_Server_Info *server,const int flags,unsigned int *instance);@@ -135,13 +134,13 @@ extern int cifs_wait_mtu_credits(struct TCP_Server_Info *server,static inline int send_cancel (struct TCP_Server_Info *server,struct smb_rqst *rqst, -struct mid_q_entry *mid) +struct smb_message *smb) {return server->ops->send_cancel ? - server->ops->send_cancel (server, rqst, mid) :0 ; + server->ops->send_cancel (server, rqst, smb) :0 ; } -int wait_for_response (struct TCP_Server_Info *server,struct mid_q_entry *midQ); +int wait_for_response (struct TCP_Server_Info *server,struct smb_message *smb); extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, struct kvec *, int /* nvec to send */, int * /* type of buf returned */, const int flags,@@ -187,7 +186,7 @@ extern int decode_negTokenInit(unsigned char *security_blob, int length,extern int cifs_convert_address (struct sockaddr *dst,const char *src,int len);extern void cifs_set_port (struct sockaddr *addr,const unsigned short int port);extern int map_smb_to_linux_error (char *buf,bool logErr); -extern int map_and_check_smb_error (struct mid_q_entry *mid,bool logErr); +extern int map_and_check_smb_error (struct smb_message *smb,bool logErr);extern void header_assemble (struct smb_hdr *,char /* command */ ,const struct cifs_tcon *,int /* length of fixed section (word count) in two byte units */ );@@ -270,7 +269,7 @@ extern unsigned int setup_special_mode_ACE(struct smb_ace *pace, __u64 nmode);extern unsigned int setup_special_user_owner_ACE (struct smb_ace *pace); -extern void dequeue_mid (struct mid_q_entry *mid,bool malformed); +extern void dequeue_mid (struct smb_message *smb,bool malformed);extern int cifs_read_from_socket (struct TCP_Server_Info *server,char *buf,unsigned int to_read); extern ssize_t cifs_discard_from_socket(struct TCP_Server_Info *server,@@ -624,7 +623,7 @@ extern struct cifs_ses * cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx);int cifs_async_readv (struct cifs_io_subrequest *rdata); -int cifs_readv_receive (struct TCP_Server_Info *server,struct mid_q_entry *mid); +int cifs_readv_receive (struct TCP_Server_Info *server,struct smb_message *smb);void cifs_async_writev (struct cifs_io_subrequest *wdata); int cifs_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,@@ -777,9 +776,9 @@ static inline bool dfs_src_pathname_equal(const char *s1, const char *s2)return true; } -static inline void release_mid (struct mid_q_entry *mid) +static inline void release_mid (struct smb_message *smb) { -kref_put (&mid->refcount, __release_mid); +kref_put (&smb->refcount, __release_mid); }static inline void cifs_free_open_info (struct cifs_open_info_data *data)fs/smb/client/cifssmb.c +41
-41@@ -577,12 +577,12 @@ CIFSSMBTDis(const unsigned int xid, struct cifs_tcon *tcon)* FIXME: maybe we should consider checking that the reply matches request? */ static void -cifs_echo_callback (struct mid_q_entry *mid) +cifs_echo_callback (struct smb_message *smb) { -struct TCP_Server_Info *server = mid->callback_data; +struct TCP_Server_Info *server = smb->callback_data;struct cifs_credits credits = { .value =1 , .instance =0 }; -release_mid (mid); +release_mid (smb);add_credits (server, &credits,CIFS_ECHO_OP ); }@@ -1296,9 +1296,9 @@ CIFS_open(const unsigned int xid, struct cifs_open_parms *oparms, int *oplock, }static void -cifs_readv_callback (struct mid_q_entry *mid) +cifs_readv_callback (struct smb_message *smb) { -struct cifs_io_subrequest *rdata = mid->callback_data; +struct cifs_io_subrequest *rdata = smb->callback_data;struct netfs_inode *ictx =netfs_inode (rdata->rreq->inode);struct cifs_tcon *tcon =tlink_tcon (rdata->req->cfile->tlink);struct TCP_Server_Info *server = tcon->ses->server;@@ -1315,10 +1315,10 @@ cifs_readv_callback(struct mid_q_entry *mid)unsigned int subreq_debug_index = rdata->subreq.debug_index;cifs_dbg (FYI ,"%s: mid=%llu state=%d result=%d bytes=%zu\n" , - __func__, mid->mid, mid->mid_state, rdata->result, + __func__, smb->mid, smb->mid_state, rdata->result, rdata->subreq.len); -switch (mid->mid_state) { +switch (smb->mid_state) {case MID_RESPONSE_RECEIVED :/* result already set, check signature */ if (server->sign) {@@ -1326,7 +1326,7 @@ cifs_readv_callback(struct mid_q_entry *mid)iov_iter_truncate (&rqst.rq_iter, rdata->got_bytes); rc =cifs_verify_signature (&rqst, server, - mid->sequence_number); + smb->sequence_number);if (rc)cifs_dbg (VFS ,"SMB signature verification returned error = %d\n" , rc);@@ -1399,7 +1399,7 @@ cifs_readv_callback(struct mid_q_entry *mid) rdata->subreq.transferred += rdata->got_bytes;trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_progress);netfs_read_subreq_terminated (&rdata->subreq); -release_mid (mid); +release_mid (smb);add_credits (server, &credits,0 ); trace_smb3_rw_credits(rreq_debug_id, subreq_debug_index, 0, server->credits, server->in_flight,@@ -1712,12 +1712,12 @@ CIFSSMBWrite(const unsigned int xid, struct cifs_io_parms *io_parms,* workqueue completion task. */ static void -cifs_writev_callback (struct mid_q_entry *mid) +cifs_writev_callback (struct smb_message *smb) { -struct cifs_io_subrequest *wdata = mid->callback_data; +struct cifs_io_subrequest *wdata = smb->callback_data;struct TCP_Server_Info *server = wdata->server;struct cifs_tcon *tcon =tlink_tcon (wdata->req->cfile->tlink); -WRITE_RSP *smb = (WRITE_RSP *)mid->resp_buf; +WRITE_RSP *rsp = (WRITE_RSP *)smb->resp_buf;struct cifs_credits credits = { .value =1 , .instance =0 ,@@ -1727,15 +1727,15 @@ cifs_writev_callback(struct mid_q_entry *mid)ssize_t result;size_t written; -switch (mid->mid_state) { +switch (smb->mid_state) {case MID_RESPONSE_RECEIVED : - result =cifs_check_receive (mid, tcon->ses->server,0 ); + result =cifs_check_receive (smb, tcon->ses->server,0 );if (result !=0 )break ; - written =le16_to_cpu (smb->CountHigh); + written =le16_to_cpu (rsp->CountHigh); written <<=16 ; - written +=le16_to_cpu (smb->Count); + written +=le16_to_cpu (rsp->Count);/* * Mask off high 16 bits when bytes written as returned * by the server is greater than bytes requested by the @@ -1779,7 +1779,7 @@ cifs_writev_callback(struct mid_q_entry *mid) 0, cifs_trace_rw_credits_write_response_clear); wdata->credits.value =0 ;cifs_write_subrequest_terminated (wdata, result); -release_mid (mid); +release_mid (smb);trace_smb3_rw_credits (credits.rreq_debug_id, credits.rreq_debug_index,0 , server->credits, server->in_flight, credits.value, cifs_trace_rw_credits_write_response_add);@@ -1791,7 +1791,7 @@ void cifs_async_writev(struct cifs_io_subrequest *wdata) {int rc = -EACCES ; -WRITE_REQ *smb =NULL ; +WRITE_REQ *req =NULL ;int wct;struct cifs_tcon *tcon =tlink_tcon (wdata->req->cfile->tlink);struct kvec iov[2 ];@@ -1808,30 +1808,30 @@ cifs_async_writev(struct cifs_io_subrequest *wdata) } } - rc =small_smb_init (SMB_COM_WRITE_ANDX , wct, tcon, (void **)&smb); + rc =small_smb_init (SMB_COM_WRITE_ANDX , wct, tcon, (void **)&req);if (rc) goto async_writev_out; - smb->hdr.Pid =cpu_to_le16 ((__u16 )wdata->req->pid); - smb->hdr.PidHigh =cpu_to_le16 ((__u16)(wdata->req->pid >>16 )); + req->hdr.Pid =cpu_to_le16 ((__u16 )wdata->req->pid); + req->hdr.PidHigh =cpu_to_le16 ((__u16)(wdata->req->pid >>16 )); - smb->AndXCommand =0xFF ;/* none */ - smb->Fid = wdata->req->cfile->fid.netfid; - smb->OffsetLow =cpu_to_le32 (wdata->subreq.start &0xFFFFFFFF ); + req->AndXCommand =0xFF ;/* none */ + req->Fid = wdata->req->cfile->fid.netfid; + req->OffsetLow =cpu_to_le32 (wdata->subreq.start &0xFFFFFFFF );if (wct ==14 ) - smb->OffsetHigh =cpu_to_le32 (wdata->subreq.start >>32 ); - smb->Reserved =0xFFFFFFFF ; - smb->WriteMode =0 ; - smb->Remaining =0 ; + req->OffsetHigh =cpu_to_le32 (wdata->subreq.start >>32 ); + req->Reserved =0xFFFFFFFF ; + req->WriteMode =0 ; + req->Remaining =0 ; - smb->DataOffset = + req->DataOffset =cpu_to_le16 (offsetof(struct smb_com_write_req , Data) -4 );/* 4 for RFC1001 length + 1 for BCC */ iov[0 ].iov_len =4 ; - iov[0 ].iov_base = smb; - iov[1 ].iov_len =get_rfc1002_len (smb) +1 ; - iov[1 ].iov_base = (char *)smb +4 ; + iov[0 ].iov_base = req; + iov[1 ].iov_len =get_rfc1002_len (req) +1 ; + iov[1 ].iov_base = (char *)req +4 ; rqst.rq_iov = iov; rqst.rq_nvec =2 ;@@ -1840,18 +1840,18 @@ cifs_async_writev(struct cifs_io_subrequest *wdata)cifs_dbg (FYI ,"async write at %llu %zu bytes\n" , wdata->subreq.start, wdata->subreq.len); - smb->DataLengthLow =cpu_to_le16 (wdata->subreq.len &0xFFFF ); - smb->DataLengthHigh =cpu_to_le16 (wdata->subreq.len >>16 ); + req->DataLengthLow =cpu_to_le16 (wdata->subreq.len &0xFFFF ); + req->DataLengthHigh =cpu_to_le16 (wdata->subreq.len >>16 );if (wct ==14 ) { -inc_rfc1001_len (&smb->hdr, wdata->subreq.len +1 ); -put_bcc (wdata->subreq.len +1 , &smb->hdr); +inc_rfc1001_len (&req->hdr, wdata->subreq.len +1 ); +put_bcc (wdata->subreq.len +1 , &req->hdr); }else {/* wct == 12 */ -struct smb_com_writex_req *smbw = - (struct smb_com_writex_req *)smb; -inc_rfc1001_len (&smbw->hdr, wdata->subreq.len +5 ); -put_bcc (wdata->subreq.len +5 , &smbw->hdr); +struct smb_com_writex_req *reqw = + (struct smb_com_writex_req *)req; +inc_rfc1001_len (&reqw->hdr, wdata->subreq.len +5 ); +put_bcc (wdata->subreq.len +5 , &reqw->hdr); iov[1 ].iov_len +=4 ;/* pad bigger by four bytes */ }@@ -1862,7 +1862,7 @@ cifs_async_writev(struct cifs_io_subrequest *wdata)cifs_stats_inc (&tcon->stats.cifs_stats.num_writes); async_writev_out: -cifs_small_buf_release (smb); +cifs_small_buf_release (req); out:if (rc) {add_credits_and_wake_if (wdata->server, &wdata->credits,0 );fs/smb/client/cifstransport.c +85
-83@@ -33,41 +33,41 @@/* Max number of iovectors we can use off the stack when sending requests. */ #define CIFS_MAX_IOV_SIZE 8 -static struct mid_q_entry * +static struct smb_message *alloc_mid (const struct smb_hdr *smb_buffer,struct TCP_Server_Info *server) { -struct mid_q_entry *temp; +struct smb_message *smb;if (server ==NULL ) {cifs_dbg (VFS ,"%s: null TCP session\n" , __func__);return NULL ; } - temp =mempool_alloc (cifs_mid_poolp,GFP_NOFS ); -memset (temp,0 ,sizeof (struct mid_q_entry )); -kref_init (&temp->refcount); -spin_lock_init (&temp->mid_lock); - temp->mid =get_mid (smb_buffer); - temp->pid = current->pid; - temp->command =cpu_to_le16 (smb_buffer->Command); + smb =mempool_alloc (&smb_message_pool,GFP_NOFS ); +memset (smb,0 ,sizeof (struct smb_message )); +kref_init (&smb->refcount); +spin_lock_init (&smb->mid_lock); + smb->mid =get_mid (smb_buffer); + smb->pid = current->pid; + smb->command =cpu_to_le16 (smb_buffer->Command);cifs_dbg (FYI ,"For smb_command %d\n" , smb_buffer->Command);/* easier to use jiffies */ /* when mid allocated can be before when sent */ - temp->when_alloc = jiffies; - temp->server = server; + smb->when_alloc = jiffies; + smb->server = server;/* * The default is for the mid to be synchronous, so the * default callback just wakes up the current task. */ get_task_struct (current); - temp->creator = current; - temp->callback = cifs_wake_up_task; - temp->callback_data = current; + smb->creator = current; + smb->callback = cifs_wake_up_task; + smb->callback_data = current;atomic_inc (&mid_count); - temp->mid_state =MID_REQUEST_ALLOCATED ; -return temp; + smb->mid_state =MID_REQUEST_ALLOCATED ; +return smb; }int @@ -87,7 +87,7 @@ smb_send(struct TCP_Server_Info *server, struct smb_hdr *smb_buffer, }static int allocate_mid (struct cifs_ses *ses,struct smb_hdr *in_buf, -struct mid_q_entry **ppmidQ) +struct smb_message **ppmidQ) {spin_lock (&ses->ses_lock);if (ses->ses_status ==SES_NEW ) {@@ -118,12 +118,12 @@ static int allocate_mid(struct cifs_ses *ses, struct smb_hdr *in_buf,return 0 ; } -struct mid_q_entry * +struct smb_message *cifs_setup_async_request (struct TCP_Server_Info *server,struct smb_rqst *rqst) {int rc;struct smb_hdr *hdr = (struct smb_hdr *)rqst->rq_iov[0 ].iov_base; -struct mid_q_entry *mid; +struct smb_message *smb;if (rqst->rq_iov[0 ].iov_len !=4 || rqst->rq_iov[0 ].iov_base +4 != rqst->rq_iov[1 ].iov_base)@@ -133,17 +133,17 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst)if (server->sign) hdr->Flags2 |=SMBFLG2_SECURITY_SIGNATURE ; - mid =alloc_mid (hdr, server); -if (mid ==NULL ) + smb =alloc_mid (hdr, server); +if (smb ==NULL )return ERR_PTR (-ENOMEM ); - rc =cifs_sign_rqst (rqst, server, &mid->sequence_number); + rc =cifs_sign_rqst (rqst, server, &smb->sequence_number);if (rc) { -release_mid (mid); +release_mid (smb);return ERR_PTR (rc); } -return mid; +return smb; }/* @@ -174,12 +174,12 @@ SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses, }int -cifs_check_receive (struct mid_q_entry *mid,struct TCP_Server_Info *server, +cifs_check_receive (struct smb_message *smb,struct TCP_Server_Info *server,bool log_error) { -unsigned int len =get_rfc1002_len (mid->resp_buf) +4 ; +unsigned int len =get_rfc1002_len (smb->resp_buf) +4 ; -dump_smb (mid->resp_buf,min_t (u32,92 , len)); +dump_smb (smb->resp_buf,min_t (u32,92 , len));/* convert the length into a more usable form */ if (server->sign) {@@ -188,43 +188,43 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,struct smb_rqst rqst = { .rq_iov = iov, .rq_nvec =2 }; - iov[0 ].iov_base = mid->resp_buf; + iov[0 ].iov_base = smb->resp_buf; iov[0 ].iov_len =4 ; - iov[1 ].iov_base = (char *)mid->resp_buf +4 ; + iov[1 ].iov_base = (char *)smb->resp_buf +4 ; iov[1 ].iov_len = len -4 ;/* FIXME: add code to kill session */ rc =cifs_verify_signature (&rqst, server, - mid->sequence_number); + smb->sequence_number);if (rc)cifs_server_dbg (VFS ,"SMB signature verification returned error = %d\n" , rc); }/* BB special case reconnect tid and uid here? */ -return map_and_check_smb_error (mid, log_error); +return map_and_check_smb_error (smb, log_error); } -struct mid_q_entry * +struct smb_message *cifs_setup_request (struct cifs_ses *ses,struct TCP_Server_Info *ignored,struct smb_rqst *rqst) {int rc;struct smb_hdr *hdr = (struct smb_hdr *)rqst->rq_iov[0 ].iov_base; -struct mid_q_entry *mid; +struct smb_message *smb;if (rqst->rq_iov[0 ].iov_len !=4 || rqst->rq_iov[0 ].iov_base +4 != rqst->rq_iov[1 ].iov_base)return ERR_PTR (-EIO ); - rc =allocate_mid (ses, hdr, &mid); + rc =allocate_mid (ses, hdr, &smb);if (rc)return ERR_PTR (rc); - rc =cifs_sign_rqst (rqst, ses->server, &mid->sequence_number); + rc =cifs_sign_rqst (rqst, ses->server, &smb->sequence_number);if (rc) { -delete_mid (mid); +delete_mid (smb);return ERR_PTR (rc); } -return mid; +return smb; }int @@ -272,7 +272,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, int *pbytes_returned, const int flags) { int rc = 0; -struct mid_q_entry *midQ; +struct smb_message *smb;unsigned int len =be32_to_cpu (in_buf->smb_buf_length);struct kvec iov = { .iov_base = in_buf, .iov_len = len };struct smb_rqst rqst = { .rq_iov = &iov, .rq_nvec =1 };@@ -316,7 +316,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,cifs_server_lock (server); - rc =allocate_mid (ses, in_buf, &midQ); + rc =allocate_mid (ses, in_buf, &smb);if (rc) {cifs_server_unlock (server);/* Update # of requests on wire to server */ @@ -324,16 +324,16 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,return rc; } - rc =cifs_sign_smb (in_buf, server, &midQ->sequence_number); + rc =cifs_sign_smb (in_buf, server, &smb->sequence_number);if (rc) {cifs_server_unlock (server); goto out; } - midQ->mid_state =MID_REQUEST_SUBMITTED ; + smb->mid_state =MID_REQUEST_SUBMITTED ; rc =smb_send (server, in_buf, len); -cifs_save_when_sent (midQ); +cifs_save_when_sent (smb);if (rc <0 ) server->sequence_number -=2 ;@@ -343,38 +343,39 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,if (rc <0 ) goto out; - rc =wait_for_response (server, midQ); + rc =wait_for_response (server, smb);if (rc !=0 ) { -send_cancel (server, &rqst, midQ); -spin_lock (&midQ->mid_lock); -if (midQ->callback) { +send_cancel (server, &rqst, smb); +spin_lock (&smb->mid_lock); +if (smb->mid_state ==MID_REQUEST_SUBMITTED || + smb->mid_state ==MID_RESPONSE_RECEIVED ) {/* no longer considered to be "in-flight" */ - midQ->callback = release_mid; -spin_unlock (&midQ->mid_lock); + smb->callback = release_mid; +spin_unlock (&smb->mid_lock);add_credits (server, &credits,0 );return rc; } -spin_unlock (&midQ->mid_lock); +spin_unlock (&smb->mid_lock); } - rc =cifs_sync_mid_result (midQ, server); + rc =cifs_sync_mid_result (smb, server);if (rc !=0 ) {add_credits (server, &credits,0 );return rc; } -if (!midQ->resp_buf || !out_buf || - midQ->mid_state !=MID_RESPONSE_READY ) { +if (!smb->resp_buf || !out_buf || + smb->mid_state !=MID_RESPONSE_READY ) { rc = -EIO ;cifs_server_dbg (VFS ,"Bad MID state?\n" ); goto out; } - *pbytes_returned =get_rfc1002_len (midQ->resp_buf); -memcpy (out_buf, midQ->resp_buf, *pbytes_returned +4 ); - rc =cifs_check_receive (midQ, server,0 ); + *pbytes_returned =get_rfc1002_len (smb->resp_buf); +memcpy (out_buf, smb->resp_buf, *pbytes_returned +4 ); + rc =cifs_check_receive (smb, server,0 ); out: -delete_mid (midQ); +delete_mid (smb);add_credits (server, &credits,0 );return rc;@@ -412,7 +413,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, {int rc =0 ;int rstart =0 ; -struct mid_q_entry *midQ; +struct smb_message *smb;struct cifs_ses *ses;unsigned int len =be32_to_cpu (in_buf->smb_buf_length);struct kvec iov = { .iov_base = in_buf, .iov_len = len };@@ -459,22 +460,22 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,cifs_server_lock (server); - rc =allocate_mid (ses, in_buf, &midQ); + rc =allocate_mid (ses, in_buf, &smb);if (rc) {cifs_server_unlock (server);return rc; } - rc =cifs_sign_smb (in_buf, server, &midQ->sequence_number); + rc =cifs_sign_smb (in_buf, server, &smb->sequence_number);if (rc) { -delete_mid (midQ); +delete_mid (smb);cifs_server_unlock (server);return rc; } - midQ->mid_state =MID_REQUEST_SUBMITTED ; + smb->mid_state =MID_REQUEST_SUBMITTED ; rc =smb_send (server, in_buf, len); -cifs_save_when_sent (midQ); +cifs_save_when_sent (smb);if (rc <0 ) server->sequence_number -=2 ;@@ -482,22 +483,22 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,cifs_server_unlock (server);if (rc <0 ) { -delete_mid (midQ); +delete_mid (smb);return rc; }/* Wait for a reply - allow signals to interrupt. */ rc =wait_event_interruptible (server->response_q, - (!(midQ->mid_state ==MID_REQUEST_SUBMITTED || - midQ->mid_state ==MID_RESPONSE_RECEIVED )) || + (!(smb->mid_state ==MID_REQUEST_SUBMITTED || + smb->mid_state ==MID_RESPONSE_RECEIVED )) || ((server->tcpStatus != CifsGood) && (server->tcpStatus != CifsNew)));/* Were we interrupted by a signal ? */ spin_lock (&server->srv_lock);if ((rc == -ERESTARTSYS ) && - (midQ->mid_state ==MID_REQUEST_SUBMITTED || - midQ->mid_state ==MID_RESPONSE_RECEIVED ) && + (smb->mid_state ==MID_REQUEST_SUBMITTED || + smb->mid_state ==MID_RESPONSE_RECEIVED ) && ((server->tcpStatus == CifsGood) || (server->tcpStatus == CifsNew))) {spin_unlock (&server->srv_lock);@@ -505,9 +506,9 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,if (in_buf->Command ==SMB_COM_TRANSACTION2 ) {/* POSIX lock. We send a NT_CANCEL SMB to cause the blocking lock to return. */ - rc =send_cancel (server, &rqst, midQ); + rc =send_cancel (server, &rqst, smb);if (rc) { -delete_mid (midQ); +delete_mid (smb);return rc; } }else {@@ -519,22 +520,23 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,/* If we get -ENOLCK back the lock may have already been removed. Don't exit in this case. */ if (rc && rc != -ENOLCK ) { -delete_mid (midQ); +delete_mid (smb);return rc; } } - rc =wait_for_response (server, midQ); + rc =wait_for_response (server, smb);if (rc) { -send_cancel (server, &rqst, midQ); -spin_lock (&midQ->mid_lock); -if (midQ->callback) { +send_cancel (server, &rqst, smb); +spin_lock (&smb->mid_lock); +if (smb->mid_state ==MID_REQUEST_SUBMITTED || + smb->mid_state ==MID_RESPONSE_RECEIVED ) {/* no longer considered to be "in-flight" */ - midQ->callback = release_mid; -spin_unlock (&midQ->mid_lock); + smb->callback = release_mid; +spin_unlock (&smb->mid_lock);return rc; } -spin_unlock (&midQ->mid_lock); +spin_unlock (&smb->mid_lock); }/* We got the response - restart system call. */ @@ -543,22 +545,22 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, }spin_unlock (&server->srv_lock); - rc =cifs_sync_mid_result (midQ, server); + rc =cifs_sync_mid_result (smb, server);if (rc !=0 )return rc;/* rcvd frame is ok */ -if (out_buf ==NULL || midQ->mid_state !=MID_RESPONSE_READY ) { +if (out_buf ==NULL || smb->mid_state !=MID_RESPONSE_READY ) { rc = -EIO ;cifs_tcon_dbg (VFS ,"Bad MID state?\n" ); goto out; } - *pbytes_returned =get_rfc1002_len (midQ->resp_buf); -memcpy (out_buf, midQ->resp_buf, *pbytes_returned +4 ); - rc =cifs_check_receive (midQ, server,0 ); + *pbytes_returned =get_rfc1002_len (smb->resp_buf); +memcpy (out_buf, smb->resp_buf, *pbytes_returned +4 ); + rc =cifs_check_receive (smb, server,0 ); out: -delete_mid (midQ); +delete_mid (smb);if (rstart && rc == -EACCES )return -ERESTARTSYS ;return rc;fs/smb/client/connect.c +76
-76@@ -293,7 +293,7 @@ cifs_mark_tcp_ses_conns_for_reconnect(struct TCP_Server_Info *server,static void cifs_abort_connection (struct TCP_Server_Info *server) { -struct mid_q_entry *mid, *nmid; +struct smb_message *smb, *nsmb;struct list_head retry_list; server->maxBuf =0 ;@@ -324,21 +324,21 @@ cifs_abort_connection(struct TCP_Server_Info *server)INIT_LIST_HEAD (&retry_list);cifs_dbg (FYI ,"%s: moving mids to private list\n" , __func__);spin_lock (&server->mid_queue_lock); -list_for_each_entry_safe (mid, nmid, &server->pending_mid_q, qhead) { -kref_get (&mid->refcount); -if (mid->mid_state ==MID_REQUEST_SUBMITTED ) - mid->mid_state =MID_RETRY_NEEDED ; -list_move (&mid->qhead, &retry_list); - mid->deleted_from_q = true; +list_for_each_entry_safe (smb, nsmb, &server->pending_mid_q, qhead) { +kref_get (&smb->refcount); +if (smb->mid_state ==MID_REQUEST_SUBMITTED ) + smb->mid_state =MID_RETRY_NEEDED ; +list_move (&smb->qhead, &retry_list); + smb->deleted_from_q = true; }spin_unlock (&server->mid_queue_lock);cifs_server_unlock (server);cifs_dbg (FYI ,"%s: issuing mid callbacks\n" , __func__); -list_for_each_entry_safe (mid, nmid, &retry_list, qhead) { -list_del_init (&mid->qhead); -mid_execute_callback (mid); -release_mid (mid); +list_for_each_entry_safe (smb, nsmb, &retry_list, qhead) { +list_del_init (&smb->qhead); +mid_execute_callback (smb); +release_mid (smb); } }@@ -868,7 +868,7 @@ is_smb_response(struct TCP_Server_Info *server, unsigned char type) !server->with_rfc1001 && server->rfc1001_sessinit != 0) {int rc, mid_rc; -struct mid_q_entry *mid, *nmid; +struct smb_message *smb, *nsmb;LIST_HEAD (dispose_list);cifs_dbg (FYI ,"RFC 1002 negative session response during SMB Negotiate, retrying with NetBIOS session\n" );@@ -881,10 +881,10 @@ is_smb_response(struct TCP_Server_Info *server, unsigned char type)* corresponding to SMB1/SMB2 Negotiate packet. */ spin_lock (&server->mid_queue_lock); -list_for_each_entry_safe (mid, nmid, &server->pending_mid_q, qhead) { -kref_get (&mid->refcount); -list_move (&mid->qhead, &dispose_list); - mid->deleted_from_q = true; +list_for_each_entry_safe (smb, nsmb, &server->pending_mid_q, qhead) { +kref_get (&smb->refcount); +list_move (&smb->qhead, &dispose_list); + smb->deleted_from_q = true; }spin_unlock (&server->mid_queue_lock);@@ -911,12 +911,12 @@ is_smb_response(struct TCP_Server_Info *server, unsigned char type)* callback. Use MID_RC state which indicates that the * return code should be read from mid_rc member. */ -list_for_each_entry_safe (mid, nmid, &dispose_list, qhead) { -list_del_init (&mid->qhead); - mid->mid_rc = mid_rc; - mid->mid_state =MID_RC ; -mid_execute_callback (mid); -release_mid (mid); +list_for_each_entry_safe (smb, nsmb, &dispose_list, qhead) { +list_del_init (&smb->qhead); + smb->mid_rc = mid_rc; + smb->mid_state =MID_RC ; +mid_execute_callback (smb); +release_mid (smb); }/* @@ -948,27 +948,27 @@ is_smb_response(struct TCP_Server_Info *server, unsigned char type) }void -dequeue_mid (struct mid_q_entry *mid,bool malformed) +dequeue_mid (struct smb_message *smb,bool malformed) {#ifdef CONFIG_CIFS_STATS2 - mid->when_received = jiffies; + smb->when_received = jiffies;#endif -spin_lock (&mid->server->mid_queue_lock); +spin_lock (&smb->server->mid_queue_lock);if (!malformed) - mid->mid_state =MID_RESPONSE_RECEIVED ; + smb->mid_state =MID_RESPONSE_RECEIVED ;else - mid->mid_state =MID_RESPONSE_MALFORMED ; + smb->mid_state =MID_RESPONSE_MALFORMED ;/* * Trying to handle/dequeue a mid after the send_recv() * function has finished processing it is a bug. */ -if (mid->deleted_from_q == true) { -spin_unlock (&mid->server->mid_queue_lock); +if (smb->deleted_from_q) { +spin_unlock (&smb->server->mid_queue_lock);pr_warn_once ("trying to dequeue a deleted mid\n" ); }else { -list_del_init (&mid->qhead); - mid->deleted_from_q = true; -spin_unlock (&mid->server->mid_queue_lock); +list_del_init (&smb->qhead); + smb->deleted_from_q = true; +spin_unlock (&smb->server->mid_queue_lock); } }@@ -987,24 +987,24 @@ smb2_get_credits_from_hdr(char *buffer, struct TCP_Server_Info *server) }static void -handle_mid (struct mid_q_entry *mid,struct TCP_Server_Info *server, +handle_mid (struct smb_message *smb,struct TCP_Server_Info *server,char *buf,int malformed) {if (server->ops->check_trans2 && - server->ops->check_trans2 (mid, server, buf, malformed)) + server->ops->check_trans2 (smb, server, buf, malformed))return ; - mid->credits_received =smb2_get_credits_from_hdr (buf, server); - mid->resp_buf = buf; - mid->large_buf = server->large_buf; + smb->credits_received =smb2_get_credits_from_hdr (buf, server); + smb->resp_buf = buf; + smb->large_buf = server->large_buf;/* Was previous buf put in mpx struct for multi-rsp? */ -if (!mid->multiRsp) { +if (!smb->multiRsp) {/* smb buffer will be freed by user thread */ if (server->large_buf) server->bigbuf =NULL ;else server->smallbuf =NULL ; } -dequeue_mid (mid, malformed); +dequeue_mid (smb, malformed); }int @@ -1093,28 +1093,28 @@ clean_demultiplex_info(struct TCP_Server_Info *server) }if (!list_empty (&server->pending_mid_q)) { -struct mid_q_entry *mid_entry; +struct smb_message *smb;struct list_head *tmp, *tmp2;LIST_HEAD (dispose_list);spin_lock (&server->mid_queue_lock);list_for_each_safe (tmp, tmp2, &server->pending_mid_q) { - mid_entry = list_entry(tmp, struct mid_q_entry, qhead); -cifs_dbg (FYI ,"Clearing mid %llu\n" , mid_entry->mid); -kref_get (&mid_entry->refcount); - mid_entry->mid_state =MID_SHUTDOWN ; -list_move (&mid_entry->qhead, &dispose_list); - mid_entry->deleted_from_q = true; + smb = list_entry(tmp, struct smb_message, qhead); +cifs_dbg (FYI ,"Clearing mid %llu\n" , smb->mid); +kref_get (&smb->refcount); + smb->mid_state =MID_SHUTDOWN ; +list_move (&smb->qhead, &dispose_list); + smb->deleted_from_q = true; }spin_unlock (&server->mid_queue_lock);/* now walk dispose list and issue callbacks */ list_for_each_safe (tmp, tmp2, &dispose_list) { - mid_entry = list_entry(tmp, struct mid_q_entry, qhead); -cifs_dbg (FYI ,"Callback mid %llu\n" , mid_entry->mid); -list_del_init (&mid_entry->qhead); -mid_execute_callback (mid_entry); -release_mid (mid_entry); + smb = list_entry(tmp, struct smb_message, qhead); +cifs_dbg (FYI ,"Callback mid %llu\n" , smb->mid); +list_del_init (&smb->qhead); +mid_execute_callback (smb); +release_mid (smb); }/* 1/8th of sec is more than enough time for them to exit */ msleep (125 );@@ -1148,7 +1148,7 @@ clean_demultiplex_info(struct TCP_Server_Info *server) }static int -standard_receive3 (struct TCP_Server_Info *server,struct mid_q_entry *mid) +standard_receive3 (struct TCP_Server_Info *server,struct smb_message *smb) {int length;char *buf = server->smallbuf;@@ -1179,11 +1179,11 @@ standard_receive3(struct TCP_Server_Info *server, struct mid_q_entry *mid)dump_smb (buf, server->total_read); -return cifs_handle_standard (server, mid); +return cifs_handle_standard (server, smb); }int -cifs_handle_standard (struct TCP_Server_Info *server,struct mid_q_entry *mid) +cifs_handle_standard (struct TCP_Server_Info *server,struct smb_message *smb) {char *buf = server->large_buf ? server->bigbuf : server->smallbuf;int rc;@@ -1211,10 +1211,10 @@ cifs_handle_standard(struct TCP_Server_Info *server, struct mid_q_entry *mid) server->ops->is_status_pending(buf, server))return -1 ; -if (!mid) +if (!smb)return rc; -handle_mid (mid, server, buf, rc); +handle_mid (smb, server, buf, rc);return 0 ; }@@ -1251,13 +1251,13 @@ smb2_add_credits_from_hdr(char *buffer, struct TCP_Server_Info *server)static int cifs_demultiplex_thread (void *p) { -int i, num_mids, length; +int i, num_smbs, length;struct TCP_Server_Info *server = p;unsigned int pdu_length;unsigned int next_offset;char *buf =NULL ;struct task_struct *task_to_wake =NULL ; -struct mid_q_entry *mids[MAX_COMPOUND ]; +struct smb_message *smbs[MAX_COMPOUND ];char *bufs[MAX_COMPOUND ];unsigned int noreclaim_flag, num_io_timeout =0 ;bool pending_reconnect = false;@@ -1332,32 +1332,32 @@ cifs_demultiplex_thread(void *p) server->pdu_size = next_offset; } -memset (mids,0 ,sizeof (mids)); +memset (smbs,0 ,sizeof (smbs));memset (bufs,0 ,sizeof (bufs)); - num_mids =0 ; + num_smbs =0 ;if (server->ops->is_transform_hdr && server->ops->receive_transform && server->ops->is_transform_hdr (buf)) { length = server->ops->receive_transform (server, - mids, + smbs, bufs, - &num_mids); + &num_smbs); }else { - mids[0 ] = server->ops->find_mid (server, buf); + smbs[0 ] = server->ops->find_mid (server, buf); bufs[0 ] = buf; - num_mids =1 ; + num_smbs =1 ; -if (!mids[0 ] || !mids[0 ]->receive) - length =standard_receive3 (server, mids[0 ]); +if (!smbs[0 ] || !smbs[0 ]->receive) + length =standard_receive3 (server, smbs[0 ]);else - length = mids[0 ]->receive (server, mids[0 ]); + length = smbs[0 ]->receive (server, smbs[0 ]); }if (length <0 ) { -for (i =0 ; i < num_mids; i++) -if (mids[i]) -release_mid (mids[i]); +for (i =0 ; i < num_smbs; i++) +if (smbs[i]) +release_mid (smbs[i]);continue ; }@@ -1376,9 +1376,9 @@ cifs_demultiplex_thread(void *p) server->lstrp = jiffies; -for (i =0 ; i < num_mids; i++) { -if (mids[i] !=NULL ) { - mids[i]->resp_buf_size = server->pdu_size; +for (i =0 ; i < num_smbs; i++) { +if (smbs[i] !=NULL ) { + smbs[i]->resp_buf_size = server->pdu_size;if (bufs[i] !=NULL ) { if (server->ops->is_network_name_deleted &&@@ -1389,10 +1389,10 @@ cifs_demultiplex_thread(void *p) } } -if (!mids[i]->multiRsp || mids[i]->multiEnd) -mid_execute_callback (mids[i]); +if (!smbs[i]->multiRsp || smbs[i]->multiEnd) +mid_execute_callback (smbs[i]); -release_mid (mids[i]); +release_mid (smbs[i]); }else if (server->ops->is_oplock_break && server->ops->is_oplock_break (bufs[i], server)) {fs/smb/client/netmisc.c +7
-7@@ -889,22 +889,22 @@ map_smb_to_linux_error(char *buf, bool logErr) }int -map_and_check_smb_error (struct mid_q_entry *mid,bool logErr) +map_and_check_smb_error (struct smb_message *smb,bool logErr) {int rc; -struct smb_hdr *smb = (struct smb_hdr *)mid->resp_buf; +struct smb_hdr *rhdr = (struct smb_hdr *)smb->resp_buf; - rc =map_smb_to_linux_error ((char *)smb, logErr); -if (rc == -EACCES && !(smb->Flags2 &SMBFLG2_ERR_STATUS )) { + rc =map_smb_to_linux_error ((char *)rhdr, logErr); +if (rc == -EACCES && !(rhdr->Flags2 &SMBFLG2_ERR_STATUS )) {/* possible ERRBaduid */ -__u8 class = smb->Status.DosError.ErrorClass; -__u16 code =le16_to_cpu (smb->Status.DosError.Error); +__u8 class = rhdr->Status.DosError.ErrorClass; +__u16 code =le16_to_cpu (rhdr->Status.DosError.Error);/* switch can be used to handle different errors */ if (class ==ERRSRV && code == ERRbaduid) {cifs_dbg (FYI ,"Server returned 0x%x, reconnecting session...\n" , code); -cifs_signal_cifsd_for_reconnect (mid->server, false); +cifs_signal_cifsd_for_reconnect (smb->server, false); } }fs/smb/client/smb1ops.c +23
-23@@ -30,7 +30,7 @@*/ static int send_nt_cancel (struct TCP_Server_Info *server,struct smb_rqst *rqst, -struct mid_q_entry *mid) +struct smb_message *smb) {int rc =0 ;struct smb_hdr *in_buf = (struct smb_hdr *)rqst->rq_iov[0 ].iov_base;@@ -42,7 +42,7 @@ send_nt_cancel(struct TCP_Server_Info *server, struct smb_rqst *rqst,put_bcc (0 , in_buf);cifs_server_lock (server); - rc =cifs_sign_smb (in_buf, server, &mid->sequence_number); + rc =cifs_sign_smb (in_buf, server, &smb->sequence_number);if (rc) {cifs_server_unlock (server);return rc;@@ -89,20 +89,20 @@ cifs_read_data_length(char *buf, bool in_remaining)le16_to_cpu (rsp->DataLength); } -static struct mid_q_entry * +static struct smb_message *cifs_find_mid (struct TCP_Server_Info *server,char *buffer) {struct smb_hdr *buf = (struct smb_hdr *)buffer; -struct mid_q_entry *mid; +struct smb_message *smb;spin_lock (&server->mid_queue_lock); -list_for_each_entry (mid, &server->pending_mid_q, qhead) { -if (compare_mid (mid->mid, buf) && - mid->mid_state ==MID_REQUEST_SUBMITTED && -le16_to_cpu (mid->command) == buf->Command) { -kref_get (&mid->refcount); +list_for_each_entry (smb, &server->pending_mid_q, qhead) { +if (compare_mid (smb->mid, buf) && + smb->mid_state ==MID_REQUEST_SUBMITTED && +le16_to_cpu (smb->command) == buf->Command) { +kref_get (&smb->refcount);spin_unlock (&server->mid_queue_lock); -return mid; +return smb; } }spin_unlock (&server->mid_queue_lock);@@ -136,7 +136,7 @@ cifs_get_credits_field(struct TCP_Server_Info *server, const int optype) }static unsigned int -cifs_get_credits (struct mid_q_entry *mid) +cifs_get_credits (struct smb_message *smb) {return 1 ; }@@ -189,7 +189,7 @@ cifs_get_next_mid(struct TCP_Server_Info *server)* did not time out). */ while (cur_mid != last_mid) { -struct mid_q_entry *mid_entry; +struct smb_message *smb;unsigned int num_mids; collision = false;@@ -198,10 +198,10 @@ cifs_get_next_mid(struct TCP_Server_Info *server) num_mids =0 ;spin_lock (&server->mid_queue_lock); -list_for_each_entry (mid_entry, &server->pending_mid_q, qhead) { +list_for_each_entry (smb, &server->pending_mid_q, qhead) { ++num_mids; -if (mid_entry->mid == cur_mid && - mid_entry->mid_state ==MID_REQUEST_SUBMITTED ) { +if (smb->mid == cur_mid && + smb->mid_state ==MID_REQUEST_SUBMITTED ) {/* This mid is in use, try a different one */ collision = true;break ;@@ -387,22 +387,22 @@ cifs_downgrade_oplock(struct TCP_Server_Info *server, }static bool -cifs_check_trans2 (struct mid_q_entry *mid,struct TCP_Server_Info *server, +cifs_check_trans2 (struct smb_message *smb,struct TCP_Server_Info *server,char *buf,int malformed) {if (malformed)return false;if (check2ndT2 (buf) <=0 )return false; - mid->multiRsp = true; -if (mid->resp_buf) { + smb->multiRsp = true; +if (smb->resp_buf) {/* merge response - fix up 1st*/ - malformed =coalesce_t2 (buf, mid->resp_buf); + malformed =coalesce_t2 (buf, smb->resp_buf);if (malformed >0 )return true;/* All parts received or packet is malformed. */ - mid->multiEnd = true; -dequeue_mid (mid, malformed); + smb->multiEnd = true; +dequeue_mid (smb, malformed);return true; }if (!server->large_buf) {@@ -410,8 +410,8 @@ cifs_check_trans2(struct mid_q_entry *mid, struct TCP_Server_Info *server,cifs_dbg (VFS ,"1st trans2 resp needs bigbuf\n" ); }else {/* Have first buffer */ - mid->resp_buf = buf; - mid->large_buf = true; + smb->resp_buf = buf; + smb->large_buf = true; server->bigbuf =NULL ; }return true;fs/smb/client/smb2misc.c +4
-4@@ -851,14 +851,14 @@ smb2_handle_cancelled_close(struct cifs_tcon *tcon, __u64 persistent_fid, }int -smb2_handle_cancelled_mid (struct mid_q_entry *mid,struct TCP_Server_Info *server) +smb2_handle_cancelled_mid (struct smb_message *smb,struct TCP_Server_Info *server) { -struct smb2_hdr *hdr = mid->resp_buf; -struct smb2_create_rsp *rsp = mid->resp_buf; +struct smb2_hdr *hdr = smb->resp_buf; +struct smb2_create_rsp *rsp = smb->resp_buf;struct cifs_tcon *tcon;int rc; -if ((mid->optype &CIFS_CP_CREATE_CLOSE_OP ) || hdr->Command !=SMB2_CREATE || +if ((smb->optype &CIFS_CP_CREATE_CLOSE_OP ) || hdr->Command !=SMB2_CREATE || hdr->Status !=STATUS_SUCCESS )return 0 ;fs/smb/client/smb2ops.c +61
-61@@ -226,9 +226,9 @@ smb2_get_credits_field(struct TCP_Server_Info *server, const int optype) }static unsigned int -smb2_get_credits (struct mid_q_entry *mid) +smb2_get_credits (struct smb_message *smb) { -return mid->credits_received; +return smb->credits_received; } static int@@ -389,10 +389,10 @@ smb2_revert_current_mid(struct TCP_Server_Info *server, const unsigned int val)spin_unlock (&server->mid_counter_lock); } -static struct mid_q_entry * +static struct smb_message *__smb2_find_mid (struct TCP_Server_Info *server,char *buf,bool dequeue) { -struct mid_q_entry *mid; +struct smb_message *smb;struct smb2_hdr *shdr = (struct smb2_hdr *)buf;__u64 wire_mid =le64_to_cpu (shdr->MessageId);@@ -402,30 +402,30 @@ __smb2_find_mid(struct TCP_Server_Info *server, char *buf, bool dequeue) }spin_lock (&server->mid_queue_lock); -list_for_each_entry (mid, &server->pending_mid_q, qhead) { -if ((mid->mid == wire_mid) && - (mid->mid_state ==MID_REQUEST_SUBMITTED ) && - (mid->command == shdr->Command)) { -kref_get (&mid->refcount); +list_for_each_entry (smb, &server->pending_mid_q, qhead) { +if ((smb->mid == wire_mid) && + (smb->mid_state ==MID_REQUEST_SUBMITTED ) && + (smb->command == shdr->Command)) { +kref_get (&smb->refcount);if (dequeue) { -list_del_init (&mid->qhead); - mid->deleted_from_q = true; +list_del_init (&smb->qhead); + smb->deleted_from_q = true; }spin_unlock (&server->mid_queue_lock); -return mid; +return smb; } }spin_unlock (&server->mid_queue_lock);return NULL ; } -static struct mid_q_entry * +static struct smb_message *smb2_find_mid (struct TCP_Server_Info *server,char *buf) {return __smb2_find_mid (server, buf, false); } -static struct mid_q_entry * +static struct smb_message *smb2_find_dequeue_mid (struct TCP_Server_Info *server,char *buf) {return __smb2_find_mid (server, buf, true);@@ -4667,7 +4667,7 @@ cifs_copy_folioq_to_iter(struct folio_queue *folioq, size_t data_size, }static int -handle_read_data (struct TCP_Server_Info *server,struct mid_q_entry *mid, +handle_read_data (struct TCP_Server_Info *server,struct smb_message *smb,char *buf,unsigned int buf_len,struct folio_queue *buffer,unsigned int buffer_len,bool is_offloaded) {@@ -4676,7 +4676,7 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid,unsigned int cur_off;unsigned int cur_page_idx;unsigned int pad_len; -struct cifs_io_subrequest *rdata = mid->callback_data; +struct cifs_io_subrequest *rdata = smb->callback_data;struct smb2_hdr *shdr = (struct smb2_hdr *)buf;size_t copied;bool use_rdma_mr = false;@@ -4714,9 +4714,9 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid, __func__, rdata->result);/* normal error on read response */ if (is_offloaded) - mid->mid_state =MID_RESPONSE_RECEIVED ; + smb->mid_state =MID_RESPONSE_RECEIVED ;else -dequeue_mid (mid, false); +dequeue_mid (smb, false);return 0 ; }@@ -4741,9 +4741,9 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid, __func__, data_offset); rdata->result = -EIO ;if (is_offloaded) - mid->mid_state =MID_RESPONSE_MALFORMED ; + smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (mid, rdata->result); +dequeue_mid (smb, rdata->result);return 0 ; }@@ -4760,9 +4760,9 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid, __func__, data_offset); rdata->result = -EIO ;if (is_offloaded) - mid->mid_state =MID_RESPONSE_MALFORMED ; + smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (mid, rdata->result); +dequeue_mid (smb, rdata->result);return 0 ; }@@ -4770,9 +4770,9 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid,/* data_len is corrupt -- discard frame */ rdata->result = -EIO ;if (is_offloaded) - mid->mid_state =MID_RESPONSE_MALFORMED ; + smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (mid, rdata->result); +dequeue_mid (smb, rdata->result);return 0 ; }@@ -4781,9 +4781,9 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid, cur_off, &rdata->subreq.io_iter);if (rdata->result !=0 ) {if (is_offloaded) - mid->mid_state =MID_RESPONSE_MALFORMED ; + smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (mid, rdata->result); +dequeue_mid (smb, rdata->result);return 0 ; } rdata->got_bytes = buffer_len;@@ -4800,16 +4800,16 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid,WARN_ONCE (1 ,"buf can not contain only a part of read data" ); rdata->result = -EIO ;if (is_offloaded) - mid->mid_state =MID_RESPONSE_MALFORMED ; + smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (mid, rdata->result); +dequeue_mid (smb, rdata->result);return 0 ; }if (is_offloaded) - mid->mid_state =MID_RESPONSE_RECEIVED ; + smb->mid_state =MID_RESPONSE_RECEIVED ;else -dequeue_mid (mid, false); +dequeue_mid (smb, false);return 0 ; }@@ -4827,7 +4827,7 @@ static void smb2_decrypt_offload(struct work_struct *work)struct smb2_decrypt_work *dw =container_of (work, struct smb2_decrypt_work, decrypt);int rc; -struct mid_q_entry *mid; +struct smb_message *smb;struct iov_iter iter;iov_iter_folio_queue (&iter,ITER_DEST , dw->buffer,0 ,0 , dw->len);@@ -4839,43 +4839,43 @@ static void smb2_decrypt_offload(struct work_struct *work) } dw->server->lstrp = jiffies; - mid =smb2_find_dequeue_mid (dw->server, dw->buf); -if (mid ==NULL ) + smb =smb2_find_dequeue_mid (dw->server, dw->buf); +if (smb ==NULL )cifs_dbg (FYI ,"mid not found\n" );else { - mid->decrypted = true; - rc =handle_read_data (dw->server, mid, dw->buf, + smb->decrypted = true; + rc =handle_read_data (dw->server, smb, dw->buf, dw->server->vals->read_rsp_size, dw->buffer, dw->len, true);if (rc >=0 ) {#ifdef CONFIG_CIFS_STATS2 - mid->when_received = jiffies; + smb->when_received = jiffies;#endif if (dw->server->ops->is_network_name_deleted) dw->server->ops->is_network_name_deleted (dw->buf, dw->server); -mid_execute_callback (mid); +mid_execute_callback (smb); }else {spin_lock (&dw->server->srv_lock);if (dw->server->tcpStatus == CifsNeedReconnect) {spin_lock (&dw->server->mid_queue_lock); - mid->mid_state =MID_RETRY_NEEDED ; + smb->mid_state =MID_RETRY_NEEDED ;spin_unlock (&dw->server->mid_queue_lock);spin_unlock (&dw->server->srv_lock); -mid_execute_callback (mid); +mid_execute_callback (smb); }else {spin_lock (&dw->server->mid_queue_lock); - mid->mid_state =MID_REQUEST_SUBMITTED ; - mid->deleted_from_q = false; -list_add_tail (&mid->qhead, + smb->mid_state =MID_REQUEST_SUBMITTED ; + smb->deleted_from_q = false; +list_add_tail (&smb->qhead, &dw->server->pending_mid_q);spin_unlock (&dw->server->mid_queue_lock);spin_unlock (&dw->server->srv_lock); } } -release_mid (mid); +release_mid (smb); } free_pages:@@ -4886,7 +4886,7 @@ static void smb2_decrypt_offload(struct work_struct *work)static int -receive_encrypted_read (struct TCP_Server_Info *server,struct mid_q_entry **mid, +receive_encrypted_read (struct TCP_Server_Info *server,struct smb_message **smb,int *num_mids) {char *buf = server->smallbuf;@@ -4962,13 +4962,13 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid,if (rc) goto free_pages; - *mid =smb2_find_mid (server, buf); -if (*mid ==NULL ) { + *smb =smb2_find_mid (server, buf); +if (*smb ==NULL ) {cifs_dbg (FYI ,"mid not found\n" ); }else {cifs_dbg (FYI ,"mid found\n" ); - (*mid)->decrypted = true; - rc =handle_read_data (server, *mid, buf, + (*smb)->decrypted = true; + rc =handle_read_data (server, *smb, buf, server->vals->read_rsp_size, dw->buffer, dw->len, false);if (rc >=0 ) {@@ -4991,7 +4991,7 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid,static int receive_encrypted_standard (struct TCP_Server_Info *server, -struct mid_q_entry **mids,char **bufs, +struct smb_message **mids,char **bufs,int *num_mids) {int ret, length;@@ -5000,7 +5000,7 @@ receive_encrypted_standard(struct TCP_Server_Info *server,unsigned int pdu_length = server->pdu_size;unsigned int buf_size;unsigned int next_cmd; -struct mid_q_entry *mid_entry; +struct smb_message *smb;int next_is_large;char *next_buffer =NULL ;@@ -5043,13 +5043,13 @@ receive_encrypted_standard(struct TCP_Server_Info *server,memcpy (next_buffer, buf + next_cmd, pdu_length - next_cmd); } - mid_entry =smb2_find_mid (server, buf); -if (mid_entry ==NULL ) + smb =smb2_find_mid (server, buf); +if (smb ==NULL )cifs_dbg (FYI ,"mid not found\n" );else {cifs_dbg (FYI ,"mid found\n" ); - mid_entry->decrypted = true; - mid_entry->resp_buf_size = server->pdu_size; + smb->decrypted = true; + smb->resp_buf_size = server->pdu_size; }if (*num_mids >=MAX_COMPOUND ) {@@ -5057,12 +5057,12 @@ receive_encrypted_standard(struct TCP_Server_Info *server,return -1 ; } bufs[*num_mids] = buf; - mids[(*num_mids)++] = mid_entry; + mids[(*num_mids)++] = smb; -if (mid_entry && mid_entry->handle) - ret = mid_entry->handle (server, mid_entry); +if (smb && smb->handle) + ret = smb->handle (server, smb);else - ret =cifs_handle_standard (server, mid_entry); + ret =cifs_handle_standard (server, smb);if (ret ==0 && next_cmd) { pdu_length -= next_cmd;@@ -5090,7 +5090,7 @@ receive_encrypted_standard(struct TCP_Server_Info *server,static int smb3_receive_transform (struct TCP_Server_Info *server, -struct mid_q_entry **mids,char **bufs,int *num_mids) +struct smb_message **mids,char **bufs,int *num_mids) {char *buf = server->smallbuf;unsigned int pdu_length = server->pdu_size;@@ -5120,11 +5120,11 @@ smb3_receive_transform(struct TCP_Server_Info *server, }int -smb3_handle_read_data (struct TCP_Server_Info *server,struct mid_q_entry *mid) +smb3_handle_read_data (struct TCP_Server_Info *server,struct smb_message *smb) {char *buf = server->large_buf ? server->bigbuf : server->smallbuf; -return handle_read_data (server, mid, buf, server->pdu_size, +return handle_read_data (server, smb, buf, server->pdu_size,NULL ,0 , false); }fs/smb/client/smb2pdu.c +23
-24@@ -4091,19 +4091,19 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,* FIXME: maybe we should consider checking that the reply matches request? */ static void -smb2_echo_callback (struct mid_q_entry *mid) +smb2_echo_callback (struct smb_message *smb) { -struct TCP_Server_Info *server = mid->callback_data; -struct smb2_echo_rsp *rsp = (struct smb2_echo_rsp *)mid->resp_buf; +struct TCP_Server_Info *server = smb->callback_data; +struct smb2_echo_rsp *rsp = (struct smb2_echo_rsp *)smb->resp_buf;struct cifs_credits credits = { .value =0 , .instance =0 }; -if (mid->mid_state ==MID_RESPONSE_RECEIVED - || mid->mid_state ==MID_RESPONSE_MALFORMED ) { +if (smb->mid_state ==MID_RESPONSE_RECEIVED + || smb->mid_state ==MID_RESPONSE_MALFORMED ) { credits.value =le16_to_cpu (rsp->hdr.CreditRequest); credits.instance = server->reconnect_instance; } -release_mid (mid); +release_mid (smb);add_credits (server, &credits,CIFS_ECHO_OP ); }@@ -4518,14 +4518,13 @@ smb2_new_read_req(void **buf, unsigned int *total_len, }static void -smb2_readv_callback (struct mid_q_entry *mid) +smb2_readv_callback (struct smb_message *smb) { -struct cifs_io_subrequest *rdata = mid->callback_data; +struct cifs_io_subrequest *rdata = smb->callback_data;struct netfs_inode *ictx =netfs_inode (rdata->rreq->inode);struct cifs_tcon *tcon =tlink_tcon (rdata->req->cfile->tlink);struct TCP_Server_Info *server = rdata->server; -struct smb2_hdr *shdr = - (struct smb2_hdr *)rdata->iov[0 ].iov_base; +struct smb2_hdr *shdr = (struct smb2_hdr *)rdata->iov[0 ].iov_base;struct cifs_credits credits = { .value =0 , .instance =0 ,@@ -4540,20 +4539,20 @@ smb2_readv_callback(struct mid_q_entry *mid) rqst.rq_iter = rdata->subreq.io_iter; } -WARN_ONCE (rdata->server != mid->server, +WARN_ONCE (rdata->server != smb->server,"rdata server %p != mid server %p" , - rdata->server, mid->server); + rdata->server, smb->server);cifs_dbg (FYI ,"%s: mid=%llu state=%d result=%d bytes=%zu/%zu\n" , - __func__, mid->mid, mid->mid_state, rdata->result, + __func__, smb->mid, smb->mid_state, rdata->result, rdata->got_bytes, rdata->subreq.len - rdata->subreq.transferred); -switch (mid->mid_state) { +switch (smb->mid_state) {case MID_RESPONSE_RECEIVED : credits.value =le16_to_cpu (shdr->CreditRequest); credits.instance = server->reconnect_instance;/* result already set, check signature */ -if (server->sign && !mid->decrypted) { +if (server->sign && !smb->decrypted) {int rc;iov_iter_truncate (&rqst.rq_iter, rdata->got_bytes);@@ -4643,7 +4642,7 @@ smb2_readv_callback(struct mid_q_entry *mid) rdata->subreq.transferred += rdata->got_bytes;trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_progress);netfs_read_subreq_terminated (&rdata->subreq); -release_mid (mid); +release_mid (smb);trace_smb3_rw_credits (rreq_debug_id, subreq_debug_index,0 , server->credits, server->in_flight, credits.value, cifs_trace_rw_credits_read_response_add);@@ -4820,12 +4819,12 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,* workqueue completion task. */ static void -smb2_writev_callback (struct mid_q_entry *mid) +smb2_writev_callback (struct smb_message *smb) { -struct cifs_io_subrequest *wdata = mid->callback_data; +struct cifs_io_subrequest *wdata = smb->callback_data;struct cifs_tcon *tcon =tlink_tcon (wdata->req->cfile->tlink);struct TCP_Server_Info *server = wdata->server; -struct smb2_write_rsp *rsp = (struct smb2_write_rsp *)mid->resp_buf; +struct smb2_write_rsp *rsp = (struct smb2_write_rsp *)smb->resp_buf;struct cifs_credits credits = { .value =0 , .instance =0 ,@@ -4837,16 +4836,16 @@ smb2_writev_callback(struct mid_q_entry *mid)ssize_t result =0 ;size_t written; -WARN_ONCE (wdata->server != mid->server, +WARN_ONCE (wdata->server != smb->server,"wdata server %p != mid server %p" , - wdata->server, mid->server); + wdata->server, smb->server); -switch (mid->mid_state) { +switch (smb->mid_state) {case MID_RESPONSE_RECEIVED :trace_netfs_sreq (&wdata->subreq, netfs_sreq_trace_io_progress); credits.value =le16_to_cpu (rsp->hdr.CreditRequest); credits.instance = server->reconnect_instance; - result =smb2_check_receive (mid, server,0 ); + result =smb2_check_receive (smb, server,0 );if (result !=0 ) {trace_netfs_sreq (&wdata->subreq, netfs_sreq_trace_io_bad);break ;@@ -4929,7 +4928,7 @@ smb2_writev_callback(struct mid_q_entry *mid) 0, cifs_trace_rw_credits_write_response_clear); wdata->credits.value =0 ;cifs_write_subrequest_terminated (wdata, result ?: written); -release_mid (mid); +release_mid (smb);trace_smb3_rw_credits (rreq_debug_id, subreq_debug_index,0 , server->credits, server->in_flight, credits.value, cifs_trace_rw_credits_write_response_add);fs/smb/client/smb2proto.h +7
-7@@ -30,12 +30,12 @@ extern __le16 *cifs_convert_path_to_utf16(const char *from, struct cifs_sb_info *cifs_sb);extern int smb2_verify_signature (struct smb_rqst *,struct TCP_Server_Info *); -extern int smb2_check_receive (struct mid_q_entry *mid, +extern int smb2_check_receive (struct smb_message *smb,struct TCP_Server_Info *server,bool log_error); -extern struct mid_q_entry *smb2_setup_request (struct cifs_ses *ses, -struct TCP_Server_Info *, -struct smb_rqst *rqst); -extern struct mid_q_entry *smb2_setup_async_request ( +struct smb_message *smb2_setup_request (struct cifs_ses *ses, +struct TCP_Server_Info *server, +struct smb_rqst *rqst); +extern struct smb_message *smb2_setup_async_request (struct TCP_Server_Info *server,struct smb_rqst *rqst);extern struct cifs_tcon *smb2_find_smb_tcon (struct TCP_Server_Info *server,__u64 ses_id,__u32 tid);@@ -44,7 +44,7 @@ extern __le32 smb2_get_lease_state(struct cifsInodeInfo *cinode);extern bool smb2_is_valid_oplock_break (char *buffer,struct TCP_Server_Info *srv);extern int smb3_handle_read_data (struct TCP_Server_Info *server, -struct mid_q_entry *mid); +struct smb_message *smb);extern int smb2_query_reparse_tag (const unsigned int xid,struct cifs_tcon *tcon,struct cifs_sb_info *cifs_sb,const char *path,__u32 *reparse_tag);@@ -251,7 +251,7 @@ extern int SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,extern int smb2_handle_cancelled_close (struct cifs_tcon *tcon,__u64 persistent_fid,__u64 volatile_fid); -extern int smb2_handle_cancelled_mid (struct mid_q_entry *mid,struct TCP_Server_Info *server); +extern int smb2_handle_cancelled_mid (struct smb_message *smb,struct TCP_Server_Info *server);void smb2_cancelled_close_fid (struct work_struct *work); extern int SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_file_id, u64 volatile_file_id,fs/smb/client/smb2transport.c +31
-31@@ -641,11 +641,11 @@ smb2_seq_num_into_buf(struct TCP_Server_Info *server,get_next_mid (server); } -static struct mid_q_entry * +static struct smb_message *smb2_mid_entry_alloc (const struct smb2_hdr *shdr,struct TCP_Server_Info *server) { -struct mid_q_entry *temp; +struct smb_message *smb;unsigned int credits =le16_to_cpu (shdr->CreditCharge);if (server ==NULL ) {@@ -653,37 +653,37 @@ smb2_mid_entry_alloc(const struct smb2_hdr *shdr,return NULL ; } - temp =mempool_alloc (cifs_mid_poolp,GFP_NOFS ); -memset (temp,0 ,sizeof (struct mid_q_entry )); -kref_init (&temp->refcount); -spin_lock_init (&temp->mid_lock); - temp->mid =le64_to_cpu (shdr->MessageId); - temp->credits = credits >0 ? credits :1 ; - temp->pid = current->pid; - temp->command = shdr->Command;/* Always LE */ - temp->when_alloc = jiffies; - temp->server = server; + smb =mempool_alloc (&smb_message_pool,GFP_NOFS ); +memset (smb,0 ,sizeof (*smb)); +kref_init (&smb->refcount); +spin_lock_init (&smb->mid_lock); + smb->mid =le64_to_cpu (shdr->MessageId); + smb->credits = credits >0 ? credits :1 ; + smb->pid = current->pid; + smb->command = shdr->Command;/* Always LE */ + smb->when_alloc = jiffies; + smb->server = server;/* * The default is for the mid to be synchronous, so the * default callback just wakes up the current task. */ get_task_struct (current); - temp->creator = current; - temp->callback = cifs_wake_up_task; - temp->callback_data = current; + smb->creator = current; + smb->callback = cifs_wake_up_task; + smb->callback_data = current;atomic_inc (&mid_count); - temp->mid_state =MID_REQUEST_ALLOCATED ; + smb->mid_state =MID_REQUEST_ALLOCATED ;trace_smb3_cmd_enter (le32_to_cpu (shdr->Id.SyncId.TreeId),le64_to_cpu (shdr->SessionId), -le16_to_cpu (shdr->Command), temp->mid); -return temp; +le16_to_cpu (shdr->Command), smb->mid); +return smb; }static int smb2_get_mid_entry (struct cifs_ses *ses,struct TCP_Server_Info *server, -struct smb2_hdr *shdr,struct mid_q_entry **mid) +struct smb2_hdr *shdr,struct smb_message **smb) {spin_lock (&server->srv_lock);if (server->tcpStatus == CifsExiting) {@@ -723,18 +723,18 @@ smb2_get_mid_entry(struct cifs_ses *ses, struct TCP_Server_Info *server, }spin_unlock (&ses->ses_lock); - *mid =smb2_mid_entry_alloc (shdr, server); -if (*mid ==NULL ) + *smb =smb2_mid_entry_alloc (shdr, server); +if (*smb ==NULL )return -ENOMEM ;spin_lock (&server->mid_queue_lock); -list_add_tail (&(*mid)->qhead, &server->pending_mid_q); +list_add_tail (&(*smb)->qhead, &server->pending_mid_q);spin_unlock (&server->mid_queue_lock);return 0 ; }int -smb2_check_receive (struct mid_q_entry *mid,struct TCP_Server_Info *server, +smb2_check_receive (struct smb_message *mid,struct TCP_Server_Info *server,bool log_error) {unsigned int len = mid->resp_buf_size;@@ -759,14 +759,14 @@ smb2_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,return map_smb2_to_linux_error (mid->resp_buf, log_error); } -struct mid_q_entry * +struct smb_message *smb2_setup_request (struct cifs_ses *ses,struct TCP_Server_Info *server,struct smb_rqst *rqst) {int rc;struct smb2_hdr *shdr = (struct smb2_hdr *)rqst->rq_iov[0 ].iov_base; -struct mid_q_entry *mid; +struct smb_message *mid;smb2_seq_num_into_buf (server, shdr);@@ -786,13 +786,13 @@ smb2_setup_request(struct cifs_ses *ses, struct TCP_Server_Info *server,return mid; } -struct mid_q_entry * +struct smb_message *smb2_setup_async_request (struct TCP_Server_Info *server,struct smb_rqst *rqst) {int rc;struct smb2_hdr *shdr = (struct smb2_hdr *)rqst->rq_iov[0 ].iov_base; -struct mid_q_entry *mid; +struct smb_message *smb;spin_lock (&server->srv_lock); if (server->tcpStatus == CifsNeedNegotiate &&@@ -804,8 +804,8 @@ smb2_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst)smb2_seq_num_into_buf (server, shdr); - mid =smb2_mid_entry_alloc (shdr, server); -if (mid ==NULL ) { + smb =smb2_mid_entry_alloc (shdr, server); +if (smb ==NULL ) {revert_current_mid_from_hdr (server, shdr);return ERR_PTR (-ENOMEM ); }@@ -813,11 +813,11 @@ smb2_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst) rc =smb2_sign_rqst (rqst, server);if (rc) {revert_current_mid_from_hdr (server, shdr); -release_mid (mid); +release_mid (smb);return ERR_PTR (rc); } -return mid; +return smb; }int fs/smb/client/transport.c +120
-118@@ -32,42 +32,42 @@#include "compress.h" void -cifs_wake_up_task (struct mid_q_entry *mid) +cifs_wake_up_task (struct smb_message *smb) { -if (mid->mid_state ==MID_RESPONSE_RECEIVED ) - mid->mid_state =MID_RESPONSE_READY ; -wake_up_process (mid->callback_data); +if (smb->mid_state ==MID_RESPONSE_RECEIVED ) + smb->mid_state =MID_RESPONSE_READY ; +wake_up_process (smb->callback_data); }void __release_mid (struct kref *refcount) { -struct mid_q_entry *midEntry = - container_of(refcount, struct mid_q_entry, refcount); +struct smb_message *smb = + container_of(refcount, struct smb_message, refcount);#ifdef CONFIG_CIFS_STATS2 -__le16 command = midEntry->server->vals->lock_cmd; -__u16 smb_cmd =le16_to_cpu (midEntry->command); +__le16 command = smb->server->vals->lock_cmd; +__u16 smb_cmd =le16_to_cpu (smb->command);unsigned long now;unsigned long roundtrip_time;#endif -struct TCP_Server_Info *server = midEntry->server; +struct TCP_Server_Info *server = smb->server; -if (midEntry->resp_buf && (midEntry->wait_cancelled) && - (midEntry->mid_state ==MID_RESPONSE_RECEIVED || - midEntry->mid_state ==MID_RESPONSE_READY ) && +if (smb->resp_buf && smb->wait_cancelled && + (smb->mid_state ==MID_RESPONSE_RECEIVED || + smb->mid_state ==MID_RESPONSE_READY ) && server->ops->handle_cancelled_mid) - server->ops->handle_cancelled_mid (midEntry, server); + server->ops->handle_cancelled_mid (smb, server); - midEntry->mid_state =MID_FREE ; + smb->mid_state =MID_FREE ;atomic_dec (&mid_count); -if (midEntry->large_buf) -cifs_buf_release (midEntry->resp_buf); +if (smb->large_buf) +cifs_buf_release (smb->resp_buf);else -cifs_small_buf_release (midEntry->resp_buf); +cifs_small_buf_release (smb->resp_buf);#ifdef CONFIG_CIFS_STATS2 now = jiffies; -if (now < midEntry->when_alloc) +if (now < smb->when_alloc)cifs_server_dbg (VFS ,"Invalid mid allocation time\n" ); - roundtrip_time = now - midEntry->when_alloc; + roundtrip_time = now - smb->when_alloc;if (smb_cmd <NUMBER_OF_SMB2_COMMANDS ) {if (atomic_read (&server->num_cmds[smb_cmd]) ==0 ) {@@ -93,8 +93,8 @@ void __release_mid(struct kref *refcount)* checks */ if ((slow_rsp_threshold !=0 ) && -time_after (now, midEntry->when_alloc + (slow_rsp_threshold *HZ )) && - (midEntry->command != command)) { +time_after (now, smb->when_alloc + (slow_rsp_threshold *HZ )) && + (smb->command != command)) {/* * smb2slowcmd[NUMBER_OF_SMB2_COMMANDS] counts by command * NB: le16_to_cpu returns unsigned so can not be negative below @@ -102,34 +102,35 @@ void __release_mid(struct kref *refcount)if (smb_cmd <NUMBER_OF_SMB2_COMMANDS )cifs_stats_inc (&server->smb2slowcmd[smb_cmd]); -trace_smb3_slow_rsp (smb_cmd, midEntry->mid, midEntry->pid, - midEntry->when_sent, midEntry->when_received); +trace_smb3_slow_rsp (smb_cmd, smb->mid, smb->pid, + smb->when_sent, smb->when_received);if (cifsFYI &CIFS_TIMER ) {pr_debug ("slow rsp: cmd %d mid %llu" , - midEntry->command, midEntry->mid); + smb->command, smb->mid);cifs_info ("A: 0x%lx S: 0x%lx R: 0x%lx\n" , - now - midEntry->when_alloc, - now - midEntry->when_sent, - now - midEntry->when_received); + now - smb->when_alloc, + now - smb->when_sent, + now - smb->when_received); } }#endif -put_task_struct (midEntry->creator); +put_task_struct (smb->creator); -mempool_free (midEntry, cifs_mid_poolp); +mempool_free (smb, &smb_message_pool); }void -delete_mid (struct mid_q_entry *mid) +delete_mid (struct smb_message *smb) { -spin_lock (&mid->server->mid_queue_lock); -if (mid->deleted_from_q == false) { -list_del_init (&mid->qhead); - mid->deleted_from_q = true; +spin_lock (&smb->server->mid_queue_lock); + +if (!smb->deleted_from_q) { +list_del_init (&smb->qhead); + smb->deleted_from_q = true; } -spin_unlock (&mid->server->mid_queue_lock); +spin_unlock (&smb->server->mid_queue_lock); -release_mid (mid); +release_mid (smb); }/* @@ -640,13 +641,13 @@ cifs_wait_mtu_credits(struct TCP_Server_Info *server, size_t size,return 0 ; } -int wait_for_response (struct TCP_Server_Info *server,struct mid_q_entry *midQ) +int wait_for_response (struct TCP_Server_Info *server,struct smb_message *smb) {int error; error =wait_event_state (server->response_q, - midQ->mid_state !=MID_REQUEST_SUBMITTED && - midQ->mid_state !=MID_RESPONSE_RECEIVED , + smb->mid_state !=MID_REQUEST_SUBMITTED && + smb->mid_state !=MID_RESPONSE_RECEIVED , (TASK_KILLABLE |TASK_FREEZABLE_UNSAFE ));if (error <0 )return -ERESTARTSYS ;@@ -660,12 +661,12 @@ int wait_for_response(struct TCP_Server_Info *server, struct mid_q_entry *midQ)*/ int cifs_call_async (struct TCP_Server_Info *server,struct smb_rqst *rqst, -mid_receive_t *receive,mid_callback_t *callback, -mid_handle_t *handle,void *cbdata,const int flags, +mid_receive_t receive,mid_callback_t callback, +mid_handle_t handle,void *cbdata,const int flags,const struct cifs_credits *exist_credits) {int rc; -struct mid_q_entry *mid; +struct smb_message *smb;struct cifs_credits credits = { .value =0 , .instance =0 };unsigned int instance;int optype;@@ -694,35 +695,35 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,return -EAGAIN ; } - mid = server->ops->setup_async_request (server, rqst); -if (IS_ERR (mid)) { + smb = server->ops->setup_async_request (server, rqst); +if (IS_ERR (smb)) {cifs_server_unlock (server);add_credits_and_wake_if (server, &credits, optype); -return PTR_ERR (mid); +return PTR_ERR (smb); } - mid->receive = receive; - mid->callback = callback; - mid->callback_data = cbdata; - mid->handle = handle; - mid->mid_state =MID_REQUEST_SUBMITTED ; + smb->receive = receive; + smb->callback = callback; + smb->callback_data = cbdata; + smb->handle = handle; + smb->mid_state =MID_REQUEST_SUBMITTED ;/* put it on the pending_mid_q */ spin_lock (&server->mid_queue_lock); -list_add_tail (&mid->qhead, &server->pending_mid_q); +list_add_tail (&smb->qhead, &server->pending_mid_q);spin_unlock (&server->mid_queue_lock);/* * Need to store the time in mid before calling I/O. For call_async, * I/O response may come back and free the mid entry on another thread. */ -cifs_save_when_sent (mid); +cifs_save_when_sent (smb); rc =smb_send_rqst (server,1 , rqst, flags);if (rc <0 ) { -revert_current_mid (server, mid->credits); +revert_current_mid (server, smb->credits); server->sequence_number -=2 ; -delete_mid (mid); +delete_mid (smb); }cifs_server_unlock (server);@@ -734,15 +735,15 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,return rc; } -int cifs_sync_mid_result (struct mid_q_entry *mid,struct TCP_Server_Info *server) +int cifs_sync_mid_result (struct smb_message *smb,struct TCP_Server_Info *server) {int rc =0 ;cifs_dbg (FYI ,"%s: cmd=%d mid=%llu state=%d\n" , - __func__,le16_to_cpu (mid->command), mid->mid, mid->mid_state); + __func__,le16_to_cpu (smb->command), smb->mid, smb->mid_state);spin_lock (&server->mid_queue_lock); -switch (mid->mid_state) { +switch (smb->mid_state) {case MID_RESPONSE_READY :spin_unlock (&server->mid_queue_lock);return rc;@@ -756,53 +757,53 @@ int cifs_sync_mid_result(struct mid_q_entry *mid, struct TCP_Server_Info *server rc = -EHOSTDOWN ;break ;case MID_RC : - rc = mid->mid_rc; + rc = smb->mid_rc;break ;default : -if (mid->deleted_from_q == false) { -list_del_init (&mid->qhead); - mid->deleted_from_q = true; +if (smb->deleted_from_q == false) { +list_del_init (&smb->qhead); + smb->deleted_from_q = true; }spin_unlock (&server->mid_queue_lock);cifs_server_dbg (VFS ,"%s: invalid mid state mid=%llu state=%d\n" , - __func__, mid->mid, mid->mid_state); + __func__, smb->mid, smb->mid_state); rc = -EIO ; goto sync_mid_done; }spin_unlock (&server->mid_queue_lock); sync_mid_done: -release_mid (mid); +release_mid (smb);return rc; }static void -cifs_compound_callback (struct mid_q_entry *mid) +cifs_compound_callback (struct smb_message *smb) { -struct TCP_Server_Info *server = mid->server; +struct TCP_Server_Info *server = smb->server;struct cifs_credits credits = { - .value = server->ops->get_credits (mid), + .value = server->ops->get_credits (smb), .instance = server->reconnect_instance, }; -add_credits (server, &credits, mid->optype); +add_credits (server, &credits, smb->optype); -if (mid->mid_state ==MID_RESPONSE_RECEIVED ) - mid->mid_state =MID_RESPONSE_READY ; +if (smb->mid_state ==MID_RESPONSE_RECEIVED ) + smb->mid_state =MID_RESPONSE_READY ; }static void -cifs_compound_last_callback (struct mid_q_entry *mid) +cifs_compound_last_callback (struct smb_message *smb) { -cifs_compound_callback (mid); -cifs_wake_up_task (mid); +cifs_compound_callback (smb); +cifs_wake_up_task (smb); }static void -cifs_cancelled_callback (struct mid_q_entry *mid) +cifs_cancelled_callback (struct smb_message *smb) { -cifs_compound_callback (mid); -release_mid (mid); +cifs_compound_callback (smb); +release_mid (smb); }/* @@ -866,7 +867,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, int *resp_buf_type, struct kvec *resp_iov) { int i, j, optype, rc = 0; -struct mid_q_entry *midQ[MAX_COMPOUND ]; +struct smb_message *smb[MAX_COMPOUND ];bool cancelled_mid[MAX_COMPOUND ] = {false}; struct cifs_credits credits[MAX_COMPOUND] = { { .value = 0, .instance = 0 }@@ -932,35 +933,35 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, }for (i =0 ; i < num_rqst; i++) { - midQ[i] = server->ops->setup_request (ses, server, &rqst[i]); -if (IS_ERR (midQ[i])) { + smb[i] = server->ops->setup_request (ses, server, &rqst[i]); +if (IS_ERR (smb[i])) {revert_current_mid (server, i);for (j =0 ; j < i; j++) -delete_mid (midQ[j]); +delete_mid (smb[j]);cifs_server_unlock (server);/* Update # of requests on wire to server */ for (j =0 ; j < num_rqst; j++)add_credits (server, &credits[j], optype); -return PTR_ERR (midQ[i]); +return PTR_ERR (smb[i]); } - midQ[i]->mid_state =MID_REQUEST_SUBMITTED ; - midQ[i]->optype = optype; + smb[i]->mid_state =MID_REQUEST_SUBMITTED ; + smb[i]->optype = optype;/* * Invoke callback for every part of the compound chain * to calculate credits properly. Wake up this thread only when * the last element is received. */ if (i < num_rqst -1 ) - midQ[i]->callback = cifs_compound_callback; + smb[i]->callback = cifs_compound_callback;else - midQ[i]->callback = cifs_compound_last_callback; + smb[i]->callback = cifs_compound_last_callback; } rc =smb_send_rqst (server, num_rqst, rqst, flags);for (i =0 ; i < num_rqst; i++) -cifs_save_when_sent (midQ[i]); +cifs_save_when_sent (smb[i]);if (rc <0 ) {revert_current_mid (server, num_rqst);@@ -1003,23 +1004,24 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,spin_unlock (&ses->ses_lock);for (i =0 ; i < num_rqst; i++) { - rc =wait_for_response (server, midQ[i]); + rc =wait_for_response (server, smb[i]);if (rc !=0 )break ; }if (rc !=0 ) {for (; i < num_rqst; i++) {cifs_server_dbg (FYI ,"Cancelling wait for mid %llu cmd: %d\n" , - midQ[i]->mid,le16_to_cpu (midQ[i]->command)); -send_cancel (server, &rqst[i], midQ[i]); -spin_lock (&midQ[i]->mid_lock); - midQ[i]->wait_cancelled = true; -if (midQ[i]->callback) { - midQ[i]->callback = cifs_cancelled_callback; + smb[i]->mid,le16_to_cpu (smb[i]->command)); +send_cancel (server, &rqst[i], smb[i]); +spin_lock (&smb[i]->mid_lock); + smb[i]->wait_cancelled = true; +if (smb[i]->mid_state ==MID_REQUEST_SUBMITTED || + smb[i]->mid_state ==MID_RESPONSE_RECEIVED ) { + smb[i]->callback = cifs_cancelled_callback; cancelled_mid[i] = true; credits[i].value =0 ; } -spin_unlock (&midQ[i]->mid_lock); +spin_unlock (&smb[i]->mid_lock); } }@@ -1027,36 +1029,36 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,if (rc <0 ) goto out; - rc =cifs_sync_mid_result (midQ[i], server); + rc =cifs_sync_mid_result (smb[i], server);if (rc !=0 ) {/* mark this mid as cancelled to not free it below */ cancelled_mid[i] = true; goto out; } -if (!midQ[i]->resp_buf || - midQ[i]->mid_state !=MID_RESPONSE_READY ) { +if (!smb[i]->resp_buf || + smb[i]->mid_state !=MID_RESPONSE_READY ) { rc = -EIO ;cifs_dbg (FYI ,"Bad MID state?\n" ); goto out; } - buf = (char *)midQ[i]->resp_buf; + buf = (char *)smb[i]->resp_buf; resp_iov[i].iov_base = buf; - resp_iov[i].iov_len = midQ[i]->resp_buf_size + + resp_iov[i].iov_len = smb[i]->resp_buf_size +HEADER_PREAMBLE_SIZE (server); -if (midQ[i]->large_buf) +if (smb[i]->large_buf) resp_buf_type[i] =CIFS_LARGE_BUFFER ;else resp_buf_type[i] =CIFS_SMALL_BUFFER ; - rc = server->ops->check_receive (midQ[i], server, + rc = server->ops->check_receive (smb[i], server, flags &CIFS_LOG_ERROR );/* mark it so buf will not be freed by delete_mid */ if ((flags &CIFS_NO_RSP_BUF ) ==0 ) - midQ[i]->resp_buf =NULL ; + smb[i]->resp_buf =NULL ; }@@ -1086,7 +1088,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,*/ for (i =0 ; i < num_rqst; i++) {if (!cancelled_mid[i]) -delete_mid (midQ[i]); +delete_mid (smb[i]); }return rc;@@ -1130,38 +1132,38 @@ cifs_discard_remaining_data(struct TCP_Server_Info *server) }static int -__cifs_readv_discard (struct TCP_Server_Info *server,struct mid_q_entry *mid, +__cifs_readv_discard (struct TCP_Server_Info *server,struct smb_message *smb,bool malformed) {int length; length =cifs_discard_remaining_data (server); -dequeue_mid (mid, malformed); - mid->resp_buf = server->smallbuf; +dequeue_mid (smb, malformed); + smb->resp_buf = server->smallbuf; server->smallbuf =NULL ;return length; }static int -cifs_readv_discard (struct TCP_Server_Info *server,struct mid_q_entry *mid) +cifs_readv_discard (struct TCP_Server_Info *server,struct smb_message *smb) { -struct cifs_io_subrequest *rdata = mid->callback_data; +struct cifs_io_subrequest *rdata = smb->callback_data; -return __cifs_readv_discard (server, mid, rdata->result); +return __cifs_readv_discard (server, smb, rdata->result); }int -cifs_readv_receive (struct TCP_Server_Info *server,struct mid_q_entry *mid) +cifs_readv_receive (struct TCP_Server_Info *server,struct smb_message *smb) {int length, len;unsigned int data_offset, data_len; -struct cifs_io_subrequest *rdata = mid->callback_data; +struct cifs_io_subrequest *rdata = smb->callback_data;char *buf = server->smallbuf;unsigned int buflen = server->pdu_size +HEADER_PREAMBLE_SIZE (server);bool use_rdma_mr = false;cifs_dbg (FYI ,"%s: mid=%llu offset=%llu bytes=%zu\n" , - __func__, mid->mid, rdata->subreq.start, rdata->subreq.len); + __func__, smb->mid, rdata->subreq.start, rdata->subreq.len);/* * read the rest of READ_RSP header (sans Data array), or whatever we @@ -1206,7 +1208,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)cifs_dbg (FYI ,"%s: server returned error %d\n" , __func__, rdata->result);/* normal error on read response */ -return __cifs_readv_discard (server, mid, false); +return __cifs_readv_discard (server, smb, false); }/* Is there enough to get to the rest of the READ_RSP header? */ @@ -1215,7 +1217,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) __func__, server->total_read, server->vals->read_rsp_size); rdata->result = -EIO ; -return cifs_readv_discard (server, mid); +return cifs_readv_discard (server, smb); } data_offset = server->ops->read_data_offset(buf) +@@ -1234,7 +1236,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)cifs_dbg (FYI ,"%s: data offset (%u) beyond end of smallbuf\n" , __func__, data_offset); rdata->result = -EIO ; -return cifs_readv_discard (server, mid); +return cifs_readv_discard (server, smb); } cifs_dbg(FYI, "%s: total_read=%u data_offset=%u\n",@@ -1258,7 +1260,7 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)if (!use_rdma_mr && (data_offset + data_len > buflen)) {/* data_len is corrupt -- discard frame */ rdata->result = -EIO ; -return cifs_readv_discard (server, mid); +return cifs_readv_discard (server, smb); }#ifdef CONFIG_CIFS_SMB_DIRECT @@ -1277,10 +1279,10 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)/* discard anything left over */ if (server->total_read < buflen) -return cifs_readv_discard (server, mid); +return cifs_readv_discard (server, smb); -dequeue_mid (mid, false); - mid->resp_buf = server->smallbuf; +dequeue_mid (smb, false); + smb->resp_buf = server->smallbuf; server->smallbuf =NULL ;return length; }
Signature · 3 lines
Thanks, Steve
David Howells
maintainerRe: [PATCH v5 1/9] cifs: Rename mid_q_entry to smb_message
Quoted 8 lines · Steve French
I lean against the rename of the struct if it is going to still contain primarily the 'mid' (ie the 'multiplex identifier' - the thing used to track a request in flight). The rest of the patch seems fine
- but why do the extra rename of the struct if it is still primarily "the struct that tracks the info on the request in flight by its multiplex id" - wouldn't it be much smaller (and just as clear) if only the other part of this patch were included? No strong opinions but could make the patch smaller and easier to review
I'm intending that the struct will become so much more than that. It'll be used to convey the request block and parameters from the SMB marshalling code (typically found in smb2pdu.c and cifssmb.c) down to the transmission layer and convey the response or error back up to the SMB marshalling code; it'll be used to chain requests together into compounds and coordinate encryption, decryption and (de)compression across them.
But, for the moment, I've removed most of that patch, leaving just a bit that normalises the definitions of the mid_*_t function pointers and posted it as v6 of the patches.
Attached is a diff between v5 and v6 for reference. The vast majority of differences are unrenaming mid_q_entry and pointer variables (that got renamed to "smb"), though I did take the liberty of removing a couple of externs on functions that got modified.
David
---
fs/smb/client/cifs_debug.c +22 -21
@@ -55,32 +55,33 @@ void cifs_dump_detail(void *buf, size_t buf_len, struct TCP_Server_Info *server)void cifs_dump_mids (struct TCP_Server_Info *server) {#ifdef CONFIG_CIFS_DEBUG2 -struct smb_message *smb; +struct mid_q_entry *mid_entry;if (server ==NULL )return ;cifs_dbg (VFS ,"Dump pending requests:\n" );spin_lock (&server->mid_queue_lock); -list_for_each_entry (smb, &server->pending_mid_q, qhead) { +list_for_each_entry (mid_entry, &server->pending_mid_q, qhead) {cifs_dbg (VFS ,"State: %d Cmd: %d Pid: %d Cbdata: %p Mid %llu\n" , - smb->mid_state, -le16_to_cpu (smb->command), - smb->pid, - smb->callback_data, - smb->mid); + mid_entry->mid_state, +le16_to_cpu (mid_entry->command), + mid_entry->pid, + mid_entry->callback_data, + mid_entry->mid);#ifdef CONFIG_CIFS_STATS2 cifs_dbg (VFS ,"IsLarge: %d buf: %p time rcv: %ld now: %ld\n" , - smb->large_buf, - smb->resp_buf, - smb->when_received, + mid_entry->large_buf, + mid_entry->resp_buf, + mid_entry->when_received, jiffies);#endif /* STATS2 */ cifs_dbg (VFS ,"IsMult: %d IsEnd: %d\n" , - smb->multiRsp, smb->multiEnd); -if (smb->resp_buf) { -cifs_dump_detail (smb->resp_buf, smb->response_pdu_len, server); -cifs_dump_mem ("existing buf: " , smb->resp_buf,62 ); + mid_entry->multiRsp, mid_entry->multiEnd); +if (mid_entry->resp_buf) { +cifs_dump_detail (mid_entry->resp_buf, + mid_entry->response_pdu_len, server); +cifs_dump_mem ("existing buf: " , mid_entry->resp_buf,62 ); } }spin_unlock (&server->mid_queue_lock);
@@ -405,7 +406,7 @@ static __always_inline const char *cipher_alg_str(__le16 cipher)static int cifs_debug_data_proc_show (struct seq_file *m,void *v) { -struct smb_message *smb; +struct mid_q_entry *mid_entry;struct TCP_Server_Info *server;struct TCP_Server_Info *chan_server;struct cifs_ses *ses;
@@ -726,13 +727,13 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\n\tServer ConnectionId: 0x%llx" , chan_server->conn_id);spin_lock (&chan_server->mid_queue_lock); -list_for_each_entry (smb, &chan_server->pending_mid_q, qhead) { +list_for_each_entry (mid_entry, &chan_server->pending_mid_q, qhead) {seq_printf (m,"\n\t\tState: %d com: %d pid: %d cbdata: %p mid %llu" , - smb->mid_state, -le16_to_cpu (smb->command), - smb->pid, - smb->callback_data, - smb->mid); + mid_entry->mid_state, +le16_to_cpu (mid_entry->command), + mid_entry->pid, + mid_entry->callback_data, + mid_entry->mid); }spin_unlock (&chan_server->mid_queue_lock); }
fs/smb/client/cifsfs.c +15 -15
@@ -437,13 +437,13 @@ static int cifs_permission(struct mnt_idmap *idmap,static struct kmem_cache *cifs_inode_cachep;static struct kmem_cache *cifs_req_cachep; -static struct kmem_cache *smb_message_cachep; +static struct kmem_cache *cifs_mid_cachep;static struct kmem_cache *cifs_sm_req_cachep;static struct kmem_cache *cifs_io_request_cachep;static struct kmem_cache *cifs_io_subrequest_cachep;mempool_t *cifs_sm_req_poolp;mempool_t *cifs_req_poolp; -mempool_t smb_message_pool; +mempool_t cifs_mid_pool;mempool_t cifs_io_request_pool;mempool_t cifs_io_subrequest_pool;
@@ -1836,27 +1836,27 @@ cifs_destroy_request_bufs(void)kmem_cache_destroy (cifs_sm_req_cachep); } -static int init_smb_message (void ) +static int init_mids (void ) { - smb_message_cachep =kmem_cache_create ("cifs_smb_message" , -sizeof (struct smb_message ),0 , -SLAB_HWCACHE_ALIGN ,NULL ); -if (smb_message_cachep ==NULL ) + cifs_mid_cachep =kmem_cache_create ("cifs_mpx_ids" , +sizeof (struct mid_q_entry ),0 , +SLAB_HWCACHE_ALIGN ,NULL ); +if (cifs_mid_cachep ==NULL )return -ENOMEM ;/* 3 is a reasonable minimum number of simultaneous operations */ -if (mempool_init_slab_pool (&smb_message_pool,3 , smb_message_cachep) <0 ) { -kmem_cache_destroy (smb_message_cachep); +if (mempool_init_slab_pool (&cifs_mid_pool,3 , cifs_mid_cachep) <0 ) { +kmem_cache_destroy (cifs_mid_cachep);return -ENOMEM ; }return 0 ; } -static void destroy_smb_message (void ) +static void destroy_mids (void ) { -mempool_exit (&smb_message_pool); -kmem_cache_destroy (smb_message_cachep); +mempool_exit (&cifs_mid_pool); +kmem_cache_destroy (cifs_mid_cachep); }static int cifs_init_netfs (void )
@@ -2020,7 +2020,7 @@ init_cifs(void)if (rc) goto out_destroy_inodecache; - rc =init_smb_message (); + rc =init_mids ();if (rc) goto out_destroy_netfs;
@@ -2077,7 +2077,7 @@ init_cifs(void)#endif cifs_destroy_request_bufs (); out_destroy_mids: -destroy_smb_message (); +destroy_mids (); out_destroy_netfs:cifs_destroy_netfs (); out_destroy_inodecache:
@@ -2119,7 +2119,7 @@ exit_cifs(void)dfs_cache_destroy ();#endif cifs_destroy_request_bufs (); -destroy_smb_message (); +destroy_mids ();cifs_destroy_netfs ();cifs_destroy_inodecache ();destroy_workqueue (deferredclose_wq);
fs/smb/client/cifsglob.h +31 -31
159 lines not on this page · raw message
fs/smb/client/cifsproto.h +23 -23
108 lines not on this page · raw message
fs/smb/client/cifssmb.c +19 -19
@@ -586,11 +586,11 @@ CIFSSMBTDis(const unsigned int xid, struct cifs_tcon *tcon)* FIXME: maybe we should consider checking that the reply matches request? */ static void -cifs_echo_callback (struct TCP_Server_Info *server,struct smb_message *smb) +cifs_echo_callback (struct TCP_Server_Info *server,struct mid_q_entry *mid) {struct cifs_credits credits = { .value =1 , .instance =0 }; -release_mid (server, smb); +release_mid (server, mid);add_credits (server, &credits,CIFS_ECHO_OP ); }
@@ -1319,9 +1319,9 @@ CIFS_open(const unsigned int xid, struct cifs_open_parms *oparms, int *oplock, }static void -cifs_readv_callback (struct TCP_Server_Info *server,struct smb_message *smb) +cifs_readv_callback (struct TCP_Server_Info *server,struct mid_q_entry *mid) { -struct cifs_io_subrequest *rdata = smb->callback_data; +struct cifs_io_subrequest *rdata = mid->callback_data;struct netfs_inode *ictx =netfs_inode (rdata->rreq->inode);struct cifs_tcon *tcon =tlink_tcon (rdata->req->cfile->tlink);struct smb_rqst rqst = { .rq_iov = rdata->iov,
@@ -1337,10 +1337,10 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)unsigned int subreq_debug_index = rdata->subreq.debug_index;cifs_dbg (FYI ,"%s: mid=%llu state=%d result=%d bytes=%zu\n" , - __func__, smb->mid, smb->mid_state, rdata->result, + __func__, mid->mid, mid->mid_state, rdata->result, rdata->subreq.len); -switch (smb->mid_state) { +switch (mid->mid_state) {case MID_RESPONSE_RECEIVED :/* result already set, check signature */ if (server->sign) {
@@ -1348,7 +1348,7 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)iov_iter_truncate (&rqst.rq_iter, rdata->got_bytes); rc =cifs_verify_signature (&rqst, server, - smb->sequence_number); + mid->sequence_number);if (rc)cifs_dbg (VFS ,"SMB signature verification returned error = %d\n" , rc);
@@ -1376,10 +1376,10 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_malformed); rdata->result =smb_EIO (smb_eio_trace_read_rsp_malformed);break ; -default : +default :trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_unknown); rdata->result =smb_EIO1 (smb_eio_trace_read_mid_state_unknown, - smb->mid_state); + mid->mid_state);break ; }
@@ -1422,7 +1422,7 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb) rdata->subreq.transferred += rdata->got_bytes;trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_progress);netfs_read_subreq_terminated (&rdata->subreq); -release_mid (server, smb); +release_mid (server, mid);add_credits (server, &credits,0 ); trace_smb3_rw_credits(rreq_debug_id, subreq_debug_index, 0, server->credits, server->in_flight,
@@ -1739,11 +1739,11 @@ CIFSSMBWrite(const unsigned int xid, struct cifs_io_parms *io_parms,* workqueue completion task. */ static void -cifs_writev_callback (struct TCP_Server_Info *server,struct smb_message *smb) +cifs_writev_callback (struct TCP_Server_Info *server,struct mid_q_entry *mid) { -struct cifs_io_subrequest *wdata = smb->callback_data; +struct cifs_io_subrequest *wdata = mid->callback_data;struct cifs_tcon *tcon =tlink_tcon (wdata->req->cfile->tlink); -WRITE_RSP *rsp = (WRITE_RSP *)smb->resp_buf; +WRITE_RSP *smb = (WRITE_RSP *)mid->resp_buf;struct cifs_credits credits = { .value =1 , .instance =0 ,
@@ -1753,15 +1753,15 @@ cifs_writev_callback(struct TCP_Server_Info *server, struct smb_message *smb)ssize_t result;size_t written; -switch (smb->mid_state) { +switch (mid->mid_state) {case MID_RESPONSE_RECEIVED : - result =cifs_check_receive (smb, tcon->ses->server,0 ); + result =cifs_check_receive (mid, tcon->ses->server,0 );if (result !=0 )break ; - written =le16_to_cpu (rsp->CountHigh); + written =le16_to_cpu (smb->CountHigh); written <<=16 ; - written +=le16_to_cpu (rsp->Count); + written +=le16_to_cpu (smb->Count);/* * Mask off high 16 bits when bytes written as returned * by the server is greater than bytes requested by the
@@ -1796,7 +1796,7 @@ cifs_writev_callback(struct TCP_Server_Info *server, struct smb_message *smb)default :trace_netfs_sreq (&wdata->subreq, netfs_sreq_trace_io_unknown); result =smb_EIO1 (smb_eio_trace_write_mid_state_unknown, - smb->mid_state); + mid->mid_state);break ; }
@@ -1806,7 +1806,7 @@ cifs_writev_callback(struct TCP_Server_Info *server, struct smb_message *smb) 0, cifs_trace_rw_credits_write_response_clear); wdata->credits.value =0 ;cifs_write_subrequest_terminated (wdata, result); -release_mid (server, smb); +release_mid (server, mid);trace_smb3_rw_credits (credits.rreq_debug_id, credits.rreq_debug_index,0 , server->credits, server->in_flight, credits.value, cifs_trace_rw_credits_write_response_add);
fs/smb/client/cifstransport.c +35 -35
156 lines not on this page · raw message
fs/smb/client/connect.c +75 -75
304 lines not on this page · raw message
fs/smb/client/netmisc.c +6 -6
@@ -894,16 +894,16 @@ map_smb_to_linux_error(char *buf, bool logErr)int map_and_check_smb_error (struct TCP_Server_Info *server, -struct smb_message *smb,bool logErr) +struct mid_q_entry *mid,bool logErr) {int rc; -struct smb_hdr *rhdr = (struct smb_hdr *)smb->resp_buf; +struct smb_hdr *smb = (struct smb_hdr *)mid->resp_buf; - rc =map_smb_to_linux_error ((char *)rhdr, logErr); -if (rc == -EACCES && !(rhdr->Flags2 &SMBFLG2_ERR_STATUS )) { + rc =map_smb_to_linux_error ((char *)smb, logErr); +if (rc == -EACCES && !(smb->Flags2 &SMBFLG2_ERR_STATUS )) {/* possible ERRBaduid */ -__u8 class = rhdr->Status.DosError.ErrorClass; -__u16 code =le16_to_cpu (rhdr->Status.DosError.Error); +__u8 class = smb->Status.DosError.ErrorClass; +__u16 code =le16_to_cpu (smb->Status.DosError.Error);/* switch can be used to handle different errors */ if (class ==ERRSRV && code == ERRbaduid) {
fs/smb/client/smb1ops.c +28 -28
135 lines not on this page · raw message
fs/smb/client/smb2misc.c +4 -4
@@ -852,14 +852,14 @@ smb2_handle_cancelled_close(struct cifs_tcon *tcon, __u64 persistent_fid, }int -smb2_handle_cancelled_mid (struct smb_message *smb,struct TCP_Server_Info *server) +smb2_handle_cancelled_mid (struct mid_q_entry *mid,struct TCP_Server_Info *server) { -struct smb2_hdr *hdr = smb->resp_buf; -struct smb2_create_rsp *rsp = smb->resp_buf; +struct smb2_hdr *hdr = mid->resp_buf; +struct smb2_create_rsp *rsp = mid->resp_buf;struct cifs_tcon *tcon;int rc; -if ((smb->optype &CIFS_CP_CREATE_CLOSE_OP ) || hdr->Command !=SMB2_CREATE || +if ((mid->optype &CIFS_CP_CREATE_CLOSE_OP ) || hdr->Command !=SMB2_CREATE || hdr->Status !=STATUS_SUCCESS )return 0 ;
fs/smb/client/smb2ops.c +61 -61
312 lines not on this page · raw message
fs/smb/client/smb2pdu.c +19 -19
@@ -4128,18 +4128,18 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,* FIXME: maybe we should consider checking that the reply matches request? */ static void -smb2_echo_callback (struct TCP_Server_Info *server,struct smb_message *smb) +smb2_echo_callback (struct TCP_Server_Info *server,struct mid_q_entry *mid) { -struct smb2_echo_rsp *rsp = (struct smb2_echo_rsp *)smb->resp_buf; +struct smb2_echo_rsp *rsp = (struct smb2_echo_rsp *)mid->resp_buf;struct cifs_credits credits = { .value =0 , .instance =0 }; -if (smb->mid_state ==MID_RESPONSE_RECEIVED - || smb->mid_state ==MID_RESPONSE_MALFORMED ) { +if (mid->mid_state ==MID_RESPONSE_RECEIVED + || mid->mid_state ==MID_RESPONSE_MALFORMED ) { credits.value =le16_to_cpu (rsp->hdr.CreditRequest); credits.instance = server->reconnect_instance; } -release_mid (server, smb); +release_mid (server, mid);add_credits (server, &credits,CIFS_ECHO_OP ); }
@@ -4554,9 +4554,9 @@ smb2_new_read_req(void **buf, unsigned int *total_len, }static void -smb2_readv_callback (struct TCP_Server_Info *server,struct smb_message *smb) +smb2_readv_callback (struct TCP_Server_Info *server,struct mid_q_entry *mid) { -struct cifs_io_subrequest *rdata = smb->callback_data; +struct cifs_io_subrequest *rdata = mid->callback_data;struct netfs_inode *ictx =netfs_inode (rdata->rreq->inode);struct cifs_tcon *tcon =tlink_tcon (rdata->req->cfile->tlink);struct smb2_hdr *shdr = (struct smb2_hdr *)rdata->iov[0 ].iov_base;
@@ -4579,15 +4579,15 @@ smb2_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb) rdata->server, server);cifs_dbg (FYI ,"%s: mid=%llu state=%d result=%d bytes=%zu/%zu\n" , - __func__, smb->mid, smb->mid_state, rdata->result, + __func__, mid->mid, mid->mid_state, rdata->result, rdata->got_bytes, rdata->subreq.len - rdata->subreq.transferred); -switch (smb->mid_state) { +switch (mid->mid_state) {case MID_RESPONSE_RECEIVED : credits.value =le16_to_cpu (shdr->CreditRequest); credits.instance = server->reconnect_instance;/* result already set, check signature */ -if (server->sign && !smb->decrypted) { +if (server->sign && !mid->decrypted) {int rc;iov_iter_truncate (&rqst.rq_iter, rdata->got_bytes);
@@ -4624,7 +4624,7 @@ smb2_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)default :trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_unknown); rdata->result =smb_EIO1 (smb_eio_trace_read_mid_state_unknown, - smb->mid_state); + mid->mid_state);break ; }#ifdef CONFIG_CIFS_SMB_DIRECT
@@ -4678,7 +4678,7 @@ smb2_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb) rdata->subreq.transferred += rdata->got_bytes;trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_progress);netfs_read_subreq_terminated (&rdata->subreq); -release_mid (server, smb); +release_mid (server, mid);trace_smb3_rw_credits (rreq_debug_id, subreq_debug_index,0 , server->credits, server->in_flight, credits.value, cifs_trace_rw_credits_read_response_add);
@@ -4856,11 +4856,11 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,* workqueue completion task. */ static void -smb2_writev_callback (struct TCP_Server_Info *server,struct smb_message *smb) +smb2_writev_callback (struct TCP_Server_Info *server,struct mid_q_entry *mid) { -struct cifs_io_subrequest *wdata = smb->callback_data; +struct cifs_io_subrequest *wdata = mid->callback_data;struct cifs_tcon *tcon =tlink_tcon (wdata->req->cfile->tlink); -struct smb2_write_rsp *rsp = (struct smb2_write_rsp *)smb->resp_buf; +struct smb2_write_rsp *rsp = (struct smb2_write_rsp *)mid->resp_buf;struct cifs_credits credits = { .value =0 , .instance =0 ,
@@ -4876,12 +4876,12 @@ smb2_writev_callback(struct TCP_Server_Info *server, struct smb_message *smb)"wdata server %p != mid server %p" , wdata->server, server); -switch (smb->mid_state) { +switch (mid->mid_state) {case MID_RESPONSE_RECEIVED :trace_netfs_sreq (&wdata->subreq, netfs_sreq_trace_io_progress); credits.value =le16_to_cpu (rsp->hdr.CreditRequest); credits.instance = server->reconnect_instance; - result =smb2_check_receive (smb, server,0 ); + result =smb2_check_receive (mid, server,0 );if (result !=0 ) {trace_netfs_sreq (&wdata->subreq, netfs_sreq_trace_io_bad);break ;
@@ -4925,7 +4925,7 @@ smb2_writev_callback(struct TCP_Server_Info *server, struct smb_message *smb)default :trace_netfs_sreq (&wdata->subreq, netfs_sreq_trace_io_unknown); result =smb_EIO1 (smb_eio_trace_write_mid_state_unknown, - smb->mid_state); + mid->mid_state);break ; }#ifdef CONFIG_CIFS_SMB_DIRECT
@@ -4965,7 +4965,7 @@ smb2_writev_callback(struct TCP_Server_Info *server, struct smb_message *smb) 0, cifs_trace_rw_credits_write_response_clear); wdata->credits.value =0 ;cifs_write_subrequest_terminated (wdata, result ?: written); -release_mid (server, smb); +release_mid (server, mid);trace_smb3_rw_credits (rreq_debug_id, subreq_debug_index,0 , server->credits, server->in_flight, credits.value, cifs_trace_rw_credits_write_response_add);
fs/smb/client/smb2proto.h +7 -7
@@ -32,12 +32,12 @@ extern __le16 *cifs_convert_path_to_utf16(const char *from, struct cifs_sb_info *cifs_sb);extern int smb2_verify_signature (struct smb_rqst *,struct TCP_Server_Info *); -extern int smb2_check_receive (struct smb_message *smb, +extern int smb2_check_receive (struct mid_q_entry *mid,struct TCP_Server_Info *server,bool log_error); -struct smb_message *smb2_setup_request (struct cifs_ses *ses, -struct TCP_Server_Info *server, -struct smb_rqst *rqst); -extern struct smb_message *smb2_setup_async_request ( +extern struct mid_q_entry *smb2_setup_request (struct cifs_ses *ses, +struct TCP_Server_Info *, +struct smb_rqst *rqst); +extern struct mid_q_entry *smb2_setup_async_request (struct TCP_Server_Info *server,struct smb_rqst *rqst);extern struct cifs_tcon *smb2_find_smb_tcon (struct TCP_Server_Info *server,__u64 ses_id,__u32 tid);
@@ -46,7 +46,7 @@ extern __le32 smb2_get_lease_state(struct cifsInodeInfo *cinode);extern bool smb2_is_valid_oplock_break (char *buffer,struct TCP_Server_Info *srv);extern int smb3_handle_read_data (struct TCP_Server_Info *server, -struct smb_message *smb); +struct mid_q_entry *mid);extern int smb2_query_reparse_tag (const unsigned int xid,struct cifs_tcon *tcon,struct cifs_sb_info *cifs_sb,const char *path,__u32 *reparse_tag);
@@ -253,7 +253,7 @@ extern int SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,extern int smb2_handle_cancelled_close (struct cifs_tcon *tcon,__u64 persistent_fid,__u64 volatile_fid); -extern int smb2_handle_cancelled_mid (struct smb_message *smb,struct TCP_Server_Info *server); +extern int smb2_handle_cancelled_mid (struct mid_q_entry *mid,struct TCP_Server_Info *server);void smb2_cancelled_close_fid (struct work_struct *work); extern int SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_file_id, u64 volatile_file_id,
fs/smb/client/smb2transport.c +30 -30
141 lines not on this page · raw message
fs/smb/client/transport.c +117 -117
512 lines not on this page · raw message
David Howells
maintainerPATCH v5 2/9 cifs: Remove the RFC1002 header from smb_hdr
In reply to David HowellsRemove the RFC1002 header from struct smb_hdr as used for SMB-1.0. This simplifies the SMB-1.0 code by simplifying a lot of places that have to add or subtract 4 to work around the fact that the RFC1002 header isn't really part of the message and the base for various offsets within the message is from the base of the smb_hdr, not the RFC1002 header.
Further, clean up a bunch of places that require an extra kvec struct specifically pointing to the RFC1002 header, such that kvec[0].iov_base must be exactly 4 bytes before kvec[1].iov_base.
This allows the header preamble size stuff to be removed too.
The size of the request and response message are then handed around either directly or by summing the size of all the iov_len members in the kvec array for which we have a count.
Also, this simplifies and cleans up the common transmission and receive paths for SMB1 and SMB2/3 as there no longer needs to be special handling casing for SMB1 messages as the RFC1002 header is now generated on the fly for SMB1 as it is for SMB2/3.
--- fs/smb/client/cifs_debug.c | 6 +- fs/smb/client/cifs_debug.h | 6 +- fs/smb/client/cifsencrypt.c | 36 +- fs/smb/client/cifsglob.h | 21 +- fs/smb/client/cifspdu.h | 2 +- fs/smb/client/cifsproto.h | 42 +- fs/smb/client/cifssmb.c | 695 +++++++++++++++++++--------------- fs/smb/client/cifstransport.c | 128 +++---- fs/smb/client/connect.c | 36 +- fs/smb/client/misc.c | 34 +- fs/smb/client/sess.c | 8 +- fs/smb/client/smb1ops.c | 21 +- fs/smb/client/smb2misc.c | 3 +- fs/smb/client/smb2ops.c | 11 +- fs/smb/client/smb2proto.h | 2 +- fs/smb/client/transport.c | 22 +- fs/smb/common/smb2pdu.h | 3 - fs/smb/common/smbglob.h | 1 - 18 files changed, 549 insertions(+), 528 deletions(-)
fs/smb/client/cifs_debug.c +3 -3
@@ -37,7 +37,7 @@ cifs_dump_mem(char *label, void *data, int length) data, length, true); } -void cifs_dump_detail (void *buf,struct TCP_Server_Info *server) +void cifs_dump_detail (void *buf,size_t buf_len,struct TCP_Server_Info *server) {#ifdef CONFIG_CIFS_DEBUG2 struct smb_hdr *smb = buf;
@@ -45,7 +45,7 @@ void cifs_dump_detail(void *buf, struct TCP_Server_Info *server)cifs_dbg (VFS ,"Cmd: %d Err: 0x%x Flags: 0x%x Flgs2: 0x%x Mid: %d Pid: %d Wct: %d\n" , smb->Command, smb->Status.CifsError, smb->Flags, smb->Flags2, smb->Mid, smb->Pid, smb->WordCount); -if (!server->ops->check_message (buf, server->total_read, server)) { +if (!server->ops->check_message (buf, buf_len, server->total_read, server)) {cifs_dbg (VFS ,"smb buf %p len %u\n" , smb, server->ops->calc_smb_size (smb)); }
@@ -79,7 +79,7 @@ void cifs_dump_mids(struct TCP_Server_Info *server)cifs_dbg (VFS ,"IsMult: %d IsEnd: %d\n" , smb->multiRsp, smb->multiEnd);if (smb->resp_buf) { -cifs_dump_detail (smb->resp_buf, server); +cifs_dump_detail (smb->resp_buf, smb->response_pdu_len, server);cifs_dump_mem ("existing buf: " , smb->resp_buf,62 ); } }
fs/smb/client/cifs_debug.h +3 -3
@@ -15,10 +15,10 @@#define pr_fmt (fmt) "CIFS: " fmtvoid cifs_dump_mem (char *label,void *data,int length); -void cifs_dump_detail (void *buf,struct TCP_Server_Info *ptcp_info); -void cifs_dump_mids (struct TCP_Server_Info *); +void cifs_dump_detail (void *buf,size_t buf_len,struct TCP_Server_Info *server); +void cifs_dump_mids (struct TCP_Server_Info *server);extern bool traceSMB;/* flag which enables the function below */ -void dump_smb (void *,int ); +void dump_smb (void *buf,int smb_buf_length);#define CIFS_INFO 0x01#define CIFS_RC 0x02#define CIFS_TIMER 0x04
fs/smb/client/cifsencrypt.c +8 -28
@@ -91,18 +91,7 @@ int __cifs_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server,struct kvec *iov = rqst->rq_iov;int n_vec = rqst->rq_nvec; -/* iov[0] is actual data and not the rfc1002 length for SMB2+ */ -if (!is_smb1 (server)) { -if (iov[0 ].iov_len <=4 ) -return -EIO ; - i =0 ; - }else { -if (n_vec <2 || iov[0 ].iov_len !=4 ) -return -EIO ; - i =1 ;/* skip rfc1002 length */ - } - -for (; i < n_vec; i++) { +for (i =0 ; i < n_vec; i++) {if (iov[i].iov_len ==0 )continue ;if (iov[i].iov_base ==NULL ) {
@@ -165,10 +154,6 @@ int cifs_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server,char smb_signature[20 ];struct smb_hdr *cifs_pdu = (struct smb_hdr *)rqst->rq_iov[0 ].iov_base; -if (rqst->rq_iov[0 ].iov_len !=4 || - rqst->rq_iov[0 ].iov_base +4 != rqst->rq_iov[1 ].iov_base) -return -EIO ; -if ((cifs_pdu ==NULL ) || (server ==NULL ))return -EINVAL ;
@@ -211,17 +196,16 @@ int cifs_sign_smbv(struct kvec *iov, int n_vec, struct TCP_Server_Info *server, }/* must be called with server->srv_mutex held */ -int cifs_sign_smb (struct smb_hdr *cifs_pdu,struct TCP_Server_Info *server, +int cifs_sign_smb (struct smb_hdr *cifs_pdu,unsigned int pdu_len, +struct TCP_Server_Info *server,__u32 *pexpected_response_sequence_number) { -struct kvec iov[2 ]; +struct kvec iov[1 ] = { + [0 ].iov_base = (char *)cifs_pdu, + [0 ].iov_len = pdu_len, + }; - iov[0 ].iov_base = cifs_pdu; - iov[0 ].iov_len =4 ; - iov[1 ].iov_base = (char *)cifs_pdu +4 ; - iov[1 ].iov_len =be32_to_cpu (cifs_pdu->smb_buf_length); - -return cifs_sign_smbv (iov,2 , server, +return cifs_sign_smbv (iov,ARRAY_SIZE (iov), server, pexpected_response_sequence_number); }
@@ -234,10 +218,6 @@ int cifs_verify_signature(struct smb_rqst *rqst,char what_we_think_sig_should_be[20 ];struct smb_hdr *cifs_pdu = (struct smb_hdr *)rqst->rq_iov[0 ].iov_base; -if (rqst->rq_iov[0 ].iov_len !=4 || - rqst->rq_iov[0 ].iov_base +4 != rqst->rq_iov[1 ].iov_base) -return -EIO ; -if (cifs_pdu ==NULL || server ==NULL )return -EINVAL ;
fs/smb/client/cifsglob.h +11 -10
@@ -347,12 +347,13 @@ struct smb_version_operations {int (*map_error)(char *,bool );/* find mid corresponding to the response message */ struct smb_message * (*find_mid)(struct TCP_Server_Info *server,char *buf); -void (*dump_detail)(void *buf,struct TCP_Server_Info *ptcp_info); +void (*dump_detail)(void *buf,size_t buf_len,struct TCP_Server_Info *ptcp_info);void (*clear_stats)(struct cifs_tcon *);void (*print_stats)(struct seq_file *m,struct cifs_tcon *);void (*dump_share_caps)(struct seq_file *,struct cifs_tcon *);/* verify the message */ -int (*check_message)(char *,unsigned int ,struct TCP_Server_Info *); +int (*check_message)(char *buf,unsigned int pdu_len,unsigned int len, +struct TCP_Server_Info *server);bool (*is_oplock_break)(char *,struct TCP_Server_Info *);int (*handle_cancelled_mid)(struct smb_message *smb,struct TCP_Server_Info *server); void (*downgrade_oplock)(struct TCP_Server_Info *server,
@@ -636,8 +637,7 @@ struct smb_version_operations {#define HEADER_SIZE (server) (server->vals->header_size)#define MAX_HEADER_SIZE (server) (server->vals->max_header_size) -#define HEADER_PREAMBLE_SIZE (server) (server->vals->header_preamble_size) -#define MID_HEADER_SIZE (server) (HEADER_SIZE(server) - 1 - HEADER_PREAMBLE_SIZE(server)) +#define MID_HEADER_SIZE (server) (HEADER_SIZE(server) - 1)/** * CIFS superblock mount flags (mnt_cifs_flags) to consider when
@@ -832,9 +832,9 @@ struct TCP_Server_Info {char dns_dom[CIFS_MAX_DOMAINNAME_LEN +1 ]; }; -static inline bool is_smb1 (struct TCP_Server_Info *server) +static inline bool is_smb1 (const struct TCP_Server_Info *server) { -return HEADER_PREAMBLE_SIZE (server) !=0 ; +return server->vals->protocol_id ==SMB10_PROT_ID ; }static inline void cifs_server_lock (struct TCP_Server_Info *server)
@@ -973,16 +973,16 @@ compare_mid(__u16 mid, const struct smb_hdr *smb)* of kvecs to handle the receive, though that should only need to be done * once. */ -#define CIFS_MAX_WSIZE ((1<<24) - 1 - sizeof(WRITE_REQ) + 4) -#define CIFS_MAX_RSIZE ((1<<24) - sizeof(READ_RSP) + 4) +#define CIFS_MAX_WSIZE ((1<<24) - 1 - sizeof(WRITE_REQ)) +#define CIFS_MAX_RSIZE ((1<<24) - sizeof(READ_RSP))/* * When the server doesn't allow large posix writes, only allow a rsize/wsize * of 2^17-1 minus the size of the call header. That allows for a read or * write up to the maximum size described by RFC1002. */ -#define CIFS_MAX_RFC1002_WSIZE ((1<<17) - 1 - sizeof(WRITE_REQ) + 4) -#define CIFS_MAX_RFC1002_RSIZE ((1<<17) - 1 - sizeof(READ_RSP) + 4) +#define CIFS_MAX_RFC1002_WSIZE ((1<<17) - 1 - sizeof(WRITE_REQ)) +#define CIFS_MAX_RFC1002_RSIZE ((1<<17) - 1 - sizeof(READ_RSP))/* * Windows only supports a max of 60kb reads and 65535 byte writes. Default to
@@ -1701,6 +1701,7 @@ struct smb_message {struct task_struct *creator;void *resp_buf;/* pointer to received SMB header */ unsigned int resp_buf_size; +u32 response_pdu_len;int mid_state;/* wish this were enum but can not pass to wait_event */ int mid_rc;/* rc for MID_RC */ __le16 command;/* smb command code */
fs/smb/client/cifspdu.h +1 -1
@@ -90,7 +90,7 @@/* future chained NTCreateXReadX bigger, but for time being NTCreateX biggest */ /* among the requests (NTCreateX response is bigger with wct of 34) */ -#define MAX_CIFS_HDR_SIZE 0x58/* 4 len + 32 hdr + (2*24 wct) + 2 bct + 2 pad */ +#define MAX_CIFS_HDR_SIZE 0x54/* 32 hdr + (2*24 wct) + 2 bct + 2 pad */ #define CIFS_SMALL_PATH 120/* allows for (448-88)/3 */ /* internal cifs vfs structures */
fs/smb/client/cifsproto.h +21 -21
72 lines not on this page · raw message
fs/smb/client/cifssmb.c +394 -301
2,311 lines not on this page · raw message
fs/smb/client/cifstransport.c +47 -81
271 lines not on this page · raw message
fs/smb/client/connect.c +17 -19
@@ -1155,15 +1155,14 @@ standard_receive3(struct TCP_Server_Info *server, struct smb_message *smb)unsigned int pdu_length = server->pdu_size;/* make sure this will fit in a large buffer */ -if (pdu_length > CIFSMaxBufSize +MAX_HEADER_SIZE (server) - -HEADER_PREAMBLE_SIZE (server)) { +if (pdu_length > CIFSMaxBufSize +MAX_HEADER_SIZE (server)) {cifs_server_dbg (VFS ,"SMB response too long (%u bytes)\n" , pdu_length);cifs_reconnect (server, true);return -ECONNABORTED ; }/* switch to large buffer if too big for a small one */ -if (pdu_length >MAX_CIFS_SMALL_BUFFER_SIZE -4 ) { +if (pdu_length >MAX_CIFS_SMALL_BUFFER_SIZE ) { server->large_buf = true;memcpy (server->bigbuf, buf, server->total_read); buf = server->bigbuf;
@@ -1196,7 +1195,8 @@ cifs_handle_standard(struct TCP_Server_Info *server, struct smb_message *smb)* 48 bytes is enough to display the header and a little bit * into the payload for debugging purposes. */ - rc = server->ops->check_message (buf, server->total_read, server); + rc = server->ops->check_message (buf, server->pdu_size, + server->total_read, server);if (rc)cifs_dump_mem ("Bad SMB: " , buf, min_t(unsigned int, server->total_read, 48));
@@ -1286,16 +1286,13 @@ cifs_demultiplex_thread(void *p)if (length <0 )continue ; -if (is_smb1 (server)) - server->total_read = length; -else - server->total_read =0 ; + server->total_read =0 ;/* * The right amount was read from socket - 4 bytes, * so we can now interpret the length field. */ - pdu_length =get_rfc1002_len (buf); + pdu_length =be32_to_cpup (((__be32 *)buf)) &0xffffff ;cifs_dbg (FYI ,"RFC1002 header 0x%x\n" , pdu_length);if (!is_smb_response (server, buf[0 ]))
@@ -1314,9 +1311,8 @@ cifs_demultiplex_thread(void *p) }/* read down to the MID */ - length =cifs_read_from_socket (server, - buf +HEADER_PREAMBLE_SIZE (server), -MID_HEADER_SIZE (server)); + length =cifs_read_from_socket (server, buf, +MID_HEADER_SIZE (server));if (length <0 )continue ; server->total_read += length;
@@ -1348,6 +1344,8 @@ cifs_demultiplex_thread(void *p) bufs[0 ] = buf; num_smbs =1 ; +if (smbs[0 ]) + smbs[0 ]->response_pdu_len = pdu_length;if (!smbs[0 ] || !smbs[0 ]->receive) length =standard_receive3 (server, smbs[0 ]);else
@@ -1406,7 +1404,7 @@ cifs_demultiplex_thread(void *p)smb2_add_credits_from_hdr (bufs[i], server);#ifdef CONFIG_CIFS_DEBUG2 if (server->ops->dump_detail) - server->ops->dump_detail (bufs[i], + server->ops->dump_detail (bufs[i], pdu_length, server);cifs_dump_mids (server);#endif /* CIFS_DEBUG2 */
@@ -3999,7 +3997,7 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses,TCONX_RSP *pSMBr;unsigned char *bcc_ptr;int rc =0 ; -int length; +int length, in_len;__u16 bytes_left, count;if (ses ==NULL )
@@ -4011,8 +4009,8 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses, smb_buffer_response = smb_buffer; -header_assemble (smb_buffer,SMB_COM_TREE_CONNECT_ANDX , -NULL /*no tid */ ,4 /*wct */ ); + in_len =header_assemble (smb_buffer,SMB_COM_TREE_CONNECT_ANDX , +NULL /*no tid */ ,4 /*wct */ ); smb_buffer->Mid =get_next_mid (ses->server); smb_buffer->Uid = ses->Suid;
@@ -4053,11 +4051,11 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses, bcc_ptr +=strlen ("?????" ); bcc_ptr +=1 ; count = bcc_ptr - &pSMB->Password[0 ]; -be32_add_cpu (&pSMB->hdr.smb_buf_length, count); + in_len += count; pSMB->ByteCount =cpu_to_le16 (count); - rc =SendReceive (xid, ses, smb_buffer, smb_buffer_response, &length, -0 ); + rc =SendReceive (xid, ses, smb_buffer, in_len, smb_buffer_response, + &length,0 );/* above now done in SendReceive */ if (rc ==0 ) {
fs/smb/client/misc.c +17 -17
@@ -264,19 +264,18 @@ free_rsp_buf(int resp_buftype, void *rsp)/* NB: MID can not be set if treeCon not passed in, in that case it is responsibility of caller to set the mid */ -void -header_assemble (struct smb_hdr *buffer,char smb_command/* command */ , +unsigned int +header_assemble (struct smb_hdr *buffer,char smb_command,const struct cifs_tcon *treeCon,int word_count/* length of fixed section (word count) in two byte units */ ) { +unsigned int in_len;char *temp = (char *) buffer;memset (temp,0 ,256 );/* bigger than MAX_CIFS_HDR_SIZE */ - buffer->smb_buf_length =cpu_to_be32 ( - (2 * word_count) +sizeof (struct smb_hdr ) - -4 /* RFC 1001 length field does not count */ + -2 /* for bcc field itself */ ) ; + in_len = (2 * word_count) +sizeof (struct smb_hdr ) + +2 /* for bcc field itself */ ; buffer->Protocol[0 ] =0xFF ; buffer->Protocol[1 ] ='S' ;
@@ -311,7 +310,7 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ ,/* endian conversion of flags is now done just before sending */ buffer->WordCount = (char ) word_count; -return ; +return in_len; } static int
@@ -346,10 +345,11 @@ check_smb_hdr(struct smb_hdr *smb) }int -checkSMB (char *buf,unsigned int total_read,struct TCP_Server_Info *server) +checkSMB (char *buf,unsigned int pdu_len,unsigned int total_read, +struct TCP_Server_Info *server) {struct smb_hdr *smb = (struct smb_hdr *)buf; -__u32 rfclen =be32_to_cpu (smb->smb_buf_length); +__u32 rfclen = pdu_len;__u32 clc_len;/* calculated length */ cifs_dbg (FYI ,"checkSMB Length: 0x%x, smb_buf_length: 0x%x\n" , total_read, rfclen);
@@ -394,24 +394,24 @@ checkSMB(char *buf, unsigned int total_read, struct TCP_Server_Info *server)return -EIO ; clc_len =smbCalcSize (smb); -if (4 + rfclen != total_read) { -cifs_dbg (VFS ,"Length read does not match RFC1001 length %d\n" , - rfclen); +if (rfclen != total_read) { +cifs_dbg (VFS ,"Length read does not match RFC1001 length %d/%d\n" , + rfclen, total_read);return -EIO ; } -if (4 + rfclen != clc_len) { +if (rfclen != clc_len) {__u16 mid =get_mid (smb);/* check if bcc wrapped around for large read responses */ if ((rfclen >64 *1024 ) && (rfclen > clc_len)) {/* check if lengths match mod 64K */ -if (((4 + rfclen) &0xFFFF ) == (clc_len &0xFFFF )) +if (((rfclen) &0xFFFF ) == (clc_len &0xFFFF ))return 0 ;/* bcc wrapped */ }cifs_dbg (FYI ,"Calculated size %u vs length %u mismatch for mid=%u\n" , - clc_len,4 + rfclen, mid); + clc_len, rfclen, mid); -if (4 + rfclen < clc_len) { +if (rfclen < clc_len) {
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
David Howells
maintainerPATCH v5 3/9 cifs: Make smb1's SendReceive() wrap cifs_send_recv()
In reply to David HowellsMake the smb1 transport's SendReceive() simply wrap cifs_send_recv() as does SendReceive2(). This will then allow that to pick up the transport changes there.
--- fs/smb/client/cifstransport.c | 83 +++++------------------------------ 1 file changed, 10 insertions(+), 73 deletions(-)
fs/smb/client/cifstransport.c +10 -73
@@ -236,12 +236,12 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, struct smb_hdr *in_buf, unsigned int in_len, struct smb_hdr *out_buf, int *pbytes_returned, const int flags) { - int rc = 0; -struct smb_message *smb; + struct TCP_Server_Info *server; +struct kvec resp_iov = {};struct kvec iov = { .iov_base = in_buf, .iov_len = in_len };struct smb_rqst rqst = { .rq_iov = &iov, .rq_nvec =1 }; -struct cifs_credits credits = { .value =1 , .instance =0 }; -struct TCP_Server_Info *server; +int resp_buf_type; +int rc =0 ;if (WARN_ON_ONCE (in_len >0xffffff ))return -EIO ;
@@ -272,78 +272,15 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,return -EIO ; } - rc =wait_for_free_request (server, flags, &credits.instance); -if (rc) -return rc; - -/* make sure that we sign in the same order that we send on this socket -and avoid races inside tcp sendmsg code that could cause corruption -of smb data */ - -cifs_server_lock (server); - - rc =allocate_mid (ses, in_buf, &smb); -if (rc) { -cifs_server_unlock (server); -/* Update # of requests on wire to server */ -add_credits (server, &credits,0 ); -return rc; - } - - rc =cifs_sign_smb (in_buf, in_len, server, &smb->sequence_number); -if (rc) { -cifs_server_unlock (server); - goto out; - } - - smb->mid_state =MID_REQUEST_SUBMITTED ; - - rc =smb_send (server, in_buf, in_len); -cifs_save_when_sent (smb); - -if (rc <0 ) - server->sequence_number -=2 ; - -cifs_server_unlock (server); - + rc =cifs_send_recv (xid, ses, ses->server, + &rqst, &resp_buf_type, flags, &resp_iov);if (rc <0 ) - goto out; - - rc =wait_for_response (server, smb); -if (rc !=0 ) { -send_cancel (server, &rqst, smb); -spin_lock (&smb->mid_lock); -if (smb->mid_state ==MID_REQUEST_SUBMITTED || - smb->mid_state ==MID_RESPONSE_RECEIVED ) { -/* no longer considered to be "in-flight" */ - smb->callback = release_mid; -spin_unlock (&smb->mid_lock); -add_credits (server, &credits,0 ); -return rc; - } -spin_unlock (&smb->mid_lock); - } - - rc =cifs_sync_mid_result (smb, server); -if (rc !=0 ) { -add_credits (server, &credits,0 );return rc; - } - -if (!smb->resp_buf || !out_buf || - smb->mid_state !=MID_RESPONSE_READY ) { - rc = -EIO ; -cifs_server_dbg (VFS ,"Bad MID state?\n" ); - goto out; - } - - *pbytes_returned = smb->response_pdu_len; -memcpy (out_buf, smb->resp_buf, *pbytes_returned); - rc =cifs_check_receive (smb, server,0 ); -out: -delete_mid (smb); -add_credits (server, &credits,0 ); + *pbytes_returned = resp_iov.iov_len; +if (resp_iov.iov_len) +memcpy (out_buf, resp_iov.iov_base, resp_iov.iov_len); +free_rsp_buf (resp_buf_type, resp_iov.iov_base);return rc; }
David Howells
maintainerPATCH v5 4/9 cifs: Clean up some places where an extra kvec[] was required for rfc1002
In reply to David HowellsClean up some places where previously an extra element in the kvec array was being used to hold an rfc1002 header for SMB1 (a previous patch removed this and generated it on the fly as for SMB2/3).
--- fs/smb/client/cifsencrypt.c | 52 ++++++++--------------------------- fs/smb/client/cifsproto.h | 7 ----- fs/smb/client/cifstransport.c | 20 ++------------ fs/smb/client/smb1ops.c | 12 +++++--- fs/smb/client/transport.c | 28 +++++++++++-------- 5 files changed, 38 insertions(+), 81 deletions(-)
fs/smb/client/cifsencrypt.c +12 -40
@@ -86,26 +86,21 @@ static int cifs_sig_iter(const struct iov_iter *iter, size_t maxsize,int __cifs_calc_signature (struct smb_rqst *rqst,struct TCP_Server_Info *server,char *signature,struct cifs_calc_sig_ctx *ctx) { -int i; +struct iov_iter iter;ssize_t rc; -struct kvec *iov = rqst->rq_iov; -int n_vec = rqst->rq_nvec; +size_t size =0 ; -for (i =0 ; i < n_vec; i++) { -if (iov[i].iov_len ==0 ) -continue ; -if (iov[i].iov_base ==NULL ) { -cifs_dbg (VFS ,"null iovec entry\n" ); -return -EIO ; - } +for (int i =0 ; i < rqst->rq_nvec; i++) + size += rqst->rq_iov[i].iov_len; - rc =cifs_sig_update (ctx, iov[i].iov_base, iov[i].iov_len); -if (rc) { -cifs_dbg (VFS ,"%s: Could not update with payload\n" , - __func__); -return rc; - } - } +iov_iter_kvec (&iter,ITER_SOURCE , rqst->rq_iov, rqst->rq_nvec, size); + +if (iov_iter_count (&iter) <=4 ) +return -EIO ; + + rc =cifs_sig_iter (&iter,iov_iter_count (&iter), ctx); +if (rc <0 ) +return rc; rc =cifs_sig_iter (&rqst->rq_iter,iov_iter_count (&rqst->rq_iter), ctx);if (rc <0 )
@@ -186,29 +181,6 @@ int cifs_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server,return rc; } -int cifs_sign_smbv (struct kvec *iov,int n_vec,struct TCP_Server_Info *server, -__u32 *pexpected_response_sequence) -{ -struct smb_rqst rqst = { .rq_iov = iov, - .rq_nvec = n_vec }; - -return cifs_sign_rqst (&rqst, server, pexpected_response_sequence); -} - -/* must be called with server->srv_mutex held */ -int cifs_sign_smb (struct smb_hdr *cifs_pdu,unsigned int pdu_len, -struct TCP_Server_Info *server, -__u32 *pexpected_response_sequence_number) -{ -struct kvec iov[1 ] = { - [0 ].iov_base = (char *)cifs_pdu, - [0 ].iov_len = pdu_len, - }; - -return cifs_sign_smbv (iov,ARRAY_SIZE (iov), server, - pexpected_response_sequence_number); -} -int cifs_verify_signature (struct smb_rqst *rqst,struct TCP_Server_Info *server,__u32 expected_sequence_number)
fs/smb/client/cifsproto.h +0 -7
@@ -30,8 +30,6 @@ extern void cifs_buf_release(void *);extern struct smb_hdr *cifs_small_buf_get (void );extern void cifs_small_buf_release (void *);extern void free_rsp_buf (int ,void *); -extern int smb_send (struct TCP_Server_Info *,struct smb_hdr *, -unsigned int /* length */ );extern int smb_send_kvec (struct TCP_Server_Info *server,struct msghdr *msg,size_t *sent);
@@ -562,11 +560,6 @@ extern void tconInfoFree(struct cifs_tcon *tcon, enum smb3_tcon_ref_trace trace)extern int cifs_sign_rqst (struct smb_rqst *rqst,struct TCP_Server_Info *server,__u32 *pexpected_response_sequence_number); -int cifs_sign_smbv (struct kvec *iov,int n_vec,struct TCP_Server_Info *server, -__u32 *pexpected_response_sequence); -int cifs_sign_smb (struct smb_hdr *cifs_pdu,unsigned int pdu_len, -struct TCP_Server_Info *server, -__u32 *pexpected_response_sequence_number);int cifs_verify_signature (struct smb_rqst *rqst,struct TCP_Server_Info *server,__u32 expected_sequence_number);
fs/smb/client/cifstransport.c +2 -18
@@ -70,22 +70,6 @@ alloc_mid(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)return smb; } -int -smb_send (struct TCP_Server_Info *server,struct smb_hdr *smb_buffer, -unsigned int smb_buf_length) -{ -struct kvec iov[1 ] = { - [0 ].iov_base = smb_buffer, - [0 ].iov_len = smb_buf_length, - }; -struct smb_rqst rqst = { - .rq_iov = iov, - .rq_nvec =ARRAY_SIZE (iov), - }; - -return __smb_send_rqst (server,1 , &rqst); -} -static int allocate_mid (struct cifs_ses *ses,struct smb_hdr *in_buf,struct smb_message **ppmidQ) {
@@ -369,7 +353,7 @@ int SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,return rc; } - rc =cifs_sign_smb (in_buf, in_len, server, &smb->sequence_number); + rc =cifs_sign_rqst (&rqst, server, &smb->sequence_number);if (rc) {delete_mid (smb);cifs_server_unlock (server);
@@ -377,7 +361,7 @@ int SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, } smb->mid_state =MID_REQUEST_SUBMITTED ; - rc =smb_send (server, in_buf, in_len); + rc =__smb_send_rqst (server,1 , &rqst);cifs_save_when_sent (smb);if (rc <0 )
fs/smb/client/smb1ops.c +8 -4
@@ -32,17 +32,21 @@ static int send_nt_cancel(struct TCP_Server_Info *server, struct smb_rqst *rqst, struct smb_message *smb) { - int rc = 0; struct smb_hdr *in_buf = (struct smb_hdr *)rqst->rq_iov[0].iov_base; -unsigned int in_len = rqst->rq_iov[0 ].iov_len; +struct kvec iov[1 ]; +struct smb_rqst crqst = { .rq_iov = iov, .rq_nvec =1 }; +int rc =0 ;/* +2 for BCC field */ in_buf->Command =SMB_COM_NT_CANCEL ; in_buf->WordCount =0 ;put_bcc (0 , in_buf); + iov[0 ].iov_base = in_buf; + iov[0 ].iov_len =sizeof (struct smb_hdr ) +2 ; +cifs_server_lock (server); - rc =cifs_sign_smb (in_buf, in_len, server, &smb->sequence_number); + rc =cifs_sign_rqst (&crqst, server, &smb->sequence_number);if (rc) {cifs_server_unlock (server);return rc;
@@ -54,7 +58,7 @@ send_nt_cancel(struct TCP_Server_Info *server, struct smb_rqst *rqst,* after signing here. */ --server->sequence_number; - rc =smb_send (server, in_buf, in_len); + rc =__smb_send_rqst (server,1 , &crqst);if (rc <0 ) server->sequence_number--;
fs/smb/client/transport.c +16 -12
@@ -995,6 +995,9 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,if ((ses->ses_status ==SES_NEW ) || (optype &CIFS_NEG_OP ) || (optype &CIFS_SESS_OP )) {spin_unlock (&ses->ses_lock); +if (WARN_ON_ONCE (num_rqst !=1 || !resp_iov)) +return -EINVAL ; +cifs_server_lock (server);smb311_update_preauth_hash (ses, server, rqst[0 ].rq_iov, rqst[0 ].rq_nvec);cifs_server_unlock (server);
@@ -1043,22 +1046,23 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, goto out; } - buf = (char *)smb[i]->resp_buf; - resp_iov[i].iov_base = buf; - resp_iov[i].iov_len = smb[i]->resp_buf_size; - -if (smb[i]->large_buf) - resp_buf_type[i] =CIFS_LARGE_BUFFER ; -else - resp_buf_type[i] =CIFS_SMALL_BUFFER ; - rc = server->ops->check_receive (smb[i], server, flags &CIFS_LOG_ERROR ); -/* mark it so buf will not be freed by delete_mid */ -if ((flags &CIFS_NO_RSP_BUF ) ==0 ) - smb[i]->resp_buf =NULL ; +if (resp_iov) { + buf = (char *)smb[i]->resp_buf; + resp_iov[i].iov_base = buf; + resp_iov[i].iov_len = smb[i]->resp_buf_size; + +if (smb[i]->large_buf) + resp_buf_type[i] =CIFS_LARGE_BUFFER ; +else + resp_buf_type[i] =CIFS_SMALL_BUFFER ; +/* mark it so buf will not be freed by delete_mid */ +if ((flags &CIFS_NO_RSP_BUF ) ==0 ) + smb[i]->resp_buf =NULL ; + } }/*
David Howells
maintainerPATCH v5 5/9 cifs: Replace SendReceiveBlockingLock() with SendReceive() plus flags
In reply to David HowellsReplace the smb1 transport's SendReceiveBlockingLock() with SendReceive() plus a couple of flags. This will then allow that to pick up the transport changes there.
The first flag, CIFS_INTERRUPTIBLE_WAIT, is added to indicate that the wait should be interruptible and the second, CIFS_WINDOWS_LOCK, indicates that we need to send a Lock command with unlock type rather than a Cancel.
send_lock_cancel() is then called from cifs_lock_cancel() which is called from the main transport loop in compound_send_recv().
[!] I *think* the error code handling is probably right.
--- fs/smb/client/cifsglob.h | 8 +- fs/smb/client/cifsproto.h | 10 +- fs/smb/client/cifssmb.c | 18 +-- fs/smb/client/cifstransport.c | 200 +--------------------------------- fs/smb/client/smb1ops.c | 47 +++++++- fs/smb/client/transport.c | 10 +- 6 files changed, 77 insertions(+), 216 deletions(-)
fs/smb/client/cifsglob.h +6 -2
@@ -311,8 +311,9 @@ struct cifs_open_parms;struct cifs_credits ;struct smb_version_operations { -int (*send_cancel)(struct TCP_Server_Info *,struct smb_rqst *, -struct smb_message *smb); +int (*send_cancel)(struct cifs_ses *ses,struct TCP_Server_Info *server, +struct smb_rqst *rqst,struct smb_message *smb, +unsigned int xid);bool (*compare_fids)(struct cifsFileInfo *,struct cifsFileInfo *);/* setup request: allocate mid, sign message */ struct smb_message *(*setup_request)(struct cifs_ses *ses,
@@ -1689,6 +1690,7 @@ struct smb_message {__u16 credits_received;/* number of credits from the response */ __u32 pid;/* process id */ __u32 sequence_number;/* for CIFS signing */ +unsigned int sr_flags;/* Flags passed to send_recv() */ unsigned long when_alloc;/* when mid was created */ #ifdef CONFIG_CIFS_STATS2 unsigned long when_sent;/* time when smb send finished */
@@ -1900,6 +1902,8 @@ enum cifs_writable_file_flags {#define CIFS_TRANSFORM_REQ 0x0800/* transform request before sending */ #define CIFS_NO_SRV_RSP 0x1000/* there is no server response */ #define CIFS_COMPRESS_REQ 0x4000/* compress request before sending */ +#define CIFS_INTERRUPTIBLE_WAIT 0x8000/* Interruptible wait (e.g. lock request) */ +#define CIFS_WINDOWS_LOCK 0x10000/* We're trying to get a Windows lock */ /* Security Flags: indicate type of session setup needed */ #define CIFSSEC_MAY_SIGN 0x00001
fs/smb/client/cifsproto.h +4 -6
@@ -130,11 +130,12 @@ extern int cifs_wait_mtu_credits(struct TCP_Server_Info *server, struct cifs_credits *credits);static inline int -send_cancel (struct TCP_Server_Info *server,struct smb_rqst *rqst, -struct smb_message *smb) +send_cancel (struct cifs_ses *ses,struct TCP_Server_Info *server, +struct smb_rqst *rqst,struct smb_message *smb, +unsigned int xid) {return server->ops->send_cancel ? - server->ops->send_cancel (server, rqst, smb) :0 ; + server->ops->send_cancel (ses, server, rqst, smb, xid) :0 ; }int wait_for_response (struct TCP_Server_Info *server,struct smb_message *smb);
@@ -142,9 +143,6 @@ extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, struct kvec *, int /* nvec to send */, int * /* type of buf returned */, const int flags, struct kvec * /* resp vec */); -int SendReceiveBlockingLock (const unsigned int xid,struct cifs_tcon *tcon, -struct smb_hdr *in_buf,unsigned int in_len, -struct smb_hdr *out_buf,int *pbytes_returned);void smb2_query_server_interfaces (struct work_struct *work);void
fs/smb/client/cifssmb.c +10 -8
@@ -2059,7 +2059,7 @@ CIFSSMBLock(const unsigned int xid, struct cifs_tcon *tcon,/* LOCK_RSP *pSMBr = NULL; */ /* No response data other than rc to parse */ unsigned int in_len;int bytes_returned; -int flags =0 ; +int flags =CIFS_WINDOWS_LOCK |CIFS_INTERRUPTIBLE_WAIT ;__u16 count; cifs_dbg(FYI, "CIFSSMBLock timeout %d numLock %d\n",
@@ -2104,8 +2104,9 @@ CIFSSMBLock(const unsigned int xid, struct cifs_tcon *tcon, pSMB->ByteCount =cpu_to_le16 (count);if (waitFlag) - rc =SendReceiveBlockingLock (xid, tcon, (struct smb_hdr *) pSMB, in_len, - (struct smb_hdr *) pSMB, &bytes_returned); + rc =SendReceive (xid, tcon->ses, (struct smb_hdr *) pSMB, in_len, + (struct smb_hdr *) pSMB, &bytes_returned, + flags);else rc =SendReceiveNoRsp (xid, tcon->ses, (char *)pSMB, in_len, flags);cifs_small_buf_release (pSMB);
@@ -2130,7 +2131,7 @@ CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon,struct cifs_posix_lock *parm_data;unsigned int in_len;int rc =0 ; -int timeout =0 ; +int sr_flags =CIFS_INTERRUPTIBLE_WAIT ;int bytes_returned =0 ;int resp_buf_type =0 ;__u16 params, param_offset, offset, byte_count, count;
@@ -2173,7 +2174,7 @@ CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon, parm_data->lock_type =cpu_to_le16 (lock_type);if (waitFlag) { - timeout =CIFS_BLOCKING_OP ;/* blocking operation, no timeout */ + sr_flags |=CIFS_BLOCKING_OP ;/* blocking operation, no timeout */ parm_data->lock_flags =cpu_to_le16 (1 ); pSMB->Timeout =cpu_to_le32 (-1 ); }else
@@ -2190,13 +2191,14 @@ CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon, in_len += byte_count; pSMB->ByteCount =cpu_to_le16 (byte_count);if (waitFlag) { - rc =SendReceiveBlockingLock (xid, tcon, (struct smb_hdr *) pSMB, in_len, - (struct smb_hdr *) pSMBr, &bytes_returned); + rc =SendReceive (xid, tcon->ses, (struct smb_hdr *) pSMB, in_len, + (struct smb_hdr *) pSMBr, &bytes_returned, + sr_flags); }else { iov[0 ].iov_base = (char *)pSMB; iov[0 ].iov_len = in_len; rc =SendReceive2 (xid, tcon->ses, iov,1 /* num iovecs */ , - &resp_buf_type, timeout, &rsp_iov); + &resp_buf_type, sr_flags, &rsp_iov); pSMBr = (struct smb_com_transaction2_sfi_rsp *)rsp_iov.iov_base; }cifs_small_buf_release (pSMB);
fs/smb/client/cifstransport.c +5 -195
212 lines not on this page · raw message
fs/smb/client/smb1ops.c +44 -3
65 lines not on this page · raw message
fs/smb/client/transport.c +8 -2
@@ -643,12 +643,16 @@ cifs_wait_mtu_credits(struct TCP_Server_Info *server, size_t size,int wait_for_response (struct TCP_Server_Info *server,struct smb_message *smb) { +unsigned int sleep_state =TASK_KILLABLE ;int error; +if (smb->sr_flags &CIFS_INTERRUPTIBLE_WAIT ) + sleep_state =TASK_INTERRUPTIBLE ; + error =wait_event_state (server->response_q, smb->mid_state !=MID_REQUEST_SUBMITTED && smb->mid_state !=MID_RESPONSE_RECEIVED , - (TASK_KILLABLE |TASK_FREEZABLE_UNSAFE )); + (sleep_state |TASK_FREEZABLE_UNSAFE ));if (error <0 )return -ERESTARTSYS ;
@@ -702,6 +706,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,return PTR_ERR (smb); } + smb->sr_flags = flags; smb->receive = receive; smb->callback = callback; smb->callback_data = cbdata;
@@ -946,6 +951,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,return PTR_ERR (smb[i]); } + smb[i]->sr_flags = flags; smb[i]->mid_state =MID_REQUEST_SUBMITTED ; smb[i]->optype = optype;/*
@@ -1015,7 +1021,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,for (; i < num_rqst; i++) {cifs_server_dbg (FYI ,"Cancelling wait for mid %llu cmd: %d\n" , smb[i]->mid,le16_to_cpu (smb[i]->command)); -send_cancel (server, &rqst[i], smb[i]); +send_cancel (ses, server, &rqst[i], smb[i], xid);spin_lock (&smb[i]->mid_lock); smb[i]->wait_cancelled = true; if (smb[i]->mid_state == MID_REQUEST_SUBMITTED ||
David Howells
maintainerPATCH v5 6/9 cifs: Remove the server pointer from smb_message
In reply to David HowellsRemove the server pointer from smb_message and instead pass it down to all the things that access it.
--- fs/smb/client/cifsglob.h | 10 ++++---- fs/smb/client/cifsproto.h | 21 +++++++++++------ fs/smb/client/cifssmb.c | 15 +++++------- fs/smb/client/cifstransport.c | 13 +++++------ fs/smb/client/connect.c | 34 +++++++++++++-------------- fs/smb/client/netmisc.c | 5 ++-- fs/smb/client/smb1ops.c | 4 ++-- fs/smb/client/smb2ops.c | 22 +++++++++--------- fs/smb/client/smb2pdu.c | 23 ++++++++---------- fs/smb/client/smb2transport.c | 7 +++--- fs/smb/client/transport.c | 44 ++++++++++++++++------------------- 11 files changed, 97 insertions(+), 101 deletions(-)
fs/smb/client/cifsglob.h +5 -5
@@ -1671,7 +1671,7 @@ typedef int (*mid_receive_t)(struct TCP_Server_Info *server,* - it will be called by cifsd, with no locks held * - the mid will be removed from any lists */ -typedef void (*mid_callback_t )(struct smb_message *smb); +typedef void (*mid_callback_t )(struct TCP_Server_Info *srv,struct smb_message *smb);/* * This is the protopyte for mid handle function. This is called once the mid
@@ -1683,8 +1683,7 @@ typedef int (*mid_handle_t)(struct TCP_Server_Info *server,/* one of these for every pending CIFS request to the server */ struct smb_message {struct list_head qhead;/* mids waiting on reply from this server */ -struct kref refcount; -struct TCP_Server_Info *server;/* server corresponding to this mid */ +refcount_t refcount;__u64 mid;/* multiplex id */ __u16 credits;/* number of credits consumed by this mid */ __u16 credits_received;/* number of credits from the response */
@@ -2356,7 +2355,8 @@ static inline bool cifs_netbios_name(const char *name, size_t namelen)* Execute mid callback atomically - ensures callback runs exactly once * and prevents sleeping in atomic context. */ -static inline void mid_execute_callback (struct smb_message *smb) +static inline void mid_execute_callback (struct TCP_Server_Info *server, +struct smb_message *smb) {mid_callback_t callback;
@@ -2366,7 +2366,7 @@ static inline void mid_execute_callback(struct smb_message *smb)spin_unlock (&smb->mid_lock);if (callback) -callback (smb); +callback (server, smb); }#define CIFS_REPARSE_SUPPORT (tcon) \
fs/smb/client/cifsproto.h +14 -7
@@ -82,9 +82,9 @@ extern char *cifs_build_path_to_root(struct smb3_fs_context *ctx, int add_treename);extern char *build_wildcard_path_from_dentry (struct dentry *direntry);char *cifs_build_devname (char *nodename,const char *prepath); -extern void delete_mid (struct smb_message *smb); -void __release_mid (struct kref *refcount); -extern void cifs_wake_up_task (struct smb_message *smb); +extern void delete_mid (struct TCP_Server_Info *server,struct smb_message *smb); +void __release_mid (struct TCP_Server_Info *server,struct smb_message *smb); +extern void cifs_wake_up_task (struct TCP_Server_Info *server,struct smb_message *smb);extern int cifs_handle_standard (struct TCP_Server_Info *server,struct smb_message *smb); extern char *smb3_fs_context_fullpath(const struct smb3_fs_context *ctx,
@@ -180,7 +180,8 @@ extern int decode_negTokenInit(unsigned char *security_blob, int length,extern int cifs_convert_address (struct sockaddr *dst,const char *src,int len);extern void cifs_set_port (struct sockaddr *addr,const unsigned short int port);extern int map_smb_to_linux_error (char *buf,bool logErr); -extern int map_and_check_smb_error (struct smb_message *smb,bool logErr); +extern int map_and_check_smb_error (struct TCP_Server_Info *server, +struct smb_message *smb,bool logErr);unsigned int header_assemble (struct smb_hdr *buffer,char smb_command,const struct cifs_tcon *treeCon,int word_count/* length of fixed section word count in two byte units */ );
@@ -263,7 +264,7 @@ extern unsigned int setup_special_mode_ACE(struct smb_ace *pace, __u64 nmode);extern unsigned int setup_special_user_owner_ACE (struct smb_ace *pace); -extern void dequeue_mid (struct smb_message *smb,bool malformed); +void dequeue_mid (struct TCP_Server_Info *server,struct smb_message *smb,bool malformed);extern int cifs_read_from_socket (struct TCP_Server_Info *server,char *buf,unsigned int to_read); extern ssize_t cifs_discard_from_socket(struct TCP_Server_Info *server,
@@ -767,9 +768,15 @@ static inline bool dfs_src_pathname_equal(const char *s1, const char *s2)return true; } -static inline void release_mid (struct smb_message *smb) +static inline void smb_get_mid (struct smb_message *smb) { -kref_put (&smb->refcount, __release_mid); +refcount_inc (&smb->refcount); +} + +static inline void release_mid (struct TCP_Server_Info *server,struct smb_message *smb) +{ +if (refcount_dec_and_test (&smb->refcount)) +__release_mid (server, smb); }static inline void cifs_free_open_info (struct cifs_open_info_data *data)
fs/smb/client/cifssmb.c +6 -9
@@ -584,12 +584,11 @@ CIFSSMBTDis(const unsigned int xid, struct cifs_tcon *tcon)* FIXME: maybe we should consider checking that the reply matches request? */ static void -cifs_echo_callback (struct smb_message *smb) +cifs_echo_callback (struct TCP_Server_Info *server,struct smb_message *smb) { -struct TCP_Server_Info *server = smb->callback_data;struct cifs_credits credits = { .value =1 , .instance =0 }; -release_mid (smb); +release_mid (server, smb);add_credits (server, &credits,CIFS_ECHO_OP ); }
@@ -1317,12 +1316,11 @@ CIFS_open(const unsigned int xid, struct cifs_open_parms *oparms, int *oplock, }static void -cifs_readv_callback (struct smb_message *smb) +cifs_readv_callback (struct TCP_Server_Info *server,struct smb_message *smb) {struct cifs_io_subrequest *rdata = smb->callback_data;struct netfs_inode *ictx =netfs_inode (rdata->rreq->inode);struct cifs_tcon *tcon =tlink_tcon (rdata->req->cfile->tlink); -struct TCP_Server_Info *server = tcon->ses->server;struct smb_rqst rqst = { .rq_iov = rdata->iov, .rq_nvec =1 , .rq_iter = rdata->subreq.io_iter };
@@ -1420,7 +1418,7 @@ cifs_readv_callback(struct smb_message *smb) rdata->subreq.transferred += rdata->got_bytes;trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_progress);netfs_read_subreq_terminated (&rdata->subreq); -release_mid (smb); +release_mid (server, smb);add_credits (server, &credits,0 ); trace_smb3_rw_credits(rreq_debug_id, subreq_debug_index, 0, server->credits, server->in_flight,
@@ -1736,10 +1734,9 @@ CIFSSMBWrite(const unsigned int xid, struct cifs_io_parms *io_parms,* workqueue completion task. */ static void -cifs_writev_callback (struct smb_message *smb) +cifs_writev_callback (struct TCP_Server_Info *server,struct smb_message *smb) {struct cifs_io_subrequest *wdata = smb->callback_data; -struct TCP_Server_Info *server = wdata->server;struct cifs_tcon *tcon =tlink_tcon (wdata->req->cfile->tlink);WRITE_RSP *rsp = (WRITE_RSP *)smb->resp_buf;struct cifs_credits credits = {
@@ -1803,7 +1800,7 @@ cifs_writev_callback(struct smb_message *smb) 0, cifs_trace_rw_credits_write_response_clear); wdata->credits.value =0 ;cifs_write_subrequest_terminated (wdata, result); -release_mid (smb); +release_mid (server, smb);trace_smb3_rw_credits (credits.rreq_debug_id, credits.rreq_debug_index,0 , server->credits, server->in_flight, credits.value, cifs_trace_rw_credits_write_response_add);
fs/smb/client/cifstransport.c +6 -7
@@ -45,7 +45,7 @@ alloc_mid(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server) smb =mempool_alloc (&smb_message_pool,GFP_NOFS );memset (smb,0 ,sizeof (struct smb_message )); -kref_init (&smb->refcount); +refcount_set (&smb->refcount,1 );spin_lock_init (&smb->mid_lock); smb->mid =get_mid (smb_buffer); smb->pid = current->pid;
@@ -54,7 +54,6 @@ alloc_mid(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)/* easier to use jiffies */ /* when mid allocated can be before when sent */ smb->when_alloc = jiffies; - smb->server = server;/* * The default is for the mid to be synchronous, so the
@@ -119,7 +118,7 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst) rc =cifs_sign_rqst (rqst, server, &smb->sequence_number);if (rc) { -release_mid (smb); +release_mid (server, smb);return ERR_PTR (rc); }
@@ -179,11 +178,11 @@ cifs_check_receive(struct smb_message *smb, struct TCP_Server_Info *server, }/* BB special case reconnect tid and uid here? */ -return map_and_check_smb_error (smb, log_error); +return map_and_check_smb_error (server, smb, log_error); }struct smb_message * -cifs_setup_request (struct cifs_ses *ses,struct TCP_Server_Info *ignored, +cifs_setup_request (struct cifs_ses *ses,struct TCP_Server_Info *server,struct smb_rqst *rqst) {int rc;
@@ -193,9 +192,9 @@ cifs_setup_request(struct cifs_ses *ses, struct TCP_Server_Info *ignored, rc =allocate_mid (ses, hdr, &smb);if (rc)return ERR_PTR (rc); - rc =cifs_sign_rqst (rqst, ses->server, &smb->sequence_number); + rc =cifs_sign_rqst (rqst, server, &smb->sequence_number);if (rc) { -delete_mid (smb); +delete_mid (server, smb);return ERR_PTR (rc); }return smb;
fs/smb/client/connect.c +17 -17
@@ -325,7 +325,7 @@ cifs_abort_connection(struct TCP_Server_Info *server)cifs_dbg (FYI ,"%s: moving mids to private list\n" , __func__);spin_lock (&server->mid_queue_lock);list_for_each_entry_safe (smb, nsmb, &server->pending_mid_q, qhead) { -kref_get (&smb->refcount); +smb_get_mid (smb);if (smb->mid_state ==MID_REQUEST_SUBMITTED ) smb->mid_state =MID_RETRY_NEEDED ;list_move (&smb->qhead, &retry_list);
@@ -337,8 +337,8 @@ cifs_abort_connection(struct TCP_Server_Info *server)cifs_dbg (FYI ,"%s: issuing mid callbacks\n" , __func__);list_for_each_entry_safe (smb, nsmb, &retry_list, qhead) {list_del_init (&smb->qhead); -mid_execute_callback (smb); -release_mid (smb); +mid_execute_callback (server, smb); +release_mid (server, smb); } }
@@ -882,7 +882,7 @@ is_smb_response(struct TCP_Server_Info *server, unsigned char type)*/ spin_lock (&server->mid_queue_lock);list_for_each_entry_safe (smb, nsmb, &server->pending_mid_q, qhead) { -kref_get (&smb->refcount); +smb_get_mid (smb);list_move (&smb->qhead, &dispose_list); smb->deleted_from_q = true; }
@@ -915,8 +915,8 @@ is_smb_response(struct TCP_Server_Info *server, unsigned char type)list_del_init (&smb->qhead); smb->mid_rc = mid_rc; smb->mid_state =MID_RC ; -mid_execute_callback (smb); -release_mid (smb); +mid_execute_callback (server, smb); +release_mid (server, smb); }/*
@@ -948,12 +948,12 @@ is_smb_response(struct TCP_Server_Info *server, unsigned char type) }void -dequeue_mid (struct smb_message *smb,bool malformed) +dequeue_mid (struct TCP_Server_Info *server,struct smb_message *smb,bool malformed) {#ifdef CONFIG_CIFS_STATS2 smb->when_received = jiffies;#endif -spin_lock (&smb->server->mid_queue_lock); +spin_lock (&server->mid_queue_lock);if (!malformed) smb->mid_state =MID_RESPONSE_RECEIVED ;else
@@ -963,12 +963,12 @@ dequeue_mid(struct smb_message *smb, bool malformed)* function has finished processing it is a bug. */ if (smb->deleted_from_q) { -spin_unlock (&smb->server->mid_queue_lock); +spin_unlock (&server->mid_queue_lock);pr_warn_once ("trying to dequeue a deleted mid\n" ); }else {list_del_init (&smb->qhead); smb->deleted_from_q = true; -spin_unlock (&smb->server->mid_queue_lock); +spin_unlock (&server->mid_queue_lock); } }
@@ -1004,7 +1004,7 @@ handle_mid(struct smb_message *smb, struct TCP_Server_Info *server,else server->smallbuf =NULL ; } -dequeue_mid (smb, malformed); +dequeue_mid (server, smb, malformed); }int
@@ -1101,7 +1101,7 @@ clean_demultiplex_info(struct TCP_Server_Info *server)list_for_each_safe (tmp, tmp2, &server->pending_mid_q) { smb = list_entry(tmp, struct smb_message, qhead);cifs_dbg (FYI ,"Clearing mid %llu\n" , smb->mid); -kref_get (&smb->refcount); +smb_get_mid (smb); smb->mid_state =MID_SHUTDOWN ;list_move (&smb->qhead, &dispose_list); smb->deleted_from_q = true;
@@ -1113,8 +1113,8 @@ clean_demultiplex_info(struct TCP_Server_Info *server) smb = list_entry(tmp, struct smb_message, qhead);cifs_dbg (FYI ,"Callback mid %llu\n" , smb->mid);list_del_init (&smb->qhead); -mid_execute_callback (smb); -release_mid (smb); +mid_execute_callback (server, smb); +release_mid (server, smb); }/* 1/8th of sec is more than enough time for them to exit */ msleep (125 );
@@ -1355,7 +1355,7 @@ cifs_demultiplex_thread(void *p)if (length <0 ) {for (i =0 ; i < num_smbs; i++)if (smbs[i]) -release_mid (smbs[i]); +release_mid (server, smbs[i]);continue ; }
@@ -1388,9 +1388,9 @@ cifs_demultiplex_thread(void *p) }if (!smbs[i]->multiRsp || smbs[i]->multiEnd) -mid_execute_callback (smbs[i]); +mid_execute_callback (server, smbs[i]); -release_mid (smbs[i]); +release_mid (server, smbs[i]); }else if (server->ops->is_oplock_break && server->ops->is_oplock_break (bufs[i], server)) {
fs/smb/client/netmisc.c +3 -2
@@ -889,7 +889,8 @@ map_smb_to_linux_error(char *buf, bool logErr) }int -map_and_check_smb_error (struct smb_message *smb,bool logErr) +map_and_check_smb_error (struct TCP_Server_Info *server, +struct smb_message *smb,bool logErr) {int rc;struct smb_hdr *rhdr = (struct smb_hdr *)smb->resp_buf;
@@ -904,7 +905,7 @@ map_and_check_smb_error(struct smb_message *smb, bool logErr)if (class ==ERRSRV && code == ERRbaduid) {cifs_dbg (FYI ,"Server returned 0x%x, reconnecting session...\n" , code); -cifs_signal_cifsd_for_reconnect (smb->server, false); +cifs_signal_cifsd_for_reconnect (server, false); } }
fs/smb/client/smb1ops.c +2 -2
@@ -145,7 +145,7 @@ cifs_find_mid(struct TCP_Server_Info *server, char *buffer)if (compare_mid (smb->mid, buf) && smb->mid_state ==MID_REQUEST_SUBMITTED &&le16_to_cpu (smb->command) == buf->Command) { -kref_get (&smb->refcount); +smb_get_mid (smb);spin_unlock (&server->mid_queue_lock);return smb; }
@@ -447,7 +447,7 @@ cifs_check_trans2(struct smb_message *smb, struct TCP_Server_Info *server,return true;/* All parts received or packet is malformed. */ smb->multiEnd = true; -dequeue_mid (smb, malformed); +dequeue_mid (server, smb, malformed);return true; }if (!server->large_buf) {
fs/smb/client/smb2ops.c +11 -11
@@ -406,7 +406,7 @@ __smb2_find_mid(struct TCP_Server_Info *server, char *buf, bool dequeue)if ((smb->mid == wire_mid) && (smb->mid_state ==MID_REQUEST_SUBMITTED ) && (smb->command == shdr->Command)) { -kref_get (&smb->refcount); +smb_get_mid (smb);if (dequeue) {list_del_init (&smb->qhead); smb->deleted_from_q = true;
@@ -4716,7 +4716,7 @@ handle_read_data(struct TCP_Server_Info *server, struct smb_message *smb,if (is_offloaded) smb->mid_state =MID_RESPONSE_RECEIVED ;else -dequeue_mid (smb, false); +dequeue_mid (server, smb, false);return 0 ; }
@@ -4743,7 +4743,7 @@ handle_read_data(struct TCP_Server_Info *server, struct smb_message *smb,if (is_offloaded) smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (smb, rdata->result); +dequeue_mid (server, smb, rdata->result);return 0 ; }
@@ -4762,7 +4762,7 @@ handle_read_data(struct TCP_Server_Info *server, struct smb_message *smb,if (is_offloaded) smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (smb, rdata->result); +dequeue_mid (server, smb, rdata->result);return 0 ; }
@@ -4772,7 +4772,7 @@ handle_read_data(struct TCP_Server_Info *server, struct smb_message *smb,if (is_offloaded) smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (smb, rdata->result); +dequeue_mid (server, smb, rdata->result);return 0 ; }
@@ -4783,7 +4783,7 @@ handle_read_data(struct TCP_Server_Info *server, struct smb_message *smb,if (is_offloaded) smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (smb, rdata->result); +dequeue_mid (server, smb, rdata->result);return 0 ; } rdata->got_bytes = buffer_len;
@@ -4802,14 +4802,14 @@ handle_read_data(struct TCP_Server_Info *server, struct smb_message *smb,if (is_offloaded) smb->mid_state =MID_RESPONSE_MALFORMED ;else -dequeue_mid (smb, rdata->result); +dequeue_mid (server, smb, rdata->result);return 0 ; }if (is_offloaded) smb->mid_state =MID_RESPONSE_RECEIVED ;else -dequeue_mid (smb, false); +dequeue_mid (server, smb, false);return 0 ; }
@@ -4856,7 +4856,7 @@ static void smb2_decrypt_offload(struct work_struct *work) dw->server->ops->is_network_name_deleted (dw->buf, dw->server); -mid_execute_callback (smb); +mid_execute_callback (dw->server, smb); }else {spin_lock (&dw->server->srv_lock);if (dw->server->tcpStatus == CifsNeedReconnect) {
@@ -4864,7 +4864,7 @@ static void smb2_decrypt_offload(struct work_struct *work) smb->mid_state =MID_RETRY_NEEDED ;spin_unlock (&dw->server->mid_queue_lock);spin_unlock (&dw->server->srv_lock); -mid_execute_callback (smb); +mid_execute_callback (dw->server, smb); }else {spin_lock (&dw->server->mid_queue_lock); smb->mid_state =MID_REQUEST_SUBMITTED ;
@@ -4875,7 +4875,7 @@ static void smb2_decrypt_offload(struct work_struct *work)spin_unlock (&dw->server->srv_lock); } } -release_mid (smb); +release_mid (dw->server, smb); } free_pages:
fs/smb/client/smb2pdu.c +10 -13
@@ -4091,9 +4091,8 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,* FIXME: maybe we should consider checking that the reply matches request? */ static void -smb2_echo_callback (struct smb_message *smb) +smb2_echo_callback (struct TCP_Server_Info *server,struct smb_message *smb) { -struct TCP_Server_Info *server = smb->callback_data;struct smb2_echo_rsp *rsp = (struct smb2_echo_rsp *)smb->resp_buf;struct cifs_credits credits = { .value =0 , .instance =0 };
@@ -4103,7 +4102,7 @@ smb2_echo_callback(struct smb_message *smb) credits.instance = server->reconnect_instance; } -release_mid (smb); +release_mid (server, smb);add_credits (server, &credits,CIFS_ECHO_OP ); }
@@ -4518,12 +4517,11 @@ smb2_new_read_req(void **buf, unsigned int *total_len, }static void -smb2_readv_callback (struct smb_message *smb) +smb2_readv_callback (struct TCP_Server_Info *server,struct smb_message *smb) {struct cifs_io_subrequest *rdata = smb->callback_data;struct netfs_inode *ictx =netfs_inode (rdata->rreq->inode);struct cifs_tcon *tcon =tlink_tcon (rdata->req->cfile->tlink); -struct TCP_Server_Info *server = rdata->server;struct smb2_hdr *shdr = (struct smb2_hdr *)rdata->iov[0 ].iov_base;struct cifs_credits credits = { .value =0 ,
@@ -4539,9 +4537,9 @@ smb2_readv_callback(struct smb_message *smb) rqst.rq_iter = rdata->subreq.io_iter; } -WARN_ONCE (rdata->server != smb->server, +WARN_ONCE (rdata->server != server,"rdata server %p != mid server %p" , - rdata->server, smb->server); + rdata->server, server); cifs_dbg(FYI, "%s: mid=%llu state=%d result=%d bytes=%zu/%zu\n", __func__, smb->mid, smb->mid_state, rdata->result,
@@ -4642,7 +4640,7 @@ smb2_readv_callback(struct smb_message *smb) rdata->subreq.transferred += rdata->got_bytes;trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_progress);netfs_read_subreq_terminated (&rdata->subreq); -release_mid (smb); +release_mid (server, smb);trace_smb3_rw_credits (rreq_debug_id, subreq_debug_index,0 , server->credits, server->in_flight, credits.value, cifs_trace_rw_credits_read_response_add);
@@ -4819,11 +4817,10 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,* workqueue completion task. */ static void -smb2_writev_callback (struct smb_message *smb) +smb2_writev_callback (struct TCP_Server_Info *server,struct smb_message *smb) {struct cifs_io_subrequest *wdata = smb->callback_data;struct cifs_tcon *tcon =tlink_tcon (wdata->req->cfile->tlink); -struct TCP_Server_Info *server = wdata->server;struct smb2_write_rsp *rsp = (struct smb2_write_rsp *)smb->resp_buf;struct cifs_credits credits = { .value =0 ,
@@ -4836,9 +4833,9 @@ smb2_writev_callback(struct smb_message *smb)ssize_t result =0 ;size_t written; -WARN_ONCE (wdata->server != smb->server, +WARN_ONCE (wdata->server != server,"wdata server %p != mid server %p" , - wdata->server, smb->server); + wdata->server, server);switch (smb->mid_state) {case MID_RESPONSE_RECEIVED :
@@ -4928,7 +4925,7 @@ smb2_writev_callback(struct smb_message *smb) 0, cifs_trace_rw_credits_write_response_clear); wdata->credits.value =0 ;cifs_write_subrequest_terminated (wdata, result ?: written); -release_mid (smb); +release_mid (server, smb);trace_smb3_rw_credits (rreq_debug_id, subreq_debug_index,0 , server->credits, server->in_flight, credits.value, cifs_trace_rw_credits_write_response_add);
fs/smb/client/smb2transport.c +3 -4
@@ -655,14 +655,13 @@ smb2_mid_entry_alloc(const struct smb2_hdr *shdr, smb =mempool_alloc (&smb_message_pool,GFP_NOFS );memset (smb,0 ,sizeof (*smb)); -kref_init (&smb->refcount); +refcount_set (&smb->refcount,1 );spin_lock_init (&smb->mid_lock); smb->mid =le64_to_cpu (shdr->MessageId); smb->credits = credits >0 ? credits :1 ; smb->pid = current->pid; smb->command = shdr->Command;/* Always LE */ smb->when_alloc = jiffies; - smb->server = server;/* * The default is for the mid to be synchronous, so the
@@ -779,7 +778,7 @@ smb2_setup_request(struct cifs_ses *ses, struct TCP_Server_Info *server, rc =smb2_sign_rqst (rqst, server);if (rc) {revert_current_mid_from_hdr (server, shdr); -delete_mid (mid); +delete_mid (server, mid);return ERR_PTR (rc); }
@@ -813,7 +812,7 @@ smb2_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst) rc =smb2_sign_rqst (rqst, server);if (rc) {revert_current_mid_from_hdr (server, shdr); -release_mid (smb); +release_mid (server, smb);return ERR_PTR (rc); }
fs/smb/client/transport.c +20 -24
127 lines not on this page · raw message
David Howells
maintainerPATCH v5 7/9 cifs: Don't need state locking in smb2_get_mid_entry()
In reply to David HowellsThere's no need to get ->srv_lock or ->ses_lock in smb2_get_mid_entry() as all that happens of relevance (to the lock) inside the locked sections is the reading of one status value in each.
Replace the locking with READ_ONCE() and use a switch instead of a chain of if-statements.
--- fs/smb/client/smb2transport.c | 48 +++++++++++++++-------------------- 1 file changed, 20 insertions(+), 28 deletions(-)
fs/smb/client/smb2transport.c +20 -28
@@ -684,43 +684,35 @@ static int smb2_get_mid_entry(struct cifs_ses *ses, struct TCP_Server_Info *server, struct smb2_hdr *shdr, struct smb_message **smb) { - spin_lock(&server->srv_lock); -if (server->tcpStatus == CifsExiting) { -spin_unlock (&server->srv_lock); + switch (READ_ONCE(server->tcpStatus)) { + case CifsExiting: return -ENOENT; - } - -if (server->tcpStatus == CifsNeedReconnect) { -spin_unlock (&server->srv_lock); +case CifsNeedReconnect:cifs_dbg (FYI ,"tcp session dead - return to caller to retry\n" );return -EAGAIN ; - } - -if (server->tcpStatus == CifsNeedNegotiate && - shdr->Command !=SMB2_NEGOTIATE ) { -spin_unlock (&server->srv_lock); -return -EAGAIN ; - } -spin_unlock (&server->srv_lock); - -spin_lock (&ses->ses_lock); -if (ses->ses_status ==SES_NEW ) { -if ((shdr->Command !=SMB2_SESSION_SETUP ) && - (shdr->Command !=SMB2_NEGOTIATE )) { -spin_unlock (&ses->ses_lock); +case CifsNeedNegotiate: +if (shdr->Command !=SMB2_NEGOTIATE )return -EAGAIN ; - } -/* else ok - we are setting up session */ +break ; +default : +break ; } -if (ses->ses_status ==SES_EXITING ) { -if (shdr->Command !=SMB2_LOGOFF ) { -spin_unlock (&ses->ses_lock); +switch (READ_ONCE (ses->ses_status)) { +case SES_NEW : +if (shdr->Command !=SMB2_SESSION_SETUP && + shdr->Command !=SMB2_NEGOTIATE ) +return -EAGAIN ; +/* else ok - we are setting up session */ +break ; +case SES_EXITING : +if (shdr->Command !=SMB2_LOGOFF )return -EAGAIN ; - }/* else ok - we are shutting down the session */ +break ; +default : +break ; } -spin_unlock (&ses->ses_lock); *smb =smb2_mid_entry_alloc (shdr, server);if (*smb ==NULL )
David Howells
maintainerPATCH v5 8/9 cifs: Add a tracepoint to log EIO errors
In reply to David HowellsAdd a tracepoint to log EIO errors and give it the capacity to convey up to two integers of information. This is then wrapped with three functions:
int smb_EIO(enum smb_eio_trace trace)
int smb_EIO1(enum smb_eio_trace trace, unsigned long info) int smb_EIO2(enum smb_eio_trace trace, unsigned long info,
unsigned long info2)
depending on how many bits of info are desired to be logged with any particular trace. The functions all return -EIO and can be used in place of -EIO.
The trace argument is an enum value that gets translated to a string when the trace is printed.
This makes is easier to log EIO instances when the client is under high load than turning on a printk wrapper such as cifs_dbg(). Granted, EIO could have its own separate EIO printing since EIO shouldn't happen.
--- fs/smb/client/cached_dir.c | 2 +- fs/smb/client/cifsacl.c | 10 +- fs/smb/client/cifsencrypt.c | 13 ++- fs/smb/client/cifsglob.h | 88 ----------------- fs/smb/client/cifsproto.h | 106 ++++++++++++++++++++ fs/smb/client/cifssmb.c | 147 ++++++++++++++++++---------- fs/smb/client/cifstransport.c | 8 +- fs/smb/client/compress.c | 2 +- fs/smb/client/connect.c | 11 ++- fs/smb/client/dir.c | 6 +- fs/smb/client/file.c | 6 +- fs/smb/client/inode.c | 14 +-- fs/smb/client/link.c | 10 +- fs/smb/client/misc.c | 18 ++-- fs/smb/client/netmisc.c | 4 + fs/smb/client/readdir.c | 2 +- fs/smb/client/reparse.c | 53 ++++++---- fs/smb/client/sess.c | 8 +- fs/smb/client/smb2file.c | 6 +- fs/smb/client/smb2inode.c | 12 ++- fs/smb/client/smb2maperror.c | 3 + fs/smb/client/smb2ops.c | 41 +++++--- fs/smb/client/smb2pdu.c | 177 +++++++++++++++++++++------------- fs/smb/client/smb2transport.c | 2 +- fs/smb/client/trace.h | 149 ++++++++++++++++++++++++++++ fs/smb/client/transport.c | 21 ++-- fs/smb/client/xattr.c | 2 +- 27 files changed, 609 insertions(+), 312 deletions(-)
fs/smb/client/cached_dir.c +1 -1
@@ -176,7 +176,7 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, server =cifs_pick_channel (ses);if (!server->ops->new_lease_key) -return -EIO ; +return smb_EIO (smb_eio_trace_no_lease_key); utf16_path =cifs_convert_path_to_utf16 (path, cifs_sb);if (!utf16_path)
fs/smb/client/cifsacl.c +6 -4
@@ -300,7 +300,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid) __func__, sidtype == SIDOWNER ? 'u' : 'g', cid); goto out_revert_creds; }else if (sidkey->datalen <CIFS_SID_BASE_SIZE ) { - rc = -EIO ; + rc =smb_EIO1 (smb_eio_trace_malformed_sid_key, sidkey->datalen);cifs_dbg (FYI ,"%s: Downcall contained malformed key (datalen=%hu)\n" , __func__, sidkey->datalen); goto invalidate_key;
@@ -317,7 +317,8 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid) ksid_size =CIFS_SID_BASE_SIZE + (ksid->num_subauth *sizeof (__le32));if (ksid_size > sidkey->datalen) { - rc = -EIO ; + rc =smb_EIO2 (smb_eio_trace_malformed_ksid_key, + ksid_size, sidkey->datalen);cifs_dbg (FYI ,"%s: Downcall contained malformed key (datalen=%hu, ksid_size=%u)\n" , __func__, sidkey->datalen, ksid_size); goto invalidate_key;
@@ -352,7 +353,8 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct smb_sid *psid,if (unlikely (psid->num_subauth >SID_MAX_SUB_AUTHORITIES )) {cifs_dbg (FYI ,"%s: %u subauthorities is too many!\n" , __func__, psid->num_subauth); -return -EIO ; +return smb_EIO2 (smb_eio_trace_sid_too_many_auth, + psid->num_subauth,SID_MAX_SUB_AUTHORITIES ); } if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UID_FROM_ACL) ||
@@ -1227,7 +1229,7 @@ static int parse_sec_desc(struct cifs_sb_info *cifs_sb,__u32 dacloffset;if (pntsd ==NULL ) -return -EIO ; +return smb_EIO (smb_eio_trace_null_pointers); owner_sid_ptr = (struct smb_sid *)((char *)pntsd +le32_to_cpu (pntsd->osidoffset));
fs/smb/client/cifsencrypt.c +8 -5
@@ -75,11 +75,13 @@ static int cifs_sig_iter(const struct iov_iter *iter, size_t maxsize, struct cifs_calc_sig_ctx *ctx) {struct iov_iter tmp_iter = *iter; -int err = -EIO ; +size_t did; +int err; -if (iterate_and_advance_kernel (&tmp_iter, maxsize, ctx, &err, - cifs_sig_step) != maxsize) -return err; + did =iterate_and_advance_kernel (&tmp_iter, maxsize, ctx, &err, + cifs_sig_step); +if (did != maxsize) +return smb_EIO2 (smb_eio_trace_sig_iter, did, maxsize);return 0 ; }
@@ -96,7 +98,8 @@ int __cifs_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server,iov_iter_kvec (&iter,ITER_SOURCE , rqst->rq_iov, rqst->rq_nvec, size);if (iov_iter_count (&iter) <=4 ) -return -EIO ; +return smb_EIO2 (smb_eio_trace_sig_data_too_small, +iov_iter_count (&iter),4 ); rc =cifs_sig_iter (&iter,iov_iter_count (&iter), ctx);if (rc <0 )
fs/smb/client/cifsglob.h +0 -88
94 lines not on this page · raw message
fs/smb/client/cifsproto.h +106 -0
110 lines not on this page · raw message
fs/smb/client/cifssmb.c +94 -53
430 lines not on this page · raw message
fs/smb/client/cifstransport.c +4 -4
@@ -227,15 +227,15 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,int rc =0 ;if (WARN_ON_ONCE (in_len >0xffffff )) -return -EIO ; +return smb_EIO1 (smb_eio_trace_tx_too_long, in_len);if (ses ==NULL ) {cifs_dbg (VFS ,"Null smb session\n" ); -return -EIO ; +return smb_EIO (smb_eio_trace_null_pointers); } server = ses->server;if (server ==NULL ) {cifs_dbg (VFS ,"Null tcp session\n" ); -return -EIO ; +return smb_EIO (smb_eio_trace_null_pointers); }/* Ensure that we do not send more than 50 overlapping requests
@@ -245,7 +245,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,if (in_len > CIFSMaxBufSize +MAX_CIFS_HDR_SIZE ) {cifs_server_dbg (VFS ,"Invalid length, greater than maximum frame, %d\n" , in_len); -return -EIO ; +return smb_EIO1 (smb_eio_trace_tx_too_long, in_len); } rc = cifs_send_recv(xid, ses, ses->server,
fs/smb/client/compress.c +1 -1
@@ -310,7 +310,7 @@ int smb_compress(struct TCP_Server_Info *server, struct smb_rqst *rq, compress_s iter = rq->rq_iter;if (!copy_from_iter_full (src, slen, &iter)) { - ret = -EIO ; + ret =smb_EIO (smb_eio_trace_compress_copy); goto err_free; }
fs/smb/client/connect.c +6 -5
@@ -3240,7 +3240,7 @@ ip_rfc1001_connect(struct TCP_Server_Info *server)if (be16_to_cpu (resp.length) !=0 ) {cifs_dbg (VFS ,"RFC 1002 positive session response but with invalid non-zero length %u\n" ,be16_to_cpu (resp.length)); -return -EIO ; +return smb_EIO (smb_eio_trace_rx_pos_sess_resp); }cifs_dbg (FYI ,"RFC 1002 positive session response" );break ;
@@ -3279,17 +3279,18 @@ ip_rfc1001_connect(struct TCP_Server_Info *server)break ;case RFC1002_INSUFFICIENT_RESOURCE :/* remote server resource error */ +smb_EIO (smb_eio_trace_rx_insuff_res); rc = -EREMOTEIO ;break ;case RFC1002_UNSPECIFIED_ERROR :default :/* other/unknown error */ - rc = -EIO ; + rc =smb_EIO (smb_eio_trace_rx_unspec_error);break ; } }else {cifs_dbg (VFS ,"RFC 1002 negative session response\n" ); - rc = -EIO ; + rc =smb_EIO (smb_eio_trace_rx_neg_sess_resp); }return rc;case RFC1002_RETARGET_SESSION_RESPONSE :
@@ -3311,7 +3312,7 @@ ip_rfc1001_connect(struct TCP_Server_Info *server)return -EMULTIHOP ;default :cifs_dbg (VFS ,"RFC 1002 unknown response type 0x%x\n" , resp.type); -return -EIO ; +return smb_EIO1 (smb_eio_trace_rx_unknown_resp, resp.type); } server->with_rfc1001 = true;
@@ -4001,7 +4002,7 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses,__u16 bytes_left, count;if (ses ==NULL ) -return -EIO ; +return smb_EIO (smb_eio_trace_null_pointers); smb_buffer =cifs_buf_get ();if (smb_buffer ==NULL )
fs/smb/client/dir.c +3 -3
@@ -471,7 +471,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,struct cifs_open_info_data buf = {};if (unlikely (cifs_forced_shutdown (CIFS_SB (inode->i_sb)))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown);/* * Posix open is only called (at lookup time) for file create now. For
@@ -589,7 +589,7 @@ int cifs_create(struct mnt_idmap *idmap, struct inode *inode, inode, direntry, direntry);if (unlikely (cifs_forced_shutdown (CIFS_SB (inode->i_sb)))) { - rc = -EIO ; + rc =smb_EIO (smb_eio_trace_forced_shutdown); goto out_free_xid; }
@@ -631,7 +631,7 @@ int cifs_mknod(struct mnt_idmap *idmap, struct inode *inode, cifs_sb =CIFS_SB (inode->i_sb);if (unlikely (cifs_forced_shutdown (cifs_sb))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown); tlink =cifs_sb_tlink (cifs_sb);if (IS_ERR (tlink))
fs/smb/client/file.c +3 -3
@@ -117,7 +117,7 @@ static void cifs_issue_write(struct netfs_io_subrequest *subreq)int rc;if (cifs_forced_shutdown (sbi)) { - rc = -EIO ; + rc =smb_EIO (smb_eio_trace_forced_shutdown); goto fail; }
@@ -285,7 +285,7 @@ static int cifs_init_request(struct netfs_io_request *rreq, struct file *file) req->pid = req->cfile->pid; }else if (rreq->origin !=NETFS_WRITEBACK ) {WARN_ON_ONCE (1 ); -return -EIO ; +return smb_EIO1 (smb_eio_trace_not_netfs_writeback, rreq->origin); }return 0 ;
@@ -1035,7 +1035,7 @@ int cifs_open(struct inode *inode, struct file *file) cifs_sb =CIFS_SB (inode->i_sb);if (unlikely (cifs_forced_shutdown (cifs_sb))) {free_xid (xid); -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown); } tlink =cifs_sb_tlink (cifs_sb);
fs/smb/client/inode.c +7 -7
@@ -1951,7 +1951,7 @@ static int __cifs_unlink(struct inode *dir, struct dentry *dentry, bool sillyrencifs_dbg (FYI ,"cifs_unlink, dir=0x%p, dentry=0x%p\n" , dir, dentry);if (unlikely (cifs_forced_shutdown (cifs_sb))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown);/* Unhash dentry in advance to prevent any concurrent opens */ spin_lock (&dentry->d_lock);
@@ -2267,7 +2267,7 @@ struct dentry *cifs_mkdir(struct mnt_idmap *idmap, struct inode *inode, cifs_sb =CIFS_SB (inode->i_sb);if (unlikely (cifs_forced_shutdown (cifs_sb))) -return ERR_PTR (-EIO ); +return ERR_PTR (smb_EIO (smb_eio_trace_forced_shutdown)); tlink =cifs_sb_tlink (cifs_sb);if (IS_ERR (tlink))return ERR_CAST (tlink);
@@ -2353,7 +2353,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry) cifs_sb =CIFS_SB (inode->i_sb);if (unlikely (cifs_forced_shutdown (cifs_sb))) { - rc = -EIO ; + rc =smb_EIO (smb_eio_trace_forced_shutdown); goto rmdir_exit; }
@@ -2515,7 +2515,7 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir, cifs_sb =CIFS_SB (source_dir->i_sb);if (unlikely (cifs_forced_shutdown (cifs_sb))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown);/* * Prevent any concurrent opens on the target by unhashing the dentry.
@@ -2900,7 +2900,7 @@ int cifs_getattr(struct mnt_idmap *idmap, const struct path *path,int rc;if (unlikely (cifs_forced_shutdown (CIFS_SB (inode->i_sb)))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown);/* * We need to be sure that all dirty pages are written and the server
@@ -2975,7 +2975,7 @@ int cifs_fiemap(struct inode *inode, struct fiemap_extent_info *fei, u64 start,int rc;if (unlikely (cifs_forced_shutdown (cifs_sb))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown);/* * We need to be sure that all dirty pages are written as they
@@ -3467,7 +3467,7 @@ cifs_setattr(struct mnt_idmap *idmap, struct dentry *direntry,#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */ if (unlikely (cifs_forced_shutdown (cifs_sb))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown);/* * Avoid setting [cm]time with O_TRUNC to prevent the server from * disabling automatic timestamp updates as specified in
fs/smb/client/link.c +6 -4
@@ -160,7 +160,8 @@ create_mf_symlink(const unsigned int xid, struct cifs_tcon *tcon, goto out;if (bytes_written !=CIFS_MF_SYMLINK_FILE_SIZE ) - rc = -EIO ; + rc =smb_EIO2 (smb_eio_trace_symlink_file_size, + bytes_written,CIFS_MF_SYMLINK_FILE_SIZE ); out:kfree (buf);return rc;
@@ -424,7 +425,8 @@ smb3_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,/* Make sure we wrote all of the symlink data */ if ((rc ==0 ) && (*pbytes_written !=CIFS_MF_SYMLINK_FILE_SIZE )) - rc = -EIO ; + rc =smb_EIO2 (smb_eio_trace_short_symlink_write, + *pbytes_written,CIFS_MF_SYMLINK_FILE_SIZE );SMB2_close (xid, tcon, fid.persistent_fid, fid.volatile_fid);
@@ -451,7 +453,7 @@ cifs_hardlink(struct dentry *old_file, struct inode *inode,struct cifsInodeInfo *cifsInode;if (unlikely (cifs_forced_shutdown (cifs_sb))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown); tlink =cifs_sb_tlink (cifs_sb);if (IS_ERR (tlink))
@@ -553,7 +555,7 @@ cifs_symlink(struct mnt_idmap *idmap, struct inode *inode,struct inode *newinode =NULL ;if (unlikely (cifs_forced_shutdown (cifs_sb))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown); page =alloc_dentry_path ();if (!page)
fs/smb/client/misc.c +12 -6
@@ -379,25 +379,29 @@ checkSMB(char *buf, unsigned int pdu_len, unsigned int total_read,return 0 ; }cifs_dbg (VFS ,"rcvd invalid byte count (bcc)\n" ); +return smb_EIO1 (smb_eio_trace_rx_inv_bcc, tmp[sizeof (struct smb_hdr )]); }else {cifs_dbg (VFS ,"Length less than smb header size\n" ); +return smb_EIO2 (smb_eio_trace_rx_too_short, + total_read, smb->WordCount); } -return -EIO ; }else if (total_read <sizeof (*smb) +2 * smb->WordCount) {cifs_dbg (VFS ,"%s: can't read BCC due to invalid WordCount(%u)\n" , __func__, smb->WordCount); -return -EIO ; +return smb_EIO2 (smb_eio_trace_rx_check_rsp, + total_read,2 +sizeof (struct smb_hdr )); }/* otherwise, there is enough to get to the BCC */ if (check_smb_hdr (smb)) -return -EIO ; +return smb_EIO1 (smb_eio_trace_rx_rfc1002_magic, *(u32 *)smb->Protocol); clc_len =smbCalcSize (smb);if (rfclen != total_read) {cifs_dbg (VFS ,"Length read does not match RFC1001 length %d/%d\n" , rfclen, total_read); -return -EIO ; +return smb_EIO2 (smb_eio_trace_rx_check_rsp, + total_read, rfclen); }if (rfclen != clc_len) {
@@ -414,7 +418,8 @@ checkSMB(char *buf, unsigned int pdu_len, unsigned int total_read,if (rfclen < clc_len) {cifs_dbg (VFS ,"RFC1001 size %u smaller than SMB for mid=%u\n" , rfclen, mid); -return -EIO ; +return smb_EIO2 (smb_eio_trace_rx_calc_len_too_big, + rfclen, clc_len); }else if (rfclen > clc_len +512 ) {/* * Some servers (Windows XP in particular) send more
@@ -427,7 +432,8 @@ checkSMB(char *buf, unsigned int pdu_len, unsigned int total_read,*/ cifs_dbg (VFS ,"RFC1001 size %u more than 512 bytes larger than SMB for mid=%u\n" , rfclen, mid); -return -EIO ; +return smb_EIO2 (smb_eio_trace_rx_overlong, + rfclen, clc_len +512 ); } }return 0 ;
fs/smb/client/netmisc.c +4 -0
@@ -885,6 +885,10 @@ map_smb_to_linux_error(char *buf, bool logErr)/* generic corrective action e.g. reconnect SMB session on * ERRbaduid could be added */ +if (rc == -EIO ) +smb_EIO2 (smb_eio_trace_smb1_received_error, +le32_to_cpu (smb->Status.CifsError), +le16_to_cpu (smb->Flags2));return rc; }
fs/smb/client/readdir.c +1 -1
@@ -775,7 +775,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos,if (cfile->srch_inf.ntwrk_buf_start ==NULL ) {cifs_dbg (VFS ,"ntwrk_buf_start is NULL during readdir\n" ); -return -EIO ; +return smb_EIO (smb_eio_trace_null_pointers); } end_of_smb = cfile->srch_inf.ntwrk_buf_start +
fs/smb/client/reparse.c +33 -20
132 lines not on this page · raw message
fs/smb/client/sess.c +4 -4
@@ -1503,7 +1503,7 @@ sess_auth_ntlmv2(struct sess_data *sess_data) smb_buf = (struct smb_hdr *)sess_data->iov[0 ].iov_base;if (smb_buf->WordCount !=3 ) { - rc = -EIO ; + rc =smb_EIO1 (smb_eio_trace_sess_nl2_wcc, smb_buf->WordCount);cifs_dbg (VFS ,"bad word count %d\n" , smb_buf->WordCount); goto out; }
@@ -1629,7 +1629,7 @@ sess_auth_kerberos(struct sess_data *sess_data) smb_buf = (struct smb_hdr *)sess_data->iov[0 ].iov_base;if (smb_buf->WordCount !=4 ) { - rc = -EIO ; + rc =smb_EIO1 (smb_eio_trace_sess_krb_wcc, smb_buf->WordCount);cifs_dbg (VFS ,"bad word count %d\n" , smb_buf->WordCount); goto out_put_spnego_key; }
@@ -1790,7 +1790,7 @@ sess_auth_rawntlmssp_negotiate(struct sess_data *sess_data)cifs_dbg (FYI ,"rawntlmssp session setup challenge phase\n" );if (smb_buf->WordCount !=4 ) { - rc = -EIO ; + rc =smb_EIO1 (smb_eio_trace_sess_rawnl_neg_wcc, smb_buf->WordCount);cifs_dbg (VFS ,"bad word count %d\n" , smb_buf->WordCount); goto out_free_ntlmsspblob; }
@@ -1880,7 +1880,7 @@ sess_auth_rawntlmssp_authenticate(struct sess_data *sess_data) pSMB = (SESSION_SETUP_ANDX *)sess_data->iov[0 ].iov_base; smb_buf = (struct smb_hdr *)sess_data->iov[0 ].iov_base;if (smb_buf->WordCount !=4 ) { - rc = -EIO ; + rc =smb_EIO1 (smb_eio_trace_sess_rawnl_auth_wcc, smb_buf->WordCount);cifs_dbg (VFS ,"bad word count %d\n" , smb_buf->WordCount); goto out_free_ntlmsspblob; }
fs/smb/client/smb2file.c +3 -3
@@ -76,11 +76,11 @@ int smb2_fix_symlink_target_type(char **target, bool directory, struct cifs_sb_ireturn 0 ;if (!*target) -return -EIO ; +return smb_EIO (smb_eio_trace_null_pointers); len =strlen (*target);if (!len) -return -EIO ; +return smb_EIO1 (smb_eio_trace_sym_target_len, len);/* * If this is directory symlink and it does not have trailing slash then
@@ -104,7 +104,7 @@ int smb2_fix_symlink_target_type(char **target, bool directory, struct cifs_sb_i* both Windows and Linux systems. So return an error for such symlink. */ if (!directory && (*target)[len-1 ] =='/' ) -return -EIO ; +return smb_EIO (smb_eio_trace_sym_slash);return 0 ; }
fs/smb/client/smb2inode.c +8 -4
@@ -31,16 +31,20 @@ static struct reparse_data_buffer *reparse_buf_ptr(struct kvec *iov)struct reparse_data_buffer *buf;struct smb2_ioctl_rsp *io = iov->iov_base;u32 off, count, len; +u16 rdlen; count =le32_to_cpu (io->OutputCount); off =le32_to_cpu (io->OutputOffset);if (check_add_overflow (off, count, &len) || len > iov->iov_len) -return ERR_PTR (-EIO ); +return ERR_PTR (smb_EIO2 (smb_eio_trace_reparse_overlong, + off, count)); buf = (struct reparse_data_buffer *)((u8 *)io + off); len =sizeof (*buf); -if (count < len || count <le16_to_cpu (buf->ReparseDataLength) + len) -return ERR_PTR (-EIO ); + rdlen =le16_to_cpu (buf->ReparseDataLength); + +if (count < len || count < rdlen + len) +return ERR_PTR (smb_EIO2 (smb_eio_trace_reparse_rdlen, count, rdlen));return buf; }
@@ -1635,7 +1639,7 @@ int smb2_rename_pending_delete(const char *full_path, }else {cifs_tcon_dbg (FYI ,"%s: failed to rename '%s' to '%s': %d\n" , __func__, full_path, to_name, rc); - rc = -EIO ; + rc =smb_EIO1 (smb_eio_trace_pend_del_fail, rc); } out:cifs_put_tlink (tlink);
fs/smb/client/smb2maperror.c +3 -0
@@ -9,6 +9,7 @@*/ #include <linux/errno.h> #include "cifsglob.h" +#include "cifsproto.h" #include "cifs_debug.h" #include "smb2pdu.h" #include "smb2proto.h"
@@ -2477,5 +2478,7 @@ map_smb2_to_linux_error(char *buf, bool log_err)le16_to_cpu (shdr->Command),le64_to_cpu (shdr->MessageId), le32_to_cpu(smb2err), rc); +if (rc == -EIO ) +smb_EIO1 (smb_eio_trace_smb2_received_error,le32_to_cpu (smb2err));return rc; }
fs/smb/client/smb2ops.c +25 -16
111 lines not on this page · raw message
fs/smb/client/smb2pdu.c +108 -69
425 lines not on this page · raw message
fs/smb/client/smb2transport.c +1 -1
@@ -153,7 +153,7 @@ static int smb2_get_sign_key(struct TCP_Server_Info *server,memcpy (key, ses->auth_key.response,SMB2_NTLMV2_SESSKEY_SIZE ); }else { - rc = -EIO ; + rc =smb_EIO (smb_eio_trace_no_auth_key); }break ;default :
fs/smb/client/trace.h +149 -0
173 lines not on this page · raw message
fs/smb/client/transport.c +12 -9
@@ -402,11 +402,11 @@ smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,return __smb_send_rqst (server, num_rqst, rqst);if (WARN_ON_ONCE (num_rqst >MAX_COMPOUND -1 )) -return -EIO ; +return smb_EIO1 (smb_eio_trace_tx_max_compound, num_rqst);if (!server->ops->init_transform_rq) {cifs_server_dbg (VFS ,"Encryption requested but transform callback is missing\n" ); -return -EIO ; +return smb_EIO (smb_eio_trace_tx_need_transform); } new_rqst[0 ].rq_iov = &iov;
@@ -753,7 +753,7 @@ int cifs_sync_mid_result(struct smb_message *smb, struct TCP_Server_Info *server rc = -EAGAIN ;break ;case MID_RESPONSE_MALFORMED : - rc = -EIO ; + rc =smb_EIO (smb_eio_trace_rx_sync_mid_malformed);break ;case MID_SHUTDOWN : rc = -EHOSTDOWN ;
@@ -769,7 +769,7 @@ int cifs_sync_mid_result(struct smb_message *smb, struct TCP_Server_Info *serverspin_unlock (&server->mid_queue_lock);cifs_server_dbg (VFS ,"%s: invalid mid state mid=%llu state=%d\n" , __func__, smb->mid, smb->mid_state); - rc = -EIO ; + rc =smb_EIO1 (smb_eio_trace_rx_sync_mid_invalid, smb->mid_state); goto sync_mid_done; }spin_unlock (&server->mid_queue_lock);
@@ -883,7 +883,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,if (!ses || !ses->server || !server) {cifs_dbg (VFS ,"Null session\n" ); -return -EIO ; +return smb_EIO (smb_eio_trace_null_pointers); }spin_lock (&server->srv_lock);
@@ -1043,7 +1043,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,if (!smb[i]->resp_buf || smb[i]->mid_state !=MID_RESPONSE_READY ) { - rc = -EIO ; + rc =smb_EIO1 (smb_eio_trace_rx_mid_unready, smb[i]->mid_state);cifs_dbg (FYI ,"Bad MID state?\n" ); goto out; }
@@ -1215,7 +1215,8 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct smb_message *smb)cifs_dbg (FYI ,"%s: server returned short header. got=%u expected=%zu\n" , __func__, server->total_read, server->vals->read_rsp_size); - rdata->result = -EIO ; + rdata->result =smb_EIO2 (smb_eio_trace_read_rsp_short, + server->total_read, server->vals->read_rsp_size);return cifs_readv_discard (server, smb); }
@@ -1233,7 +1234,8 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct smb_message *smb)/* data_offset is beyond the end of smallbuf */ cifs_dbg (FYI ,"%s: data offset (%u) beyond end of smallbuf\n" , __func__, data_offset); - rdata->result = -EIO ; + rdata->result =smb_EIO1 (smb_eio_trace_read_overlarge, + data_offset);return cifs_readv_discard (server, smb); }
@@ -1257,7 +1259,8 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct smb_message *smb) data_len = server->ops->read_data_length (buf, use_rdma_mr);if (!use_rdma_mr && (data_offset + data_len > buflen)) {/* data_len is corrupt -- discard frame */ - rdata->result = -EIO ; + rdata->result =smb_EIO2 (smb_eio_trace_read_rsp_malformed, + data_offset + data_len, buflen);return cifs_readv_discard (server, smb); }
fs/smb/client/xattr.c +1 -1
@@ -397,7 +397,7 @@ ssize_t cifs_listxattr(struct dentry *direntry, char *data, size_t buf_size)void *page;if (unlikely (cifs_forced_shutdown (cifs_sb))) -return -EIO ; +return smb_EIO (smb_eio_trace_forced_shutdown);if (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_NO_XATTR )return -EOPNOTSUPP ;
David Howells
maintainerPATCH v5 9/9 cifs: Do some preparation prior to organising the function declarations
In reply to David HowellsMake some preparatory cleanups prior to running a script to organise the function declarations within the fs/smb/client/ headers. These include:
(1) Remove "inline" from the dummy cifs_proc_init/clean() functions as they are in a .c file.
(2) Move should_compress()'s kdoc comment to the .c file and remove kdoc markers from the comments.
(3) Rename CIFS_ALLOW_INSECURE_LEGACY in #endif comments to have CONFIG_ on the front to allow the script to recognise it.
(4) Don't let comments have bare words at the left margin as that confused the simplistic function detection code in the script.
(5) Adjust some argument lists so that when and if the cleanup script is run they don't end up over 100 chars.
(6) Fix a few comments to have missing '*' added or the "*/" moved to their own lines so that checkpatch doesn't moan over the cleanup script patch.
(7) Move struct cifs_calc_sig_ctx to cifsglob.h.
(8) Remove some __KERNEL__ conditionals.
--- fs/smb/client/cifs_debug.c | 4 ++-- fs/smb/client/cifs_spnego.h | 2 -- fs/smb/client/cifs_unicode.h | 3 --- fs/smb/client/cifsfs.c | 5 +++-- fs/smb/client/cifsglob.h | 8 +++++++- fs/smb/client/cifsproto.h | 7 +------ fs/smb/client/compress.c | 21 ++++++++++++++++++--- fs/smb/client/compress.h | 19 ++----------------- fs/smb/client/dir.c | 2 +- fs/smb/client/dns_resolve.h | 4 ---- fs/smb/client/fs_context.c | 2 +- fs/smb/client/misc.c | 1 + fs/smb/client/netmisc.c | 2 +- fs/smb/client/smb2file.c | 3 ++- fs/smb/client/smb2inode.c | 1 - fs/smb/client/smb2maperror.c | 3 +-- fs/smb/client/smb2ops.c | 4 ++-- fs/smb/client/smb2pdu.c | 5 +++-- fs/smb/client/smb2proto.h | 2 ++ 19 files changed, 47 insertions(+), 51 deletions(-)
fs/smb/client/cifs_debug.c +2 -2
@@ -1317,11 +1317,11 @@ static const struct proc_ops cifs_mount_params_proc_ops = { };#else -inline void cifs_proc_init (void ) +void cifs_proc_init (void ) { } -inline void cifs_proc_clean (void ) +void cifs_proc_clean (void ) { }#endif /* PROC_FS */
fs/smb/client/cifs_spnego.h +0 -2
@@ -27,10 +27,8 @@ struct cifs_spnego_msg { uint8_t data[]; }; -#ifdef __KERNEL__extern struct key_type cifs_spnego_key_type;extern struct key *cifs_get_spnego_key (struct cifs_ses *sesInfo,struct TCP_Server_Info *server); -#endif /* KERNEL */ #endif /* _CIFS_SPNEGO_H */
fs/smb/client/cifs_unicode.h +0 -3
@@ -54,7 +54,6 @@#define SFM_MAP_UNI_RSVD 1#define SFU_MAP_UNI_RSVD 2 -#ifdef __KERNEL__int cifs_from_utf16 (char *to,const __le16 *from,int tolen,int fromlen,const struct nls_table *cp,int map_type); int cifs_utf16_bytes(const __le16 *from, int maxbytes,
@@ -69,8 +68,6 @@ extern int cifs_remap(struct cifs_sb_info *cifs_sb);extern __le16 *cifs_strndup_to_utf16 (const char *src,const int maxlen,int *utf16_len,const struct nls_table *cp,int remap); -#endif -wchar_t cifs_toupper (wchar_t in);#endif /* _CIFS_UNICODE_H */
fs/smb/client/cifsfs.c +3 -2
@@ -28,6 +28,8 @@#include <linux/splice.h> #include <linux/uuid.h> #include <linux/xattr.h> +#include <linux/mm.h> +#include <linux/key-type.h> #include <uapi/linux/magic.h> #include <net/ipv6.h> #include "cifsfs.h"
@@ -35,10 +37,9 @@#define DECLARE_GLOBALS_HERE #include "cifsglob.h" #include "cifsproto.h" +#include "smb2proto.h" #include "cifs_debug.h" #include "cifs_fs_sb.h" -#include <linux/mm.h> -#include <linux/key-type.h> #include "cifs_spnego.h" #include "fscache.h" #ifdef CONFIG_CIFS_DFS_UPCALL
fs/smb/client/cifsglob.h +7 -1
@@ -2118,7 +2118,7 @@ extern struct smb_version_operations smb1_operations;extern struct smb_version_values smb1_values;extern struct smb_version_operations smb20_operations;extern struct smb_version_values smb20_values; -#endif /* CIFS_ALLOW_INSECURE_LEGACY */ +#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */ extern struct smb_version_operations smb21_operations;extern struct smb_version_values smb21_values;extern struct smb_version_values smbdefault_values;
@@ -2286,4 +2286,10 @@ static inline void mid_execute_callback(struct TCP_Server_Info *server, (le32_to_cpu((tcon)->fsAttrInfo.Attributes) & \ FILE_SUPPORTS_REPARSE_POINTS)) +struct cifs_calc_sig_ctx { +struct md5_ctx *md5; +struct hmac_sha256_ctx *hmac; +struct shash_desc *shash; +}; +#endif /* _CIFS_GLOB_H */
fs/smb/client/cifsproto.h +1 -6
@@ -594,7 +594,7 @@ extern int cifs_do_set_acl(const unsigned int xid, struct cifs_tcon *tcon, const struct nls_table *nls_codepage, int remap);extern int CIFSGetExtAttr (const unsigned int xid,struct cifs_tcon *tcon,const int netfid,__u64 *pExtAttrBits,__u64 *pMask); -#endif /* CIFS_ALLOW_INSECURE_LEGACY */ +#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */ extern void cifs_autodisable_serverino (struct cifs_sb_info *cifs_sb);extern bool couldbe_mf_symlink (const struct cifs_fattr *fattr); extern int check_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
@@ -626,11 +626,6 @@ int cifs_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,struct cifs_sb_info *cifs_sb, const unsigned char *path, char *pbuf, unsigned int *pbytes_written); -struct cifs_calc_sig_ctx { -struct md5_ctx *md5; -struct hmac_sha256_ctx *hmac; -struct shash_desc *shash; -};int __cifs_calc_signature (struct smb_rqst *rqst,struct TCP_Server_Info *server,char *signature,struct cifs_calc_sig_ctx *ctx); enum securityEnum cifs_select_sectype(struct TCP_Server_Info *,
fs/smb/client/compress.c +18 -3
@@ -44,7 +44,7 @@ struct bucket {unsigned int count; }; -/** +/* * has_low_entropy() - Compute Shannon entropy of the sampled data. * @bkt: Bytes counts of the sample. * @slen: Size of the sample.
@@ -82,7 +82,7 @@ static bool has_low_entropy(struct bucket *bkt, size_t slen)#define BYTE_DIST_BAD 0#define BYTE_DIST_GOOD 1#define BYTE_DIST_MAYBE 2 -/** +/* * calc_byte_distribution() - Compute byte distribution on the sampled data. * @bkt: Byte counts of the sample. * @slen: Size of the sample.
@@ -182,7 +182,7 @@ static int collect_sample(const struct iov_iter *source, ssize_t max, u8 *samplereturn s; } -/** +/* * is_compressible() - Determines if a chunk of data is compressible. * @data: Iterator containing uncompressed data. *
@@ -261,6 +261,21 @@ static bool is_compressible(const struct iov_iter *data)return ret; } +/* +* should_compress() - Determines if a request (write) or the response to a +* request (read) should be compressed. +* @tcon: tcon of the request is being sent to +* @rqst: request to evaluate +* +* Return: true iff: +* - compression was successfully negotiated with server +* - server has enabled compression for the share +* - it's a read or write request +* - (write only) request length is >= SMB_COMPRESS_MIN_LEN +* - (write only) is_compressible() returns 1 +* +* Return false otherwise. +*/ bool should_compress (const struct cifs_tcon *tcon,const struct smb_rqst *rq) {const struct smb2_hdr *shdr = rq->rq_iov->iov_base;
fs/smb/client/compress.h +2 -17
@@ -29,26 +29,11 @@#ifdef CONFIG_CIFS_COMPRESSION typedef int (*compress_send_fn )(struct TCP_Server_Info *,int ,struct smb_rqst *); -int smb_compress (struct TCP_Server_Info *server,struct smb_rqst *rq,compress_send_fn send_fn); -/** -* should_compress() - Determines if a request (write) or the response to a -* request (read) should be compressed. -* @tcon: tcon of the request is being sent to -* @rqst: request to evaluate -* -* Return: true iff: -* - compression was successfully negotiated with server -* - server has enabled compression for the share -* - it's a read or write request -* - (write only) request length is >= SMB_COMPRESS_MIN_LEN -* - (write only) is_compressible() returns 1 -* -* Return false otherwise. -*/ +int smb_compress (struct TCP_Server_Info *server,struct smb_rqst *rq,compress_send_fn send_fn);bool should_compress (const struct cifs_tcon *tcon,const struct smb_rqst *rq); -/** +/* * smb_compress_alg_valid() - Validate a compression algorithm. * @alg: Compression algorithm to check. * @valid_none: Conditional check whether NONE algorithm should be
fs/smb/client/dir.c +1 -1
@@ -457,7 +457,7 @@ static int cifs_do_create(struct inode *inode, struct dentry *direntry, unsignedint cifs_atomic_open (struct inode *inode,struct dentry *direntry, -struct file *file,unsigned oflags,umode_t mode) +struct file *file,unsigned int oflags,umode_t mode) {int rc;unsigned int xid;
fs/smb/client/dns_resolve.h +0 -4
@@ -15,8 +15,6 @@#include "cifsglob.h" #include "cifsproto.h" -#ifdef __KERNEL__ -int dns_resolve_name (const char *dom,const char *name,size_t namelen,struct sockaddr *ip_addr);
@@ -36,6 +34,4 @@ static inline int dns_resolve_unc(const char *dom, const char *unc, return dns_resolve_name(dom, name, namelen, ip_addr); } -#endif /* KERNEL */ -#endif /* _DNS_RESOLVE_H */
fs/smb/client/fs_context.c +1 -1
@@ -505,7 +505,7 @@ cifs_parse_smb_version(struct fs_context *fc, char *value, struct smb3_fs_contexcase Smb_20:cifs_errorf (fc,"vers=2.0 mount not permitted when legacy dialects disabled\n" );return 1 ; -#endif /* CIFS_ALLOW_INSECURE_LEGACY */ +#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */ case Smb_21: ctx->ops = &smb21_operations; ctx->vals = &smb21_values;
fs/smb/client/misc.c +1 -0
@@ -18,6 +18,7 @@#include "nterr.h" #include "cifs_unicode.h" #include "smb2pdu.h" +#include "smb2proto.h" #include "cifsfs.h" #ifdef CONFIG_CIFS_DFS_UPCALL #include "dns_resolve.h"
fs/smb/client/netmisc.c +1 -1
@@ -200,7 +200,7 @@ cifs_set_port(struct sockaddr *addr, const unsigned short int port) }/***************************************************************************** -convert a NT status code to a dos class/code +*convert a NT status code to a dos class/code *****************************************************************************/ /* NT status -> dos error map */ static const struct {
fs/smb/client/smb2file.c +2 -1
@@ -140,7 +140,8 @@ int smb2_parse_symlink_response(struct cifs_sb_info *cifs_sb, const struct kvec cifs_sb); } -int smb2_open_file (const unsigned int xid,struct cifs_open_parms *oparms,__u32 *oplock,void *buf) +int smb2_open_file (const unsigned int xid,struct cifs_open_parms *oparms, +__u32 *oplock,void *buf) {int rc;__le16 *smb2_path;
fs/smb/client/smb2inode.c +0 -1
@@ -21,7 +21,6 @@#include "cifs_unicode.h" #include "fscache.h" #include "smb2glob.h" -#include "smb2pdu.h" #include "smb2proto.h" #include "cached_dir.h" #include "../common/smb2status.h"
fs/smb/client/smb2maperror.c +1 -2
@@ -11,10 +11,9 @@#include "cifsglob.h" #include "cifsproto.h" #include "cifs_debug.h" -#include "smb2pdu.h" #include "smb2proto.h" -#include "../common/smb2status.h" #include "smb2glob.h" +#include "../common/smb2status.h" #include "trace.h" struct status_to_posix_error {
fs/smb/client/smb2ops.c +2 -2
@@ -17,9 +17,9 @@#include <uapi/linux/magic.h> #include "cifsfs.h" #include "cifsglob.h" -#include "smb2pdu.h" -#include "smb2proto.h" #include "cifsproto.h" +#include "smb2proto.h" +#include "smb2pdu.h" #include "cifs_debug.h" #include "cifs_unicode.h" #include "../common/smb2status.h"
fs/smb/client/smb2pdu.c +3 -2
@@ -26,8 +26,8 @@#include <linux/netfs.h> #include <trace/events/netfs.h> #include "cifsglob.h" -#include "cifsacl.h" #include "cifsproto.h" +#include "cifsacl.h" #include "smb2proto.h" #include "cifs_unicode.h" #include "cifs_debug.h"
@@ -3949,7 +3949,8 @@ int SMB2_query_info(const unsigned int xid, struct cifs_tcon *tcon,/* currently unused, as now we are doing compounding instead (see smb311_posix_query_path_info) */ int SMB311_posix_query_info (const unsigned int xid,struct cifs_tcon *tcon, -u64 persistent_fid,u64 volatile_fid,struct smb311_posix_qinfo *data,u32 *plen) +u64 persistent_fid,u64 volatile_fid, +struct smb311_posix_qinfo *data,u32 *plen) {size_t output_len =sizeof (struct smb311_posix_qinfo *) + (sizeof (struct smb_sid ) *2 ) + (PATH_MAX *2 );
fs/smb/client/smb2proto.h +2 -0
@@ -9,8 +9,10 @@*/ #ifndef _SMB2PROTO_H#define _SMB2PROTO_H +#include <linux/nls.h> #include <linux/key-type.h> +#include "cached_dir.h" struct statfs ;struct smb_rqst ;
Tom Talpey
reviewerI've (re)reviewed the patches and am ok with #2 (which I already gave an R-B for), and additionally #4 looks especially good. These changes are very appropriate for the previously missing layering.
I like the idea of #1, but I'm a little bit on the fence on the code impact of the rename. If Steve's not opposed, I'm ok with it.
The others are all worthy.
For #2 and #4: Reviewed-by: Tom Talpey <[email protected]>
For the others, feel free to my Acked-by.
Tom.
Quoted 135 lines · David Howells
Hi Steve,
Could you take these patches extracted from my I/O layer rewrite for the upcoming merge window. The performance change should be neutral, but it cleans up the code a bit.
(1) Rename struct
mid_q_entrytosmb_message. In my rewrite,smb_messagewill get allocated in the marshalling functions insmb2pdu.candcifssmb.crather than intransport.cand used to hand parameters down
- and so I think it could be better named for that.(2) Remove the RFC1002 header from the
smb_hdrstruct so that it's consistent with SMB2/3. This allows I/O routines to be simplified and shared.(3) Make SMB1's
SendReceive()wrapcifs_send_recv()and thus share codewith SMB2/3.(4) Clean up a bunch of extra kvec[] that were required for RFC1002 headers from SMB1's header struct.
(5) Replace
SendReceiveBlockingLock()withSendReceive()plus flags.(6) Remove the server pointer from
smb_message. It can be passed down from the caller to all places that need it.(7) Don't need state locking in
smb2_get_mid_entry()as we're just doing a single read inside the lock.READ_ONCE()should suffice instead.(8) Add a tracepoint to log EIO errors and up to a couple of bits of info for each to make it easier to find out why an EIO error happened when the system is very busy without introducing printk delays.
(9) Make some minor code cleanups.
The patches will be found here also when the git server is accessible again:
https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=cifs-next
Thanks,
DavidChanges
=======
ver #5)
- Rebased on the ksmbd-for-next branch.
- Drop thenetfs_allocpatch as that's now taken.
- Added a warning check requested by Stefan Metzmacher.
- Switched to a branch without the header prototype cleanups.
- Add a patch to make some minor code cleanups.
- Don't do EIO changed insmbdirect.cas that interferes with Stefan's changes.ver #4)
- Rebased on the ksmbd-for-next branch.
- The read tracepoint patch got merged, so drop it.
- Move thenetfs_alloc, etc. patch first.
- Fix a couple of prototypes that need to be conditional (may need some post cleanup).
- Fixed another couple of headers that needed their own prototype lists.
- Fixed #include order in a couple of places.ver #3)
- Rebased on the ksmbd-for-next branch.
- Add the patches to clean up the function prototypes in the headers.
- Don't touch smbdirect.
- Put prototypes intonetlink.handcached_dir.hrather than centralising them.
- Indent the arguments in the prototypes to the opening bracket + 1.
- Cleaned up most other checkpatch complaints.
- Added the EIO tracepoint patch to the end.ver #2)
- Rebased on the ksmbd-for-next-next branch.
- Moved the patch to use netfs_alloc/free_folioq_buffer() down the stack.David Howells (9):
cifs: Renamemid_q_entrytosmb_message
cifs: Remove the RFC1002 header fromsmb_hdr
cifs: Make smb1'sSendReceive()wrapcifs_send_recv()
cifs: Clean up some places where an extra kvec[] was required forrfc1002cifs: Replace
SendReceiveBlockingLock()withSendReceive()plus flags
cifs: Remove the server pointer fromsmb_message
cifs: Don't need state locking insmb2_get_mid_entry()
cifs: Add a tracepoint to log EIO errors
cifs: Do some preparation prior to organising the function
declarationsfs/smb/client/cached_dir.c | 2 +- fs/smb/client/cifs_debug.c | 51 +- fs/smb/client/cifs_debug.h | 6 +- fs/smb/client/cifs_spnego.h | 2 - fs/smb/client/cifs_unicode.h | 3 - fs/smb/client/cifsacl.c | 10 +- fs/smb/client/cifsencrypt.c | 83 +-- fs/smb/client/cifsfs.c | 36 +- fs/smb/client/cifsglob.h | 197 +++---- fs/smb/client/cifspdu.h | 2 +- fs/smb/client/cifsproto.h | 200 ++++++-- fs/smb/client/cifssmb.c | 931 +++++++++++++++++++--------------- fs/smb/client/cifstransport.c | 438 +++------------- fs/smb/client/compress.c | 23 +- fs/smb/client/compress.h | 19 +- fs/smb/client/connect.c | 199 ++++---- fs/smb/client/dir.c | 8 +- fs/smb/client/dns_resolve.h | 4 - fs/smb/client/file.c | 6 +- fs/smb/client/fs_context.c | 2 +- fs/smb/client/inode.c | 14 +- fs/smb/client/link.c | 10 +- fs/smb/client/misc.c | 53 +- fs/smb/client/netmisc.c | 21 +- fs/smb/client/readdir.c | 2 +- fs/smb/client/reparse.c | 53 +- fs/smb/client/sess.c | 16 +- fs/smb/client/smb1ops.c | 114 +++-- fs/smb/client/smb2file.c | 9 +- fs/smb/client/smb2inode.c | 13 +- fs/smb/client/smb2maperror.c | 6 +- fs/smb/client/smb2misc.c | 11 +- fs/smb/client/smb2ops.c | 178 +++---- fs/smb/client/smb2pdu.c | 230 +++++---- fs/smb/client/smb2proto.h | 18 +- fs/smb/client/smb2transport.c | 113 ++--- fs/smb/client/trace.h | 149 ++++++ fs/smb/client/transport.c | 305 +++++------ fs/smb/client/xattr.c | 2 +- fs/smb/common/smb2pdu.h | 3 - fs/smb/common/smbglob.h | 1 - 41 files changed, 1800 insertions(+), 1743 deletions(-)