From patchwork Tue Nov 23 12:50:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 12634135 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 231BCC433EF for ; Tue, 23 Nov 2021 12:51:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235777AbhKWMyS (ORCPT ); Tue, 23 Nov 2021 07:54:18 -0500 Received: from pi.codeconstruct.com.au ([203.29.241.158]:55716 "EHLO codeconstruct.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235122AbhKWMyQ (ORCPT ); Tue, 23 Nov 2021 07:54:16 -0500 Received: by codeconstruct.com.au (Postfix, from userid 10000) id 2591720271; Tue, 23 Nov 2021 20:51:07 +0800 (AWST) From: Jeremy Kerr To: netdev@vger.kernel.org Cc: Jiri Slaby , Greg Kroah-Hartman , Matt Johnston , "David S. Miller" , Jakub Kicinski Subject: [PATCH net-next 1/3] mctp: serial: cancel tx work on ldisc close Date: Tue, 23 Nov 2021 20:50:40 +0800 Message-Id: <20211123125042.2564114-2-jk@codeconstruct.com.au> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211123125042.2564114-1-jk@codeconstruct.com.au> References: <20211123125042.2564114-1-jk@codeconstruct.com.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org We want to ensure that the tx work has finished before returning from the ldisc close op, so do a synchronous cancel. Reported-by: Jiri Slaby Signed-off-by: Jeremy Kerr --- drivers/net/mctp/mctp-serial.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mctp/mctp-serial.c b/drivers/net/mctp/mctp-serial.c index 9ac0e187f36e..c958d773a82a 100644 --- a/drivers/net/mctp/mctp-serial.c +++ b/drivers/net/mctp/mctp-serial.c @@ -478,6 +478,7 @@ static void mctp_serial_close(struct tty_struct *tty) struct mctp_serial *dev = tty->disc_data; int idx = dev->idx; + cancel_work_sync(&dev->tx_work); unregister_netdev(dev->netdev); ida_free(&mctp_serial_ida, idx); } From patchwork Tue Nov 23 12:50:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 12634137 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95B27C433FE for ; Tue, 23 Nov 2021 12:51:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236621AbhKWMyS (ORCPT ); Tue, 23 Nov 2021 07:54:18 -0500 Received: from pi.codeconstruct.com.au ([203.29.241.158]:55728 "EHLO codeconstruct.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232746AbhKWMyQ (ORCPT ); Tue, 23 Nov 2021 07:54:16 -0500 Received: by codeconstruct.com.au (Postfix, from userid 10000) id 8CBF120274; Tue, 23 Nov 2021 20:51:07 +0800 (AWST) From: Jeremy Kerr To: netdev@vger.kernel.org Cc: Jiri Slaby , Greg Kroah-Hartman , Matt Johnston , "David S. Miller" , Jakub Kicinski Subject: [PATCH net-next 2/3] mctp: serial: enforce fixed MTU Date: Tue, 23 Nov 2021 20:50:41 +0800 Message-Id: <20211123125042.2564114-3-jk@codeconstruct.com.au> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211123125042.2564114-1-jk@codeconstruct.com.au> References: <20211123125042.2564114-1-jk@codeconstruct.com.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The current serial driver requires a maximum MTU of 68, and it doesn't make sense to set a MTU below the MCTP-required baseline (of 68) either. This change sets the min_mtu & max_mtu of the mctp netdev, essentially disallowing changes. By using these instead of a ndo_change_mtu op, we get the netlink extacks reported too. Signed-off-by: Jeremy Kerr --- drivers/net/mctp/mctp-serial.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/mctp/mctp-serial.c b/drivers/net/mctp/mctp-serial.c index c958d773a82a..5687ad3220cd 100644 --- a/drivers/net/mctp/mctp-serial.c +++ b/drivers/net/mctp/mctp-serial.c @@ -410,7 +410,14 @@ static const struct net_device_ops mctp_serial_netdev_ops = { static void mctp_serial_setup(struct net_device *ndev) { ndev->type = ARPHRD_MCTP; + + /* we limit at the fixed MTU, which is also the MCTP-standard + * baseline MTU, so is also our minimum + */ ndev->mtu = MCTP_SERIAL_MTU; + ndev->max_mtu = MCTP_SERIAL_MTU; + ndev->min_mtu = MCTP_SERIAL_MTU; + ndev->hard_header_len = 0; ndev->addr_len = 0; ndev->tx_queue_len = DEFAULT_TX_QUEUE_LEN; From patchwork Tue Nov 23 12:50:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 12634139 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 380E9C4332F for ; Tue, 23 Nov 2021 12:51:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236778AbhKWMyT (ORCPT ); Tue, 23 Nov 2021 07:54:19 -0500 Received: from pi.codeconstruct.com.au ([203.29.241.158]:55740 "EHLO codeconstruct.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236620AbhKWMyR (ORCPT ); Tue, 23 Nov 2021 07:54:17 -0500 Received: by codeconstruct.com.au (Postfix, from userid 10000) id E53C92029B; Tue, 23 Nov 2021 20:51:07 +0800 (AWST) From: Jeremy Kerr To: netdev@vger.kernel.org Cc: Jiri Slaby , Greg Kroah-Hartman , Matt Johnston , "David S. Miller" , Jakub Kicinski Subject: [PATCH net-next 3/3] mctp: serial: remove unnecessary ldisc data check Date: Tue, 23 Nov 2021 20:50:42 +0800 Message-Id: <20211123125042.2564114-4-jk@codeconstruct.com.au> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211123125042.2564114-1-jk@codeconstruct.com.au> References: <20211123125042.2564114-1-jk@codeconstruct.com.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Jiri assures me that a ldisc->open with tty->disc_data set should never happen, so this check doesn't do anything. Reported-by: Jiri Slaby Signed-off-by: Jeremy Kerr --- drivers/net/mctp/mctp-serial.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/mctp/mctp-serial.c b/drivers/net/mctp/mctp-serial.c index 5687ad3220cd..9919a4734ed9 100644 --- a/drivers/net/mctp/mctp-serial.c +++ b/drivers/net/mctp/mctp-serial.c @@ -439,9 +439,6 @@ static int mctp_serial_open(struct tty_struct *tty) if (!tty->ops->write) return -EOPNOTSUPP; - if (tty->disc_data) - return -EEXIST; - idx = ida_alloc(&mctp_serial_ida, GFP_KERNEL); if (idx < 0) return idx;