Skip to content

Commit ddfcb06

Browse files
metze-sambasmfrench
authored andcommitted
smb: client: make use of smbdirect_socket.statistics
This will allow us to use common functions soon. Note this generates the following warnings from scripts/checkpatch.pl --quiet: WARNING: quoted string split across lines #59: FILE: fs/smb/client/cifs_debug.c:481: + seq_printf(m, "\nDebug count_get_receive_buffer: %llu " + "count_put_receive_buffer: %llu count_send_empty: %llu", WARNING: quoted string split across lines #66: FILE: fs/smb/client/cifs_debug.c:486: seq_printf(m, "\nRead Queue " + "count_enqueue_reassembly_queue: %llu " WARNING: quoted string split across lines #67: FILE: fs/smb/client/cifs_debug.c:487: + "count_enqueue_reassembly_queue: %llu " + "count_dequeue_reassembly_queue: %llu " total: 0 errors, 3 warnings, 83 lines checked scripts/checkpatch.pl: FAILED But I left them in there, because it matches the code arround it... Cc: Steve French <smfrench@gmail.com> Cc: Tom Talpey <tom@talpey.com> Cc: Long Li <longli@microsoft.com> Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 2449c7c commit ddfcb06

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

fs/smb/client/cifs_debug.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -477,18 +477,18 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
477477
sp->keepalive_interval_msec * 1000,
478478
sp->max_read_write_size,
479479
server->smbd_conn->rdma_readwrite_threshold);
480-
seq_printf(m, "\nDebug count_get_receive_buffer: %u "
481-
"count_put_receive_buffer: %u count_send_empty: %u",
482-
server->smbd_conn->count_get_receive_buffer,
483-
server->smbd_conn->count_put_receive_buffer,
484-
server->smbd_conn->count_send_empty);
480+
seq_printf(m, "\nDebug count_get_receive_buffer: %llu "
481+
"count_put_receive_buffer: %llu count_send_empty: %llu",
482+
sc->statistics.get_receive_buffer,
483+
sc->statistics.put_receive_buffer,
484+
sc->statistics.send_empty);
485485
seq_printf(m, "\nRead Queue "
486-
"count_enqueue_reassembly_queue: %u "
487-
"count_dequeue_reassembly_queue: %u "
486+
"count_enqueue_reassembly_queue: %llu "
487+
"count_dequeue_reassembly_queue: %llu "
488488
"reassembly_data_length: %u "
489489
"reassembly_queue_length: %u",
490-
server->smbd_conn->count_enqueue_reassembly_queue,
491-
server->smbd_conn->count_dequeue_reassembly_queue,
490+
sc->statistics.enqueue_reassembly_queue,
491+
sc->statistics.dequeue_reassembly_queue,
492492
sc->recv_io.reassembly.data_length,
493493
sc->recv_io.reassembly.queue_length);
494494
seq_printf(m, "\nCurrent Credits send_credits: %u "

fs/smb/client/smbdirect.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,9 +1212,10 @@ static int smbd_post_send_iter(struct smbd_connection *info,
12121212
*/
12131213
static int smbd_post_send_empty(struct smbd_connection *info)
12141214
{
1215+
struct smbdirect_socket *sc = &info->socket;
12151216
int remaining_data_length = 0;
12161217

1217-
info->count_send_empty++;
1218+
sc->statistics.send_empty++;
12181219
return smbd_post_send_iter(info, NULL, &remaining_data_length);
12191220
}
12201221

@@ -1353,7 +1354,7 @@ static void enqueue_reassembly(
13531354
virt_wmb();
13541355
sc->recv_io.reassembly.data_length += data_length;
13551356
spin_unlock(&sc->recv_io.reassembly.lock);
1356-
info->count_enqueue_reassembly_queue++;
1357+
sc->statistics.enqueue_reassembly_queue++;
13571358
}
13581359

13591360
/*
@@ -1392,7 +1393,7 @@ static struct smbdirect_recv_io *get_receive_buffer(struct smbd_connection *info
13921393
&sc->recv_io.free.list,
13931394
struct smbdirect_recv_io, list);
13941395
list_del(&ret->list);
1395-
info->count_get_receive_buffer++;
1396+
sc->statistics.get_receive_buffer++;
13961397
}
13971398
spin_unlock_irqrestore(&sc->recv_io.free.lock, flags);
13981399

@@ -1421,7 +1422,7 @@ static void put_receive_buffer(
14211422

14221423
spin_lock_irqsave(&sc->recv_io.free.lock, flags);
14231424
list_add_tail(&response->list, &sc->recv_io.free.list);
1424-
info->count_put_receive_buffer++;
1425+
sc->statistics.put_receive_buffer++;
14251426
spin_unlock_irqrestore(&sc->recv_io.free.lock, flags);
14261427

14271428
queue_work(info->workqueue, &sc->recv_io.posted.refill_work);
@@ -2078,7 +2079,7 @@ int smbd_recv(struct smbd_connection *info, struct msghdr *msg)
20782079
&sc->recv_io.reassembly.lock);
20792080
}
20802081
queue_removed++;
2081-
info->count_dequeue_reassembly_queue++;
2082+
sc->statistics.dequeue_reassembly_queue++;
20822083
put_receive_buffer(info, response);
20832084
offset = 0;
20842085
log_read(INFO, "put_receive_buffer offset=0\n");

fs/smb/client/smbdirect.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ struct smbd_connection {
6262
wait_queue_head_t wait_for_mr_cleanup;
6363

6464
struct workqueue_struct *workqueue;
65-
66-
/* for debug purposes */
67-
unsigned int count_get_receive_buffer;
68-
unsigned int count_put_receive_buffer;
69-
unsigned int count_enqueue_reassembly_queue;
70-
unsigned int count_dequeue_reassembly_queue;
71-
unsigned int count_send_empty;
7265
};
7366

7467
/* Create a SMBDirect session */

0 commit comments

Comments
 (0)