From patchwork Thu Apr 20 08:50:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "D. Starke" X-Patchwork-Id: 85784 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp186086vqo; Thu, 20 Apr 2023 02:06:26 -0700 (PDT) X-Google-Smtp-Source: AKy350bjFEm9oG1GKAKfpDkspSDW1075z41REES9SLUsIjBog8g/KgMsfYivB9wr8X6ZZgyHCyGU X-Received: by 2002:a25:2b48:0:b0:b8b:f174:b83f with SMTP id r69-20020a252b48000000b00b8bf174b83fmr801034ybr.20.1681981586090; Thu, 20 Apr 2023 02:06:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681981586; cv=none; d=google.com; s=arc-20160816; b=zjqm0wIqWE766KHaDTrxLhEBAZ3+dQslM7uGhX8j1DwIhRuSHpUmCecpGSbSuQMQ/x g45gI8EK+mr642W1gbkvLhIycK1tweSv+GdkUIbWaKRKTJD3DhTM82U10lNToOqaKuAx mC0ZI/CKOaQGJqqbT6EBPEJ4OWNt0+NEZClhcUO+0IO1Cyg/LnONTblhJ6kjq+MYZ+Kq ufDST+pb2C3q+d8S12zRG0h9kn+zvom99zGYeQioe2fQEtUiyIEZQunNkCrEG299iDIP sqM87yAMFBYACq0PahwjMVGYbXV50aeBMl2L8kfQ/bWIn0POntsvRDNK4D1nzQ/pQBtJ 4s6g== 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=GMJnTQBjqNDmRCR9GVA4p1Mh+jUY2F8iX0UGlZoBzWI=; b=VW+8PCkcEJWWKNCoZMQP+5khnlwm91/odD1TfRjShH0iJq0f+sJIkaV4ptUMK6V96O fJnT81l6HMQPGBAn1flwgtkq6gC8Y9nbsQaFAUP2hTsGLTtQosWzknWGaYdauGjD/mjn suYIlTvL2Yv/FnYrMcxbPEWjQ/VwBCbxNwyMxM0kcaN1nfjlDes6bbL5D2nmcSbDREgG qYdUPm0cgnZENbmpzHRjghbb0HIf91PiL+Le7x19d8bcFfPte3j4S+DyhwHzSNGfibRH /23ZHTI+aOI5XVHG9C9kDAzFJy0vjsJ2d9oC1XQqfuo4HesVWcxkproQVxGloCK/18Tg jjAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="AuyFbk//"; 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 c66-20020a814e45000000b0054f6d611cacsi937059ywb.457.2023.04.20.02.06.12; Thu, 20 Apr 2023 02:06:26 -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="AuyFbk//"; 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 S234351AbjDTIzJ (ORCPT + 99 others); Thu, 20 Apr 2023 04:55:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233992AbjDTIxw (ORCPT ); Thu, 20 Apr 2023 04:53:52 -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 7F07F7297 for ; Thu, 20 Apr 2023 01:52:04 -0700 (PDT) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20230420085202985c15d48e4d787d92 for ; Thu, 20 Apr 2023 10:52:02 +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=GMJnTQBjqNDmRCR9GVA4p1Mh+jUY2F8iX0UGlZoBzWI=; b=AuyFbk//3khrCXXs0xkWwn6u7UfH40FHgcDYoNUmV+ND4Luo7vLCO/ufVWrIGHDeiS609b TooMq2FIlpsMSNtbOixkvdMfhr3FL1DVkJZ7KK2AdALAOCGN4v0sWYsY35guW7KSd6yZa+1C vfdvz88uOIb3lQUk6J9NwcXksOmIA=; 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 v2 9/9] tty: n_gsm: add DLCI specific rx/tx statistics Date: Thu, 20 Apr 2023 10:50:17 +0200 Message-Id: <20230420085017.7314-9-daniel.starke@siemens.com> In-Reply-To: <20230420085017.7314-1-daniel.starke@siemens.com> References: <20230420085017.7314-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=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?1763685523812914253?= X-GMAIL-MSGID: =?utf-8?q?1763685523812914253?= 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(-) 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@AS4PR10MB5895.EURPRD10.PROD.OUTLOOK.COM/ 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 {