From patchwork Fri Dec 15 17:16:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Prasad N X-Patchwork-Id: 1876712 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=WqoNtZzc; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:40f1:3f00::1; helo=sy.mirrors.kernel.org; envelope-from=linux-cifs+bounces-479-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [IPv6:2604:1380:40f1:3f00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SsGQ75FtSz20LT for ; Sat, 16 Dec 2023 04:27:59 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 4B5C4B23EF7 for ; Fri, 15 Dec 2023 17:27:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 15A833DBB9; Fri, 15 Dec 2023 17:17:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WqoNtZzc" X-Original-To: linux-cifs@vger.kernel.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF54A60B85 for ; Fri, 15 Dec 2023 17:17:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6d2350636d6so842319b3a.2 for ; Fri, 15 Dec 2023 09:17:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702660624; x=1703265424; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GRU7I/eeZw1LGutUSgW9yoZO4ClDgANacK7Uia9/ZEg=; b=WqoNtZzclJVrxaAHb7DNGrSyWFgjUv9U4lnfWT26ytAP4ILGrgeggS8DBjDH3Ep4us HJxiitFrZl9DlEomh48eJlfTe/9pmN33zfGPwJjFcyheFtCRf+qb/UtQZI5GpKE9KhiG mXvVpqtlwPSX6x+FlDkD7+iEwszGNIA4tJmotXu1AaEa/9TG3fY7nQLbZJs8KmMTPMjX D17vuQcF/fLTzep18LrwKVOUHdGWEZhp7DzqSzBYHkycK8aO/VrDFoqWaeuY4E3C795I I2IptmvSXVm15bXyAzc2rWrGzGHKgXeeUItBt2Bl2E2lbz/orj/rjWgxM4Lz731KO2ol 5zPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702660624; x=1703265424; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GRU7I/eeZw1LGutUSgW9yoZO4ClDgANacK7Uia9/ZEg=; b=iNLG1qAvF24+Cb0/J8SPKw03VXuPBHr1VkCJSTM2mZlI5xjKNLZ5014a2GG5amjetf KmzSYxW2dF9E0CHZA6uD8RxFJeQ+BNSRJsTMkTYN/3WPgz83hiC+9QXS18SLs5w8jkFF c64AqaCZYhAHLF3/YWmw2ihceGT7jMgE7+enxT0L0kaL0mjKsJbnwGB7wMKe8zukaz/a kH6W1lxZSX8yQZ4UiGN7woR/hWE8sEdRNC59ZQqA2zrHrjTFqvq5vPTdSf21JmqLCCQo 85X0cbB+WVaf1RPOh1o2+/C+0mVoO97wwYPjdDFZifxQaZQdHSOm3t0As3SaYcCSQ+Pu Tz0w== X-Gm-Message-State: AOJu0YwpiR/K6XOSe9aDfQfzIkd+GLCjBT8ORKcmYKXvHf8hOf5uG956 a5zJexe0OGSIacj4G86rqb+AsvbZxrgJrQ== X-Google-Smtp-Source: AGHT+IHyFVE7b8+XpY13jH/XZn9uaI4Cv5n4WFY24fokJmafVGRscG7cUtbOs2zcay1bHxAc8nNWuw== X-Received: by 2002:a05:6a20:85a7:b0:191:309:1646 with SMTP id s39-20020a056a2085a700b0019103091646mr7603792pzd.20.1702660623908; Fri, 15 Dec 2023 09:17:03 -0800 (PST) Received: from lindev-local-latest.corp.microsoft.com ([2404:f801:8028:3:7e0c:5dff:fea8:2c14]) by smtp.gmail.com with ESMTPSA id g13-20020aa79dcd000000b006d26eed29a8sm2125970pfq.95.2023.12.15.09.17.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 09:17:03 -0800 (PST) From: nspmangalore@gmail.com X-Google-Original-From: sprasad@microsoft.com To: pc@manguebit.com, smfrench@gmail.com, linux-cifs@vger.kernel.org Cc: Shyam Prasad N Subject: [PATCH 1/2] cifs: fix a pending undercount of srv_count Date: Fri, 15 Dec 2023 17:16:55 +0000 Message-Id: <20231215171656.4140-1-sprasad@microsoft.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Shyam Prasad N The following commit reverted the changes to ref count the server struct while scheduling a reconnect work: 823342524868 Revert "cifs: reconnect work should have reference on server struct" However, a following change also introduced scheduling of reconnect work, and assumed ref counting. This change reverts that instance as well. Fixes: 705fc522fe9d ("cifs: handle when server starts supporting multichannel") Signed-off-by: Shyam Prasad N --- fs/smb/client/smb2pdu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index 20634fc6d4f0..d2437aca6a76 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -411,8 +411,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon, } if (smb2_command != SMB2_INTERNAL_CMD) - if (mod_delayed_work(cifsiod_wq, &server->reconnect, 0)) - cifs_put_tcp_session(server, false); + mod_delayed_work(cifsiod_wq, &server->reconnect, 0); atomic_inc(&tconInfoReconnectCount); out: From patchwork Fri Dec 15 17:16:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Prasad N X-Patchwork-Id: 1876713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=TNAm+B1H; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-cifs+bounces-480-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SsGQC0bP8z20LT for ; Sat, 16 Dec 2023 04:28:03 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 25B621F2589C for ; Fri, 15 Dec 2023 17:28:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ADC5849F6F; Fri, 15 Dec 2023 17:17:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TNAm+B1H" X-Original-To: linux-cifs@vger.kernel.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4ADEE3FB1A for ; Fri, 15 Dec 2023 17:17:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-5c65ca2e1eeso439892a12.2 for ; Fri, 15 Dec 2023 09:17:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702660626; x=1703265426; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YNohwMkxQEk//lSnhopBEMjKiAOO70+tuLCR9Gvi02g=; b=TNAm+B1HQEdBcarIY4rzUphY7K7vxx7VuHO5n6lssw93afSmw36mI3NLfnJUGlRD2l gbRo/kLmBwtvLOzzS2X68/kR8xymZnanzbXiji/h0aWq7VneIGhPKj2WJJT+nMw+2b5E 81Efi5kF27x2nd/WDJCipYr50G2HLUeb0joILi2vCkmj+gSra/Vta/DDbcNMW7pDCT/y fzgmPWWce8+9oUOukSmBziVzUgsaavEp8aYpbx+aeGsOsQnqsBDe1nbB13ZkQYAGeWNm yzQSwUGebtoYaJ3S7TVPckdlT1cOY5fvkGlEHxCRtcOXe0eBCvxl16LrS2bzHcA1joRa 2wRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702660626; x=1703265426; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YNohwMkxQEk//lSnhopBEMjKiAOO70+tuLCR9Gvi02g=; b=nr7NC9shUqsIfEUrS+xM2WqOtj1THrXR9EKfQl4zqg8HvVxnyqdJPYg/m/UVV7M5aN wgGiiXJee9b4HsoJlWjJ6ivZu2b3iG81fcfAphBC3JaG6PW4dnKlfXFdDIWC2bBGUMSx NNrQaMOI8B12jRLtscCkYtvCA9jGb6th3b3hP8oZ+Z4VbDX7Oc9Xxw24VcZRZ6usP5RM Y9eLKG1HFWz6yFaq2d2aW9k7e1E0EBiHmB8loXOD3gNfMe8PTz5GMexubGRzQPSfFQ30 k/Sud729nX8/A29xeMNyqFtEGERdINyyWSmwc1dPe0BfBZDcKXBOq4jcbopUbdZUJmjQ cF0g== X-Gm-Message-State: AOJu0Yxo+3+CwFt09M0HJ0RZ8Top1lVz3TQMOC78OYqWRbAFoWeKMM4v ENHwIXahDJ0qEcgEPQmG44c= X-Google-Smtp-Source: AGHT+IGAXmBgbN/VhtfJALONtl1bYXLagtqFbUAoYbcEZINT2Urq7ZLZL+VYqG1+IltkHju4wqU5sg== X-Received: by 2002:a05:6a20:734f:b0:18b:5a8a:4333 with SMTP id v15-20020a056a20734f00b0018b5a8a4333mr5552548pzc.19.1702660626392; Fri, 15 Dec 2023 09:17:06 -0800 (PST) Received: from lindev-local-latest.corp.microsoft.com ([2404:f801:8028:3:7e0c:5dff:fea8:2c14]) by smtp.gmail.com with ESMTPSA id g13-20020aa79dcd000000b006d26eed29a8sm2125970pfq.95.2023.12.15.09.17.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 09:17:05 -0800 (PST) From: nspmangalore@gmail.com X-Google-Original-From: sprasad@microsoft.com To: pc@manguebit.com, smfrench@gmail.com, linux-cifs@vger.kernel.org Cc: Shyam Prasad N Subject: [PATCH 2/2] cifs: do not let cifs_chan_update_iface deallocate channels Date: Fri, 15 Dec 2023 17:16:56 +0000 Message-Id: <20231215171656.4140-2-sprasad@microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231215171656.4140-1-sprasad@microsoft.com> References: <20231215171656.4140-1-sprasad@microsoft.com> Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Shyam Prasad N cifs_chan_update_iface is meant to check and update the server interface used for a channel when the existing server interface is no longer available. So far, this handler had the code to remove an interface entry even if a new candidate interface is not available. Allowing this leads to several corner cases to handle. This change makes the logic much simpler by not deallocating the current channel interface entry if a new interface is not found to replace it with. Signed-off-by: Shyam Prasad N --- fs/smb/client/sess.c | 50 +++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c index 816e01c5589b..2d3b332a79a1 100644 --- a/fs/smb/client/sess.c +++ b/fs/smb/client/sess.c @@ -439,7 +439,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server) cifs_dbg(FYI, "unable to find a suitable iface\n"); } - if (!chan_index && !iface) { + if (!iface) { cifs_dbg(FYI, "unable to get the interface matching: %pIS\n", &ss); spin_unlock(&ses->iface_lock); @@ -447,7 +447,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server) } /* now drop the ref to the current iface */ - if (old_iface && iface) { + if (old_iface) { cifs_dbg(FYI, "replacing iface: %pIS with %pIS\n", &old_iface->sockaddr, &iface->sockaddr); @@ -460,44 +460,32 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server) kref_put(&old_iface->refcount, release_iface); } else if (old_iface) { - cifs_dbg(FYI, "releasing ref to iface: %pIS\n", + /* if a new candidate is not found, keep things as is */ + cifs_dbg(FYI, "could not replace iface: %pIS\n", &old_iface->sockaddr); - - old_iface->num_channels--; - if (old_iface->weight_fulfilled) - old_iface->weight_fulfilled--; - - kref_put(&old_iface->refcount, release_iface); } else if (!chan_index) { /* special case: update interface for primary channel */ - cifs_dbg(FYI, "referencing primary channel iface: %pIS\n", - &iface->sockaddr); - iface->num_channels++; - iface->weight_fulfilled++; - } else { - WARN_ON(!iface); - cifs_dbg(FYI, "adding new iface: %pIS\n", &iface->sockaddr); + if (iface) { + cifs_dbg(FYI, "referencing primary channel iface: %pIS\n", + &iface->sockaddr); + iface->num_channels++; + iface->weight_fulfilled++; + } } spin_unlock(&ses->iface_lock); - spin_lock(&ses->chan_lock); - chan_index = cifs_ses_get_chan_index(ses, server); - if (chan_index == CIFS_INVAL_CHAN_INDEX) { + if (iface) { + spin_lock(&ses->chan_lock); + chan_index = cifs_ses_get_chan_index(ses, server); + if (chan_index == CIFS_INVAL_CHAN_INDEX) { + spin_unlock(&ses->chan_lock); + return 0; + } + + ses->chans[chan_index].iface = iface; spin_unlock(&ses->chan_lock); - return 0; } - ses->chans[chan_index].iface = iface; - - /* No iface is found. if secondary chan, drop connection */ - if (!iface && SERVER_IS_CHAN(server)) - ses->chans[chan_index].server = NULL; - - spin_unlock(&ses->chan_lock); - - if (!iface && SERVER_IS_CHAN(server)) - cifs_put_tcp_session(server, false); - return rc; }