Commit 851f657a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.2-rc-smb3-client-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs client updates from Steve French:

 - SMB3.1.1 POSIX Extensions fixes

 - remove use of generic_writepages() and ->cifs_writepage(), in favor
   of ->cifs_writepages() and ->migrate_folio()

 - memory management fixes

 - mount parm parsing fixes

 - minor cleanup fixes

* tag '6.2-rc-smb3-client-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Remove duplicated include in cifsglob.h
  cifs: fix oops during encryption
  cifs: print warning when conflicting soft vs. hard mount options specified
  cifs: fix missing display of three mount options
  cifs: fix various whitespace errors in headers
  cifs: minor cleanup of some headers
  cifs: skip alloc when request has no pages
  cifs: remove ->writepage
  cifs: stop using generic_writepages
  cifs: wire up >migrate_folio
  cifs: Parse owner/group for stat in smb311 posix extensions
  cifs: Add "extbuf" and "extbuflen" args to smb2_compound_op()
  Fix path in cifs/usage.rst
parents ec9187ec d74f4a3f

Documentation/admin-guide/cifs/usage.rst

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ CIFS kernel module parameters 
These module parameters can be specified or modified either during the time of

module loading or during the runtime by using the interface::



	/proc/module/cifs/parameters/<param>

	/sys/module/cifs/parameters/<param>



i.e.::

fs/cifs/cifsfs.c

+7 −1
Original line number Diff line number Diff line
@@ -678,9 +678,15 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
	seq_printf(s, ",echo_interval=%lu",

			tcon->ses->server->echo_interval / HZ);



	/* Only display max_credits if it was overridden on mount */

	/* Only display the following if overridden on mount */

	if (tcon->ses->server->max_credits != SMB2_MAX_CREDITS_AVAILABLE)

		seq_printf(s, ",max_credits=%u", tcon->ses->server->max_credits);

	if (tcon->ses->server->tcp_nodelay)

		seq_puts(s, ",tcpnodelay");

	if (tcon->ses->server->noautotune)

		seq_puts(s, ",noautotune");

	if (tcon->ses->server->noblocksnd)

		seq_puts(s, ",noblocksend");



	if (tcon->snapshot_time)

		seq_printf(s, ",snapshot=%llu", tcon->snapshot_time);

fs/cifs/cifsfs.h

+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ extern int cifs_lock(struct file *, int, struct file_lock *); 
extern int cifs_fsync(struct file *, loff_t, loff_t, int);

extern int cifs_strict_fsync(struct file *, loff_t, loff_t, int);

extern int cifs_flush(struct file *, fl_owner_t id);

extern int cifs_file_mmap(struct file * , struct vm_area_struct *);

extern int cifs_file_strict_mmap(struct file * , struct vm_area_struct *);

extern int cifs_file_mmap(struct file *file, struct vm_area_struct *vma);

extern int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma);

extern const struct file_operations cifs_dir_ops;

extern int cifs_dir_open(struct inode *inode, struct file *file);

extern int cifs_readdir(struct file *file, struct dir_context *ctx);

fs/cifs/cifsglob.h

+73 −3
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <linux/in6.h>

#include <linux/inet.h>

#include <linux/slab.h>

#include <linux/scatterlist.h>

#include <linux/mm.h>

#include <linux/mempool.h>

#include <linux/workqueue.h>

#include <linux/utsname.h>
@@ -21,7 +23,6 @@ 
#include "cifs_fs_sb.h"

#include "cifsacl.h"

#include <crypto/internal/hash.h>

#include <linux/scatterlist.h>

#include <uapi/linux/cifs/cifs_mount.h>

#include "../smbfs_common/smb2pdu.h"

#include "smb2pdu.h"
@@ -785,6 +786,7 @@ static inline unsigned int 
in_flight(struct TCP_Server_Info *server)

{

	unsigned int num;



	spin_lock(&server->req_lock);

	num = server->in_flight;

	spin_unlock(&server->req_lock);
@@ -795,6 +797,7 @@ static inline bool 
has_credits(struct TCP_Server_Info *server, int *credits, int num_credits)

{

	int num;



	spin_lock(&server->req_lock);

	num = *credits;

	spin_unlock(&server->req_lock);
@@ -1025,7 +1028,7 @@ struct cifs_ses { 
	struct TCP_Server_Info *server;	/* pointer to server info */

	int ses_count;		/* reference counter */

	enum ses_status_enum ses_status;  /* updates protected by cifs_tcp_ses_lock */

	unsigned overrideSecFlg;  /* if non-zero override global sec flags */

	unsigned int overrideSecFlg; /* if non-zero override global sec flags */

	char *serverOS;		/* name of operating system underlying server */

	char *serverNOS;	/* name of network operating system of server */

	char *serverDomain;	/* security realm of server */
@@ -1381,7 +1384,7 @@ struct cifsFileInfo { 
	__u32 pid;		/* process id who opened file */

	struct cifs_fid fid;	/* file id from remote */

	struct list_head rlist; /* reconnect list */

	/* BB add lock scope info here if needed */ ;

	/* BB add lock scope info here if needed */

	/* lock scope id (0 if none) */

	struct dentry *dentry;

	struct tcon_link *tlink;
@@ -1769,6 +1772,7 @@ static inline void free_dfs_info_array(struct dfs_info3_param *param, 
				       int number_of_items)

{

	int i;



	if ((number_of_items == 0) || (param == NULL))

		return;

	for (i = 0; i < number_of_items; i++) {
@@ -2137,4 +2141,70 @@ static inline void move_cifs_info_to_smb2(struct smb2_file_all_info *dst, const 
	dst->FileNameLength = src->FileNameLength;

}



static inline unsigned int cifs_get_num_sgs(const struct smb_rqst *rqst,

					    int num_rqst,

					    const u8 *sig)

{

	unsigned int len, skip;

	unsigned int nents = 0;

	unsigned long addr;

	int i, j;



	/* Assumes the first rqst has a transform header as the first iov.

	 * I.e.

	 * rqst[0].rq_iov[0]  is transform header

	 * rqst[0].rq_iov[1+] data to be encrypted/decrypted

	 * rqst[1+].rq_iov[0+] data to be encrypted/decrypted

	 */

	for (i = 0; i < num_rqst; i++) {

		/*

		 * The first rqst has a transform header where the

		 * first 20 bytes are not part of the encrypted blob.

		 */

		for (j = 0; j < rqst[i].rq_nvec; j++) {

			struct kvec *iov = &rqst[i].rq_iov[j];



			skip = (i == 0) && (j == 0) ? 20 : 0;

			addr = (unsigned long)iov->iov_base + skip;

			if (unlikely(is_vmalloc_addr((void *)addr))) {

				len = iov->iov_len - skip;

				nents += DIV_ROUND_UP(offset_in_page(addr) + len,

						      PAGE_SIZE);

			} else {

				nents++;

			}

		}

		nents += rqst[i].rq_npages;

	}

	nents += DIV_ROUND_UP(offset_in_page(sig) + SMB2_SIGNATURE_SIZE, PAGE_SIZE);

	return nents;

}



/* We can not use the normal sg_set_buf() as we will sometimes pass a

 * stack object as buf.

 */

static inline struct scatterlist *cifs_sg_set_buf(struct scatterlist *sg,

						  const void *buf,

						  unsigned int buflen)

{

	unsigned long addr = (unsigned long)buf;

	unsigned int off = offset_in_page(addr);



	addr &= PAGE_MASK;

	if (unlikely(is_vmalloc_addr((void *)addr))) {

		do {

			unsigned int len = min_t(unsigned int, buflen, PAGE_SIZE - off);



			sg_set_page(sg++, vmalloc_to_page((void *)addr), len, off);



			off = 0;

			addr += PAGE_SIZE;

			buflen -= len;

		} while (buflen);

	} else {

		sg_set_page(sg++, virt_to_page(addr), buflen, off);

	}

	return sg;

}



#endif	/* _CIFS_GLOB_H */

fs/cifs/cifspdu.h

+21 −29
Original line number Diff line number Diff line
@@ -1752,8 +1752,7 @@ struct smb_com_transaction2_sfi_rsp { 
	struct smb_hdr hdr;	/* wct = 10 + SetupCount */

	struct trans2_resp t2;

	__u16 ByteCount;

	__u16 Reserved2;	/* parameter word reserved -

					present for infolevels > 100 */

	__u16 Reserved2; /* parameter word reserved - present for infolevels > 100 */

} __attribute__((packed));



struct smb_t2_qfi_req {
@@ -1768,8 +1767,7 @@ struct smb_t2_qfi_rsp { 
	struct smb_hdr hdr;     /* wct = 10 + SetupCount */

	struct trans2_resp t2;

	__u16 ByteCount;

	__u16 Reserved2;        /* parameter word reserved -

				   present for infolevels > 100 */

	__u16 Reserved2; /* parameter word reserved - present for infolevels > 100 */

} __attribute__((packed));



/*
@@ -2146,13 +2144,11 @@ typedef struct { 
#define CIFS_UNIX_POSIX_PATH_OPS_CAP    0x00000020 /* Allow new POSIX path based

						      calls including posix open

						      and posix unlink */

#define CIFS_UNIX_LARGE_READ_CAP        0x00000040 /* support reads >128K (up

						      to 0xFFFF00 */

#define CIFS_UNIX_LARGE_READ_CAP        0x00000040 /* support reads >128K (up to 0xFFFF00 */

#define CIFS_UNIX_LARGE_WRITE_CAP       0x00000080

#define CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP 0x00000100 /* can do SPNEGO crypt */

#define CIFS_UNIX_TRANSPORT_ENCRYPTION_MANDATORY_CAP  0x00000200 /* must do  */

#define CIFS_UNIX_PROXY_CAP             0x00000400 /* Proxy cap: 0xACE ioctl and

						      QFS PROXY call */

#define CIFS_UNIX_PROXY_CAP             0x00000400 /* Proxy cap: 0xACE ioctl and QFS PROXY call */

#ifdef CONFIG_CIFS_POSIX

/* presumably don't need the 0x20 POSIX_PATH_OPS_CAP since we never send

   LockingX instead of posix locking call on unix sess (and we do not expect
@@ -2368,8 +2364,7 @@ typedef struct { 


struct file_allocation_info {

	__le64 AllocationSize; /* Note old Samba srvr rounds this up too much */

} __attribute__((packed));	/* size used on disk, for level 0x103 for set,

				   0x105 for query */

} __packed; /* size used on disk, for level 0x103 for set, 0x105 for query */



struct file_end_of_file_info {

	__le64 FileSize;		/* offset to end of file */
@@ -2409,8 +2404,7 @@ struct cifs_posix_acl { /* access conrol list (ACL) */ 
	__le16	access_entry_count;  /* access ACL - count of entries */

	__le16	default_entry_count; /* default ACL - count of entries */

	struct cifs_posix_ace ace_array[];

	/* followed by

	struct cifs_posix_ace default_ace_arraay[] */

	/* followed by struct cifs_posix_ace default_ace_array[] */

} __attribute__((packed));  /* level 0x204 */



/* types of access control entries already defined in posix_acl.h */
@@ -2716,15 +2710,13 @@ typedef struct file_xattr_info { 
	__u32 xattr_value_len;

	char  xattr_name[];

	/* followed by xattr_value[xattr_value_len], no pad */

} __attribute__((packed)) FILE_XATTR_INFO; /* extended attribute info

					      level 0x205 */

} __packed FILE_XATTR_INFO; /* extended attribute info level 0x205 */



/* flags for lsattr and chflags commands removed arein uapi/linux/fs.h */



typedef struct file_chattr_info {

	__le64	mask; /* list of all possible attribute bits */

	__le64	mode; /* list of actual attribute bits on this inode */

} __attribute__((packed)) FILE_CHATTR_INFO;  /* ext attributes

						(chattr, chflags) level 0x206 */

} __packed FILE_CHATTR_INFO;  /* ext attributes (chattr, chflags) level 0x206 */

#endif				/* POSIX */

#endif				/* _CIFSPDU_H */