Skip to content

Commit 6e3c505

Browse files
metze-sambasmfrench
authored andcommitted
smb: smbdirect: introduce smbdirect_socket.recv_io.credits.available
The logic off managing recv credits by counting posted recv_io and granted credits is racy. That's because the peer might already consumed a credit, but between receiving the incoming recv at the hardware and processing the completion in the 'recv_done' functions we likely have a window where we grant credits, which don't really exist. So we better have a decicated counter for the available credits, which will be incremented when we posted new recv buffers and drained when we grant the credits to the peer. Fixes: 5fb9b45 ("smb: client: count the number of posted recv_io messages in order to calculated credits") Fixes: 89b021a ("smb: server: manage recv credits by counting posted recv_io and granted credits") Cc: <stable@vger.kernel.org> # 6.18.x Cc: Steve French <smfrench@gmail.com> Cc: Tom Talpey <tom@talpey.com> Cc: Long Li <longli@microsoft.com> Cc: Namjae Jeon <linkinjeon@kernel.org> Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Signed-off-by: Stefan Metzmacher <metze@samba.org> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 05f7e89 commit 6e3c505

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

fs/smb/common/smbdirect/smbdirect_socket.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ struct smbdirect_socket {
239239
*/
240240
struct {
241241
u16 target;
242+
atomic_t available;
242243
atomic_t count;
243244
} credits;
244245

@@ -387,6 +388,7 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)
387388
INIT_WORK(&sc->recv_io.posted.refill_work, __smbdirect_socket_disabled_work);
388389
disable_work_sync(&sc->recv_io.posted.refill_work);
389390

391+
atomic_set(&sc->recv_io.credits.available, 0);
390392
atomic_set(&sc->recv_io.credits.count, 0);
391393

392394
INIT_LIST_HEAD(&sc->recv_io.reassembly.list);

0 commit comments

Comments
 (0)