{"id":2229679,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229679/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260428154604.222551-4-henrique.carvalho@suse.com/","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/1.1/projects/12/?format=json","name":"Linux CIFS Client","link_name":"linux-cifs-client","list_id":"linux-cifs.vger.kernel.org","list_email":"linux-cifs@vger.kernel.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260428154604.222551-4-henrique.carvalho@suse.com>","date":"2026-04-28T15:45:59","name":"[02/11] smb: client: prepare connect path for QUIC transport","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"176b774ac418176101a7c233633f2265ef4b7e29","submitter":{"id":89563,"url":"http://patchwork.ozlabs.org/api/1.1/people/89563/?format=json","name":"Henrique Carvalho","email":"henrique.carvalho@suse.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260428154604.222551-4-henrique.carvalho@suse.com/mbox/","series":[{"id":501882,"url":"http://patchwork.ozlabs.org/api/1.1/series/501882/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=501882","date":"2026-04-28T15:45:56","name":"smb: implement SMB over QUIC","version":1,"mbox":"http://patchwork.ozlabs.org/series/501882/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2229679/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229679/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-cifs@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256\n header.s=google header.b=gTB+404d;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.105.105.114; helo=tor.lore.kernel.org;\n envelope-from=linux-cifs+bounces-11223-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com\n header.b=\"gTB+404d\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=209.85.128.51","smtp.subspace.kernel.org;\n dmarc=pass (p=quarantine dis=none) header.from=suse.com","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=suse.com"],"Received":["from tor.lore.kernel.org (tor.lore.kernel.org [172.105.105.114])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g4lDx4bVxz1xvV\n\tfor ; Wed, 29 Apr 2026 01:47:29 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby tor.lore.kernel.org (Postfix) with ESMTP id 24D343056EC4\n\tfor ; Tue, 28 Apr 2026 15:46:48 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id D92993C3420;\n\tTue, 28 Apr 2026 15:46:44 +0000 (UTC)","from mail-wm1-f51.google.com (mail-wm1-f51.google.com\n [209.85.128.51])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 2021B3A9638\n\tfor ; Tue, 28 Apr 2026 15:46:42 +0000 (UTC)","by mail-wm1-f51.google.com with SMTP id\n 5b1f17b1804b1-488b8bc6bc9so83786815e9.3\n for ;\n Tue, 28 Apr 2026 08:46:42 -0700 (PDT)","from precision ([2a01:4b00:c007:bb00:be9d:a3c4:18b1:4a25])\n by smtp.gmail.com with ESMTPSA id\n ffacd0b85a97d-4463d4fa52bsm7725384f8f.15.2026.04.28.08.46.40\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 28 Apr 2026 08:46:40 -0700 (PDT)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777391204; cv=none;\n b=nWYJyoeyRvX0ybDHmNCkpA72D6jgn9UoJG62FnN5xke8Mn9UlEy0+GhlNhLWLQy95W/iF8wG14wGQavD8KsqjZHBjNa2PQsfP3DUwbU9hi+hfJPNDwqyf9pXFaAOE9Lev926QJz/6wEMMFgMjtBJBFw2rxAnsW0W0b6DqNpqTys=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777391204; c=relaxed/simple;\n\tbh=HzBrtan3XMzaHpanhKmqmsH4mAx5s9caerQyGxymO08=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=rYf/GoFFkLAOSt5yU/vRRlyu6ezwaWIe+mReuIQfT3X3DmhdUBjcZG52M0XnSfsrBUkDGcfBhs0tG3mhupHV6oLbBO8Qbh0QN7NWDNYoaAuXbqRVBRWD/kjrlcZiVMm3YBE1Lzh0eFiv6/wKHNi2j509eHDanBeBIbJRvAQ2lao=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=quarantine dis=none) header.from=suse.com;\n spf=pass smtp.mailfrom=suse.com;\n dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com\n header.b=gTB+404d; arc=none smtp.client-ip=209.85.128.51","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=suse.com; s=google; t=1777391201; x=1777996001;\n darn=vger.kernel.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=L/zHGpSjGM0CV+0mm24nsl5EoKH85EC1QlGcwmBMwDk=;\n b=gTB+404djr1C06ZnaPo/oAbP+OmOTy9w762/lRh1sE/N/nd5/ItDLnewobNFnnRZJa\n xQvwHHGljRqdPz4ogxm3MG66T7Yrm4YIyK8FYJdJBz6ZPfePiiIoVs7UCBcMxl2/sxJO\n WVv+FOdyt49Fx8Ty7XhatKlcQljx6aHmnrhNrM4F/6oC2I6xXBfwCL9HY3yd/dAHwyC1\n HImY/IaJSe/wdlN4cnj8zZ8dogiK42+1n2aQbmi61sWSTJ1C35mMyFltaXWCzATvTC+7\n JiFEn833ykkmh/obPrpoAPnzCi18om7z2Y7leLLIx3+hwSnNkC2NkUUgyIXGYft+VDqm\n +9wA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777391201; x=1777996001;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=L/zHGpSjGM0CV+0mm24nsl5EoKH85EC1QlGcwmBMwDk=;\n b=gDaT+5Zd+9yMvS8I++CxKR08qqK4r6IGIhtoVkkiGqDISXJPh1KPX8iLL0tFyzW0Ac\n dKhUeFW3yl/3gwqPKg502reZFZ6qmDFoUFLfPAS63x8Vnl1XiiRoRSvoxVyChPU7kqAL\n CIZ4+Rn59vcCUuD1I8w7fFoo8HcceQN0Ar6JIAMtJd9oSDrveKQ83hLLPTKF3CXDlNnF\n rkvfAIRGP11iShTamPlzB3DPQrl5d4gxoNc+KPDv9hWpzu64hau3hHBXCBrTlzNT1GTY\n EX2umNN/IageXQ5Y6HiabfBcfvM2Z+vlqFWz8n1CLvqLh5vDfooabPjFkKWLXAG5+sMR\n 7ukA==","X-Gm-Message-State":"AOJu0Ywq/HJt0OkY4KRw45dE8tMDpOnqY9WdpU4bgHa2rqU483pmSPl1\n\tfhASDkkRtZZlHqjptzUR5n4UtwM/K6cFlANL/Y7EbhiTkOnQak9u6MeNP7b+sNbFuF2/RoPY+nb\n\tlhXM0J/OctA==","X-Gm-Gg":"AeBDiesY1qZEhnoJvW5vRt076v+mA7RtmJXiGC8Eo8vfKj+/s3NY7736CgY67i7vReo\n\totkYGrguVhymCpCNHZhYnv0b4qAVZQF+Ihd0oEXe6fyBxz7P4GQyhAqitL7vmxyuPf68xzoSwKV\n\tjI5SwZNSLDVlONPHyyjmVLHZAz24s3gDwcg0+knRJpmwd1FAMkrrYNj+KX4qnaFfBEmrctCAbsA\n\tcI1Kf96h4BlG2/HS0BZ2CrCUtzkGYFLaKF3Er24c+lANIOo1ItN7eiseGdLwH2ZcATvbK4cMfT9\n\t8yAPhuirzjS/co6R46rwD3s4mgO+L6MSemCQbmZfpPpWZSHRolmnzluRXl3FUuqlUuw5UREEmzV\n\tUsE1IHt4T70OX/i7QPvStuzdRlV3KOpSPm4z7hjoFdhOzl9mF6oREThv96LT+tr5FusLW8RDj1M\n\tP1mZn7EsF2R4JCMwet4ssXZ7IJyAOOjqWOeUfhESbHM1V676MrJhHCWhk=","X-Received":"by 2002:a05:600c:c177:b0:48a:5301:bb5c with SMTP id\n 5b1f17b1804b1-48a77b12a49mr50931355e9.16.1777391201099;\n Tue, 28 Apr 2026 08:46:41 -0700 (PDT)","From":"Henrique Carvalho ","To":"linux-cifs@vger.kernel.org","Cc":"sfrench@samba.org,\n\tlinkinjeon@kernel.org,\n\tmetze@samba.org,\n\tpc@manguebit.com,\n\tronniesahlberg@gmail.com,\n\tsprasad@microsoft.com,\n\ttom@talpey.com,\n\tbharathsm@microsoft.com,\n\tematsumiya@suse.de,\n\tHenrique Carvalho ","Subject":"[PATCH 02/11] smb: client: prepare connect path for QUIC transport","Date":"Tue, 28 Apr 2026 12:45:59 -0300","Message-ID":"<20260428154604.222551-4-henrique.carvalho@suse.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260428154604.222551-1-henrique.carvalho@suse.com>","References":"<20260428154604.222551-1-henrique.carvalho@suse.com>","Precedence":"bulk","X-Mailing-List":"linux-cifs@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"Refactor the connect path to ease introducing QUIC as an alternative\ntransport alongside TCP and RDMA.\n\nNo functional change intended.\n\nSigned-off-by: Henrique Carvalho \n---\n fs/smb/client/connect.c | 56 ++++++++++++++++++++++++++++-------------\n 1 file changed, 39 insertions(+), 17 deletions(-)","diff":"diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c\nindex 92962d63d256..33d619007905 100644\n--- a/fs/smb/client/connect.c\n+++ b/fs/smb/client/connect.c\n@@ -62,11 +62,18 @@ static int ip_connect(struct TCP_Server_Info *server);\n static int generic_ip_connect(struct TCP_Server_Info *server);\n static void tlink_rb_insert(struct rb_root *root, struct tcon_link *new_tlink);\n static void cifs_prune_tlinks(struct work_struct *work);\n+static void smb_sock_release(struct TCP_Server_Info *server);\n \n static struct mchan_mount *mchan_mount_alloc(struct cifs_ses *ses);\n static void mchan_mount_free(struct mchan_mount *mchan_mount);\n static void mchan_mount_work_fn(struct work_struct *work);\n \n+static void smb_sock_release(struct TCP_Server_Info *server)\n+{\n+\tsock_release(server->ssocket);\n+\tserver->ssocket = NULL;\n+}\n+\n /*\n * Resolve hostname and set ip addr in tcp ses. Useful for hostnames that may\n * get their ip addresses changed at some point.\n@@ -311,8 +318,7 @@ cifs_abort_connection(struct TCP_Server_Info *server)\n \t\tkernel_sock_shutdown(server->ssocket, SHUT_WR);\n \t\tcifs_dbg(FYI, \"Post shutdown state: 0x%x Flags: 0x%lx\\n\", server->ssocket->state,\n \t\t\t server->ssocket->flags);\n-\t\tsock_release(server->ssocket);\n-\t\tserver->ssocket = NULL;\n+\t\tsmb_sock_release(server);\n \t}\n \tserver->sequence_number = 0;\n \tserver->session_estab = false;\n@@ -1077,10 +1083,8 @@ clean_demultiplex_info(struct TCP_Server_Info *server)\n \twake_up_all(&server->request_q);\n \t/* give those requests time to exit */\n \tmsleep(125);\n-\tif (server->ssocket) {\n-\t\tsock_release(server->ssocket);\n-\t\tserver->ssocket = NULL;\n-\t}\n+\n+\tsmb_sock_release(server);\n \n \tif (!list_empty(&server->pending_mid_q)) {\n \t\tstruct mid_q_entry *mid_entry;\n@@ -1778,7 +1782,11 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx,\n \ttcp_ses->noblocksnd = ctx->noblocksnd || ctx->rootfs;\n \ttcp_ses->noautotune = ctx->noautotune;\n \ttcp_ses->tcp_nodelay = ctx->sockopt_tcp_nodelay;\n-\ttcp_ses->ipproto = ctx->rdma ? IPPROTO_SMBDIRECT : IPPROTO_TCP;\n+\tif (ctx->rdma)\n+\t\ttcp_ses->ipproto = IPPROTO_SMBDIRECT;\n+\telse\n+\t\ttcp_ses->ipproto = IPPROTO_TCP;\n+\n \ttcp_ses->in_flight = 0;\n \ttcp_ses->max_in_flight = 0;\n \ttcp_ses->credits = 1;\n@@ -1895,8 +1903,7 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx,\n \t\t\tcifs_put_tcp_session(tcp_ses->primary_server, false);\n \t\tkfree(tcp_ses->hostname);\n \t\tkfree(tcp_ses->leaf_fullpath);\n-\t\tif (tcp_ses->ssocket)\n-\t\t\tsock_release(tcp_ses->ssocket);\n+\t\tsmb_sock_release(tcp_ses);\n \t\tkfree(tcp_ses);\n \t}\n \treturn ERR_PTR(rc);\n@@ -3297,13 +3304,29 @@ ip_rfc1001_connect(struct TCP_Server_Info *server)\n \treturn 0;\n }\n \n+static inline const char *\n+get_protocol_name(struct TCP_Server_Info *server)\n+{\n+\tswitch (server->ipproto) {\n+\tcase IPPROTO_TCP:\n+\t\treturn \"tcp\";\n+\tcase IPPROTO_QUIC:\n+\t\treturn \"quic\";\n+\tcase IPPROTO_SMBDIRECT:\n+\t\treturn \"smbdirect\";\n+\tdefault:\n+\t\tcifs_dbg(VFS, \"Unknown ipproto value: %d\", server->ipproto);\n+\t\treturn \"unknown\";\n+\t}\n+}\n+\n static int\n generic_ip_connect(struct TCP_Server_Info *server)\n {\n \tstruct sockaddr *saddr;\n \tstruct socket *socket;\n \tint slen, sfamily;\n-\tconst char *pname = cifs_rdma_enabled(server) ? \"smbdirect\" : \"tcp\";\n+\tconst char *pname = get_protocol_name(server);\n \t__be16 sport;\n \tint rc = 0;\n \n@@ -3327,10 +3350,7 @@ generic_ip_connect(struct TCP_Server_Info *server)\n \t\t\t __func__, pname, &ipv4->sin_addr, ntohs(sport));\n \t}\n \n-\tif (server->ssocket) {\n-\t\tsock_release(server->ssocket);\n-\t\tserver->ssocket = NULL;\n-\t}\n+\tsmb_sock_release(server);\n \n \t{\n \t\tstruct net *net = cifs_net_ns(server);\n@@ -3383,7 +3403,7 @@ generic_ip_connect(struct TCP_Server_Info *server)\n \tif (server->tcp_nodelay)\n \t\ttcp_sock_set_nodelay(socket->sk);\n \n-\tif (server->ipproto == IPPROTO_SMBDIRECT) {\n+\tif (cifs_rdma_enabled(server)) {\n \t\trc = smbd_prepare_socket(server, ntohs(sport));\n \t\tif (rc < 0) {\n \t\t\tcifs_dbg(FYI, \"Error %d from smbd_prepare_socket(port=%u)\\n\",\n@@ -3431,8 +3451,7 @@ generic_ip_connect(struct TCP_Server_Info *server)\n \n close_socket:\n \ttrace_smb3_connect_err(server->hostname, server->conn_id, &server->dstaddr, rc);\n-\tsock_release(socket);\n-\tserver->ssocket = NULL;\n+\tsmb_sock_release(server);\n \treturn rc;\n }\n \n@@ -3465,6 +3484,9 @@ ip_connect(struct TCP_Server_Info *server)\n \t\tif (rc >= 0)\n \t\t\treturn rc;\n \n+\t\tif (!port2)\n+\t\t\treturn rc;\n+\n \t\t/* if it failed, try with port2 */\n \t\t*sport = htons(port2);\n \t}\n","prefixes":["02/11"]}