[PATCH v2 9/9] tty: n_gsm: add DLCI specific rx/tx statistics

From: D. Starke
Date: Thu Apr 20 2023 - 04:55:13 EST


From: Daniel Starke <daniel.starke@xxxxxxxxxxx>

Add counters for the number of data bytes received/transmitted per DLCI in
for preparation for an upcoming patch which will expose these values to the
user.

Signed-off-by: Daniel Starke <daniel.starke@xxxxxxxxxxx>
---
drivers/tty/n_gsm.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)

v1 -> v2:
Moved from patch 8 to 9 as suggested in the review.
Added missing change of gsm_dlci_data_output_framed() where dlci->tx also
needs to be increased. This has been pointed out in the review.

Link: https://lore.kernel.org/all/AS4PR10MB58956DDD178D33EC6CA3A73EE0919@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index bd6bddb185b9..7f15c122a333 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -185,6 +185,9 @@ struct gsm_dlci {
void (*data)(struct gsm_dlci *dlci, const u8 *data, int len);
void (*prev_data)(struct gsm_dlci *dlci, const u8 *data, int len);
struct net_device *net; /* network interface, if created */
+ /* Statistics (not currently exposed) */
+ u64 tx; /* Data bytes sent on this DLCI */
+ u64 rx; /* Data bytes received on this DLCI */
};

/*
@@ -1215,6 +1218,7 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci)
tty_port_tty_wakeup(&dlci->port);

__gsm_data_queue(dlci, msg);
+ dlci->tx += len;
/* Bytes of data we used up */
return size;
}
@@ -1282,6 +1286,7 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
memcpy(dp, dlci->skb->data, len);
skb_pull(dlci->skb, len);
__gsm_data_queue(dlci, msg);
+ dlci->tx += len;
if (last) {
dev_kfree_skb_any(dlci->skb);
dlci->skb = NULL;
@@ -1460,6 +1465,7 @@ static int gsm_control_command(struct gsm_mux *gsm, int cmd, const u8 *data,
msg->data[1] = (dlen << 1) | EA;
memcpy(msg->data + 2, data, dlen);
gsm_data_queue(dlci, msg);
+ dlci->tx += dlen;

return 0;
}
@@ -1487,6 +1493,7 @@ static void gsm_control_reply(struct gsm_mux *gsm, int cmd, const u8 *data,
msg->data[1] = (dlen << 1) | EA;
memcpy(msg->data + 2, data, dlen);
gsm_data_queue(dlci, msg);
+ dlci->tx += dlen;
}

/**
@@ -1851,10 +1858,13 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command,
const u8 *data, int clen)
{
u8 buf[1];
+ struct gsm_dlci *dlci = gsm->dlci[0];
+
+ if (dlci)
+ dlci->rx += clen;

switch (command) {
case CMD_CLD: {
- struct gsm_dlci *dlci = gsm->dlci[0];
/* Modem wishes to close down */
if (dlci) {
dlci->dead = true;
@@ -1933,6 +1943,8 @@ static void gsm_control_response(struct gsm_mux *gsm, unsigned int command,

ctrl = gsm->pending_cmd;
dlci = gsm->dlci[0];
+ if (dlci)
+ dlci->rx += clen;
command |= 1;
/* Does the reply match our command */
if (ctrl != NULL && (command == ctrl->cmd || command == CMD_NSC)) {
@@ -2297,6 +2309,9 @@ static void gsm_dlci_begin_open(struct gsm_dlci *dlci)
need_pn = true;
}

+ dlci->tx = 0;
+ dlci->rx = 0;
+
switch (dlci->state) {
case DLCI_CLOSED:
case DLCI_WAITING_CONFIG:
@@ -2329,6 +2344,9 @@ static void gsm_dlci_begin_open(struct gsm_dlci *dlci)
*/
static void gsm_dlci_set_opening(struct gsm_dlci *dlci)
{
+ dlci->tx = 0;
+ dlci->rx = 0;
+
switch (dlci->state) {
case DLCI_CLOSED:
case DLCI_WAITING_CONFIG:
@@ -2348,6 +2366,9 @@ static void gsm_dlci_set_opening(struct gsm_dlci *dlci)
*/
static void gsm_dlci_set_wait_config(struct gsm_dlci *dlci)
{
+ dlci->tx = 0;
+ dlci->rx = 0;
+
switch (dlci->state) {
case DLCI_CLOSED:
case DLCI_CLOSING:
@@ -2424,6 +2445,7 @@ static void gsm_dlci_data(struct gsm_dlci *dlci, const u8 *data, int clen)
fallthrough;
case 1: /* Line state will go via DLCI 0 controls only */
default:
+ dlci->rx += clen;
tty_insert_flip_string(port, data, clen);
tty_flip_buffer_push(port);
}
@@ -2784,6 +2806,7 @@ static void gsm_queue(struct gsm_mux *gsm)
gsm->open_error++;
return;
}
+ dlci->rx += gsm->len;
if (dlci->dead)
gsm_response(gsm, address, DM|PF);
else {
--
2.34.1