From patchwork Mon Apr 24 07:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "D. Starke" X-Patchwork-Id: 86894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2584278vqo; Mon, 24 Apr 2023 01:23:18 -0700 (PDT) X-Google-Smtp-Source: AKy350bg1559/zt+xO6fucriDI7TptY0/pDIARi/IPGISxo3DD+NaqKlZ7CsyT9ibXYyw5CqMAaX X-Received: by 2002:a17:90b:3110:b0:246:fd44:eb6f with SMTP id gc16-20020a17090b311000b00246fd44eb6fmr13015380pjb.39.1682324598144; Mon, 24 Apr 2023 01:23:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682324598; cv=none; d=google.com; s=arc-20160816; b=whzDnD8fglLdLsnyA/UlbOHN40vQlY4FhF2cEVJDGUcJ8xdz3LNR1J7cIFoUMyYjLR qOh++KZmi9o2c1mFpTnh/8exPcaqsKPFlhLBRau+Mxp7Ra9bpA9REDP3JyFIWfvnETDE ea1YY+1Yp4zrBRHPdEIEwNRi75PjR7WWjzxfX/C5LI1tGyDHto0KrxzytWJhL5+QBoBu eZjzLbnFPf54l0zXL7sv+Nx1dIUXb57nLSjdbwFFm2/aRUREr8U6U/tazik1UJ3jgzPC Y2U6UUPJKo8KQtELmnHosqb5//bB0rNEHhBdz5VcUFDCnbyG/oifJ8qTin9JOxCodMtt E61A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TMiKHVqdPJJ94SJ7CYeAuedDKJjk5C6OoKfwHyNkX74=; b=JKSNUctaNogNqK/6P+xPS/giVSPsQaYYpvvzejYBZnXLv5A1sYBI59dm/M7NWOWuVa n45cxpB9FUULr8I0BfZcoQOhi2dkBKXJ6c5kXcHrRxvLlujt2xor6Pn6YaBEHxBhlWF0 x+Ag+lFpKGj5u30g1o3MQctX+WcHocfXQUPW6RC1FNTo0UyEkAcTbTZq6u1IxHFyqgBY 7YGq9hJfUpfyulgec2mY4TCj/PrkIJyZ4fab9009ESaz+/gYNiQQWtEgBnrL2BGpJDPS 9oirw6jITT15QrKfEtD5OZvEEhSJYPmWnHzl7SRJSr6jQJH7WuxRC3a3tyUuXl98dbMo CeMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KcyPzwEz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b2-20020a63cf42000000b0050bcfe667e7si10371571pgj.474.2023.04.24.01.23.05; Mon, 24 Apr 2023 01:23:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=KcyPzwEz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231312AbjDXHzB (ORCPT + 99 others); Mon, 24 Apr 2023 03:55:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231461AbjDXHyl (ORCPT ); Mon, 24 Apr 2023 03:54:41 -0400 Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DB9010F5 for ; Mon, 24 Apr 2023 00:54:40 -0700 (PDT) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2023042407543818b8085091f816099a for ; Mon, 24 Apr 2023 09:54:38 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=daniel.starke@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=TMiKHVqdPJJ94SJ7CYeAuedDKJjk5C6OoKfwHyNkX74=; b=KcyPzwEzxq2cT9bEVkBbcU6KeITsFXBmrV3DKv5X/CId4YV28+aCpg5P5nmoc5aSn7xmUV EaguzZ+QCskm9vYOt323mnEieR8xIa1+FgMX1Nw/0AvgtS4KMFWI4zQQ+AKDWq2QhbV1jWUs eINdAk2KwYh1y5eBJdr7K0YZi5gCg=; From: "D. Starke" To: linux-serial@vger.kernel.org, gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com Cc: linux-kernel@vger.kernel.org, Daniel Starke Subject: [PATCH v3 8/8] tty: n_gsm: add DLCI specific rx/tx statistics Date: Mon, 24 Apr 2023 09:52:51 +0200 Message-Id: <20230424075251.5216-8-daniel.starke@siemens.com> In-Reply-To: <20230424075251.5216-1-daniel.starke@siemens.com> References: <20230424075251.5216-1-daniel.starke@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-314044:519-21489:flowmailer X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764045197763187437?= X-GMAIL-MSGID: =?utf-8?q?1764045197763187437?= From: Daniel Starke 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 --- drivers/tty/n_gsm.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) v2 -> v3: No changes. Link: https://lore.kernel.org/all/20230420085017.7314-9-daniel.starke@siemens.com/ diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 6bfcaf8fe54c..7377a37320af 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -186,6 +186,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 */ }; /* @@ -1216,6 +1219,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; } @@ -1283,6 +1287,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; @@ -1461,6 +1466,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; } @@ -1488,6 +1494,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; } /** @@ -1852,10 +1859,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; @@ -1934,6 +1944,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)) { @@ -2298,6 +2310,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: @@ -2330,6 +2345,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: @@ -2349,6 +2367,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: @@ -2425,6 +2446,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); } @@ -2785,6 +2807,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 {