Commit d14f2780 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.10-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:
 "Five smb3 client fixes

   - three nets/fiolios cifs fixes

   - fix typo in module parameters description

   - fix incorrect swap warning"

* tag '6.10-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Move the 'pid' from the subreq to the req
  cifs: Only pick a channel once per read request
  cifs: Defer read completion
  cifs: fix typo in module parameter enable_gcm_256
  cifs: drop the incorrect assertion in cifs_swap_rw()
parents 0971e82e 3f591385

fs/smb/client/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ module_param(enable_oplocks, bool, 0644); 
MODULE_PARM_DESC(enable_oplocks, "Enable or disable oplocks. Default: y/Y/1");



module_param(enable_gcm_256, bool, 0644);

MODULE_PARM_DESC(enable_gcm_256, "Enable requesting strongest (256 bit) GCM encryption. Default: n/N/0");

MODULE_PARM_DESC(enable_gcm_256, "Enable requesting strongest (256 bit) GCM encryption. Default: y/Y/0");



module_param(require_gcm_256, bool, 0644);

MODULE_PARM_DESC(require_gcm_256, "Require strongest (256 bit) GCM encryption. Default: n/N/0");

fs/smb/client/cifsglob.h

+2 −1
Original line number Diff line number Diff line
@@ -1494,6 +1494,8 @@ struct cifs_aio_ctx { 
struct cifs_io_request {

	struct netfs_io_request		rreq;

	struct cifsFileInfo		*cfile;

	struct TCP_Server_Info		*server;

	pid_t				pid;

};



/* asynchronous read support */
@@ -1504,7 +1506,6 @@ struct cifs_io_subrequest { 
		struct cifs_io_request *req;

	};

	ssize_t				got_bytes;

	pid_t				pid;

	unsigned int			xid;

	int				result;

	bool				have_xid;

fs/smb/client/cifssmb.c

+4 −4
Original line number Diff line number Diff line
@@ -1345,8 +1345,8 @@ cifs_async_readv(struct cifs_io_subrequest *rdata) 
	if (rc)

		return rc;



	smb->hdr.Pid = cpu_to_le16((__u16)rdata->pid);

	smb->hdr.PidHigh = cpu_to_le16((__u16)(rdata->pid >> 16));

	smb->hdr.Pid = cpu_to_le16((__u16)rdata->req->pid);

	smb->hdr.PidHigh = cpu_to_le16((__u16)(rdata->req->pid >> 16));



	smb->AndXCommand = 0xFF;	/* none */

	smb->Fid = rdata->req->cfile->fid.netfid;
@@ -1689,8 +1689,8 @@ cifs_async_writev(struct cifs_io_subrequest *wdata) 
	if (rc)

		goto async_writev_out;



	smb->hdr.Pid = cpu_to_le16((__u16)wdata->pid);

	smb->hdr.PidHigh = cpu_to_le16((__u16)(wdata->pid >> 16));

	smb->hdr.Pid = cpu_to_le16((__u16)wdata->req->pid);

	smb->hdr.PidHigh = cpu_to_le16((__u16)(wdata->req->pid >> 16));



	smb->AndXCommand = 0xFF;	/* none */

	smb->Fid = wdata->req->cfile->fid.netfid;

fs/smb/client/file.c

+6 −21
Original line number Diff line number Diff line
@@ -134,17 +134,15 @@ static void cifs_issue_write(struct netfs_io_subrequest *subreq) 
static bool cifs_clamp_length(struct netfs_io_subrequest *subreq)

{

	struct netfs_io_request *rreq = subreq->rreq;

	struct TCP_Server_Info *server;

	struct cifs_io_subrequest *rdata = container_of(subreq, struct cifs_io_subrequest, subreq);

	struct cifs_io_request *req = container_of(subreq->rreq, struct cifs_io_request, rreq);

	struct TCP_Server_Info *server = req->server;

	struct cifs_sb_info *cifs_sb = CIFS_SB(rreq->inode->i_sb);

	size_t rsize = 0;

	int rc;



	rdata->xid = get_xid();

	rdata->have_xid = true;



	server = cifs_pick_channel(tlink_tcon(req->cfile->tlink)->ses);

	rdata->server = server;



	if (cifs_sb->ctx->rsize == 0)
@@ -179,15 +177,8 @@ static void cifs_req_issue_read(struct netfs_io_subrequest *subreq) 
	struct netfs_io_request *rreq = subreq->rreq;

	struct cifs_io_subrequest *rdata = container_of(subreq, struct cifs_io_subrequest, subreq);

	struct cifs_io_request *req = container_of(subreq->rreq, struct cifs_io_request, rreq);

	struct cifs_sb_info *cifs_sb = CIFS_SB(rreq->inode->i_sb);

	pid_t pid;

	int rc = 0;



	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)

		pid = req->cfile->pid;

	else

		pid = current->tgid; // Ummm...  This may be a workqueue



	cifs_dbg(FYI, "%s: op=%08x[%x] mapping=%p len=%zu/%zu\n",

		 __func__, rreq->debug_id, subreq->debug_index, rreq->mapping,

		 subreq->transferred, subreq->len);
@@ -201,16 +192,8 @@ static void cifs_req_issue_read(struct netfs_io_subrequest *subreq) 
	}



	__set_bit(NETFS_SREQ_CLEAR_TAIL, &subreq->flags);

	rdata->pid = pid;



	rc = adjust_credits(rdata->server, &rdata->credits, rdata->subreq.len);

	if (!rc) {

		if (rdata->req->cfile->invalidHandle)

			rc = -EAGAIN;

		else

	rc = rdata->server->ops->async_readv(rdata);

	}



out:

	if (rc)

		netfs_subreq_terminated(subreq, rc, false);
@@ -245,11 +228,15 @@ static int cifs_init_request(struct netfs_io_request *rreq, struct file *file) 


	rreq->rsize = cifs_sb->ctx->rsize;

	rreq->wsize = cifs_sb->ctx->wsize;

	req->pid = current->tgid; // Ummm...  This may be a workqueue



	if (file) {

		open_file = file->private_data;

		rreq->netfs_priv = file->private_data;

		req->cfile = cifsFileInfo_get(open_file);

		req->server = cifs_pick_channel(tlink_tcon(req->cfile->tlink)->ses);

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)

			req->pid = req->cfile->pid;

	} else if (rreq->origin != NETFS_WRITEBACK) {

		WARN_ON_ONCE(1);

		return -EIO;
@@ -3200,8 +3187,6 @@ static int cifs_swap_rw(struct kiocb *iocb, struct iov_iter *iter) 
{

	ssize_t ret;



	WARN_ON_ONCE(iov_iter_count(iter) != PAGE_SIZE);



	if (iov_iter_rw(iter) == READ)

		ret = netfs_unbuffered_read_iter_locked(iocb, iter);

	else

fs/smb/client/smb2pdu.c

+14 −5
Original line number Diff line number Diff line
@@ -4484,6 +4484,16 @@ smb2_new_read_req(void **buf, unsigned int *total_len, 
	return rc;

}



static void smb2_readv_worker(struct work_struct *work)

{

	struct cifs_io_subrequest *rdata =

		container_of(work, struct cifs_io_subrequest, subreq.work);



	netfs_subreq_terminated(&rdata->subreq,

				(rdata->result == 0 || rdata->result == -EAGAIN) ?

				rdata->got_bytes : rdata->result, true);

}



static void

smb2_readv_callback(struct mid_q_entry *mid)

{
@@ -4578,9 +4588,8 @@ smb2_readv_callback(struct mid_q_entry *mid) 
			rdata->result = 0;

	}

	rdata->credits.value = 0;

	netfs_subreq_terminated(&rdata->subreq,

				(rdata->result == 0 || rdata->result == -EAGAIN) ?

				rdata->got_bytes : rdata->result, true);

	INIT_WORK(&rdata->subreq.work, smb2_readv_worker);

	queue_work(cifsiod_wq, &rdata->subreq.work);

	release_mid(mid);

	add_credits(server, &credits, 0);

}
@@ -4612,7 +4621,7 @@ smb2_async_readv(struct cifs_io_subrequest *rdata) 
	io_parms.length = rdata->subreq.len;

	io_parms.persistent_fid = rdata->req->cfile->fid.persistent_fid;

	io_parms.volatile_fid = rdata->req->cfile->fid.volatile_fid;

	io_parms.pid = rdata->pid;

	io_parms.pid = rdata->req->pid;



	rc = smb2_new_read_req(

		(void **) &buf, &total_len, &io_parms, rdata, 0, 0);
@@ -4864,7 +4873,7 @@ smb2_async_writev(struct cifs_io_subrequest *wdata) 
		.length = wdata->subreq.len,

		.persistent_fid = wdata->req->cfile->fid.persistent_fid,

		.volatile_fid = wdata->req->cfile->fid.volatile_fid,

		.pid = wdata->pid,

		.pid = wdata->req->pid,

	};

	io_parms = &_io_parms;