From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F7EFC48297 for ; Fri, 9 Feb 2024 10:53:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53EAD6B0085; Fri, 9 Feb 2024 05:53:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C7D26B0087; Fri, 9 Feb 2024 05:53:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 367F26B0088; Fri, 9 Feb 2024 05:53:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 223246B0085 for ; Fri, 9 Feb 2024 05:53:03 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C046B41013 for ; Fri, 9 Feb 2024 10:53:02 +0000 (UTC) X-FDA: 81771953004.02.664ECF2 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf28.hostedemail.com (Postfix) with ESMTP id A736FC000F for ; Fri, 9 Feb 2024 10:53:00 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EXECrLG1; spf=pass (imf28.hostedemail.com: domain of horms@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=horms@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707475981; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=H3D3/3GgNohdgSj9Yn8y0oBD7JrkjvECZfNKBL5lvg0=; b=R/xFWs1uyO9m6XtmJDcF64XyLa/1ColNgmpix6r1MzKTyVZwLu2H3h8otqV4tltYZ5QgFf OvrxXbZx8BaJr41JqUOEq4VSfeBwahlwcMC5+h0JTytXtGUKRRqFCBBah8TCKMheW8/Zh4 AfemJEjGmOl6ZK4lKkzi8UGdPIwzpDY= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EXECrLG1; spf=pass (imf28.hostedemail.com: domain of horms@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=horms@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707475981; a=rsa-sha256; cv=none; b=lvwd85WyfQZMEqc6gIdJeRDyppWTzRnSkidfxU/1Pay3GsTB416erYQjnFtshGvOSa164x 3lqvCRXyL9NSPBswwzPpOnaNHwP5RS5va0dRWVbMLTsQhmhHgJ9a6/NgAW6m5Wr0ybszAK g8ecrWej2hx0RZ+pYQ3sfVBX+tWhrLk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 6EEC2CE1CF7; Fri, 9 Feb 2024 10:52:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 639B6C433C7; Fri, 9 Feb 2024 10:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707475976; bh=6dwnkyROxGZ2SBXY1Zy0Ne8yjBZ4UXuUgvnfXsanGsQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EXECrLG1KqQf6D1VRtpPf0wmtjc9PzW9ElAmQMSqXLAzHQKbzULSUnUOE3Bby2xlp GK7ieqInVtLdUUSYzlGAcRaW0rv6cfSTNYvOmKWKkk3lXyh8IF6+7uNzHyUdUcPj6t NrxJJnPLsb66NeenDW6S2qSV0Klh/g4oECelQu6sXppSXmP8rS9g/2ErRO/+8IPFzF LQCMwdSk4qJx/skt/SzOs/nexEbRBThp96JwWg4DAbDaf57O4lNB2Ryg1HNYrcKzAL 3P/2VVnO4+ivMyhapwruu/QIZR7iTGesCy5u4DjniEHH5m5l9yRYlgdoTr+0aCv7oF AiBrIDrSfsCPQ== Date: Fri, 9 Feb 2024 10:52:51 +0000 From: Simon Horman To: David Howells Cc: Steve French , Jeff Layton , Matthew Wilcox , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Christian Brauner , netfs@lists.linux.dev, linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Steve French , Shyam Prasad N , Rohith Surabattula Subject: Re: [PATCH v5 09/12] cifs: Cut over to using netfslib Message-ID: <20240209105251.GE1516992@kernel.org> References: <20240205225726.3104808-1-dhowells@redhat.com> <20240205225726.3104808-10-dhowells@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240205225726.3104808-10-dhowells@redhat.com> X-Rspamd-Queue-Id: A736FC000F X-Rspam-User: X-Stat-Signature: 6q8p1zd8nwat86hka8qwu7iiax69b349 X-Rspamd-Server: rspam01 X-HE-Tag: 1707475980-720243 X-HE-Meta: U2FsdGVkX1+2PsIsR+TqCQlvoWfJJbvSVi0eUHuENCsZ4fGx/uIsBoFg9EFxQE6Z7adFehe+JvZT75e2JndkwmsW7h+OFm38nAvSGYp0gBrPUeRDJlHTiJtDkeYH1c7DmaEKKoyT14Cp0fx+dy0Kez3yihCMd2Q2iXOxlF8OrlCjcaY0RiDZ4b4cQhzxwSpUnl4DMACxwZOCZn5g9lIFzcePndlUVbRZuwegFETNPLDeYCIY6dazR4BqnWikWuy7Q/RrK/iDqwfFG3GG3HSVYjAPvmhqKVA6T9Q25TnMMjNyRrZTzoaKrBykwVyaZ6SOJ5Gc4GomDbIVI9fxQJSh1ECtg5hoVgEteYPvjC0CU5CshIe98Y1dVFqOGbqHIEGARtt7/Y0FAg67h9zdRjbihhi8866NYSobGQ3tglvzspJyQ6eDlMvGjGoXI3bgagCP2gh+O2+SzukFNk6uQw71kwU29jGllm5ytXkulLPJtmBoEnUZqkV5YsDzTMkftrJAHbHUcbsFBnK3wu7MED+HIP/ubtp+YFU8QEuJjBB0sBFb4kZcLm53ubeCzoAztqhIbO7hDmYp/wPgUueTSH2ua/I8bSxI1hsfD6vZsQDyHqAH/yfnqPq3gk1ATI0BjhoWDQqlSd4Oiqc62trBWWpl/qtu+tF8xc6xxUUo8S43eO/hPwu19u+U6s8piMVUBn9LXtRA7jbCkwC8xXDO4a8vUqlZee3c+kPdgGjUY95aY9DeT1WvFPoH3ql4jDhDyqij/reLZmsVIKaloPomzCKtBOLzpApAeqm0Yufx4R2AXpTNkqPavTnyFlEox0lqCfkuHj4KZYB+E0fpr89nLRzcx6rEiXqDkW+zvS2wTkVgC7/sI48Cvr8cRaR6ZfY+ugO2aLjyWccbrpwnaX8qHIKK1w7BJ0BWm3YhWXqMruXvHK2j0eA60AS5K+V+hOsti/FewQpJWo0qciFwVMxc0qt R8MNPB5f f9/iw/aW9lgIhpp6BEktZyo2zsQHkGLqJGnyPPsxTaG3CMpwJRlKOi9LoYvD2s8so3P5X/quKFV1WkD+cVsrRnYrNu7i1hDYYiksIYl+cE81mm6Af4gcJjdJEskRMhPz+R4ijLVlij4u+gokmH6u7xIuo34mfMNgIVCUgvQbyjSp72/4+jwb8561FrYx0Qeo0ystz87slubT2marOA19OlL3JE9cD59uXibKsgisr6CUgIdQhnYAhChKxXfSRiCNBHo5z4RfTwgddQyE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Mon, Feb 05, 2024 at 10:57:21PM +0000, David Howells wrote: ... > diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c > index 84e3675eb41e..b58fdee40755 100644 > --- a/fs/smb/client/smb2pdu.c > +++ b/fs/smb/client/smb2pdu.c > @@ -4386,10 +4386,12 @@ smb2_new_read_req(void **buf, unsigned int *total_len, > req->Length = cpu_to_le32(io_parms->length); > req->Offset = cpu_to_le64(io_parms->offset); > > - trace_smb3_read_enter(0 /* xid */, > - io_parms->persistent_fid, > - io_parms->tcon->tid, io_parms->tcon->ses->Suid, > - io_parms->offset, io_parms->length); > + trace_smb3_read_enter(rdata ? rdata->rreq->debug_id : 0, > + rdata ? rdata->subreq.debug_index : 0, > + rdata ? rdata->xid : 0, > + io_parms->persistent_fid, > + io_parms->tcon->tid, io_parms->tcon->ses->Suid, > + io_parms->offset, io_parms->length); > #ifdef CONFIG_CIFS_SMB_DIRECT Hi David, above some care is taken to handle the case where rdata might be NULL. However, the code below this hunk, other than being guarded by smb3_use_rdma_offload(io_parms), uses rdata unconditionally. Perhaps the guard makes this ok. But Smatch flags this inconsistency. And I thought I should bring it to your attention. For reference the code I am referring to looks like this: #ifdef CONFIG_CIFS_SMB_DIRECT /* * If we want to do a RDMA write, fill in and append * smbd_buffer_descriptor_v1 to the end of read request */ if (smb3_use_rdma_offload(io_parms)) { struct smbd_buffer_descriptor_v1 *v1; bool need_invalidate = server->dialect == SMB30_PROT_ID; rdata->mr = smbd_register_mr(server->smbd_conn, &rdata->subreq.io_iter, true, need_invalidate); if (!rdata->mr) return -EAGAIN; ...