From: Samuel Cabrero <scabrero@suse.com>
To: linux-cifs@vger.kernel.org
Cc: smfrench@gmail.com, pc@manguebit.com, ronniesahlberg@gmail.com,
sprasad@microsoft.com, tom@talpey.com, bharathsm@microsoft.com,
henrique.carvalho@suse.com, ematsumiya@suse.de,
Samuel Cabrero <scabrero@suse.com>
Subject: [PATCH 17/18] smb:client: Improve registration network and share names handling
Date: Fri, 10 Jul 2026 11:16:36 +0200 [thread overview]
Message-ID: <20260710091637.58873-18-scabrero@suse.com> (raw)
In-Reply-To: <20260710091637.58873-1-scabrero@suse.com>
Store the names and add them to the netlink messages only if required.
The network name notification is always enabled. The share name
notification is only enabled for asymmetric shares.
Signed-off-by: Samuel Cabrero <scabrero@suse.com>
---
fs/smb/client/cifs_swn.c | 111 +++++++++++++++++++++------------------
1 file changed, 61 insertions(+), 50 deletions(-)
diff --git a/fs/smb/client/cifs_swn.c b/fs/smb/client/cifs_swn.c
index 3375a65ec32e..a196b06c4b8c 100644
--- a/fs/smb/client/cifs_swn.c
+++ b/fs/smb/client/cifs_swn.c
@@ -212,7 +212,7 @@ static bool cifs_swn_reg_net_name_matches(const struct cifs_swn_reg *swnreg,
return false;
host_len = delim - host;
- if (strlen(swnreg->net_name) == host_len &&
+ if (swnreg->net_name != NULL && strlen(swnreg->net_name) == host_len &&
!strncasecmp(swnreg->net_name, host, host_len)) {
return true;
}
@@ -269,7 +269,7 @@ static bool cifs_swn_reg_tcon_matches(const struct cifs_swn_reg *swnreg,
return false;
/* The network name notification is always enabled */
- if (!cifs_swn_reg_net_name_matches(swnreg, tcon))
+ if (swnreg->net_name_notify && !cifs_swn_reg_net_name_matches(swnreg, tcon))
return false;
/*
@@ -346,26 +346,28 @@ static int cifs_swn_send_register_message(struct cifs_swn_reg *swnreg)
if (ret < 0)
goto nlmsg_fail;
- ret = nla_put_string(skb, CIFS_GENL_ATTR_SWN_NET_NAME, swnreg->net_name);
- if (ret < 0)
- goto nlmsg_fail;
-
- ret = nla_put_string(skb, CIFS_GENL_ATTR_SWN_SHARE_NAME, swnreg->share_name);
- if (ret < 0)
- goto nlmsg_fail;
-
ret = nla_put(skb, CIFS_GENL_ATTR_SWN_IP,
sizeof(struct sockaddr_storage), &swnreg->addr);
if (ret < 0)
goto nlmsg_fail;
if (swnreg->net_name_notify) {
+ ret = nla_put_string(skb, CIFS_GENL_ATTR_SWN_NET_NAME,
+ swnreg->net_name);
+ if (ret < 0)
+ goto nlmsg_fail;
+
ret = nla_put_flag(skb, CIFS_GENL_ATTR_SWN_NET_NAME_NOTIFY);
if (ret < 0)
goto nlmsg_fail;
}
if (swnreg->share_name_notify) {
+ ret = nla_put_string(skb, CIFS_GENL_ATTR_SWN_SHARE_NAME,
+ swnreg->share_name);
+ if (ret < 0)
+ goto nlmsg_fail;
+
ret = nla_put_flag(skb, CIFS_GENL_ATTR_SWN_SHARE_NAME_NOTIFY);
if (ret < 0)
goto nlmsg_fail;
@@ -403,8 +405,8 @@ static int cifs_swn_send_register_message(struct cifs_swn_reg *swnreg)
genlmsg_end(skb, hdr);
genlmsg_multicast(&cifs_genl_family, skb, 0, CIFS_GENL_MCGRP_SWN, GFP_ATOMIC);
- cifs_dbg(FYI, "%s: Message to register for network name %s with id %d sent\n", __func__,
- swnreg->net_name, swnreg->id);
+ cifs_dbg(FYI, "%s: Message to register for network name '%s' with id %d sent\n", __func__,
+ swnreg->net_name ? swnreg->net_name : "", swnreg->id);
return 0;
@@ -439,26 +441,28 @@ static int cifs_swn_send_unregister_message(struct cifs_swn_reg *swnreg)
if (ret < 0)
goto nlmsg_fail;
- ret = nla_put_string(skb, CIFS_GENL_ATTR_SWN_NET_NAME, swnreg->net_name);
- if (ret < 0)
- goto nlmsg_fail;
-
- ret = nla_put_string(skb, CIFS_GENL_ATTR_SWN_SHARE_NAME, swnreg->share_name);
- if (ret < 0)
- goto nlmsg_fail;
-
ret = nla_put(skb, CIFS_GENL_ATTR_SWN_IP,
sizeof(struct sockaddr_storage), &swnreg->addr);
if (ret < 0)
goto nlmsg_fail;
if (swnreg->net_name_notify) {
+ ret = nla_put_string(skb, CIFS_GENL_ATTR_SWN_NET_NAME,
+ swnreg->net_name);
+ if (ret < 0)
+ goto nlmsg_fail;
+
ret = nla_put_flag(skb, CIFS_GENL_ATTR_SWN_NET_NAME_NOTIFY);
if (ret < 0)
goto nlmsg_fail;
}
if (swnreg->share_name_notify) {
+ ret = nla_put_string(skb, CIFS_GENL_ATTR_SWN_SHARE_NAME,
+ swnreg->share_name);
+ if (ret < 0)
+ goto nlmsg_fail;
+
ret = nla_put_flag(skb, CIFS_GENL_ATTR_SWN_SHARE_NAME_NOTIFY);
if (ret < 0)
goto nlmsg_fail;
@@ -473,8 +477,8 @@ static int cifs_swn_send_unregister_message(struct cifs_swn_reg *swnreg)
genlmsg_end(skb, hdr);
genlmsg_multicast(&cifs_genl_family, skb, 0, CIFS_GENL_MCGRP_SWN, GFP_ATOMIC);
- cifs_dbg(FYI, "%s: Message to unregister for network name %s with id %d sent\n", __func__,
- swnreg->net_name, swnreg->id);
+ cifs_dbg(FYI, "%s: Message to unregister for network name '%s' with id %d sent\n", __func__,
+ swnreg->net_name ? swnreg->net_name : "", swnreg->id);
return 0;
@@ -938,29 +942,40 @@ int cifs_swn_register(struct cifs_tcon *tcon)
return ret;
}
- swnreg->net_name = extract_hostname(tcon->tree_name);
- if (IS_ERR(swnreg->net_name)) {
- ret = PTR_ERR(swnreg->net_name);
- cifs_dbg(VFS,
- "%s: failed to extract host name from target: %d\n",
- __func__, ret);
- idr_remove(&cifs_swnreg_idr, swnreg->id);
- kfree(swnreg);
- mutex_unlock(&cifs_swnreg_idr_mutex);
- return ret;
+ swnreg->net_name_notify = true;
+ swnreg->share_name_notify =
+ (tcon->capabilities & SMB2_SHARE_CAP_ASYMMETRIC);
+ swnreg->ip_notify = false;
+
+ if (swnreg->net_name_notify) {
+ swnreg->net_name = extract_hostname(tcon->tree_name);
+ if (IS_ERR(swnreg->net_name)) {
+ ret = PTR_ERR(swnreg->net_name);
+ cifs_dbg(
+ VFS,
+ "%s: failed to extract host name from target: %d\n",
+ __func__, ret);
+ idr_remove(&cifs_swnreg_idr, swnreg->id);
+ kfree(swnreg);
+ mutex_unlock(&cifs_swnreg_idr_mutex);
+ return ret;
+ }
}
- swnreg->share_name = extract_sharename(tcon->tree_name);
- if (IS_ERR(swnreg->share_name)) {
- ret = PTR_ERR(swnreg->share_name);
- cifs_dbg(VFS,
- "%s: failed to extract share name from target: %d\n",
- __func__, ret);
- kfree(swnreg->net_name);
- idr_remove(&cifs_swnreg_idr, swnreg->id);
- kfree(swnreg);
- mutex_unlock(&cifs_swnreg_idr_mutex);
- return ret;
+ if (swnreg->share_name_notify) {
+ swnreg->share_name = extract_sharename(tcon->tree_name);
+ if (IS_ERR(swnreg->share_name)) {
+ ret = PTR_ERR(swnreg->share_name);
+ cifs_dbg(
+ VFS,
+ "%s: failed to extract share name from target: %d\n",
+ __func__, ret);
+ kfree(swnreg->net_name);
+ idr_remove(&cifs_swnreg_idr, swnreg->id);
+ kfree(swnreg);
+ mutex_unlock(&cifs_swnreg_idr_mutex);
+ return ret;
+ }
}
ret = cifs_swn_reg_set_auth(swnreg, tcon);
@@ -986,11 +1001,6 @@ int cifs_swn_register(struct cifs_tcon *tcon)
else
swnreg->addr = tcon->ses->server->dstaddr;
- swnreg->net_name_notify = true;
- swnreg->share_name_notify =
- (tcon->capabilities & SMB2_SHARE_CAP_ASYMMETRIC);
- swnreg->ip_notify = false;
-
swnreg->check_interval = tcon->ses->server->echo_interval;
INIT_DELAYED_WORK(&swnreg->check, cifs_swn_reg_check);
@@ -1036,9 +1046,10 @@ void cifs_swn_dump(struct seq_file *m)
seq_printf(
m,
"\nId: %d Refs: %u Network name: '%s'%s Share name: '%s'%s Ip address: '%pISc'%s",
- id, kref_read(&swnreg->ref_count), swnreg->net_name,
+ id, kref_read(&swnreg->ref_count),
+ swnreg->net_name ? swnreg->net_name : "",
swnreg->net_name_notify ? "(y)" : "(n)",
- swnreg->share_name,
+ swnreg->share_name ? swnreg->share_name : "",
swnreg->share_name_notify ? "(y)" : "(n)",
&swnreg->addr, swnreg->ip_notify ? "(y)" : "(n)");
}
--
2.54.0
next prev parent reply other threads:[~2026-07-10 9:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-10 9:16 [PATCH 00/18] SWN: Decouple witness registrations and tcons Samuel Cabrero
2026-07-10 9:16 ` [PATCH 01/18] Revert "smb: client: resolve SWN tcon from live registrations" Samuel Cabrero
2026-07-10 9:16 ` [PATCH 02/18] smb:client: Adjust witness notification request Samuel Cabrero
2026-07-10 9:16 ` [PATCH 03/18] smb:client: Rename variable to match the rest of the code Samuel Cabrero
2026-07-10 9:16 ` [PATCH 04/18] smb:client: Split idr remove and release functions Samuel Cabrero
2026-07-10 9:16 ` [PATCH 05/18] smb:client: Add a specific task to refresh witness registrations Samuel Cabrero
2026-07-10 9:16 ` [PATCH 06/18] smb:client: Store the tcon dstaddr in the witness registration Samuel Cabrero
2026-07-10 9:16 ` [PATCH 07/18] smb:client: Fix printf format string Samuel Cabrero
2026-07-10 9:16 ` [PATCH 08/18] smb:client: Save memory allocations Samuel Cabrero
2026-07-10 9:16 ` [PATCH 09/18] smb:client: Use the correct return code Samuel Cabrero
2026-07-10 9:16 ` [PATCH 10/18] smb:client: Improve tcon matching logic Samuel Cabrero
2026-07-10 9:16 ` [PATCH 11/18] smb:client: Pass the tcon to cifs_swn_send_register_message Samuel Cabrero
2026-07-10 9:16 ` [PATCH 12/18] smb:client: Pass the tcon to notification handlers Samuel Cabrero
2026-07-10 9:16 ` [PATCH 13/18] smb:client: Introduce swn_notification struct Samuel Cabrero
2026-07-10 9:16 ` [PATCH 14/18] smb:client: Cache auth info Samuel Cabrero
2026-07-10 9:16 ` [PATCH 15/18] smb:client: Do not store the tcon reference, find a matching one Samuel Cabrero
2026-07-10 9:16 ` [PATCH 16/18] smb:client: Simplify registration creation Samuel Cabrero
2026-07-10 9:16 ` Samuel Cabrero [this message]
2026-07-10 9:16 ` [PATCH 18/18] smb:client: Avoid witness re-register if the address did not change Samuel Cabrero
2026-07-10 14:16 ` [PATCH 00/18] SWN: Decouple witness registrations and tcons Enzo Matsumiya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260710091637.58873-18-scabrero@suse.com \
--to=scabrero@suse.com \
--cc=bharathsm@microsoft.com \
--cc=ematsumiya@suse.de \
--cc=henrique.carvalho@suse.com \
--cc=linux-cifs@vger.kernel.org \
--cc=pc@manguebit.com \
--cc=ronniesahlberg@gmail.com \
--cc=smfrench@gmail.com \
--cc=sprasad@microsoft.com \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox