cifs: Add a tracepoint to log EIO errors
Subsystems (5)
David Howells
maintainerPATCH 1/1 cifs: Add a tracepoint to log EIO errors
Add 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 | 50 +++++++----- fs/smb/client/sess.c | 8 - fs/smb/client/smb2file.c | 6 - fs/smb/client/smb2inode.c | 10 +- fs/smb/client/smb2maperror.c | 3 fs/smb/client/smb2ops.c | 41 ++++++--- fs/smb/client/smb2pdu.c | 174 +++++++++++++++++++++++++----------------- fs/smb/client/smb2transport.c | 2 fs/smb/client/smbdirect.c | 18 ++-- fs/smb/client/trace.h | 153 ++++++++++++++++++++++++++++++++++++ fs/smb/client/transport.c | 21 ++--- fs/smb/client/xattr.c | 2 28 files changed, 613 insertions(+), 322 deletions(-)
fs/smb/client/cached_dir.c +1 -1
@@ -175,7 +175,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 +30 -20
129 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 +6 -4
@@ -35,12 +35,14 @@ static struct reparse_data_buffer *reparse_buf_ptr(struct kvec *iov) 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 ); +u16 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 +1637,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 +104 -70
421 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/smbdirect.c +9 -9
@@ -979,7 +979,7 @@ static int smbd_post_send_negotiate_req(struct smbdirect_socket *sc) sc->ib.dev, (void *)packet, sizeof(*packet), DMA_TO_DEVICE);if (ib_dma_mapping_error (sc->ib.dev, request->sge[0 ].addr)) { - rc = -EIO ; + rc =smb_EIO (smb_eio_trace_rdma_dma_map); goto dma_mapping_failed; }
@@ -1179,7 +1179,7 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc, header_length, DMA_TO_DEVICE);if (ib_dma_mapping_error (sc->ib.dev, request->sge[0 ].addr)) { - rc = -EIO ; + rc =smb_EIO (smb_eio_trace_rdma_dma_map); goto err_dma; }
@@ -1321,13 +1321,13 @@ static int smbd_post_recv( {struct smbdirect_socket_parameters *sp = &sc->parameters;struct ib_recv_wr recv_wr; -int rc = -EIO ; +int rc; response->sge.addr =ib_dma_map_single ( sc->ib.dev, response->packet, sp->max_recv_size,DMA_FROM_DEVICE );if (ib_dma_mapping_error (sc->ib.dev, response->sge.addr)) -return rc; +return smb_EIO (smb_eio_trace_rdma_dma_map); response->sge.length = sp->max_recv_size; response->sge.lkey = sc->ib.pd->local_dma_lkey;
@@ -2855,7 +2855,7 @@ static ssize_t smb_extract_bvec_to_rdma(struct iov_iter *iter, off = bv[i].bv_offset + start;if (!smb_set_sge (rdma, bv[i].bv_page, off, len)) -return -EIO ; +return smb_EIO (smb_eio_trace_rdma_set_sge); ret += len; maxsize -= len;
@@ -2909,7 +2909,7 @@ static ssize_t smb_extract_kvec_to_rdma(struct iov_iter *iter, page =virt_to_page ((void *)kaddr);if (!smb_set_sge (rdma, page, off, seg)) -return -EIO ; +return smb_EIO (smb_eio_trace_rdma_set_sge); ret += seg; len -= seg;
@@ -2945,7 +2945,7 @@ static ssize_t smb_extract_folioq_to_rdma(struct iov_iter *iter,if (slot >=folioq_nr_slots (folioq)) { folioq = folioq->next;if (WARN_ON_ONCE (!folioq)) -return -EIO ; +return smb_EIO (smb_eio_trace_rdma_fq_overrun); slot =0 ; }
@@ -2957,7 +2957,7 @@ static ssize_t smb_extract_folioq_to_rdma(struct iov_iter *iter,size_t part =umin (maxsize, fsize - offset);if (!smb_set_sge (rdma,folio_page (folio,0 ), offset, part)) -return -EIO ; +return smb_EIO (smb_eio_trace_rdma_set_sge); offset += part; ret += part;
@@ -3014,7 +3014,7 @@ static ssize_t smb_extract_iter_to_rdma(struct iov_iter *iter, size_t len,break ;default :WARN_ON_ONCE (1 ); -return -EIO ; +return smb_EIO (smb_eio_trace_rdma_iter_type); }if (ret <0 ) {
fs/smb/client/trace.h +153 -0
177 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);
@@ -1040,7 +1040,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; }
@@ -1212,7 +1212,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); }
@@ -1230,7 +1231,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); }
@@ -1254,7 +1256,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 ;