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

Merge tag '5.19-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd 

Pull ksmbd server updates from Steve French:

 - rdma (smbdirect) fixes, cleanup and optimizations

 - crediting (flow control) fix for mounts from Windows client

 - ACL fix

 - Windows client query dir fix

 - write validation fix

 - cleanups

* tag '5.19-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd:
  ksmbd: smbd: relax the count of sges required
  ksmbd: fix outstanding credits related bugs
  ksmbd: smbd: fix connection dropped issue
  ksmbd: Fix some kernel-doc comments
  ksmbd: fix wrong smbd max read/write size check
  ksmbd: add smbd max io size parameter
  ksmbd: handle smb2 query dir request for OutputBufferLength that is too small
  ksmbd: smbd: handle multiple Buffer descriptors
  ksmbd: smbd: change the return value of get_sg_list
  ksmbd: smbd: simplify tracking pending packets
  ksmbd: smbd: introduce read/write credits for RDMA read/write
  ksmbd: smbd: change prototypes of RDMA read/write related functions
  ksmbd: validate length in smb2_write()
  ksmbd: fix reference count leak in smb_check_perm_dacl()
parents 17eabd42 621433b7

fs/ksmbd/connection.c

+11 −11
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct ksmbd_conn *ksmbd_conn_alloc(void) 
	atomic_set(&conn->req_running, 0);

	atomic_set(&conn->r_count, 0);

	conn->total_credits = 1;

	conn->outstanding_credits = 1;

	conn->outstanding_credits = 0;



	init_waitqueue_head(&conn->req_running_q);

	INIT_LIST_HEAD(&conn->conns_list);
@@ -205,31 +205,31 @@ int ksmbd_conn_write(struct ksmbd_work *work) 
	return 0;

}



int ksmbd_conn_rdma_read(struct ksmbd_conn *conn, void *buf,

			 unsigned int buflen, u32 remote_key, u64 remote_offset,

			 u32 remote_len)

int ksmbd_conn_rdma_read(struct ksmbd_conn *conn,

			 void *buf, unsigned int buflen,

			 struct smb2_buffer_desc_v1 *desc,

			 unsigned int desc_len)

{

	int ret = -EINVAL;



	if (conn->transport->ops->rdma_read)

		ret = conn->transport->ops->rdma_read(conn->transport,

						      buf, buflen,

						      remote_key, remote_offset,

						      remote_len);

						      desc, desc_len);

	return ret;

}



int ksmbd_conn_rdma_write(struct ksmbd_conn *conn, void *buf,

			  unsigned int buflen, u32 remote_key,

			  u64 remote_offset, u32 remote_len)

int ksmbd_conn_rdma_write(struct ksmbd_conn *conn,

			  void *buf, unsigned int buflen,

			  struct smb2_buffer_desc_v1 *desc,

			  unsigned int desc_len)

{

	int ret = -EINVAL;



	if (conn->transport->ops->rdma_write)

		ret = conn->transport->ops->rdma_write(conn->transport,

						       buf, buflen,

						       remote_key, remote_offset,

						       remote_len);

						       desc, desc_len);

	return ret;

}

fs/ksmbd/connection.h

+16 −11
Original line number Diff line number Diff line
@@ -122,11 +122,14 @@ struct ksmbd_transport_ops { 
	int (*writev)(struct ksmbd_transport *t, struct kvec *iovs, int niov,

		      int size, bool need_invalidate_rkey,

		      unsigned int remote_key);

	int (*rdma_read)(struct ksmbd_transport *t, void *buf, unsigned int len,

			 u32 remote_key, u64 remote_offset, u32 remote_len);

	int (*rdma_write)(struct ksmbd_transport *t, void *buf,

			  unsigned int len, u32 remote_key, u64 remote_offset,

			  u32 remote_len);

	int (*rdma_read)(struct ksmbd_transport *t,

			 void *buf, unsigned int len,

			 struct smb2_buffer_desc_v1 *desc,

			 unsigned int desc_len);

	int (*rdma_write)(struct ksmbd_transport *t,

			  void *buf, unsigned int len,

			  struct smb2_buffer_desc_v1 *desc,

			  unsigned int desc_len);

};



struct ksmbd_transport {
@@ -148,12 +151,14 @@ struct ksmbd_conn *ksmbd_conn_alloc(void); 
void ksmbd_conn_free(struct ksmbd_conn *conn);

bool ksmbd_conn_lookup_dialect(struct ksmbd_conn *c);

int ksmbd_conn_write(struct ksmbd_work *work);

int ksmbd_conn_rdma_read(struct ksmbd_conn *conn, void *buf,

			 unsigned int buflen, u32 remote_key, u64 remote_offset,

			 u32 remote_len);

int ksmbd_conn_rdma_write(struct ksmbd_conn *conn, void *buf,

			  unsigned int buflen, u32 remote_key, u64 remote_offset,

			  u32 remote_len);

int ksmbd_conn_rdma_read(struct ksmbd_conn *conn,

			 void *buf, unsigned int buflen,

			 struct smb2_buffer_desc_v1 *desc,

			 unsigned int desc_len);

int ksmbd_conn_rdma_write(struct ksmbd_conn *conn,

			  void *buf, unsigned int buflen,

			  struct smb2_buffer_desc_v1 *desc,

			  unsigned int desc_len);

void ksmbd_conn_enqueue_request(struct ksmbd_work *work);

int ksmbd_conn_try_dequeue_request(struct ksmbd_work *work);

void ksmbd_conn_init_server_callbacks(struct ksmbd_conn_ops *ops);

fs/ksmbd/ksmbd_netlink.h

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ struct ksmbd_startup_request { 
					 */

	__u32	sub_auth[3];		/* Subauth value for Security ID */

	__u32	smb2_max_credits;	/* MAX credits */

	__u32	reserved[128];		/* Reserved room */

	__u32	smbd_max_io_size;	/* smbd read write size */

	__u32	reserved[127];		/* Reserved room */

	__u32	ifc_list_sz;		/* interfaces list size */

	__s8	____payload[];

};

fs/ksmbd/misc.c

+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 * wildcard '*' and '?'

 * TODO : implement consideration about DOS_DOT, DOS_QM and DOS_STAR

 *

 * @string:	string to compare with a pattern

 * @str:	string to compare with a pattern

 * @len:	string length

 * @pattern:	pattern string which might include wildcard '*' and '?'

 *
@@ -152,8 +152,8 @@ int parse_stream_name(char *filename, char **stream_name, int *s_type) 
/**

 * convert_to_nt_pathname() - extract and return windows path string

 *      whose share directory prefix was removed from file path

 * @filename : unix filename

 * @sharepath: share path string

 * @share: ksmbd_share_config pointer

 * @path: path to report

 *

 * Return : windows path string or error

 */
@@ -250,8 +250,8 @@ char *ksmbd_extract_sharename(char *treename) 


/**

 * convert_to_unix_name() - convert windows name to unix format

 * @path:	name to be converted

 * @tid:	tree id of mathing share

 * @share:	ksmbd_share_config pointer

 * @name:	file name that is relative to share

 *

 * Return:	converted name on success, otherwise NULL

 */

fs/ksmbd/smb2misc.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int smb2_validate_credit_charge(struct ksmbd_conn *conn, 
		ret = 1;

	}



	if ((u64)conn->outstanding_credits + credit_charge > conn->vals->max_credits) {

	if ((u64)conn->outstanding_credits + credit_charge > conn->total_credits) {

		ksmbd_debug(SMB, "Limits exceeding the maximum allowable outstanding requests, given : %u, pending : %u\n",

			    credit_charge, conn->outstanding_credits);

		ret = 1;