cifs: optimize opendir and save one roundtrip
Subsystems (2)
cover cifs: optimize opendir and save one roundtrip
Pavel, Steve
Please find an updated version of these patches.
It addresses Pavels concerns and adds an extra patch to set maxbufsize correctly for two other functions that were found during review.
PATCH 1/4 cifs: prepare SMB2_query_directory to be used with compounding
--- fs/cifs/smb2pdu.c | 111 +++++++++++++++++++++++++++++++++++----------------- fs/cifs/smb2pdu.h | 2 + fs/cifs/smb2proto.h | 5 +++ 3 files changed, 82 insertions(+), 36 deletions(-)
fs/cifs/smb2pdu.c +75 -36
@@ -4296,56 +4296,38 @@ num_entries(char *bufstart, char *end_of_buf, char **lastentry, size_t size)/* * Readdir/FindFirst */ -int -SMB2_query_directory (const unsigned int xid,struct cifs_tcon *tcon, -u64 persistent_fid,u64 volatile_fid,int index, -struct cifs_search_info *srch_inf) +int SMB2_query_directory_init (const unsigned int xid, +struct cifs_tcon *tcon,struct smb_rqst *rqst, +u64 persistent_fid,u64 volatile_fid, +int index,int info_level) { -struct smb_rqst rqst; +struct TCP_Server_Info *server = tcon->ses->server;struct smb2_query_directory_req *req; -struct smb2_query_directory_rsp *rsp =NULL ; -struct kvec iov[2 ]; -struct kvec rsp_iov; -int rc =0 ; -int len; -int resp_buftype =CIFS_NO_BUFFER ;unsigned char *bufptr; -struct TCP_Server_Info *server; -struct cifs_ses *ses = tcon->ses;__le16 asteriks =cpu_to_le16 ('*' ); -char *end_of_smb; -unsigned int output_size = CIFSMaxBufSize; -size_t info_buf_size; -int flags =0 ; +unsigned int output_size = CIFSMaxBufSize - +MAX_SMB2_CREATE_RESPONSE_SIZE - +MAX_SMB2_CLOSE_RESPONSE_SIZE ;unsigned int total_len; - -if (ses && (ses->server)) - server = ses->server; -else -return -EIO ; +struct kvec *iov = rqst->rq_iov; +int len, rc; rc =smb2_plain_req_init (SMB2_QUERY_DIRECTORY , tcon, (void **) &req, &total_len);if (rc)return rc; -if (smb3_encryption_required (tcon)) - flags |=CIFS_TRANSFORM_REQ ; - -switch (srch_inf->info_level) { +switch (info_level) {case SMB_FIND_FILE_DIRECTORY_INFO : req->FileInformationClass =FILE_DIRECTORY_INFORMATION ; - info_buf_size =sizeof (FILE_DIRECTORY_INFO ) -1 ;break ;case SMB_FIND_FILE_ID_FULL_DIR_INFO : req->FileInformationClass =FILEID_FULL_DIRECTORY_INFORMATION ; - info_buf_size =sizeof (SEARCH_ID_FULL_DIR_INFO ) -1 ;break ;default :cifs_tcon_dbg (VFS ,"info level %u isn't supported\n" , - srch_inf->info_level); - rc = -EINVAL ; - goto qdir_exit; + info_level); +return -EINVAL ; } req->FileIndex =cpu_to_le32 (index);
@@ -4374,15 +4356,56 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, iov[1 ].iov_base = (char *)(req->Buffer); iov[1 ].iov_len = len; +trace_smb3_query_dir_enter (xid, persistent_fid, tcon->tid, + tcon->ses->Suid, index, output_size); + +return 0 ; +} + +void SMB2_query_directory_free (struct smb_rqst *rqst) +{ +if (rqst && rqst->rq_iov) { +cifs_small_buf_release (rqst->rq_iov[0 ].iov_base);/* request */ + } +} + +int +SMB2_query_directory (const unsigned int xid,struct cifs_tcon *tcon, +u64 persistent_fid,u64 volatile_fid,int index, +struct cifs_search_info *srch_inf) +{ +struct smb_rqst rqst; +struct kvec iov[SMB2_QUERY_DIRECTORY_IOV_SIZE ]; +struct smb2_query_directory_rsp *rsp =NULL ; +int resp_buftype =CIFS_NO_BUFFER ; +struct kvec rsp_iov; +int rc =0 ; +struct TCP_Server_Info *server; +struct cifs_ses *ses = tcon->ses; +char *end_of_smb; +size_t info_buf_size; +int flags =0 ; + +if (ses && (ses->server)) + server = ses->server; +else +return -EIO ; + +if (smb3_encryption_required (tcon)) + flags |=CIFS_TRANSFORM_REQ ; +memset (&rqst,0 ,sizeof (struct smb_rqst )); +memset (&iov,0 ,sizeof (iov)); rqst.rq_iov = iov; - rqst.rq_nvec =2 ; + rqst.rq_nvec =SMB2_QUERY_DIRECTORY_IOV_SIZE ; -trace_smb3_query_dir_enter (xid, persistent_fid, tcon->tid, - tcon->ses->Suid, index, output_size); + rc =SMB2_query_directory_init (xid, tcon, &rqst, persistent_fid, + volatile_fid, index, + srch_inf->info_level); +if (rc) + goto qdir_exit; rc =cifs_send_recv (xid, ses, &rqst, &resp_buftype, flags, &rsp_iov); -cifs_small_buf_release (req); rsp = (struct smb2_query_directory_rsp *)rsp_iov.iov_base;if (rc) {
@@ -4400,6 +4423,20 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, goto qdir_exit; } +switch (srch_inf->info_level) { +case SMB_FIND_FILE_DIRECTORY_INFO : + info_buf_size =sizeof (FILE_DIRECTORY_INFO ) -1 ; +break ; +case SMB_FIND_FILE_ID_FULL_DIR_INFO : + info_buf_size =sizeof (SEARCH_ID_FULL_DIR_INFO ) -1 ; +break ; +default : +cifs_tcon_dbg (VFS ,"info level %u isn't supported\n" , + srch_inf->info_level); + rc = -EINVAL ; + goto qdir_exit; + } + rc =smb2_validate_iov (le16_to_cpu (rsp->OutputBufferOffset),le32_to_cpu (rsp->OutputBufferLength), &rsp_iov, info_buf_size);
@@ -4435,11 +4472,13 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,else cifs_tcon_dbg (VFS ,"illegal search buffer type\n" ); + resp_buftype =CIFS_NO_BUFFER ; +trace_smb3_query_dir_done (xid, persistent_fid, tcon->tid, tcon->ses->Suid, index, srch_inf->entries_in_buffer); -return rc; qdir_exit: +SMB2_query_directory_free (&rqst);free_rsp_buf (resp_buftype, rsp);return rc; }
fs/cifs/smb2pdu.h +2 -0
@@ -1282,6 +1282,8 @@ struct smb2_echo_rsp {#define SMB2_INDEX_SPECIFIED 0x04#define SMB2_REOPEN 0x10 +#define SMB2_QUERY_DIRECTORY_IOV_SIZE 2 +struct smb2_query_directory_req {struct smb2_sync_hdr sync_hdr;__le16 StructureSize;/* Must be 33 */
fs/cifs/smb2proto.h +5 -0
@@ -197,6 +197,11 @@ extern int SMB2_echo(struct TCP_Server_Info *server);extern int SMB2_query_directory (const unsigned int xid,struct cifs_tcon *tcon,u64 persistent_fid,u64 volatile_fid,int index,struct cifs_search_info *srch_inf); +extern int SMB2_query_directory_init (unsigned int xid,struct cifs_tcon *tcon, +struct smb_rqst *rqst, +u64 persistent_fid,u64 volatile_fid, +int index,int info_level); +extern void SMB2_query_directory_free (struct smb_rqst *rqst);extern int SMB2_set_eof (const unsigned int xid,struct cifs_tcon *tcon,u64 persistent_fid,u64 volatile_fid,u32 pid,__le64 *eof);
Signature · 1 line
2.13.6
PATCH 2/4 cifs: create a helper function to parse the query-directory response buffer
In reply to Ronnie Sahlberg--- fs/cifs/smb2pdu.c | 109 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 46 deletions(-)
fs/cifs/smb2pdu.c +63 -46
@@ -4370,6 +4370,67 @@ void SMB2_query_directory_free(struct smb_rqst *rqst) }int +smb2_parse_query_directory (struct cifs_tcon *tcon, +struct kvec *rsp_iov, +int resp_buftype, +struct cifs_search_info *srch_inf) +{ +struct smb2_query_directory_rsp *rsp; +size_t info_buf_size; +char *end_of_smb; +int rc; + + rsp = (struct smb2_query_directory_rsp *)rsp_iov->iov_base; + +switch (srch_inf->info_level) { +case SMB_FIND_FILE_DIRECTORY_INFO : + info_buf_size =sizeof (FILE_DIRECTORY_INFO ) -1 ; +break ; +case SMB_FIND_FILE_ID_FULL_DIR_INFO : + info_buf_size =sizeof (SEARCH_ID_FULL_DIR_INFO ) -1 ; +break ; +default : +cifs_tcon_dbg (VFS ,"info level %u isn't supported\n" , + srch_inf->info_level); +return -EINVAL ; + } + + rc =smb2_validate_iov (le16_to_cpu (rsp->OutputBufferOffset), +le32_to_cpu (rsp->OutputBufferLength), rsp_iov, + info_buf_size); +if (rc) +return rc; + + srch_inf->unicode = true; + +if (srch_inf->ntwrk_buf_start) { +if (srch_inf->smallBuf) +cifs_small_buf_release (srch_inf->ntwrk_buf_start); +else +cifs_buf_release (srch_inf->ntwrk_buf_start); + } + srch_inf->ntwrk_buf_start = (char *)rsp; + srch_inf->srch_entries_start = srch_inf->last_entry = + (char *)rsp +le16_to_cpu (rsp->OutputBufferOffset); + end_of_smb = rsp_iov->iov_len + (char *)rsp; + srch_inf->entries_in_buffer = +num_entries (srch_inf->srch_entries_start, end_of_smb, + &srch_inf->last_entry, info_buf_size); + srch_inf->index_of_last_entry += srch_inf->entries_in_buffer; +cifs_dbg (FYI ,"num entries %d last_index %lld srch start %p srch end %p\n" , + srch_inf->entries_in_buffer, srch_inf->index_of_last_entry, + srch_inf->srch_entries_start, srch_inf->last_entry); +if (resp_buftype ==CIFS_LARGE_BUFFER ) + srch_inf->smallBuf = false; +else if (resp_buftype ==CIFS_SMALL_BUFFER ) + srch_inf->smallBuf = true; +else +cifs_tcon_dbg (VFS ,"illegal search buffer type\n" ); + +return 0 ; +} + +int SMB2_query_directory (const unsigned int xid,struct cifs_tcon *tcon,u64 persistent_fid,u64 volatile_fid,int index,struct cifs_search_info *srch_inf)
@@ -4382,8 +4443,6 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,int rc =0 ;struct TCP_Server_Info *server;struct cifs_ses *ses = tcon->ses; -char *end_of_smb; -size_t info_buf_size;int flags =0 ;if (ses && (ses->server))
@@ -4423,55 +4482,13 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, goto qdir_exit; } -switch (srch_inf->info_level) { -case SMB_FIND_FILE_DIRECTORY_INFO : - info_buf_size =sizeof (FILE_DIRECTORY_INFO ) -1 ; -break ; -case SMB_FIND_FILE_ID_FULL_DIR_INFO : - info_buf_size =sizeof (SEARCH_ID_FULL_DIR_INFO ) -1 ; -break ; -default : -cifs_tcon_dbg (VFS ,"info level %u isn't supported\n" , - srch_inf->info_level); - rc = -EINVAL ; - goto qdir_exit; - } - - rc =smb2_validate_iov (le16_to_cpu (rsp->OutputBufferOffset), -le32_to_cpu (rsp->OutputBufferLength), &rsp_iov, - info_buf_size); + rc =smb2_parse_query_directory (tcon, &rsp_iov, resp_buftype, + srch_inf);if (rc) {trace_smb3_query_dir_err (xid, persistent_fid, tcon->tid, tcon->ses->Suid, index,0 , rc); goto qdir_exit; } - - srch_inf->unicode = true; - -if (srch_inf->ntwrk_buf_start) { -if (srch_inf->smallBuf) -cifs_small_buf_release (srch_inf->ntwrk_buf_start); -else -cifs_buf_release (srch_inf->ntwrk_buf_start); - } - srch_inf->ntwrk_buf_start = (char *)rsp; - srch_inf->srch_entries_start = srch_inf->last_entry = - (char *)rsp +le16_to_cpu (rsp->OutputBufferOffset); - end_of_smb = rsp_iov.iov_len + (char *)rsp; - srch_inf->entries_in_buffer = -num_entries (srch_inf->srch_entries_start, end_of_smb, - &srch_inf->last_entry, info_buf_size); - srch_inf->index_of_last_entry += srch_inf->entries_in_buffer; -cifs_dbg (FYI ,"num entries %d last_index %lld srch start %p srch end %p\n" , - srch_inf->entries_in_buffer, srch_inf->index_of_last_entry, - srch_inf->srch_entries_start, srch_inf->last_entry); -if (resp_buftype ==CIFS_LARGE_BUFFER ) - srch_inf->smallBuf = false; -else if (resp_buftype ==CIFS_SMALL_BUFFER ) - srch_inf->smallBuf = true; -else -cifs_tcon_dbg (VFS ,"illegal search buffer type\n" ); - resp_buftype =CIFS_NO_BUFFER ; trace_smb3_query_dir_done(xid, persistent_fid, tcon->tid,
Signature · 1 line
2.13.6
PATCH 3/4 cifs: use compounding for open and first query-dir for readdir()
In reply to Ronnie SahlbergCombine the initial SMB2_Open and the first SMB2_Query_Directory in a compound. This shaves one round-trip of each directory listing, changing it from 4 to 3 for small directories.
--- fs/cifs/cifsproto.h | 3 ++ fs/cifs/smb2ops.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 87 insertions(+), 12 deletions(-)
fs/cifs/cifsproto.h +3 -0
@@ -596,6 +596,9 @@ bool is_ses_using_iface(struct cifs_ses *ses, struct cifs_server_iface *iface);void extract_unc_hostname (const char *unc,const char **h,size_t *len);int copy_path_name (char *dst,const char *src); +int smb2_parse_query_directory (struct cifs_tcon *tcon,struct kvec *rsp_iov, +int resp_buftype, +struct cifs_search_info *srch_inf);#ifdef CONFIG_CIFS_DFS_UPCALL static inline int get_dfs_path(const unsigned int xid, struct cifs_ses *ses,
fs/cifs/smb2ops.c +84 -12
120 lines not on this page · raw message
Signature · 1 line
2.13.6
PATCH 4/4 cifs: set correct max-buffer-size for smb2_ioctl_init()
In reply to Ronnie SahlbergFix two places where we need to adjust down the max response size for ioctl when it is used together with compounding.
--- fs/cifs/smb2ops.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/cifs/smb2ops.c +7 -2
@@ -1523,7 +1523,9 @@ smb2_ioctl_query_info(const unsigned int xid,COMPOUND_FID ,COMPOUND_FID , qi.info_type, true, buffer, qi.output_buffer_length, - CIFSMaxBufSize); + CIFSMaxBufSize - +MAX_SMB2_CREATE_RESPONSE_SIZE - + MAX_SMB2_CLOSE_RESPONSE_SIZE); } }else if (qi.flags ==PASSTHRU_SET_INFO ) {/* Can eventually relax perm check since server enforces too */
@@ -2769,7 +2771,10 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon, rc =SMB2_ioctl_init (tcon, &rqst[1 ], fid.persistent_fid, fid.volatile_fid,FSCTL_GET_REPARSE_POINT , - true/* is_fctl */ ,NULL ,0 , CIFSMaxBufSize); + true/* is_fctl */ ,NULL ,0 , + CIFSMaxBufSize - +MAX_SMB2_CREATE_RESPONSE_SIZE - +MAX_SMB2_CLOSE_RESPONSE_SIZE );if (rc) goto querty_exit;
Signature · 1 line
2.13.6
вт, 7 янв. 2020 г. в 19:08, Ronnie Sahlberg <[email protected]>:
Quoted 6 lines
Pavel, Steve
Please find an updated version of these patches.
It addresses Pavels concerns and adds an extra patch to set maxbufsize correctly for two other functions that were found during review.
Looks good overall, thanks!
Do we need a stable tag on the last patch?
--
Best regards,
Pavel Shilovsky
tentatively merged into cifs-2.6.git for-next (and added cc:stable for the last patch in the series) pending more testing.
Quoted 20 lines · Pavel Shilovsky
вт, 7 янв. 2020 г. в 19:08, Ronnie Sahlberg <[email protected]>:
Quoted 6 lines
Pavel, Steve
Please find an updated version of these patches.
It addresses Pavels concerns and adds an extra patch to set maxbufsize correctly for two other functions that were found during review.Looks good overall, thanks!
Reviewed-by Pavel Shilovsky <[email protected]>Do we need a stable tag on the last patch?
--
Best regards,
Pavel Shilovsky
Signature · 3 lines
Thanks, Steve