Commit 4119bf9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.7-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "Ten cifs/smb fixes:

   - five RDMA (smbdirect) related fixes

   - add experimental support for swap over SMB3 mounts

   - also a fix which improves performance of signed connections"

* tag '5.7-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: enable swap on SMB3 mounts
  smb3: change noisy error message to FYI
  smb3: smbdirect support can be configured by default
  cifs: smbd: Do not schedule work to send immediate packet on every receive
  cifs: smbd: Properly process errors on ib_post_send
  cifs: Allocate crypto structures on the fly for calculating signatures of incoming packets
  cifs: smbd: Update receive credits before sending and deal with credits roll back on failure before sending
  cifs: smbd: Check send queue size before posting a send
  cifs: smbd: Merge code to track pending packets
  cifs: ignore cached share root handle closing errors
parents 50bda5fa 4e8aea30

fs/cifs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ config CIFS_SMB_DIRECT 
	help

	  Enables SMB Direct support for SMB 3.0, 3.02 and 3.1.1.

	  SMB Direct allows transferring SMB packets over RDMA. If unsure,

	  say N.

	  say Y.



config CIFS_FSCACHE

	bool "Provide CIFS client caching support"

fs/cifs/cifs_debug.c

+2 −4
Original line number Diff line number Diff line
@@ -323,10 +323,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
			atomic_read(&server->smbd_conn->send_credits),

			atomic_read(&server->smbd_conn->receive_credits),

			server->smbd_conn->receive_credit_target);

		seq_printf(m, "\nPending send_pending: %x "

			"send_payload_pending: %x",

			atomic_read(&server->smbd_conn->send_pending),

			atomic_read(&server->smbd_conn->send_payload_pending));

		seq_printf(m, "\nPending send_pending: %x ",

			atomic_read(&server->smbd_conn->send_pending));

		seq_printf(m, "\nReceive buffers count_receive_queue: %x "

			"count_empty_packet_queue: %x",

			server->smbd_conn->count_receive_queue,

fs/cifs/cifsfs.c

+4 −0
Original line number Diff line number Diff line
@@ -1208,6 +1208,10 @@ static ssize_t cifs_copy_file_range(struct file *src_file, loff_t off, 
{

	unsigned int xid = get_xid();

	ssize_t rc;

	struct cifsFileInfo *cfile = dst_file->private_data;



	if (cfile->swapfile)

		return -EOPNOTSUPP;



	rc = cifs_file_copychunk_range(xid, src_file, off, dst_file, destoff,

					len, flags);

fs/cifs/cifsglob.h

+3 −1
Original line number Diff line number Diff line
@@ -426,7 +426,8 @@ struct smb_version_operations { 
	/* generate new lease key */

	void (*new_lease_key)(struct cifs_fid *);

	int (*generate_signingkey)(struct cifs_ses *);

	int (*calc_signature)(struct smb_rqst *, struct TCP_Server_Info *);

	int (*calc_signature)(struct smb_rqst *, struct TCP_Server_Info *,

				bool allocate_crypto);

	int (*set_integrity)(const unsigned int, struct cifs_tcon *tcon,

			     struct cifsFileInfo *src_file);

	int (*enum_snapshots)(const unsigned int xid, struct cifs_tcon *tcon,
@@ -1312,6 +1313,7 @@ struct cifsFileInfo { 
	struct tcon_link *tlink;

	unsigned int f_flags;

	bool invalidHandle:1;	/* file closed via session abend */

	bool swapfile:1;

	bool oplock_break_cancelled:1;

	unsigned int oplock_epoch; /* epoch from the lease break */

	__u32 oplock_level; /* oplock/lease level from the lease break */

fs/cifs/file.c

+61 −0
Original line number Diff line number Diff line
@@ -4808,6 +4808,60 @@ cifs_direct_io(struct kiocb *iocb, struct iov_iter *iter) 
        return -EINVAL;

}



static int cifs_swap_activate(struct swap_info_struct *sis,

			      struct file *swap_file, sector_t *span)

{

	struct cifsFileInfo *cfile = swap_file->private_data;

	struct inode *inode = swap_file->f_mapping->host;

	unsigned long blocks;

	long long isize;



	cifs_dbg(FYI, "swap activate\n");



	spin_lock(&inode->i_lock);

	blocks = inode->i_blocks;

	isize = inode->i_size;

	spin_unlock(&inode->i_lock);

	if (blocks*512 < isize) {

		pr_warn("swap activate: swapfile has holes\n");

		return -EINVAL;

	}

	*span = sis->pages;



	printk_once(KERN_WARNING "Swap support over SMB3 is experimental\n");



	/*

	 * TODO: consider adding ACL (or documenting how) to prevent other

	 * users (on this or other systems) from reading it

	 */





	/* TODO: add sk_set_memalloc(inet) or similar */



	if (cfile)

		cfile->swapfile = true;

	/*

	 * TODO: Since file already open, we can't open with DENY_ALL here

	 * but we could add call to grab a byte range lock to prevent others

	 * from reading or writing the file

	 */



	return 0;

}



static void cifs_swap_deactivate(struct file *file)

{

	struct cifsFileInfo *cfile = file->private_data;



	cifs_dbg(FYI, "swap deactivate\n");



	/* TODO: undo sk_set_memalloc(inet) will eventually be needed */



	if (cfile)

		cfile->swapfile = false;



	/* do we need to unpin (or unlock) the file */

}



const struct address_space_operations cifs_addr_ops = {

	.readpage = cifs_readpage,
@@ -4821,6 +4875,13 @@ const struct address_space_operations cifs_addr_ops = { 
	.direct_IO = cifs_direct_io,

	.invalidatepage = cifs_invalidate_page,

	.launder_page = cifs_launder_page,

	/*

	 * TODO: investigate and if useful we could add an cifs_migratePage

	 * helper (under an CONFIG_MIGRATION) in the future, and also

	 * investigate and add an is_dirty_writeback helper if needed

	 */

	.swap_activate = cifs_swap_activate,

	.swap_deactivate = cifs_swap_deactivate,

};



/*