| Message ID | 20180119171258.14244-3-aaptel@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2018-01-19 9:12 GMT-08:00 Aurelien Aptel <aaptel@suse.com>: > Since IPC now has a tcon object, the caller can just pass it. This > allows domain-based DFS requests to work with smb2+. > > Link: https://bugzilla.samba.org/show_bug.cgi?id=12917 > Fixes: 9d49640a21bf ("CIFS: implement get_dfs_refer for SMB2+") > Signed-off-by: Aurelien Aptel <aaptel@suse.com> > --- > fs/cifs/smb2file.c | 2 +- > fs/cifs/smb2ops.c | 53 ++++++++++++++++++++++------------------------------- > fs/cifs/smb2pdu.c | 4 +--- > fs/cifs/smb2proto.h | 3 +-- > 4 files changed, 25 insertions(+), 37 deletions(-) > > diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c > index b4b1f0305f29..12af5dba742b 100644 > --- a/fs/cifs/smb2file.c > +++ b/fs/cifs/smb2file.c > @@ -74,7 +74,7 @@ smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, > nr_ioctl_req.Reserved = 0; > rc = SMB2_ioctl(xid, oparms->tcon, fid->persistent_fid, > fid->volatile_fid, FSCTL_LMR_REQUEST_RESILIENCY, > - true /* is_fsctl */, false /* use_ipc */, > + true /* is_fsctl */, > (char *)&nr_ioctl_req, sizeof(nr_ioctl_req), > NULL, NULL /* no return info */); > if (rc == -EOPNOTSUPP) { > diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c > index ed88ab8a4774..1d9907da96f4 100644 > --- a/fs/cifs/smb2ops.c > +++ b/fs/cifs/smb2ops.c > @@ -283,7 +283,6 @@ SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon) > > rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID, > FSCTL_QUERY_NETWORK_INTERFACE_INFO, true /* is_fsctl */, > - false /* use_ipc */, > NULL /* no data input */, 0 /* no data input */, > (char **)&out_buf, &ret_data_len); > if (rc != 0) > @@ -782,7 +781,6 @@ SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon, > > rc = SMB2_ioctl(xid, tcon, persistent_fid, volatile_fid, > FSCTL_SRV_REQUEST_RESUME_KEY, true /* is_fsctl */, > - false /* use_ipc */, > NULL, 0 /* no input */, > (char **)&res_key, &ret_data_len); > > @@ -848,8 +846,7 @@ smb2_copychunk_range(const unsigned int xid, > /* Request server copy to target from src identified by key */ > rc = SMB2_ioctl(xid, tcon, trgtfile->fid.persistent_fid, > trgtfile->fid.volatile_fid, FSCTL_SRV_COPYCHUNK_WRITE, > - true /* is_fsctl */, false /* use_ipc */, > - (char *)pcchunk, > + true /* is_fsctl */, (char *)pcchunk, > sizeof(struct copychunk_ioctl), (char **)&retbuf, > &ret_data_len); > if (rc == 0) { > @@ -1006,7 +1003,7 @@ static bool smb2_set_sparse(const unsigned int xid, struct cifs_tcon *tcon, > > rc = SMB2_ioctl(xid, tcon, cfile->fid.persistent_fid, > cfile->fid.volatile_fid, FSCTL_SET_SPARSE, > - true /* is_fctl */, false /* use_ipc */, > + true /* is_fctl */, > &setsparse, 1, NULL, NULL); > if (rc) { > tcon->broken_sparse_sup = true; > @@ -1077,7 +1074,7 @@ smb2_duplicate_extents(const unsigned int xid, > rc = SMB2_ioctl(xid, tcon, trgtfile->fid.persistent_fid, > trgtfile->fid.volatile_fid, > FSCTL_DUPLICATE_EXTENTS_TO_FILE, > - true /* is_fsctl */, false /* use_ipc */, > + true /* is_fsctl */, > (char *)&dup_ext_buf, > sizeof(struct duplicate_extents_to_file), > NULL, > @@ -1112,7 +1109,7 @@ smb3_set_integrity(const unsigned int xid, struct cifs_tcon *tcon, > return SMB2_ioctl(xid, tcon, cfile->fid.persistent_fid, > cfile->fid.volatile_fid, > FSCTL_SET_INTEGRITY_INFORMATION, > - true /* is_fsctl */, false /* use_ipc */, > + true /* is_fsctl */, > (char *)&integr_info, > sizeof(struct fsctl_set_integrity_information_req), > NULL, > @@ -1132,7 +1129,7 @@ smb3_enum_snapshots(const unsigned int xid, struct cifs_tcon *tcon, > rc = SMB2_ioctl(xid, tcon, cfile->fid.persistent_fid, > cfile->fid.volatile_fid, > FSCTL_SRV_ENUMERATE_SNAPSHOTS, > - true /* is_fsctl */, false /* use_ipc */, > + true /* is_fsctl */, > NULL, 0 /* no input data */, > (char **)&retbuf, > &ret_data_len); > @@ -1351,16 +1348,20 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses, > cifs_dbg(FYI, "smb2_get_dfs_refer path <%s>\n", search_name); > > /* > - * Use any tcon from the current session. Here, the first one. > + * Try to use the IPC tcon, otherwise just use any > */ > - spin_lock(&cifs_tcp_ses_lock); > - tcon = list_first_entry_or_null(&ses->tcon_list, struct cifs_tcon, > - tcon_list); > - if (tcon) > - tcon->tc_count++; > - spin_unlock(&cifs_tcp_ses_lock); > + tcon = ses->tcon_ipc; > + if (tcon == NULL) { > + spin_lock(&cifs_tcp_ses_lock); > + tcon = list_first_entry_or_null(&ses->tcon_list, > + struct cifs_tcon, > + tcon_list); > + if (tcon) > + tcon->tc_count++; > + spin_unlock(&cifs_tcp_ses_lock); > + } > > - if (!tcon) { > + if (tcon == NULL) { > cifs_dbg(VFS, "session %p has no tcon available for a dfs referral request\n", > ses); > rc = -ENOTCONN; > @@ -1389,20 +1390,11 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses, > memcpy(dfs_req->RequestFileName, utf16_path, utf16_path_len); > > do { > - /* try first with IPC */ > rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID, > FSCTL_DFS_GET_REFERRALS, > - true /* is_fsctl */, true /* use_ipc */, > + true /* is_fsctl */, > (char *)dfs_req, dfs_req_size, > (char **)&dfs_rsp, &dfs_rsp_size); > - if (rc == -ENOTCONN) { > - /* try with normal tcon */ > - rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID, > - FSCTL_DFS_GET_REFERRALS, > - true /* is_fsctl */, false /*use_ipc*/, > - (char *)dfs_req, dfs_req_size, > - (char **)&dfs_rsp, &dfs_rsp_size); > - } Is it safe to try IPC share only and not retry with any normal tcon in the case of ENOTCONN like the current code does? Best regards, Pavel Shilovsky -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Pavel Shilovsky <piastryyy@gmail.com> writes: > Is it safe to try IPC share only and not retry with any normal tcon in > the case of ENOTCONN like the current code does? ENOTCONN was returned when SMB2_ioctl(with_ipc=true) was called and no ipc was available so I believe it is functionnaly equivalent currently. Unless other NT_STATUS mapped to ENOTCONN can be returned in that scenario but I don't think it can. While rebasing this on top of Steve's for-next I've realized since IPC is not part of the tcon list anymore it's not automatically reconnected. I have to do more testing :(
diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c index b4b1f0305f29..12af5dba742b 100644 --- a/fs/cifs/smb2file.c +++ b/fs/cifs/smb2file.c @@ -74,7 +74,7 @@ smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, nr_ioctl_req.Reserved = 0; rc = SMB2_ioctl(xid, oparms->tcon, fid->persistent_fid, fid->volatile_fid, FSCTL_LMR_REQUEST_RESILIENCY, - true /* is_fsctl */, false /* use_ipc */, + true /* is_fsctl */, (char *)&nr_ioctl_req, sizeof(nr_ioctl_req), NULL, NULL /* no return info */); if (rc == -EOPNOTSUPP) { diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index ed88ab8a4774..1d9907da96f4 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -283,7 +283,6 @@ SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon) rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID, FSCTL_QUERY_NETWORK_INTERFACE_INFO, true /* is_fsctl */, - false /* use_ipc */, NULL /* no data input */, 0 /* no data input */, (char **)&out_buf, &ret_data_len); if (rc != 0) @@ -782,7 +781,6 @@ SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon, rc = SMB2_ioctl(xid, tcon, persistent_fid, volatile_fid, FSCTL_SRV_REQUEST_RESUME_KEY, true /* is_fsctl */, - false /* use_ipc */, NULL, 0 /* no input */, (char **)&res_key, &ret_data_len); @@ -848,8 +846,7 @@ smb2_copychunk_range(const unsigned int xid, /* Request server copy to target from src identified by key */ rc = SMB2_ioctl(xid, tcon, trgtfile->fid.persistent_fid, trgtfile->fid.volatile_fid, FSCTL_SRV_COPYCHUNK_WRITE, - true /* is_fsctl */, false /* use_ipc */, - (char *)pcchunk, + true /* is_fsctl */, (char *)pcchunk, sizeof(struct copychunk_ioctl), (char **)&retbuf, &ret_data_len); if (rc == 0) { @@ -1006,7 +1003,7 @@ static bool smb2_set_sparse(const unsigned int xid, struct cifs_tcon *tcon, rc = SMB2_ioctl(xid, tcon, cfile->fid.persistent_fid, cfile->fid.volatile_fid, FSCTL_SET_SPARSE, - true /* is_fctl */, false /* use_ipc */, + true /* is_fctl */, &setsparse, 1, NULL, NULL); if (rc) { tcon->broken_sparse_sup = true; @@ -1077,7 +1074,7 @@ smb2_duplicate_extents(const unsigned int xid, rc = SMB2_ioctl(xid, tcon, trgtfile->fid.persistent_fid, trgtfile->fid.volatile_fid, FSCTL_DUPLICATE_EXTENTS_TO_FILE, - true /* is_fsctl */, false /* use_ipc */, + true /* is_fsctl */, (char *)&dup_ext_buf, sizeof(struct duplicate_extents_to_file), NULL, @@ -1112,7 +1109,7 @@ smb3_set_integrity(const unsigned int xid, struct cifs_tcon *tcon, return SMB2_ioctl(xid, tcon, cfile->fid.persistent_fid, cfile->fid.volatile_fid, FSCTL_SET_INTEGRITY_INFORMATION, - true /* is_fsctl */, false /* use_ipc */, + true /* is_fsctl */, (char *)&integr_info, sizeof(struct fsctl_set_integrity_information_req), NULL, @@ -1132,7 +1129,7 @@ smb3_enum_snapshots(const unsigned int xid, struct cifs_tcon *tcon, rc = SMB2_ioctl(xid, tcon, cfile->fid.persistent_fid, cfile->fid.volatile_fid, FSCTL_SRV_ENUMERATE_SNAPSHOTS, - true /* is_fsctl */, false /* use_ipc */, + true /* is_fsctl */, NULL, 0 /* no input data */, (char **)&retbuf, &ret_data_len); @@ -1351,16 +1348,20 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses, cifs_dbg(FYI, "smb2_get_dfs_refer path <%s>\n", search_name); /* - * Use any tcon from the current session. Here, the first one. + * Try to use the IPC tcon, otherwise just use any */ - spin_lock(&cifs_tcp_ses_lock); - tcon = list_first_entry_or_null(&ses->tcon_list, struct cifs_tcon, - tcon_list); - if (tcon) - tcon->tc_count++; - spin_unlock(&cifs_tcp_ses_lock); + tcon = ses->tcon_ipc; + if (tcon == NULL) { + spin_lock(&cifs_tcp_ses_lock); + tcon = list_first_entry_or_null(&ses->tcon_list, + struct cifs_tcon, + tcon_list); + if (tcon) + tcon->tc_count++; + spin_unlock(&cifs_tcp_ses_lock); + } - if (!tcon) { + if (tcon == NULL) { cifs_dbg(VFS, "session %p has no tcon available for a dfs referral request\n", ses); rc = -ENOTCONN; @@ -1389,20 +1390,11 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses, memcpy(dfs_req->RequestFileName, utf16_path, utf16_path_len); do { - /* try first with IPC */ rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID, FSCTL_DFS_GET_REFERRALS, - true /* is_fsctl */, true /* use_ipc */, + true /* is_fsctl */, (char *)dfs_req, dfs_req_size, (char **)&dfs_rsp, &dfs_rsp_size); - if (rc == -ENOTCONN) { - /* try with normal tcon */ - rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID, - FSCTL_DFS_GET_REFERRALS, - true /* is_fsctl */, false /*use_ipc*/, - (char *)dfs_req, dfs_req_size, - (char **)&dfs_rsp, &dfs_rsp_size); - } } while (rc == -EAGAIN); if (rc) { @@ -1421,7 +1413,8 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses, } out: - if (tcon) { + if (tcon && !tcon->ipc) { + /* ipc tcons are not refcounted */ spin_lock(&cifs_tcp_ses_lock); tcon->tc_count--; spin_unlock(&cifs_tcp_ses_lock); @@ -1713,8 +1706,7 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, rc = SMB2_ioctl(xid, tcon, cfile->fid.persistent_fid, cfile->fid.volatile_fid, FSCTL_SET_ZERO_DATA, - true /* is_fctl */, false /* use_ipc */, - (char *)&fsctl_buf, + true /* is_fctl */, (char *)&fsctl_buf, sizeof(struct file_zero_data_information), NULL, NULL); free_xid(xid); return rc; @@ -1748,8 +1740,7 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon, rc = SMB2_ioctl(xid, tcon, cfile->fid.persistent_fid, cfile->fid.volatile_fid, FSCTL_SET_ZERO_DATA, - true /* is_fctl */, false /* use_ipc */, - (char *)&fsctl_buf, + true /* is_fctl */, (char *)&fsctl_buf, sizeof(struct file_zero_data_information), NULL, NULL); free_xid(xid); return rc; diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index a5c94f8308eb..a8a632c44c1b 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -713,7 +713,6 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon) rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID, FSCTL_VALIDATE_NEGOTIATE_INFO, true /* is_fsctl */, - false /* use_ipc */, (char *)&vneg_inbuf, sizeof(struct validate_negotiate_info_req), (char **)&pneg_rsp, &rsplen); @@ -1863,7 +1862,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path, */ int SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, - u64 volatile_fid, u32 opcode, bool is_fsctl, bool use_ipc, + u64 volatile_fid, u32 opcode, bool is_fsctl, char *in_data, u32 indatalen, char **out_data, u32 *plen /* returned data len */) { @@ -2028,7 +2027,6 @@ SMB2_set_compression(const unsigned int xid, struct cifs_tcon *tcon, rc = SMB2_ioctl(xid, tcon, persistent_fid, volatile_fid, FSCTL_SET_COMPRESSION, true /* is_fsctl */, - false /* use_ipc */, (char *)&fsctl_input /* data input */, 2 /* in data len */, &ret_data /* out data */, NULL); diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h index e9ab5227e7a8..05287b01f596 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/cifs/smb2proto.h @@ -125,8 +125,7 @@ extern int SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, struct smb2_err_rsp **err_buf); extern int SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, u32 opcode, - bool is_fsctl, bool use_ipc, - char *in_data, u32 indatalen, + bool is_fsctl, char *in_data, u32 indatalen, char **out_data, u32 *plen /* returned data len */); extern int SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_file_id, u64 volatile_file_id);
Since IPC now has a tcon object, the caller can just pass it. This allows domain-based DFS requests to work with smb2+. Link: https://bugzilla.samba.org/show_bug.cgi?id=12917 Fixes: 9d49640a21bf ("CIFS: implement get_dfs_refer for SMB2+") Signed-off-by: Aurelien Aptel <aaptel@suse.com> --- fs/cifs/smb2file.c | 2 +- fs/cifs/smb2ops.c | 53 ++++++++++++++++++++++------------------------------- fs/cifs/smb2pdu.c | 4 +--- fs/cifs/smb2proto.h | 3 +-- 4 files changed, 25 insertions(+), 37 deletions(-)