From patchwork Wed May 17 15:57:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "D. Starke" X-Patchwork-Id: 95400 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1253088vqo; Wed, 17 May 2023 09:11:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4q/3lkc0O6qNF8J8fdHPAn65gTntCZK7q20S+a/z+hRID9xpJHpnaoNy8RbZE4Rrvb9MxC X-Received: by 2002:a17:90a:9315:b0:24e:edd:4d63 with SMTP id p21-20020a17090a931500b0024e0edd4d63mr249487pjo.5.1684339899455; Wed, 17 May 2023 09:11:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684339899; cv=none; d=google.com; s=arc-20160816; b=x2q6X+ucxWO3f7deC0M3ZCpJW7FZvYo+ZKncG8g8xW5HHUMI9szYxNKJsJohcaoncY U1xqdMlwXgwfrKujI3rEermEtgp6uX+UK2Chyiqsx3on9qSW9WhrHrlNR87FiyUGVPRv 81aHhFLHWIGAVLwC3Jw+iCIzePB6JbaieB3xNiQo+dQ2pX6VSN2mxphvjB1uDZjh5zQp 0lLg9QSfq9cXHpONv8NAOWHvoIVgdLv/yJjIBpt40H32qe55GHba02C0EZNz7ab0kim3 jJr1AfaqBG42qtiTkPPqB4TGp0kZTjIo1k3ljNQt6ebkYQLg58WOkJa9Lz83qh9BuGP8 zFKQ== 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=Sa2/lDymF7guLu5/iTBwB/pVI82RAGaOTwCGzH2ZfJs=; b=LYng0oEIgludrt2AJ+3/q8sNFfYPSN8abxJjrmEVmvoy2Khpb8DF5tHfr895Z9FQ1b tsj3dzo+3eW5hzt/qAcyQft6jYZLmLTnNWIgUFUPSfnbcB3RZJvtn4YccOSU2vcpNtaY 0nchmXwiIje6H5GwWzOCo7CGEz6K4N10OOBhY9x7Betvgdy2VpkYB68BnZ8S7wEUbhQw 7rBzTd/mVgWeYpUnKx/PUeWzzzo08rXyMhlicsk6eLjtFb68gMRNbw2+l3mTu4XR7IHY 2Qk2BhVY/30hjxepimbVwqZoOxFXYwul2VdhofNI06J18RijUC6qLYKRrxwL7OtSDx6+ 8j/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=GGbH5S9C; 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 rj7-20020a17090b3e8700b00247ad11b6d3si2205384pjb.88.2023.05.17.09.11.26; Wed, 17 May 2023 09:11:39 -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=GGbH5S9C; 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 S232125AbjEQP7H (ORCPT + 99 others); Wed, 17 May 2023 11:59:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231963AbjEQP6y (ORCPT ); Wed, 17 May 2023 11:58:54 -0400 Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net [185.136.64.225]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41D567AB1 for ; Wed, 17 May 2023 08:58:33 -0700 (PDT) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20230517155831f80cb885b24e654a99 for ; Wed, 17 May 2023 17:58:31 +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=Sa2/lDymF7guLu5/iTBwB/pVI82RAGaOTwCGzH2ZfJs=; b=GGbH5S9CVsn0iyn2AM467c9w4vL3Ia8lP4NQfMoFErGuzQ9vWcRrvigDC/YCnFkNy0ovoD 6NLoU6f4pviCO6yg2TCfBg2K0TCGQb1bv+UwaHmGcReOhouc2p3s/Vf94URSYEU8vbJajS+U IXTkWiALiGAJtR4DlF9uPIYctR8wg=; From: "D. Starke" To: linux-serial@vger.kernel.org, gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com, felix-haase@siemens.com Cc: linux-kernel@vger.kernel.org, Daniel Starke Subject: [PATCH v5 08/10] tty: n_gsm: add DLCI specific rx/tx statistics Date: Wed, 17 May 2023 17:57:02 +0200 Message-Id: <20230517155704.5701-8-daniel.starke@siemens.com> In-Reply-To: <20230517155704.5701-1-daniel.starke@siemens.com> References: <20230517155704.5701-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,URIBL_BLOCKED autolearn=unavailable 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?1766158394733605085?= X-GMAIL-MSGID: =?utf-8?q?1766158394733605085?= 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 | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) v4 -> v5: Added blank line before comment of new tx/rx fields in struct gsm_dlci as suggested in the review. The remarked upcoming patch which exposes these flags is now included in patch 9/10. This has been done as recommended in the review. Please note that I cannot response to emails until August 7th. Felix Haase will take over from our side for questions regarding this patch series or the n_gsm. Link: https://lore.kernel.org/all/DB9PR10MB5881A7A09725EAF8FDB5F35BE0789@DB9PR10MB5881.EURPRD10.PROD.OUTLOOK.COM/ diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 62bff4474b57..511f22489754 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -186,6 +186,10 @@ 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 +1220,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 +1288,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 +1467,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 +1495,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 +1860,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 +1945,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 +2311,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 +2346,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 +2368,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 +2447,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 +2808,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 {