From patchwork Tue Jun 7 09:47:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2017 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id DF77E3F08A for ; Tue, 7 Jun 2022 11:48:18 +0200 (CEST) Received: by mail-wm1-f69.google.com with SMTP id bi22-20020a05600c3d9600b0039c4144992csf4791030wmb.5 for ; Tue, 07 Jun 2022 02:48:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654595298; cv=pass; d=google.com; s=arc-20160816; b=bRGAXBeLXOd8jic8cqmWEu7r6AimDMEdP9gmFvFEio/Rl5fPThga4XmpIe3fohSJ8Z gIwYT2gtrQIPv/90vUTWNpP3+RbifZP295gmMnoLNPayniIvTRWAsj1Io/OtZEcrF5qI 0d8WS/ikpJU1nFRbgA5Dcns3ZBgeQA2VRD+YD9Gy9oYfMP6LamhnaKRAj7Fav9GHdNob /U6haZUsRN3d06jD2Kc17I+/tyn22lrcP6o12u+YJBBCi0vG1uULA8vY61aFHEUU2ZSV mWH9p20HXT9GiYohTN1j9dE5KFfhvZ7FBd4bb6FbrCsolY6OpbN4COprAr58oeBuWfT3 1Lhw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=OhU7b9Cs4phuiaOFIPCS384ligvEjn+id8TYxD96mDo=; b=KoKnRZACpHSUolRfjyk4hPbLMEHRjANf0/r4cU5FFCojBoPvwlJkq99R2YVtg2/PN9 WtwUYUzNkdi5wfdtWcEurdd4I7V9wvKY6wGzwMPJfEb01sJdb/actTCCWt2VXuIlDQKd NVtbtSUZ/Yg3Q9wQaLILA3TKm3tUNEnHuqM+QPWvp6QRnuimEok6tTRhrvgM8tcHap0Q NBfjHokkvEJLWcC8RZEGZxHZAdFqjANFFI3vlpLBT1dOCZECdevJq8BYj08CbXbtdiZi VckDe8e+FNz7lWu1H/yZo9vuNxfW1n3s8xn/3nPoNHa189KDwn5+F4lR7YZjgO39JOOB teXg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Laes7FMm; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=OhU7b9Cs4phuiaOFIPCS384ligvEjn+id8TYxD96mDo=; b=VCTKmNsxB+PQ8/KgSvDC4bGenjLL3hDq0QvgG0Q83UcJIe7jF3+VAerJG3sM6EB2CP xC5CzQxZesQBXiQTSHmPxtXqR0AxOjyRMXEn+LyIt2USaWykruriwxLD2FiFjZWcySl2 xbTSBxkxVzuT9FFjPKvEsW6d9aWOqZmU9GNTg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=OhU7b9Cs4phuiaOFIPCS384ligvEjn+id8TYxD96mDo=; b=w132Pco6Z4udW3Pqk+7qUQQyQrUw54E+QPfyhmJbBYYhhz9haU3tD6yigLy7ip7Xtp HVQ6AG/uOaCZVzqUh2nlfT8i6QUlDI633+kCnBbvDpnw9bdqJL4yMGYtHm0oX/PrBeT9 vcND3BapdfreLJmY7XqQts0suCeOFpHuHysgjCZ+aO+7uf0RKawDynPS9Xmj7A/dYWL+ cnNEBp7Lu1C+nwoxto8ghu7m3BAL9Q7YDmLFhP5z/m3psr6ebJ6fnlwnfpUh4u5Oyyv9 U3QKnDeLv1bwACB50VtL7+nvq4gR860IYaC8cCjpBE3FDuvvKvTPY3NO+FeCpcu71Jnr y/Gw== X-Gm-Message-State: AOAM5322GxN1r3Z0MTCLPHgpOJI16mvKyotWH6D5XexASHw54EQqXwR2 UJDgIfYTxtDpNGUMZq1ydgXaptEh X-Google-Smtp-Source: ABdhPJzKGNrVhr3cjupAcu0AFf7Xzg2gc1BG7R1AH7tgKj1cQHdLK1Vb3SGEU1ppcDZ4lBaCCoSmjw== X-Received: by 2002:a05:6000:170a:b0:215:6799:782c with SMTP id n10-20020a056000170a00b002156799782cmr19977075wrc.38.1654595298619; Tue, 07 Jun 2022 02:48:18 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:600c:3d8c:b0:39c:5b80:3b5c with SMTP id bi12-20020a05600c3d8c00b0039c5b803b5cls393560wmb.2.gmail; Tue, 07 Jun 2022 02:48:17 -0700 (PDT) X-Received: by 2002:a05:600c:3d11:b0:39c:1c62:cebc with SMTP id bh17-20020a05600c3d1100b0039c1c62cebcmr35268931wmb.147.1654595297484; Tue, 07 Jun 2022 02:48:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654595297; cv=none; d=google.com; s=arc-20160816; b=lK4MKnZE73zTCEa/Zrj3xtAU5UpX7T8/qU+zaMn+9B10w6rZLV0TLnxoUzU/dO8qXh LJ0UsMkvG6MC2LZWJrMJTTuuupbpwr7/W5OV595CW/Uz4GgslbVFoT8E3NXXAnlqu0z4 v9R8RobLhE7cFEueydvWfut2jQGoPcUEw86C3qAHeLs/AQz0lLcocAFMrrtHv/IIIC2z nBB3jqX6Y/IFCctzVsIiDFp+Ef//0J7iL0GtGPbwUy/frXbqKgfvh8cDnNfT5udu3OJj erBptHeYB7vXSP6V3KOMvfwaFLImIuA3BqDVjKzjdpD+AX0CQ1VYvsbYZwg0Pr6Zwld3 o9QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Hg+fyB+R4Q3yPGfYEvg6uZVcvjloB1KZxDlCqHLSkx0=; b=g0dJqCulS4rJryWzpFyblvle7/BG2oN8EuW2XVIP6RUwxICve9x/ja8es2qMcTjsNo z3ka+f41p/KNMYXnBe4CHn3SKAC23h15uWT9rHa6tCFhfBawOlN7QGlr9f/oGv0wXP/z BUXnB2eMGpa49qCF+Z2Kd3CX7pXUztyfodDwZSuKYqeoiUF0rzCxLjIgIdqDpPvnDKV3 IkOTeZcu0rmGgyQjiSpoNBNEmG5FZwul9bC0dgfuFyFxKUVbxBEWbDhpaPLrDQu/ozn9 x/uNlZJm7HLDR+57UWed/8JcjXBsIQ1CFs03IDclrcPCwaDQCsl6MrtzPRj0Ymz/xaFC YyMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Laes7FMm; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id d5-20020adfef85000000b00210081209c9sor9876898wro.2.2022.06.07.02.48.17 for (Google Transport Security); Tue, 07 Jun 2022 02:48:17 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:adf:eb11:0:b0:213:19dd:e1aa with SMTP id s17-20020adfeb11000000b0021319dde1aamr25605595wrn.324.1654595297228; Tue, 07 Jun 2022 02:48:17 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.pdxnet.pdxeng.ch (mob-5-90-137-51.net.vodafone.it. [5.90.137.51]) by smtp.gmail.com with ESMTPSA id o4-20020a05600c510400b0039748be12dbsm23200547wms.47.2022.06.07.02.48.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 02:48:16 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: Amarula patchwork , michael@amarulasolutions.com, Dario Binacchi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Marc Kleine-Budde , Paolo Abeni , Wolfgang Grandegger , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [RFC PATCH 04/13] can: slcan: use CAN network device driver API Date: Tue, 7 Jun 2022 11:47:43 +0200 Message-Id: <20220607094752.1029295-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220607094752.1029295-1-dario.binacchi@amarulasolutions.com> References: <20220607094752.1029295-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Laes7FMm; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , As suggested by commit [1], now the driver uses the functions and the data structures provided by the CAN network device driver interface. There is no way to set bitrate for SLCAN based devices via ip tool, so you'll have to do this by slcand/slcan_attach invocation through the -sX parameter: - slcan_attach -f -s6 -o /dev/ttyACM0 - slcand -f -s8 -o /dev/ttyUSB0 where -s6 in will set adapter's bitrate to 500 Kbit/s and -s8 to 1Mbit/s. See the table below for further CAN bitrates: - s0 -> 10 Kbit/s - s1 -> 20 Kbit/s - s2 -> 50 Kbit/s - s3 -> 100 Kbit/s - s4 -> 125 Kbit/s - s5 -> 250 Kbit/s - s6 -> 500 Kbit/s - s7 -> 800 Kbit/s - s8 -> 1000 Kbit/s In doing so, the struct can_priv::bittiming.bitrate of the driver is not set and since the open_candev() checks that the bitrate has been set, it must be a non-zero value, the bitrate is set to a fake value (-1) before it is called. [1] 39549eef3587f ("can: CAN Network device driver and Netlink interface") Signed-off-by: Dario Binacchi --- drivers/net/can/slcan.c | 112 ++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c index 964b02f321ab..956b47bd40a7 100644 --- a/drivers/net/can/slcan.c +++ b/drivers/net/can/slcan.c @@ -56,7 +56,6 @@ #include #include #include -#include MODULE_ALIAS_LDISC(N_SLCAN); MODULE_DESCRIPTION("serial line CAN interface"); @@ -79,6 +78,7 @@ MODULE_PARM_DESC(maxdev, "Maximum number of slcan interfaces"); #define SLC_EFF_ID_LEN 8 struct slcan { + struct can_priv can; int magic; /* Various fields. */ @@ -100,6 +100,7 @@ struct slcan { }; static struct net_device **slcan_devs; +static DEFINE_SPINLOCK(slcan_lock); /************************************************************************ * SLCAN ENCAPSULATION FORMAT * @@ -369,7 +370,7 @@ static netdev_tx_t slc_xmit(struct sk_buff *skb, struct net_device *dev) spin_unlock(&sl->lock); out: - kfree_skb(skb); + can_put_echo_skb(skb, dev, 0, 0); return NETDEV_TX_OK; } @@ -389,6 +390,8 @@ static int slc_close(struct net_device *dev) clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags); } netif_stop_queue(dev); + close_candev(dev); + sl->can.state = CAN_STATE_STOPPED; sl->rcount = 0; sl->xleft = 0; spin_unlock_bh(&sl->lock); @@ -400,21 +403,36 @@ static int slc_close(struct net_device *dev) static int slc_open(struct net_device *dev) { struct slcan *sl = netdev_priv(dev); + int err; if (sl->tty == NULL) return -ENODEV; + /* The baud rate is not set with the command + * `ip link set type can bitrate ' and therefore + * can.bittiming.bitrate is 0, causing open_candev() to fail. + * So let's set to a fake value. + */ + sl->can.bittiming.bitrate = -1; + err = open_candev(dev); + if (err) { + netdev_err(dev, "failed to open can device\n"); + return err; + } + + sl->can.state = CAN_STATE_ERROR_ACTIVE; sl->flags &= BIT(SLF_INUSE); netif_start_queue(dev); return 0; } -/* Hook the destructor so we can free slcan devs at the right point in time */ -static void slc_free_netdev(struct net_device *dev) +static void slc_dealloc(struct slcan *sl) { - int i = dev->base_addr; + int i = sl->dev->base_addr; - slcan_devs[i] = NULL; + free_candev(sl->dev); + if (slcan_devs) + slcan_devs[i] = NULL; } static int slcan_change_mtu(struct net_device *dev, int new_mtu) @@ -429,24 +447,6 @@ static const struct net_device_ops slc_netdev_ops = { .ndo_change_mtu = slcan_change_mtu, }; -static void slc_setup(struct net_device *dev) -{ - dev->netdev_ops = &slc_netdev_ops; - dev->needs_free_netdev = true; - dev->priv_destructor = slc_free_netdev; - - dev->hard_header_len = 0; - dev->addr_len = 0; - dev->tx_queue_len = 10; - - dev->mtu = CAN_MTU; - dev->type = ARPHRD_CAN; - - /* New-style flags. */ - dev->flags = IFF_NOARP; - dev->features = NETIF_F_HW_CSUM; -} - /****************************************** Routines looking at TTY side. ******************************************/ @@ -509,11 +509,8 @@ static void slc_sync(void) static struct slcan *slc_alloc(void) { int i; - char name[IFNAMSIZ]; struct net_device *dev = NULL; - struct can_ml_priv *can_ml; struct slcan *sl; - int size; for (i = 0; i < maxdev; i++) { dev = slcan_devs[i]; @@ -526,16 +523,14 @@ static struct slcan *slc_alloc(void) if (i >= maxdev) return NULL; - sprintf(name, "slcan%d", i); - size = ALIGN(sizeof(*sl), NETDEV_ALIGN) + sizeof(struct can_ml_priv); - dev = alloc_netdev(size, name, NET_NAME_UNKNOWN, slc_setup); + dev = alloc_candev(sizeof(*sl), 1); if (!dev) return NULL; + snprintf(dev->name, sizeof(dev->name), "slcan%d", i); + dev->netdev_ops = &slc_netdev_ops; dev->base_addr = i; sl = netdev_priv(dev); - can_ml = (void *)sl + ALIGN(sizeof(*sl), NETDEV_ALIGN); - can_set_ml_priv(dev, can_ml); /* Initialize channel control data */ sl->magic = SLCAN_MAGIC; @@ -568,11 +563,7 @@ static int slcan_open(struct tty_struct *tty) if (tty->ops->write == NULL) return -EOPNOTSUPP; - /* RTnetlink lock is misused here to serialize concurrent - opens of slcan channels. There are better ways, but it is - the simplest one. - */ - rtnl_lock(); + spin_lock(&slcan_lock); /* Collect hanged up channels. */ slc_sync(); @@ -600,13 +591,15 @@ static int slcan_open(struct tty_struct *tty) set_bit(SLF_INUSE, &sl->flags); - err = register_netdevice(sl->dev); - if (err) + err = register_candev(sl->dev); + if (err) { + pr_err("slcan: can't register candev\n"); goto err_free_chan; + } } /* Done. We have linked the TTY line to a channel. */ - rtnl_unlock(); + spin_unlock(&slcan_lock); tty->receive_room = 65536; /* We don't flow control */ /* TTY layer expects 0 on success */ @@ -616,14 +609,10 @@ static int slcan_open(struct tty_struct *tty) sl->tty = NULL; tty->disc_data = NULL; clear_bit(SLF_INUSE, &sl->flags); - slc_free_netdev(sl->dev); - /* do not call free_netdev before rtnl_unlock */ - rtnl_unlock(); - free_netdev(sl->dev); - return err; + slc_dealloc(sl); err_exit: - rtnl_unlock(); + spin_unlock(&slcan_lock); /* Count references from TTY module */ return err; @@ -653,9 +642,11 @@ static void slcan_close(struct tty_struct *tty) synchronize_rcu(); flush_work(&sl->tx_work); - /* Flush network side */ - unregister_netdev(sl->dev); - /* This will complete via sl_free_netdev */ + slc_close(sl->dev); + unregister_candev(sl->dev); + spin_lock(&slcan_lock); + slc_dealloc(sl); + spin_unlock(&slcan_lock); } static void slcan_hangup(struct tty_struct *tty) @@ -763,18 +754,29 @@ static void __exit slcan_exit(void) dev = slcan_devs[i]; if (!dev) continue; - slcan_devs[i] = NULL; - sl = netdev_priv(dev); - if (sl->tty) { - netdev_err(dev, "tty discipline still running\n"); - } + spin_lock(&slcan_lock); + dev = slcan_devs[i]; + if (dev) { + slcan_devs[i] = NULL; + spin_unlock(&slcan_lock); + sl = netdev_priv(dev); + if (sl->tty) { + netdev_err(dev, + "tty discipline still running\n"); + } - unregister_netdev(dev); + slc_close(dev); + unregister_candev(dev); + } else { + spin_unlock(&slcan_lock); + } } + spin_lock(&slcan_lock); kfree(slcan_devs); slcan_devs = NULL; + spin_unlock(&slcan_lock); tty_unregister_ldisc(&slc_ldisc); }