Witness protocol support for transparent failover
Subsystems (2)
v2 cover Witness protocol support for transparent failover
Changes from v1:
* Update SPDX header in user space API files to LGPL-2.1+ with Linux-syscall-note
[PATCH v2 01/11] cifs: Make extract_hostname function public [PATCH v2 02/11] cifs: Make extract_sharename function public [PATCH v2 03/11] cifs: Register generic netlink family [PATCH v2 04/11] cifs: add witness mount option and data structs [PATCH v2 05/11] cifs: Send witness register and unregister commands [PATCH v2 06/11] cifs: Set witness notification handler for messages [PATCH v2 07/11] cifs: Add witness information to debug data dump [PATCH v2 08/11] cifs: Send witness register messages to userspace [PATCH v2 09/11] cifs: Simplify reconnect code when dfs upcall is [PATCH v2 10/11] cifs: Handle witness client move notification [PATCH v2 11/11] cifs: Handle witness share moved notification
fs/cifs/Kconfig | 11 + fs/cifs/Makefile | 2 + fs/cifs/cache.c | 24 - fs/cifs/cifs_debug.c | 13 + fs/cifs/cifs_swn.c | 723 ++++++++++++++++++++++++ fs/cifs/cifs_swn.h | 25 + fs/cifs/cifsfs.c | 22 +- fs/cifs/cifsglob.h | 8 + fs/cifs/cifsproto.h | 2 + fs/cifs/connect.c | 141 +++-- fs/cifs/fscache.c | 1 + fs/cifs/fscache.h | 1 - fs/cifs/misc.c | 56 ++ fs/cifs/netlink.c | 88 +++ fs/cifs/netlink.h | 16 + include/uapi/linux/cifs/cifs_netlink.h | 63 +++ 16 files changed, 1117 insertions(+), 79 deletions(-)
PATCH v2 1/11 cifs: Make extract_hostname function public
Move the function to misc.c and give it a public header.
--- fs/cifs/cifsproto.h | 1 + fs/cifs/connect.c | 34 ---------------------------------- fs/cifs/misc.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 34 deletions(-)
fs/cifs/cifsproto.h +1 -0
@@ -620,6 +620,7 @@ int smb2_parse_query_directory(struct cifs_tcon *tcon, struct kvec *rsp_iov,struct super_block *cifs_get_tcp_super (struct TCP_Server_Info *server);void cifs_put_tcp_super (struct super_block *sb);int update_super_prepath (struct cifs_tcon *tcon,char *prefix); +char *extract_hostname (const char *unc);#ifdef CONFIG_CIFS_DFS_UPCALL static inline int get_dfs_path(const unsigned int xid, struct cifs_ses *ses,
fs/cifs/connect.c +0 -34
@@ -284,7 +284,6 @@ static int ip_connect(struct TCP_Server_Info *server);static int generic_ip_connect (struct TCP_Server_Info *server);static void tlink_rb_insert (struct rb_root *root,struct tcon_link *new_tlink);static void cifs_prune_tlinks (struct work_struct *work); -static char *extract_hostname (const char *unc);/* * Resolve hostname and set ip addr in tcp ses. Useful for hostnames that may
@@ -1230,39 +1229,6 @@ cifs_demultiplex_thread(void *p)module_put_and_exit (0 ); } -/* extract the host portion of the UNC string */ -static char * -extract_hostname (const char *unc) -{ -const char *src; -char *dst, *delim; -unsigned int len; - -/* skip double chars at beginning of string */ -/* BB: check validity of these bytes? */ -if (strlen (unc) <3 ) -return ERR_PTR (-EINVAL ); -for (src = unc; *src && *src =='\\' ; src++) - ; -if (!*src) -return ERR_PTR (-EINVAL ); - -/* delimiter between hostname and sharename is always '\\' now */ - delim =strchr (src,'\\' ); -if (!delim) -return ERR_PTR (-EINVAL ); - - len = delim - src; - dst =kmalloc ((len +1 ),GFP_KERNEL ); -if (dst ==NULL ) -return ERR_PTR (-ENOMEM ); - -memcpy (dst, src, len); - dst[len] ='\0' ; - -return dst; -} -static int get_option_ul (substring_t args[],unsigned long *option) {int rc;
fs/cifs/misc.c +32 -0
@@ -1195,3 +1195,35 @@ int update_super_prepath(struct cifs_tcon *tcon, char *prefix)cifs_put_tcon_super (sb);return rc; } + +/* extract the host portion of the UNC string */ +char *extract_hostname (const char *unc) +{ +const char *src; +char *dst, *delim; +unsigned int len; + +/* skip double chars at beginning of string */ +/* BB: check validity of these bytes? */ +if (strlen (unc) <3 ) +return ERR_PTR (-EINVAL ); +for (src = unc; *src && *src =='\\' ; src++) + ; +if (!*src) +return ERR_PTR (-EINVAL ); + +/* delimiter between hostname and sharename is always '\\' now */ + delim =strchr (src,'\\' ); +if (!delim) +return ERR_PTR (-EINVAL ); + + len = delim - src; + dst =kmalloc ((len +1 ),GFP_KERNEL ); +if (dst ==NULL ) +return ERR_PTR (-ENOMEM ); + +memcpy (dst, src, len); + dst[len] ='\0' ; + +return dst; +}
Signature · 1 line
2.29.0
PATCH v2 2/11 cifs: Make extract_sharename function public
In reply to Samuel CabreroMove the function to misc.c
--- fs/cifs/cache.c | 24 ------------------------ fs/cifs/cifsproto.h | 1 + fs/cifs/fscache.c | 1 + fs/cifs/fscache.h | 1 - fs/cifs/misc.c | 24 ++++++++++++++++++++++++ 5 files changed, 26 insertions(+), 25 deletions(-)
fs/cifs/cache.c +0 -24
@@ -53,30 +53,6 @@ const struct fscache_cookie_def cifs_fscache_server_index_def = { .type = FSCACHE_COOKIE_TYPE_INDEX, }; -char *extract_sharename (const char *treename) -{ -const char *src; -char *delim, *dst; -int len; - -/* skip double chars at the beginning */ - src = treename +2 ; - -/* share name is always preceded by '\\' now */ - delim =strchr (src,'\\' ); -if (!delim) -return ERR_PTR (-EINVAL ); - delim++; - len =strlen (delim); - -/* caller has to free the memory */ - dst =kstrndup (delim, len,GFP_KERNEL ); -if (!dst) -return ERR_PTR (-ENOMEM ); - -return dst; -} - static enum fscache_checkaux cifs_fscache_super_check_aux(void *cookie_netfs_data, const void *data,
fs/cifs/cifsproto.h +1 -0
@@ -621,6 +621,7 @@ struct super_block *cifs_get_tcp_super(struct TCP_Server_Info *server);void cifs_put_tcp_super (struct super_block *sb);int update_super_prepath (struct cifs_tcon *tcon,char *prefix);char *extract_hostname (const char *unc); +char *extract_sharename (const char *unc);#ifdef CONFIG_CIFS_DFS_UPCALL static inline int get_dfs_path(const unsigned int xid, struct cifs_ses *ses,
fs/cifs/fscache.c +1 -0
@@ -22,6 +22,7 @@#include "cifsglob.h" #include "cifs_debug.h" #include "cifs_fs_sb.h" +#include "cifsproto.h" /* * Key layout of CIFS server cache index object
fs/cifs/fscache.h +0 -1
@@ -57,7 +57,6 @@ extern const struct fscache_cookie_def cifs_fscache_inode_object_def;extern int cifs_fscache_register (void );extern void cifs_fscache_unregister (void ); -extern char *extract_sharename (const char *);/* * fscache.c
fs/cifs/misc.c +24 -0
@@ -1227,3 +1227,27 @@ char *extract_hostname(const char *unc)return dst; } + +char *extract_sharename (const char *unc) +{ +const char *src; +char *delim, *dst; +int len; + +/* skip double chars at the beginning */ + src = unc +2 ; + +/* share name is always preceded by '\\' now */ + delim =strchr (src,'\\' ); +if (!delim) +return ERR_PTR (-EINVAL ); + delim++; + len =strlen (delim); + +/* caller has to free the memory */ + dst =kstrndup (delim, len,GFP_KERNEL ); +if (!dst) +return ERR_PTR (-ENOMEM ); + +return dst; +}
Signature · 1 line
2.29.0
PATCH v2 3/11 cifs: Register generic netlink family
In reply to Samuel CabreroRegister a new generic netlink family to talk to the witness service userspace daemon.
--- fs/cifs/Kconfig | 11 +++++ fs/cifs/Makefile | 2 + fs/cifs/cifsfs.c | 17 ++++++- fs/cifs/netlink.c | 68 ++++++++++++++++++++++++++ fs/cifs/netlink.h | 16 ++++++ include/uapi/linux/cifs/cifs_netlink.h | 31 ++++++++++++ 6 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 fs/cifs/netlink.c create mode 100644 fs/cifs/netlink.h create mode 100644 include/uapi/linux/cifs/cifs_netlink.h
fs/cifs/Kconfig +11 -0
@@ -190,6 +190,17 @@ config CIFS_DFS_UPCALL servers if their addresses change or for implicit mounts of DFS junction points. If unsure, say Y. +config CIFS_SWN_UPCALL + bool "SWN feature support" + depends on CIFS + help + The Service Witness Protocol (SWN) is used to get notifications + from a highly available server of resource state changes. This + feature enables an upcall mechanism for CIFS which contacts an + userspace daemon to establish the DCE/RPC connection to retrieve + the cluster available interfaces and resource change notifications. + If unsure, say Y. + config CIFS_NFSD_EXPORT bool "Allow nfsd to export CIFS file system" depends on CIFS && BROKEN
fs/cifs/Makefile +2 -0
@@ -18,6 +18,8 @@ cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o dfs_cache.o +cifs-$(CONFIG_CIFS_SWN_UPCALL) += netlink.o + cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o cifs-$(CONFIG_CIFS_SMB_DIRECT) += smbdirect.o
fs/cifs/cifsfs.c +16 -1
@@ -55,6 +55,9 @@#ifdef CONFIG_CIFS_DFS_UPCALL #include "dfs_cache.h" #endif +#ifdef CONFIG_CIFS_SWN_UPCALL +#include "netlink.h" +#endif /* * DOS dates from 1980/1/1 through 2107/12/31
@@ -1617,10 +1620,15 @@ init_cifs(void)if (rc) goto out_destroy_dfs_cache;#endif /* CONFIG_CIFS_UPCALL */ +#ifdef CONFIG_CIFS_SWN_UPCALL + rc =cifs_genl_init (); +if (rc) + goto out_register_key_type; +#endif /* CONFIG_CIFS_SWN_UPCALL */ rc =init_cifs_idmap ();if (rc) - goto out_register_key_type; + goto out_cifs_swn_init; rc =register_filesystem (&cifs_fs_type);if (rc)
@@ -1636,7 +1644,11 @@ init_cifs(void) out_init_cifs_idmap:exit_cifs_idmap (); +out_cifs_swn_init: +#ifdef CONFIG_CIFS_SWN_UPCALL +cifs_genl_exit (); out_register_key_type: +#endif #ifdef CONFIG_CIFS_UPCALL exit_cifs_spnego (); out_destroy_dfs_cache:
@@ -1673,6 +1685,9 @@ exit_cifs(void)unregister_filesystem (&smb3_fs_type);cifs_dfs_release_automount_timer ();exit_cifs_idmap (); +#ifdef CONFIG_CIFS_SWN_UPCALL +cifs_genl_exit (); +#endif #ifdef CONFIG_CIFS_UPCALL exit_cifs_spnego ();#endif
fs/cifs/netlink.c new file +68 -0
68 lines not on this page · raw message
fs/cifs/netlink.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Netlink routines for CIFS +* +* Copyright (c) 2020 Samuel Cabrero <[email protected]> +*/ + +#ifndef _CIFS_NETLINK_H +#define _CIFS_NETLINK_H + +extern struct genl_family cifs_genl_family; + +extern int cifs_genl_init (void ); +extern void cifs_genl_exit (void ); + +#endif /* _CIFS_NETLINK_H */
include/uapi/linux/cifs/cifs_netlink.h new file +31 -0
@@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */ +/* +* Netlink routines for CIFS +* +* Copyright (c) 2020 Samuel Cabrero <[email protected]> +*/ + + +#ifndef _UAPILINUX_CIFS_NETLINK_H +#define _UAPILINUX_CIFS_NETLINK_H + +#define CIFS_GENL_NAME "cifs" +#define CIFS_GENL_VERSION 0x1 + +#define CIFS_GENL_MCGRP_SWN_NAME "cifs_mcgrp_swn" + +enum cifs_genl_multicast_groups { +CIFS_GENL_MCGRP_SWN , +}; + +enum cifs_genl_attributes { + __CIFS_GENL_ATTR_MAX, +}; +#define CIFS_GENL_ATTR_MAX (__CIFS_GENL_ATTR_MAX - 1) + +enum cifs_genl_commands { + __CIFS_GENL_CMD_MAX +}; +#define CIFS_GENL_CMD_MAX (__CIFS_GENL_CMD_MAX - 1) + +#endif /* _UAPILINUX_CIFS_NETLINK_H */
Signature · 1 line
2.29.0
kernel test robot
build botRe: [PATCH v2 03/11] cifs: Register generic netlink family
Thank you for the patch! Perhaps something to improve:
Hi Samuel,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on cifs/for-next]
[also build test WARNING on linus/master v5.10-rc1 next-20201027] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Samuel-Cabrero/Witness-protocol-support-for-transparent-failover/20201027-180948 base: git://git.samba.org/sfrench/cifs-2.6.git for-next config: xtensa-allyesconfig (attached as .config) compiler: xtensa-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/c097d4f8238be23b7a1e036c4b0e1e1c996a303d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Samuel-Cabrero/Witness-protocol-support-for-transparent-failover/20201027-180948 git checkout c097d4f8238be23b7a1e036c4b0e1e1c996a303d
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=xtensa
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> fs/cifs/netlink.c:42:5: warning: no previous prototype for 'cifs_genl_init' [-Wmissing-prototypes]
42 | int cifs_genl_init(void)
| ^~~~~~~~~~~~~~
>> fs/cifs/netlink.c:59:6: warning: no previous prototype for 'cifs_genl_exit' [-Wmissing-prototypes] 59 | void cifs_genl_exit(void)
| ^~~~~~~~~~~~~~
vim +/cifs_genl_init +42 fs/cifs/netlink.c
36
37 /**
38 * cifs_genl_init - Register generic netlink family
39 *
40 * Return zero if initialized successfully, otherwise non-zero.
41 */
> 42 int cifs_genl_init(void)
43 {
44 int ret;
45
46 ret = genl_register_family(&cifs_genl_family);
47 if (ret < 0) {
48 cifs_dbg(VFS, "%s: failed to register netlink family\n",
49 __func__);
50 return ret;
51 }
52
53 return 0;
54 }
55
56 /**
57 * cifs_genl_exit - Unregister generic netlink family
58 */
> 59 void cifs_genl_exit(void)---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v2 4/11 cifs: add witness mount option and data structs
In reply to Samuel CabreroAdd 'witness' mount option to register for witness notifications.
--- fs/cifs/cifsfs.c | 5 +++++ fs/cifs/cifsglob.h | 4 ++++ fs/cifs/connect.c | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-)
fs/cifs/cifsfs.c +5 -0
@@ -637,6 +637,11 @@ cifs_show_options(struct seq_file *s, struct dentry *root)seq_printf (s,",multichannel,max_channels=%zu" , tcon->ses->chan_max); +#ifdef CONFIG_CIFS_SWN_UPCALL +if (tcon->use_witness) +seq_puts (s,",witness" ); +#endif +return 0 ; }
fs/cifs/cifsglob.h +4 -0
@@ -619,6 +619,7 @@ struct smb_vol {unsigned int max_channels;__u16 compression;/* compression algorithm 0xFFFF default 0=disabled */ bool rootfs:1; /* if it's a SMB root file system */ + bool witness:1; /* use witness protocol */ };/**
@@ -1177,6 +1178,9 @@ struct cifs_tcon { int remap:2;struct list_head ulist;/* cache update list */ #endif +#ifdef CONFIG_CIFS_SWN_UPCALL + bool use_witness:1; /* use witness protocol */ +#endif };/*
fs/cifs/connect.c +34 -1
@@ -102,7 +102,7 @@ enum { Opt_resilient, Opt_noresilient, Opt_domainauto, Opt_rdma, Opt_modesid, Opt_rootfs, Opt_multichannel, Opt_nomultichannel, - Opt_compress, + Opt_compress, Opt_witness,/* Mount options which take numeric value */ Opt_backupuid, Opt_backupgid, Opt_uid,
@@ -276,6 +276,7 @@ static const match_table_t cifs_mount_option_tokens = { { Opt_ignore, "relatime" }, { Opt_ignore, "_netdev" }, { Opt_rootfs, "rootfs" }, + { Opt_witness, "witness" }, { Opt_err, NULL } };
@@ -1538,6 +1539,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, vol->rootfs = true;#endif break ; +case Opt_witness: +#ifndef CONFIG_CIFS_SWN_UPCALL +cifs_dbg (VFS ,"Witness support needs CONFIG_CIFS_SWN_UPCALL kernel config option set\n" ); + goto cifs_parse_mount_err; +#endif + vol->witness = true; +break ;case Opt_posixpaths: vol->posix_paths =1 ;break ;
@@ -3158,6 +3166,8 @@ cifs_put_tcon(struct cifs_tcon *tcon)return ; } +/* TODO witness unregister */ +list_del_init (&tcon->tcon_list);spin_unlock (&cifs_tcp_ses_lock);
@@ -3319,6 +3329,26 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb_vol *volume_info) tcon->use_resilient = true; } +#ifdef CONFIG_CIFS_SWN_UPCALL + tcon->use_witness = false; +if (volume_info->witness) { +if (ses->server->vals->protocol_id >=SMB30_PROT_ID ) { +if (tcon->capabilities &SMB2_SHARE_CAP_CLUSTER ) { +/* TODO witness register */ + tcon->use_witness = true; + }else { +cifs_dbg (VFS ,"witness requested on mount but no CLUSTER capability on share\n" ); + rc = -EOPNOTSUPP ; + goto out_fail; + } + }else { +cifs_dbg (VFS ,"SMB3 or later required for witness option\n" ); + rc = -EOPNOTSUPP ; + goto out_fail; + } + } +#endif +/* If the user really knows what they are doing they can override */ if (tcon->share_flags &SMB2_SHAREFLAG_NO_CACHING ) {if (volume_info->cache_ro)
@@ -5070,6 +5100,9 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid) vol_info->sectype = master_tcon->ses->sectype; vol_info->sign = master_tcon->ses->sign; vol_info->seal = master_tcon->seal; +#ifdef CONFIG_CIFS_SWN_UPCALL + vol_info->witness = master_tcon->use_witness; +#endif rc =cifs_set_vol_auth (vol_info, master_tcon->ses);if (rc) {
Signature · 1 line
2.29.0
PATCH v2 5/11 cifs: Send witness register and unregister commands to userspace daemon
In reply to Samuel Cabrero+ Define the generic netlink family commands and message attributes to communicate with the userspace daemon
+ The register and unregister commands are sent when connecting or disconnecting a tree. The witness registration keeps a pointer to the tcon and has the same lifetime.
+ Each registration has an id allocated by an IDR. This id is sent to the userspace daemon in the register command, and will be included in the notification messages from the userspace daemon to retrieve from the IDR the matching registration.
+ The authentication information is bundled in the register message. If kerberos is used the message just carries a flag.
--- fs/cifs/Makefile | 2 +- fs/cifs/cifs_swn.c | 417 +++++++++++++++++++++++++ fs/cifs/cifs_swn.h | 17 + fs/cifs/connect.c | 26 +- fs/cifs/netlink.c | 11 + include/uapi/linux/cifs/cifs_netlink.h | 15 + 6 files changed, 485 insertions(+), 3 deletions(-) create mode 100644 fs/cifs/cifs_swn.c create mode 100644 fs/cifs/cifs_swn.h
fs/cifs/Makefile +1 -1
@@ -18,7 +18,7 @@ cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o dfs_cache.o -cifs-$(CONFIG_CIFS_SWN_UPCALL) += netlink.o +cifs-$(CONFIG_CIFS_SWN_UPCALL) += netlink.o cifs_swn.o cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o
fs/cifs/cifs_swn.c new file +417 -0
417 lines not on this page · raw message
fs/cifs/cifs_swn.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Witness Service client for CIFS +* +* Copyright (c) 2020 Samuel Cabrero <[email protected]> +*/ + +#ifndef _CIFS_SWN_H +#define _CIFS_SWN_H + +struct cifs_tcon ; + +extern int cifs_swn_register (struct cifs_tcon *tcon); + +extern int cifs_swn_unregister (struct cifs_tcon *tcon); + +#endif /* _CIFS_SWN_H */
fs/cifs/connect.c +24 -2
@@ -62,6 +62,9 @@#include "dfs_cache.h" #endif #include "fs_context.h" +#ifdef CONFIG_CIFS_SWN_UPCALL +#include "cifs_swn.h" +#endif extern mempool_t *cifs_req_poolp;extern bool disable_legacy_dialects;
@@ -3166,7 +3169,17 @@ cifs_put_tcon(struct cifs_tcon *tcon)return ; } -/* TODO witness unregister */ +#ifdef CONFIG_CIFS_SWN_UPCALL +if (tcon->use_witness) { +int rc; + + rc =cifs_swn_unregister (tcon); +if (rc <0 ) { +cifs_dbg (VFS ,"%s: Failed to unregister for witness notifications: %d\n" , + __func__, rc); + } + } +#endif list_del_init (&tcon->tcon_list);spin_unlock (&cifs_tcp_ses_lock);
@@ -3334,8 +3347,17 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb_vol *volume_info)if (volume_info->witness) {if (ses->server->vals->protocol_id >=SMB30_PROT_ID ) {if (tcon->capabilities &SMB2_SHARE_CAP_CLUSTER ) { -/* TODO witness register */ +/* +* Set witness in use flag in first place +* to retry registration in the echo task +*/ tcon->use_witness = true; +/* And try to register immediately */ + rc =cifs_swn_register (tcon); +if (rc <0 ) { +cifs_dbg (VFS ,"Failed to register for witness notifications: %d\n" , rc); + goto out_fail; + } }else {cifs_dbg (VFS ,"witness requested on mount but no CLUSTER capability on share\n" ); rc = -EOPNOTSUPP ;
fs/cifs/netlink.c +11 -0
@@ -12,6 +12,17 @@#include "cifs_debug.h" static const struct nla_policy cifs_genl_policy[CIFS_GENL_ATTR_MAX +1 ] = { + [CIFS_GENL_ATTR_SWN_REGISTRATION_ID ] = { .type =NLA_U32 }, + [CIFS_GENL_ATTR_SWN_NET_NAME ] = { .type =NLA_STRING }, + [CIFS_GENL_ATTR_SWN_SHARE_NAME ] = { .type =NLA_STRING }, + [CIFS_GENL_ATTR_SWN_IP ] = { .len =sizeof (struct sockaddr_storage ) }, + [CIFS_GENL_ATTR_SWN_NET_NAME_NOTIFY ] = { .type =NLA_FLAG }, + [CIFS_GENL_ATTR_SWN_SHARE_NAME_NOTIFY ] = { .type =NLA_FLAG }, + [CIFS_GENL_ATTR_SWN_IP_NOTIFY ] = { .type =NLA_FLAG }, + [CIFS_GENL_ATTR_SWN_KRB_AUTH ] = { .type =NLA_FLAG }, + [CIFS_GENL_ATTR_SWN_USER_NAME ] = { .type =NLA_STRING }, + [CIFS_GENL_ATTR_SWN_PASSWORD ] = { .type =NLA_STRING }, + [CIFS_GENL_ATTR_SWN_DOMAIN_NAME ] = { .type =NLA_STRING }, };static struct genl_ops cifs_genl_ops[] = {
include/uapi/linux/cifs/cifs_netlink.h +15 -0
@@ -19,11 +19,26 @@ enum cifs_genl_multicast_groups { };enum cifs_genl_attributes { +CIFS_GENL_ATTR_UNSPEC , +CIFS_GENL_ATTR_SWN_REGISTRATION_ID , +CIFS_GENL_ATTR_SWN_NET_NAME , +CIFS_GENL_ATTR_SWN_SHARE_NAME , +CIFS_GENL_ATTR_SWN_IP , +CIFS_GENL_ATTR_SWN_NET_NAME_NOTIFY , +CIFS_GENL_ATTR_SWN_SHARE_NAME_NOTIFY , +CIFS_GENL_ATTR_SWN_IP_NOTIFY , +CIFS_GENL_ATTR_SWN_KRB_AUTH , +CIFS_GENL_ATTR_SWN_USER_NAME , +CIFS_GENL_ATTR_SWN_PASSWORD , +CIFS_GENL_ATTR_SWN_DOMAIN_NAME , __CIFS_GENL_ATTR_MAX, };#define CIFS_GENL_ATTR_MAX (__CIFS_GENL_ATTR_MAX - 1)enum cifs_genl_commands { +CIFS_GENL_CMD_UNSPEC , +CIFS_GENL_CMD_SWN_REGISTER , +CIFS_GENL_CMD_SWN_UNREGISTER , __CIFS_GENL_CMD_MAX };#define CIFS_GENL_CMD_MAX (__CIFS_GENL_CMD_MAX - 1)
Signature · 1 line
2.29.0
PATCH v2 6/11 cifs: Set witness notification handler for messages from userspace daemon
In reply to Samuel Cabrero+ Set a handler for the witness notification messages received from the userspace daemon.
+ Handle the resource state change notification. When the resource becomes unavailable or available set the tcp status to CifsNeedReconnect for all channels.
--- fs/cifs/cifs_swn.c | 86 ++++++++++++++++++++++++++ fs/cifs/cifs_swn.h | 4 ++ fs/cifs/netlink.c | 9 +++ include/uapi/linux/cifs/cifs_netlink.h | 17 +++++ 4 files changed, 116 insertions(+)
fs/cifs/cifs_swn.c +86 -0
@@ -379,6 +379,92 @@ static void cifs_put_swn_reg(struct cifs_swn_reg *swnreg)mutex_unlock (&cifs_swnreg_idr_mutex); } +static int cifs_swn_resource_state_changed (struct cifs_swn_reg *swnreg,const char *name,int state) +{ +int i; + +switch (state) { +case CIFS_SWN_RESOURCE_STATE_UNAVAILABLE : +cifs_dbg (FYI ,"%s: resource name '%s' become unavailable\n" , __func__, name); +for (i =0 ; i < swnreg->tcon->ses->chan_count; i++) { +spin_lock (&GlobalMid_Lock); +if (swnreg->tcon->ses->chans[i].server->tcpStatus != CifsExiting) + swnreg->tcon->ses->chans[i].server->tcpStatus = CifsNeedReconnect; +spin_unlock (&GlobalMid_Lock); + } +break ; +case CIFS_SWN_RESOURCE_STATE_AVAILABLE : +cifs_dbg (FYI ,"%s: resource name '%s' become available\n" , __func__, name); +for (i =0 ; i < swnreg->tcon->ses->chan_count; i++) { +spin_lock (&GlobalMid_Lock); +if (swnreg->tcon->ses->chans[i].server->tcpStatus != CifsExiting) + swnreg->tcon->ses->chans[i].server->tcpStatus = CifsNeedReconnect; +spin_unlock (&GlobalMid_Lock); + } +break ; +case CIFS_SWN_RESOURCE_STATE_UNKNOWN : +cifs_dbg (FYI ,"%s: resource name '%s' changed to unknown state\n" , __func__, name); +break ; + } +return 0 ; +} + +int cifs_swn_notify (struct sk_buff *skb,struct genl_info *info) +{ +struct cifs_swn_reg *swnreg; +char name[256 ]; +int type; + +if (info->attrs[CIFS_GENL_ATTR_SWN_REGISTRATION_ID ]) { +int swnreg_id; + + swnreg_id =nla_get_u32 (info->attrs[CIFS_GENL_ATTR_SWN_REGISTRATION_ID ]); +mutex_lock (&cifs_swnreg_idr_mutex); + swnreg =idr_find (&cifs_swnreg_idr, swnreg_id); +mutex_unlock (&cifs_swnreg_idr_mutex); +if (swnreg ==NULL ) { +cifs_dbg (FYI ,"%s: registration id %d not found\n" , __func__, swnreg_id); +return -EINVAL ; + } + }else { +cifs_dbg (FYI ,"%s: missing registration id attribute\n" , __func__); +return -EINVAL ; + } + +if (info->attrs[CIFS_GENL_ATTR_SWN_NOTIFICATION_TYPE ]) { + type =nla_get_u32 (info->attrs[CIFS_GENL_ATTR_SWN_NOTIFICATION_TYPE ]); + }else { +cifs_dbg (FYI ,"%s: missing notification type attribute\n" , __func__); +return -EINVAL ; + } + +switch (type) { +case CIFS_SWN_NOTIFICATION_RESOURCE_CHANGE : { +int state; + +if (info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_NAME ]) { +nla_strlcpy (name, info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_NAME ], +sizeof (name)); + }else { +cifs_dbg (FYI ,"%s: missing resource name attribute\n" , __func__); +return -EINVAL ; + } +if (info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_STATE ]) { + state =nla_get_u32 (info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_STATE ]); + }else { +cifs_dbg (FYI ,"%s: missing resource state attribute\n" , __func__); +return -EINVAL ; + } +return cifs_swn_resource_state_changed (swnreg, name, state); + } +default : +cifs_dbg (FYI ,"%s: unknown notification type %d\n" , __func__, type); +break ; + } + +return 0 ; +} +int cifs_swn_register (struct cifs_tcon *tcon) {struct cifs_swn_reg *swnreg;
fs/cifs/cifs_swn.h +4 -0
@@ -9,9 +9,13 @@#define _CIFS_SWN_Hstruct cifs_tcon ; +struct sk_buff ; +struct genl_info ;extern int cifs_swn_register (struct cifs_tcon *tcon);extern int cifs_swn_unregister (struct cifs_tcon *tcon); +extern int cifs_swn_notify (struct sk_buff *skb,struct genl_info *info); +#endif /* _CIFS_SWN_H */
fs/cifs/netlink.c +9 -0
@@ -10,6 +10,7 @@#include "cifsglob.h" #include "cifs_debug.h" +#include "cifs_swn.h" static const struct nla_policy cifs_genl_policy[CIFS_GENL_ATTR_MAX +1 ] = { [CIFS_GENL_ATTR_SWN_REGISTRATION_ID ] = { .type =NLA_U32 },
@@ -23,9 +24,17 @@ static const struct nla_policy cifs_genl_policy[CIFS_GENL_ATTR_MAX + 1] = { [CIFS_GENL_ATTR_SWN_USER_NAME] = { .type = NLA_STRING }, [CIFS_GENL_ATTR_SWN_PASSWORD] = { .type = NLA_STRING }, [CIFS_GENL_ATTR_SWN_DOMAIN_NAME] = { .type = NLA_STRING }, + [CIFS_GENL_ATTR_SWN_NOTIFICATION_TYPE] = { .type = NLA_U32 }, + [CIFS_GENL_ATTR_SWN_RESOURCE_STATE] = { .type = NLA_U32 }, + [CIFS_GENL_ATTR_SWN_RESOURCE_NAME] = { .type = NLA_STRING}, };static struct genl_ops cifs_genl_ops[] = { + { + .cmd =CIFS_GENL_CMD_SWN_NOTIFY , + .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , + .doit = cifs_swn_notify, + }, };static const struct genl_multicast_group cifs_genl_mcgrps[] = {
include/uapi/linux/cifs/cifs_netlink.h +17 -0
@@ -31,6 +31,9 @@ enum cifs_genl_attributes {CIFS_GENL_ATTR_SWN_USER_NAME ,CIFS_GENL_ATTR_SWN_PASSWORD ,CIFS_GENL_ATTR_SWN_DOMAIN_NAME , +CIFS_GENL_ATTR_SWN_NOTIFICATION_TYPE , +CIFS_GENL_ATTR_SWN_RESOURCE_STATE , +CIFS_GENL_ATTR_SWN_RESOURCE_NAME , __CIFS_GENL_ATTR_MAX, };#define CIFS_GENL_ATTR_MAX (__CIFS_GENL_ATTR_MAX - 1)
@@ -39,8 +42,22 @@ enum cifs_genl_commands {CIFS_GENL_CMD_UNSPEC ,CIFS_GENL_CMD_SWN_REGISTER ,CIFS_GENL_CMD_SWN_UNREGISTER , +CIFS_GENL_CMD_SWN_NOTIFY , __CIFS_GENL_CMD_MAX };#define CIFS_GENL_CMD_MAX (__CIFS_GENL_CMD_MAX - 1) +enum cifs_swn_notification_type { +CIFS_SWN_NOTIFICATION_RESOURCE_CHANGE =0x01 , +CIFS_SWN_NOTIFICATION_CLIENT_MOVE =0x02 , +CIFS_SWN_NOTIFICATION_SHARE_MOVE =0x03 , +CIFS_SWN_NOTIFICATION_IP_CHANGE =0x04 , +}; + +enum cifs_swn_resource_state { +CIFS_SWN_RESOURCE_STATE_UNKNOWN =0x00 , +CIFS_SWN_RESOURCE_STATE_AVAILABLE =0x01 , +CIFS_SWN_RESOURCE_STATE_UNAVAILABLE =0xFF +}; +#endif /* _UAPILINUX_CIFS_NETLINK_H */
Signature · 1 line
2.29.0
PATCH v2 7/11 cifs: Add witness information to debug data dump
In reply to Samuel Cabrero+ Indicate if witness feature is supported
+ Indicate if witness is used when dumping tcons
+ Dumps witness registrations. Example:
Witness registrations:
Id: 1 Refs: 1 Network name: 'fs.fover.ad'(y) Share name: 'share1'(y) \
Ip address: 192.168.103.200(n)--- fs/cifs/cifs_debug.c | 13 +++++++++++++ fs/cifs/cifs_swn.c | 35 +++++++++++++++++++++++++++++++++++ fs/cifs/cifs_swn.h | 2 ++ 3 files changed, 50 insertions(+)
fs/cifs/cifs_debug.c +13 -0
@@ -23,6 +23,9 @@#ifdef CONFIG_CIFS_SMB_DIRECT #include "smbdirect.h" #endif +#ifdef CONFIG_CIFS_SWN_UPCALL +#include "cifs_swn.h" +#endif void cifs_dump_mem (char *label,void *data,int length)
@@ -115,6 +118,10 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon)seq_printf (m," POSIX Extensions" );if (tcon->ses->server->ops->dump_share_caps) tcon->ses->server->ops->dump_share_caps (m, tcon); +#ifdef CONFIG_CIFS_SWN_UPCALL +if (tcon->use_witness) +seq_puts (m," Witness" ); +#endif if (tcon->need_reconnect)seq_puts (m,"\tDISCONNECTED " );
@@ -262,6 +269,9 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,",XATTR" );#endif seq_printf (m,",ACL" ); +#ifdef CONFIG_CIFS_SWN_UPCALL +seq_puts (m,",WITNESS" ); +#endif seq_putc (m,'\n' );seq_printf (m,"CIFSMaxBufSize: %d\n" , CIFSMaxBufSize);seq_printf (m,"Active VFS Requests: %d\n" , GlobalTotalActiveXid);
@@ -462,6 +472,9 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)spin_unlock (&cifs_tcp_ses_lock);seq_putc (m,'\n' ); +#ifdef CONFIG_CIFS_SWN_UPCALL +cifs_swn_dump (m); +#endif /* BB add code to dump additional info such as TCP session info now */ return 0 ; }
fs/cifs/cifs_swn.c +35 -0
@@ -501,3 +501,38 @@ int cifs_swn_unregister(struct cifs_tcon *tcon)return 0 ; } + +void cifs_swn_dump (struct seq_file *m) +{ +struct cifs_swn_reg *swnreg; +struct sockaddr_in *sa; +struct sockaddr_in6 *sa6; +int id; + +seq_puts (m,"Witness registrations:" ); + +mutex_lock (&cifs_swnreg_idr_mutex); +idr_for_each_entry (&cifs_swnreg_idr, swnreg, id) { +seq_printf (m,"\nId: %u Refs: %u Network name: '%s'%s Share name: '%s'%s Ip address: " , + id,kref_read (&swnreg->ref_count), + swnreg->net_name, swnreg->net_name_notify ?"(y)" :"(n)" , + swnreg->share_name, swnreg->share_name_notify ?"(y)" :"(n)" ); +switch (swnreg->tcon->ses->server->dstaddr.ss_family) { +case AF_INET : + sa = (struct sockaddr_in *) &swnreg->tcon->ses->server->dstaddr; +seq_printf (m,"%pI4" , &sa->sin_addr.s_addr); +break ; +case AF_INET6 : + sa6 = (struct sockaddr_in6 *) &swnreg->tcon->ses->server->dstaddr; +seq_printf (m,"%pI6" , &sa6->sin6_addr.s6_addr); +if (sa6->sin6_scope_id) +seq_printf (m,"%%%u" , sa6->sin6_scope_id); +break ; +default : +seq_puts (m,"(unknown)" ); + } +seq_printf (m,"%s" , swnreg->ip_notify ?"(y)" :"(n)" ); + } +mutex_unlock (&cifs_swnreg_idr_mutex); +seq_puts (m,"\n" ); +}
fs/cifs/cifs_swn.h +2 -0
@@ -18,4 +18,6 @@ extern int cifs_swn_unregister(struct cifs_tcon *tcon);extern int cifs_swn_notify (struct sk_buff *skb,struct genl_info *info); +extern void cifs_swn_dump (struct seq_file *m); +#endif /* _CIFS_SWN_H */
Signature · 1 line
2.29.0
PATCH v2 8/11 cifs: Send witness register messages to userspace daemon in echo task
In reply to Samuel CabreroIf the daemon starts after mounting a share, or if it crashes, this provides a mechanism to register again.
--- fs/cifs/cifs_swn.c | 15 +++++++++++++++ fs/cifs/cifs_swn.h | 2 ++ fs/cifs/connect.c | 5 +++++ 3 files changed, 22 insertions(+)
fs/cifs/cifs_swn.c +15 -0
@@ -536,3 +536,18 @@ void cifs_swn_dump(struct seq_file *m)mutex_unlock (&cifs_swnreg_idr_mutex);seq_puts (m,"\n" ); } + +void cifs_swn_check (void ) +{ +struct cifs_swn_reg *swnreg; +int id; +int ret; + +mutex_lock (&cifs_swnreg_idr_mutex); +idr_for_each_entry (&cifs_swnreg_idr, swnreg, id) { + ret =cifs_swn_send_register_message (swnreg); +if (ret <0 ) +cifs_dbg (FYI ,"%s: Failed to send register message: %d\n" , __func__, ret); + } +mutex_unlock (&cifs_swnreg_idr_mutex); +}
fs/cifs/cifs_swn.h +2 -0
@@ -20,4 +20,6 @@ extern int cifs_swn_notify(struct sk_buff *skb, struct genl_info *info);extern void cifs_swn_dump (struct seq_file *m); +extern void cifs_swn_check (void ); +#endif /* _CIFS_SWN_H */
fs/cifs/connect.c +5 -0
@@ -613,6 +613,11 @@ cifs_echo_request(struct work_struct *work)cifs_dbg (FYI ,"Unable to send echo request to server: %s\n" , server->hostname); +#ifdef CONFIG_CIFS_SWN_UPCALL +/* Check witness registrations */ +cifs_swn_check (); +#endif + requeue_echo:queue_delayed_work (cifsiod_wq, &server->echo, server->echo_interval); }
Signature · 1 line
2.29.0
PATCH v2 9/11 cifs: Simplify reconnect code when dfs upcall is enabled
In reply to Samuel CabreroSome witness notifications, like client move, tell the client to reconnect to a specific IP address. In this situation the DFS failover code path has to be skipped so clean up as much as possible the cifs_reconnect() code.
--- fs/cifs/connect.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
fs/cifs/connect.c +8 -13
@@ -296,7 +296,7 @@ static void cifs_prune_tlinks(struct work_struct *work);* This should be called with server->srv_mutex held. */ #ifdef CONFIG_CIFS_DFS_UPCALL -static int reconn_set_ipaddr (struct TCP_Server_Info *server) +static int reconn_set_ipaddr_from_hostname (struct TCP_Server_Info *server) {int rc;int len;
@@ -331,14 +331,7 @@ static int reconn_set_ipaddr(struct TCP_Server_Info *server)return !rc ?-1 :0 ; } -#else -static inline int reconn_set_ipaddr (struct TCP_Server_Info *server) -{ -return 0 ; -} -#endif -#ifdef CONFIG_CIFS_DFS_UPCALL /* These functions must be called with server->srv_mutex held */ static void reconn_set_next_dfs_target(struct TCP_Server_Info *server, struct cifs_sb_info *cifs_sb,
@@ -346,6 +339,7 @@ static void reconn_set_next_dfs_target(struct TCP_Server_Info *server, struct dfs_cache_tgt_iterator **tgt_it) {const char *name; +int rc;if (!cifs_sb || !cifs_sb->origin_fullpath)return ;
@@ -370,6 +364,12 @@ static void reconn_set_next_dfs_target(struct TCP_Server_Info *server,"%s: failed to extract hostname from target: %ld\n" , __func__, PTR_ERR(server->hostname)); } + + rc =reconn_set_ipaddr_from_hostname (server); +if (rc) { +cifs_dbg (FYI ,"%s: failed to resolve hostname: %d\n" , + __func__, rc); + } } static inline int reconn_setup_dfs_targets(struct cifs_sb_info *cifs_sb,
@@ -528,11 +528,6 @@ cifs_reconnect(struct TCP_Server_Info *server)*/ reconn_set_next_dfs_target (server, cifs_sb, &tgt_list, &tgt_it);#endif - rc =reconn_set_ipaddr (server); -if (rc) { -cifs_dbg (FYI ,"%s: failed to resolve hostname: %d\n" , - __func__, rc); - }if (cifs_rdma_enabled (server)) rc =smbd_reconnect (server);
Signature · 1 line
2.29.0
PATCH v2 10/11 cifs: Handle witness client move notification
In reply to Samuel CabreroThis message is sent to tell a client to close its current connection and connect to the specified address.
--- fs/cifs/cifs_swn.c | 140 ++++++++++++++++++++++++++++++++++++++++++++- fs/cifs/cifsglob.h | 4 ++ fs/cifs/connect.c | 26 +++++++-- 3 files changed, 162 insertions(+), 8 deletions(-)
fs/cifs/cifs_swn.c +138 -2
@@ -78,6 +78,7 @@ static int cifs_swn_send_register_message(struct cifs_swn_reg *swnreg)struct sk_buff *skb;struct genlmsghdr *hdr;enum securityEnum authtype; +struct sockaddr_storage *addr;int ret; skb =genlmsg_new (NLMSG_DEFAULT_SIZE ,GFP_KERNEL );
@@ -104,8 +105,18 @@ static int cifs_swn_send_register_message(struct cifs_swn_reg *swnreg)if (ret <0 ) goto nlmsg_fail; - ret =nla_put (skb,CIFS_GENL_ATTR_SWN_IP ,sizeof (struct sockaddr_storage ), - &swnreg->tcon->ses->server->dstaddr); +/* +* If there is an address stored use it instead of the server address, because we are +* in the process of reconnecting to it after a share has been moved or we have been +* told to switch to it (client move message). In these cases we unregister from the +* server address and register to the new address when we receive the notification. +*/ +if (swnreg->tcon->ses->server->use_swn_dstaddr) + addr = &swnreg->tcon->ses->server->swn_dstaddr; +else + addr = &swnreg->tcon->ses->server->dstaddr; + + ret =nla_put (skb,CIFS_GENL_ATTR_SWN_IP ,sizeof (struct sockaddr_storage ), addr);if (ret <0 ) goto nlmsg_fail;
@@ -409,6 +420,120 @@ static int cifs_swn_resource_state_changed(struct cifs_swn_reg *swnreg, const chreturn 0 ; } +static bool cifs_sockaddr_equal (struct sockaddr_storage *addr1,struct sockaddr_storage *addr2) +{ +if (addr1->ss_family != addr2->ss_family) +return false; + +if (addr1->ss_family ==AF_INET ) { +return (memcmp (&((const struct sockaddr_in *)addr1)->sin_addr, + &((const struct sockaddr_in *)addr2)->sin_addr, +sizeof (struct in_addr )) ==0 ); + } + +if (addr1->ss_family ==AF_INET6 ) { +return (memcmp (&((const struct sockaddr_in6 *)addr1)->sin6_addr, + &((const struct sockaddr_in6 *)addr2)->sin6_addr, +sizeof (struct in6_addr )) ==0 ); + } + +return false; +} + +static int cifs_swn_store_swn_addr (const struct sockaddr_storage *new, +const struct sockaddr_storage *old, +struct sockaddr_storage *dst) +{ +__be16 port; + +if (old->ss_family ==AF_INET ) { +struct sockaddr_in *ipv4 = (struct sockaddr_in *)old; + + port = ipv4->sin_port; + } + +if (old->ss_family ==AF_INET6 ) { +struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)old; + + port = ipv6->sin6_port; + } + +if (new->ss_family ==AF_INET ) { +struct sockaddr_in *ipv4 = (struct sockaddr_in *)new; + + ipv4->sin_port = port; + } + +if (new->ss_family ==AF_INET6 ) { +struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)new; + + ipv6->sin6_port = port; + } + + *dst = *new; + +return 0 ; +} + +static int cifs_swn_reconnect (struct cifs_tcon *tcon,struct sockaddr_storage *addr) +{ +/* Store the reconnect address */ +mutex_lock (&tcon->ses->server->srv_mutex); +if (!cifs_sockaddr_equal (&tcon->ses->server->dstaddr, addr)) { +int ret; + + ret =cifs_swn_store_swn_addr (addr, &tcon->ses->server->dstaddr, + &tcon->ses->server->swn_dstaddr); +if (ret <0 ) { +cifs_dbg (VFS ,"%s: failed to store address: %d\n" , __func__, ret); +return ret; + } + tcon->ses->server->use_swn_dstaddr = true; + +/* +* Unregister to stop receiving notifications for the old IP address. +*/ + ret =cifs_swn_unregister (tcon); +if (ret <0 ) { +cifs_dbg (VFS ,"%s: Failed to unregister for witness notifications: %d\n" , + __func__, ret); +return ret; + } + +/* +* And register to receive notifications for the new IP address now that we have +* stored the new address. +*/ + ret =cifs_swn_register (tcon); +if (ret <0 ) { +cifs_dbg (VFS ,"%s: Failed to register for witness notifications: %d\n" , + __func__, ret); +return ret; + } + +spin_lock (&GlobalMid_Lock); +if (tcon->ses->server->tcpStatus != CifsExiting) + tcon->ses->server->tcpStatus = CifsNeedReconnect; +spin_unlock (&GlobalMid_Lock); + } +mutex_unlock (&tcon->ses->server->srv_mutex); + +return 0 ; +} + +static int cifs_swn_client_move (struct cifs_swn_reg *swnreg,struct sockaddr_storage *addr) +{ +struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr; +struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)addr; + +if (addr->ss_family ==AF_INET ) +cifs_dbg (FYI ,"%s: move to %pI4\n" , __func__, &ipv4->sin_addr); +else if (addr->ss_family ==AF_INET6 ) +cifs_dbg (FYI ,"%s: move to %pI6\n" , __func__, &ipv6->sin6_addr); + +return cifs_swn_reconnect (swnreg->tcon, addr); +} +int cifs_swn_notify (struct sk_buff *skb,struct genl_info *info) {struct cifs_swn_reg *swnreg;
@@ -457,6 +582,17 @@ int cifs_swn_notify(struct sk_buff *skb, struct genl_info *info) }return cifs_swn_resource_state_changed (swnreg, name, state); } +case CIFS_SWN_NOTIFICATION_CLIENT_MOVE : { +struct sockaddr_storage addr; + +if (info->attrs[CIFS_GENL_ATTR_SWN_IP ]) { +nla_memcpy (&addr, info->attrs[CIFS_GENL_ATTR_SWN_IP ],sizeof (addr)); + }else { +cifs_dbg (FYI ,"%s: missing IP address attribute\n" , __func__); +return -EINVAL ; + } +return cifs_swn_client_move (swnreg, &addr); + }default :cifs_dbg (FYI ,"%s: unknown notification type %d\n" , __func__, type);break ;
fs/cifs/cifsglob.h +4 -0
@@ -779,6 +779,10 @@ struct TCP_Server_Info {int nr_targets;bool noblockcnt;/* use non-blocking connect() */ bool is_channel;/* if a session channel */ +#ifdef CONFIG_CIFS_SWN_UPCALL +bool use_swn_dstaddr; +struct sockaddr_storage swn_dstaddr; +#endif };struct cifs_credits {
fs/cifs/connect.c +20 -6
@@ -520,13 +520,24 @@ cifs_reconnect(struct TCP_Server_Info *server)try_to_freeze ();mutex_lock (&server->srv_mutex); + +#ifdef CONFIG_CIFS_SWN_UPCALL +if (server->use_swn_dstaddr) { + server->dstaddr = server->swn_dstaddr; + }else { +#endif +#ifdef CONFIG_CIFS_DFS_UPCALL -/* -* Set up next DFS target server (if any) for reconnect. If DFS -* feature is disabled, then we will retry last server we -* connected to before. -*/ -reconn_set_next_dfs_target (server, cifs_sb, &tgt_list, &tgt_it); +/* +* Set up next DFS target server (if any) for reconnect. If DFS +* feature is disabled, then we will retry last server we +* connected to before. +*/ +reconn_set_next_dfs_target (server, cifs_sb, &tgt_list, &tgt_it); +#endif + +#ifdef CONFIG_CIFS_SWN_UPCALL + }#endif if (cifs_rdma_enabled (server))
@@ -544,6 +555,9 @@ cifs_reconnect(struct TCP_Server_Info *server)if (server->tcpStatus != CifsExiting) server->tcpStatus = CifsNeedNegotiate;spin_unlock (&GlobalMid_Lock); +#ifdef CONFIG_CIFS_SWN_UPCALL + server->use_swn_dstaddr = false; +#endif mutex_unlock (&server->srv_mutex); } }while (server->tcpStatus == CifsNeedReconnect);
Signature · 1 line
2.29.0
PATCH v2 11/11 cifs: Handle witness share moved notification
In reply to Samuel CabreroJust log a message as it is not clear enough what this notification means. It is received for example when a node belonging to a scale-out file server dies, but it is also received as soon as a client registers for notifications (w2k12r2) when the server is scale-out.
--- fs/cifs/cifs_swn.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
fs/cifs/cifs_swn.c +34 -0
@@ -534,6 +534,29 @@ static int cifs_swn_client_move(struct cifs_swn_reg *swnreg, struct sockaddr_storeturn cifs_swn_reconnect (swnreg->tcon, addr); } +static int cifs_swn_share_moved (struct cifs_swn_reg *swnreg,struct sockaddr_storage *addr) +{ +struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr; +struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)addr; + +if (addr->ss_family ==AF_INET ) +cifs_dbg (FYI ,"%s: share '%s' from '%s' moved to %pI4\n" , + __func__, swnreg->share_name, swnreg->net_name, + &ipv4->sin_addr); +else if (addr->ss_family ==AF_INET6 ) +cifs_dbg (FYI ,"%s: share '%s' from '%s' moved to %pI6\n" , + __func__, swnreg->share_name, swnreg->net_name, + &ipv6->sin6_addr); + +/* +* FIXME It is not clear enough how to handle this notification and what does it mean. +* It is received for example when a node belonging to a scale-out file server dies, but +* it is also received as soon as a client registers for notifications (w2k12r2) when the +* share is scale-out and all nodes are working fine. Just log for now. +*/ +return 0 ; +} +int cifs_swn_notify (struct sk_buff *skb,struct genl_info *info) {struct cifs_swn_reg *swnreg;
@@ -593,6 +616,17 @@ int cifs_swn_notify(struct sk_buff *skb, struct genl_info *info) }return cifs_swn_client_move (swnreg, &addr); } +case CIFS_SWN_NOTIFICATION_SHARE_MOVE : { +struct sockaddr_storage addr; + +if (info->attrs[CIFS_GENL_ATTR_SWN_IP ]) { +nla_memcpy (&addr, info->attrs[CIFS_GENL_ATTR_SWN_IP ],sizeof (addr)); + }else { +cifs_dbg (FYI ,"%s: missing IP address attribute\n" , __func__); +return -EINVAL ; + } +return cifs_swn_share_moved (swnreg, &addr); + }default :cifs_dbg (FYI ,"%s: unknown notification type %d\n" , __func__, type);break ;
Signature · 1 line
2.29.0