[PATCH v2 10/11] smb: server: track TCP and QUIC listener state independently

[Henrique Carvalho <henrique.carvalho@suse.com>]

An interface can host both TCP and QUIC listeners, so a single
configured/down state is no longer precise enough once QUIC support is
added (e.g. a TCP listener may already be up when QUIC setup fails).

Turn iface->state into a transport bitmask and track TCP and QUIC
listener bring-up independently. This lets NETDEV_UP retry only the
missing transport and lets NETDEV_DOWN tear down only the listeners that
were actually started.

Signed-off-by: Henrique Carvalho <henrique.carvalho@suse.com>
---
 fs/smb/server/interface.c      | 61 ++++++++++++++++++++++------------
 fs/smb/server/interface.h      |  6 ++--
 fs/smb/server/transport_quic.c |  2 +-
 fs/smb/server/transport_tcp.c  |  2 +-
 4 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/fs/smb/server/interface.c b/fs/smb/server/interface.c
index 25b8e7f44059..272c4aaad347 100644
--- a/fs/smb/server/interface.c
+++ b/fs/smb/server/interface.c
@@ -17,6 +17,11 @@
 static LIST_HEAD(iface_list);
 static int bind_additional_ifaces;
 
+static inline bool ksmbd_iface_transport_up(const struct interface *iface)
+{
+	return iface->state != 0;
+}
+
 static struct interface *alloc_iface(char *ifname)
 {
 	struct interface *iface;
@@ -31,7 +36,7 @@ static struct interface *alloc_iface(char *ifname)
 	}
 
 	iface->name = ifname;
-	iface->state = IFACE_STATE_DOWN;
+	iface->state = 0;
 	list_add(&iface->entry, &iface_list);
 	return iface;
 }
@@ -80,20 +85,30 @@ static int ksmbd_netdev_event(struct notifier_block *nb, unsigned long event,
 			return NOTIFY_OK;
 
 		iface = ksmbd_find_netdev_name_iface_list(netdev->name);
-		if (iface && iface->state == IFACE_STATE_DOWN) {
+		if (iface) {
 			ksmbd_debug(CONN, "netdev-up event: netdev(%s) is going up\n",
 					iface->name);
 
 			if (!iface->net)
 				iface->net = get_net(dev_net(netdev));
 
-			ret = ksmbd_tcp_create_socket(iface);
-			if (ret)
-				break;
-
-			ret = ksmbd_quic_create_socket(iface);
-			if (ret)
-				break;
+			if (!(iface->state & IFACE_STATE_TCP_UP)) {
+				ret = ksmbd_tcp_create_socket(iface);
+				if (ret && !ksmbd_iface_transport_up(iface)) {
+					put_net(iface->net);
+					iface->net = NULL;
+					break;
+				}
+			}
+
+			if (!(iface->state & IFACE_STATE_QUIC_UP)) {
+				ret = ksmbd_quic_create_socket(iface);
+				if (ret && !ksmbd_iface_transport_up(iface)) {
+					put_net(iface->net);
+					iface->net = NULL;
+					break;
+				}
+			}
 		}
 		if (!iface && bind_additional_ifaces) {
 			iface = alloc_iface(kstrdup(netdev->name, KSMBD_DEFAULT_GFP));
@@ -106,44 +121,49 @@ static int ksmbd_netdev_event(struct notifier_block *nb, unsigned long event,
 			iface->net = get_net(dev_net(netdev));
 
 			ret = ksmbd_tcp_create_socket(iface);
-			if (ret)
+			if (ret && !ksmbd_iface_transport_up(iface)) {
+				put_net(iface->net);
+				iface->net = NULL;
 				break;
+			}
 
 			ret = ksmbd_quic_create_socket(iface);
-			if (ret)
+			if (ret && !ksmbd_iface_transport_up(iface)) {
+				put_net(iface->net);
+				iface->net = NULL;
 				break;
+			}
 		}
 		break;
 	case NETDEV_DOWN:
 		iface = ksmbd_find_netdev_name_iface_list(netdev->name);
-		if (iface && iface->state == IFACE_STATE_CONFIGURED) {
+		if (iface && ksmbd_iface_transport_up(iface)) {
 			ksmbd_debug(CONN, "netdev-down event: netdev(%s) is going down\n",
 					iface->name);
 
-			if (iface->ksmbd_tcp_socket)
+			if (iface->state & IFACE_STATE_TCP_UP)
 				kernel_sock_shutdown(iface->ksmbd_tcp_socket, SHUT_RDWR);
-			if (iface->ksmbd_quic_socket)
+			if (iface->state & IFACE_STATE_QUIC_UP)
 				kernel_sock_shutdown(iface->ksmbd_quic_socket, SHUT_RDWR);
 
-			if (iface->ksmbd_tcp_kthread)
+			if (iface->state & IFACE_STATE_TCP_UP)
 				ksmbd_interface_stop_kthread(iface->ksmbd_tcp_kthread);
-			if (iface->ksmbd_quic_kthread)
+			if (iface->state & IFACE_STATE_QUIC_UP)
 				ksmbd_interface_stop_kthread(iface->ksmbd_quic_kthread);
 
-			if (iface->ksmbd_tcp_socket)
+			if (iface->state & IFACE_STATE_TCP_UP)
 				sock_release(iface->ksmbd_tcp_socket);
-			if (iface->ksmbd_quic_socket)
+			if (iface->state & IFACE_STATE_QUIC_UP)
 				sock_release(iface->ksmbd_quic_socket);
 
 			iface->ksmbd_tcp_kthread = NULL;
 			iface->ksmbd_quic_kthread = NULL;
 			iface->ksmbd_tcp_socket = NULL;
 			iface->ksmbd_quic_socket = NULL;
+			iface->state = 0;
 
 			put_net(iface->net);
 			iface->net = NULL;
-
-			iface->state = IFACE_STATE_DOWN;
 			break;
 		}
 		break;
@@ -213,4 +233,3 @@ int ksmbd_set_interfaces(char *ifc_list, int ifc_list_sz)
 
 	return 0;
 }
-
diff --git a/fs/smb/server/interface.h b/fs/smb/server/interface.h
index 94ffb73fd635..d99b1f3c8bc0 100644
--- a/fs/smb/server/interface.h
+++ b/fs/smb/server/interface.h
@@ -10,8 +10,8 @@
 
 #include <linux/freezer.h>
 
-#define IFACE_STATE_DOWN		BIT(0)
-#define IFACE_STATE_CONFIGURED		BIT(1)
+#define IFACE_STATE_TCP_UP		BIT(0)
+#define IFACE_STATE_QUIC_UP		BIT(1)
 
 struct interface {
 	struct task_struct	*ksmbd_tcp_kthread;
@@ -20,7 +20,7 @@ struct interface {
 	struct socket		*ksmbd_quic_socket;
 	struct list_head	entry;
 	char			*name;
-	int			state;
+	unsigned int		state;
 	struct net		*net;
 };
 
diff --git a/fs/smb/server/transport_quic.c b/fs/smb/server/transport_quic.c
index 84067225c1d3..da089b655e6c 100644
--- a/fs/smb/server/transport_quic.c
+++ b/fs/smb/server/transport_quic.c
@@ -314,7 +314,7 @@ int ksmbd_quic_create_socket(struct interface *iface)
 
 	iface->ksmbd_quic_socket  = ksmbd_socket;
 	iface->ksmbd_quic_kthread = kthread;
-	iface->state = IFACE_STATE_CONFIGURED;
+	iface->state |= IFACE_STATE_QUIC_UP;
 #endif /* CONFIG_IP_QUIC */
 	return 0;
 }
diff --git a/fs/smb/server/transport_tcp.c b/fs/smb/server/transport_tcp.c
index 1496f0336af6..81bf6996a6f7 100644
--- a/fs/smb/server/transport_tcp.c
+++ b/fs/smb/server/transport_tcp.c
@@ -208,7 +208,7 @@ int ksmbd_tcp_create_socket(struct interface *iface)
 	}
 
 	iface->ksmbd_tcp_kthread = kthread;
-	iface->state = IFACE_STATE_CONFIGURED;
+	iface->state |= IFACE_STATE_TCP_UP;
 
 	return 0;
 
-- 
2.53.0