Skip to contentSkip to conversation

cifs: remove unnecessary copies of tcon->crfid.fid

PATCH In review Muhammad Usama Anjum 3 participants 4 messages Apr 15, 2021 – Apr 28, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 cifs: remove unnecessary copies of tcon->crfid.fid

pfid is being set to tcon->crfid.fid and they are copied in each other multiple times. Remove the memcopy between same pointers - memory locations.

Addresses-Coverity: ("Overlapped copy")

Fixes 9e81e8ff74b9 ("cifs: return cached_fid from open_shroot")

---
Changes in V2:
refcount increment is necessary. Don't remove it. Add and improve comments.

fs/cifs/smb2ops.c | 11 ++++++-----

 1 file changed, 6 insertions(+), 5 deletions(-)
fs/cifs/smb2ops.c +6 -5
index caa5432a5ed1..797a20714ca1 100644
@@ -848,11 +848,9 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
 		};
 
 		/*
-		 * caller expects this func to set pfid to a valid
-		 * cached root, so we copy the existing one and get a
-		 * reference.
+		 * caller expects this func to set the fid in crfid to valid
+		 * cached root, so increment the refcount.
 		 */
-		memcpy(pfid, tcon->crfid.fid, sizeof(*pfid));
 		kref_get(&tcon->crfid.refcount);
 
 		mutex_unlock(&tcon->crfid.fid_mutex);
@@ -885,7 +883,6 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
 	oparms.fid->mid = le64_to_cpu(o_rsp->sync_hdr.MessageId);
 #endif /* CIFS_DEBUG2 */
 
-	memcpy(tcon->crfid.fid, pfid, sizeof(struct cifs_fid));
 	tcon->crfid.tcon = tcon;
 	tcon->crfid.is_valid = true;
 	tcon->crfid.dentry = dentry;
@@ -894,6 +891,10 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
 
 	/* BB TBD check to see if oplock level check can be removed below */
 	if (o_rsp->OplockLevel == SMB2_OPLOCK_LEVEL_LEASE) {
+		/*
+		 * caller expects this func to set the fid in crfid to valid
+		 * cached root, so increment the refcount.
+		 */
 		kref_get(&tcon->crfid.refcount);
 		tcon->crfid.has_lease = true;
 		smb2_parse_contexts(server, o_rsp,
Signature · 1 line
2.25.1
#1 lore raw

Hi,

This is better I think.

fs/cifs/smb2ops.c int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, · line 897

Quoted 8 lines · Muhammad Usama Anjum
fs/cifs/smb2ops.c +4 -0
@@ -894,6 +891,10 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
 
 	/* BB TBD check to see if oplock level check can be removed below */
 	if (o_rsp->OplockLevel == SMB2_OPLOCK_LEVEL_LEASE) {
+		/*
+		 * caller expects this func to set the fid in crfid to valid
+		 * cached root, so increment the refcount.
+		 */

This comment is misleading. crfid variable doesn't exist anymore, and the kref_get() here is because of this commit:

    commit 2f94a3125b87
    Author: Ronnie Sahlberg <[email protected]>
    Date:   Thu Mar 28 11:20:02 2019 +1000
    
        cifs: fix kref underflow in close_shroot()

        [...]
-->     This extra get() is only used to hold the structure until we get a lease
-->     break from the server at which point we will kref_put() it during lease
-->     processing.
        [...]

When we queue a lease break, we usually get() the cifsFileInfo, but if that cifsFileInfo is backed by a cached_fid, the cached_fid isn't bumped. That commit was probably a work around for that.

@Ronnie :

struct cached_fid is starting to look very much like struct cifsFileInfo. I wonder why we couldn't use it, along with find_writable_file()/find_readable_file() to handle the caching.

Alternatively, make cifsFileInfo use cached_fid (perhaps renaming it in the process, I don't know)

Because I suspect a lot more issues will come up regarding cached_fid refcount and cifsFileInfo refcount going out of sync otherwise.

Cheers,

Signature · 4 lines
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97  8C99 03C8 A49B 521B D5D3
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)
#2 lore raw

I changed the comment to

+ /*

+                * See commit 2f94a3125b87. Increment the refcount when we
+                * get a lease for root, release it if lease break occurs
+                */

and added Aurelien's Reviewed-by. Let me know if you see any additional problems.

Quoted 55 lines · Aurélien Aptel

Hi,

This is better I think.

fs/cifs/smb2ops.c int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, · line 897

Quoted 8 lines · Muhammad Usama Anjum
fs/cifs/smb2ops.c +4 -0
@@ -894,6 +891,10 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
 
      /* BB TBD check to see if oplock level check can be removed below */
      if (o_rsp->OplockLevel == SMB2_OPLOCK_LEVEL_LEASE) {
+             /*
+              * caller expects this func to set the fid in crfid to valid
+              * cached root, so increment the refcount.
+              */

This comment is misleading. crfid variable doesn't exist anymore, and the kref_get() here is because of this commit:

    commit 2f94a3125b87
    Author: Ronnie Sahlberg <[email protected]>
    Date:   Thu Mar 28 11:20:02 2019 +1000

        cifs: fix kref underflow in close_shroot()

        [...]
-->     This extra get() is only used to hold the structure until we get a lease
-->     break from the server at which point we will kref_put() it during lease
-->     processing.
        [...]

When we queue a lease break, we usually get() the cifsFileInfo, but if that cifsFileInfo is backed by a cached_fid, the cached_fid isn't bumped. That commit was probably a work around for that.

@Ronnie :

struct cached_fid is starting to look very much like struct cifsFileInfo. I wonder why we couldn't use it, along with find_writable_file()/find_readable_file() to handle the caching.

Alternatively, make cifsFileInfo use cached_fid (perhaps renaming it in the process, I don't know)

Because I suspect a lot more issues will come up regarding cached_fid refcount and cifsFileInfo refcount going out of sync otherwise.

Cheers,
--
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)

Signature · 3 lines
Thanks,

Steve
#3 lore raw
Quoted 10 lines · Steve French

I changed the comment to

fs/cifs/smb2ops.c +4 -0
+               /*
+                * See commit 2f94a3125b87. Increment the refcount when we
+                * get a lease for root, release it if lease break occurs
+                */

and added Aurelien's Reviewed-by. Let me know if you see any additional problems.

Thank you so much!