Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3516401rwa; Tue, 23 Aug 2022 06:07:33 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Sgl1oRlmwGJLUMwdKUAHpRir1MeFDPVY5EVQTiLe4Z90BAV1J77rmQ0KP+86ipdHa8fNI X-Received: by 2002:a05:6402:3315:b0:446:5c1b:2209 with SMTP id e21-20020a056402331500b004465c1b2209mr3639816eda.199.1661260053391; Tue, 23 Aug 2022 06:07:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661260053; cv=none; d=google.com; s=arc-20160816; b=qbgSKzjHpVZQzsouWn9uLNn5FDnYvPKDfedgLZz96ORdEXW3Mb62RuWUVOHFssehaW 9NNrR0FTXX9Bd4/TW7pkTShR9kk5r8SBlOa1iFdDGKiXsCiksxTGYSY6B1wRri4oHCsV JjmTuANGy0uuWMC2ldHL+NYFeEiCydGMdH/HABqVdJa7lIxbz0sSQweqgK/cxyWiNHJJ JATBTi/WWS9nCtAymDKuUFiKZWd35gqnHLa/UTfcTmPAcNJVCxgqSCoN1A8FsK0WvtU4 xATAynE1yPoNm0oL/2Fg4shDuqRXiUZpTGdRoi8uMme0oSE0RlHPkwerr4SsXLc0/eOA vbSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MP413ldKXrVJ49RWALX456uOJFeDM+FajfKf2IVD/i8=; b=BtqVfVzfq38bMwV0UA3BXw5czJRu6WuA3tOaDOVGXPPQHe4VxSrCxhPgQ8wO7CqOrI hmn1zGPSKoWR3I72WTiAsE8JnhGfy0OUMOBYNHGGTkJ/Q+C8r9yNpoMbGUSGsT0WuKGH 8TuanKkjmVf+YctOy5gKLrAiy4WgtceG4Dtbqsd9FtADlZzS3er8PcU4lXUMecskHK8m VkCDa++oSyGx0MQ3F6EZqU+kj19uIwUJKE5a424fmlIJp7oLhgSkh1iOwR6ukvdtACbZ uP4Oaj84w9VNqb7p9Xu60iCeNSUfHbfw788sZfaJMKA8ujypWpbkQpy98adktJdmyUmd CX7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="axtYP/Yd"; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wy9-20020a170906fe0900b0073d671012c7si9756108ejb.486.2022.08.23.06.07.07; Tue, 23 Aug 2022 06:07:33 -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=@linuxfoundation.org header.s=korg header.b="axtYP/Yd"; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357581AbiHWLfq (ORCPT + 99 others); Tue, 23 Aug 2022 07:35:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357745AbiHWLbx (ORCPT ); Tue, 23 Aug 2022 07:31:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8CB890838; Tue, 23 Aug 2022 02:26:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5835861328; Tue, 23 Aug 2022 09:25:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50F4AC433D6; Tue, 23 Aug 2022 09:25:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661246758; bh=8fHAmm5kuO8u3fVNM0lsNvv3FgA2v4FB+neb2g6I6+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=axtYP/YdYeRtDfPOgHpaDBWrU1bIeEDKQKWG6bNfoGHPkHcixEtGJ7thXcxjXzKUs QHnNmHJpEiZPkIOSBVQTSA/2Q5JPD8Y0AVYC9VpeRgaiBKdr2dS1rBD9RbTTrdF9F6 Nqiwr5AEYrNsQbH8c1TdIftoJz846HtirCIlHCrg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Starke , Sasha Levin Subject: [PATCH 5.4 211/389] tty: n_gsm: fix non flow control frames during mux flow off Date: Tue, 23 Aug 2022 10:24:49 +0200 Message-Id: <20220823080124.428283195@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080115.331990024@linuxfoundation.org> References: <20220823080115.331990024@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,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 From: Daniel Starke [ Upstream commit bec0224816d19abe4fe503586d16d51890540615 ] n_gsm is based on the 3GPP 07.010 and its newer version is the 3GPP 27.010. See https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1516 The changes from 07.010 to 27.010 are non-functional. Therefore, I refer to the newer 27.010 here. Chapter 5.4.6.3.6 states that FCoff stops the transmission on all channels except the control channel. This is already implemented in gsm_data_kick(). However, chapter 5.4.8.1 explains that this shall result in the same behavior as software flow control on the ldisc in advanced option mode. That means only flow control frames shall be sent during flow off. The current implementation does not consider this case. Change gsm_data_kick() to send only flow control frames if constipated to abide the standard. gsm_read_ea_val() and gsm_is_flow_ctrl_msg() are introduced as helper functions for this. It is planned to use gsm_read_ea_val() in later code cleanups for other functions, too. Fixes: c01af4fec2c8 ("n_gsm : Flow control handling in Mux driver") Signed-off-by: Daniel Starke Link: https://lore.kernel.org/r/20220701061652.39604-5-daniel.starke@siemens.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/n_gsm.c | 54 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 907a4d0784ac..cab30df61196 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -410,6 +410,27 @@ static int gsm_read_ea(unsigned int *val, u8 c) return c & EA; } +/** + * gsm_read_ea_val - read a value until EA + * @val: variable holding value + * @data: buffer of data + * @dlen: length of data + * + * Processes an EA value. Updates the passed variable and + * returns the processed data length. + */ +static unsigned int gsm_read_ea_val(unsigned int *val, const u8 *data, int dlen) +{ + unsigned int len = 0; + + for (; dlen > 0; dlen--) { + len++; + if (gsm_read_ea(val, *data++)) + break; + } + return len; +} + /** * gsm_encode_modem - encode modem data bits * @dlci: DLCI to encode from @@ -657,6 +678,37 @@ static struct gsm_msg *gsm_data_alloc(struct gsm_mux *gsm, u8 addr, int len, return m; } +/** + * gsm_is_flow_ctrl_msg - checks if flow control message + * @msg: message to check + * + * Returns true if the given message is a flow control command of the + * control channel. False is returned in any other case. + */ +static bool gsm_is_flow_ctrl_msg(struct gsm_msg *msg) +{ + unsigned int cmd; + + if (msg->addr > 0) + return false; + + switch (msg->ctrl & ~PF) { + case UI: + case UIH: + cmd = 0; + if (gsm_read_ea_val(&cmd, msg->data + 2, msg->len - 2) < 1) + break; + switch (cmd & ~PF) { + case CMD_FCOFF: + case CMD_FCON: + return true; + } + break; + } + + return false; +} + /** * gsm_data_kick - poke the queue * @gsm: GSM Mux @@ -675,7 +727,7 @@ static void gsm_data_kick(struct gsm_mux *gsm, struct gsm_dlci *dlci) int len; list_for_each_entry_safe(msg, nmsg, &gsm->tx_list, list) { - if (gsm->constipated && msg->addr) + if (gsm->constipated && !gsm_is_flow_ctrl_msg(msg)) continue; if (gsm->encoding != 0) { gsm->txframe[0] = GSM1_SOF; -- 2.35.1