From patchwork Thu Jun 2 16:04:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 1989 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 6CBA23F06D for ; Thu, 2 Jun 2022 18:04:44 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id q12-20020a056402040c00b0042a84f9939dsf3791413edv.7 for ; Thu, 02 Jun 2022 09:04:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654185884; cv=pass; d=google.com; s=arc-20160816; b=OFQNtx42791eA8vbnbW33rKh7xQCUfkIqAbv5hI0cDMRMjdxD0yEESBrU0yJw5ljRD bHHxJKVhkwUx2Y2FpQDzDl/T7yMaR1g19MIaCvUnCjK7DftCZ40bW83Rn+imvdugnuYW Ohadg5eKwuWRTWqOf+50D7pngocTrg1YAqQfTdxFEUeTRcQjsnzh5I7FEPE3OoJg9zFR 551YBTDY+B0iAMb80EObDvzsploDuXSUaIqaOelyFj30KMdVUmxsuu6uq+lS6bVSxKYr hAggpH32HcVvBG33vzDMyHXziGn5LtsXbP/RUlZANkcu9pRISoGa1m9Epk17XzyRE8te 3Rpg== 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=pvZg2TCnamYsjlfGhiDH9usy2Jsjx81fYPrNJ9Eb5vM=; b=DXUnQBVqsilB2wmY4mgmBn1Wc8KpBSsACDw4NhGCxV/my1QfmiKhJTlLe8JlNcmVjK 0nsWnGwloRTxjUTXGhUxV6yLVtvoUMMdxAJYOSz6IBIyqrAhGHA7tHMCfVI9jmov/Dzz jPmxSMmmQd9NPS0a2M2fZ0RPQVowNgFz3D5H7y+nw9p3qsMZDDl0sJxxUWjlimyxuoE2 XTFESu5kGBACDpAIyXA2nB9xeRarLk0eruOKyNCowmpfxa2Lfmqi+8UWIHT4fhHCJklS 2uwoawRG5Wqnz7jb7vTWI6g+HII6oHatYCNEa0YuVN87oywgJpQgRCFg4OU1w5V0W/fK AKiA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=p6WNLq9b; 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=pvZg2TCnamYsjlfGhiDH9usy2Jsjx81fYPrNJ9Eb5vM=; b=ALX3dlRDpcmWcwzVsVVcAR0kB/9RMYH1eIp2VxmUeIBhaa6EVrcU0vvfAx3P5802ag jiZq9kIT9MUmispWGFYZzyW6OhWD5ERMZsJYubMYGZSfuYzvZ9maCAGSDV5lJOqCCoZu J9VKJtW6AkKOF+rbu46efrCtcy7vAxKtoUzOk= 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=pvZg2TCnamYsjlfGhiDH9usy2Jsjx81fYPrNJ9Eb5vM=; b=BpPk3udd4Yn+bGv6WByt2xmalGZEGk2Q7vHB7nnN1Oddx5gcGu/HN9MOJ6gs3J0PBh WZoahFPKPSMsZmhq1RbxZUJ8yu3nFEt89liolTLOYbnL/+cBH4jDWEcVZD8cRpxTNOnx JqZgj7M5FJ/oaa1LRbCMZys1gBqHNDvkPiZz61B+fFUqvwWvarHiSCilJHARIs00hiEI wB9R6Lkd5V4lRqD8UgZgenZKxzzrS9sO+7Dx/vEvkXooj21ALGT6YyWleyH9qdes46+4 nqF+TF9j+Iw2eQmdsa2sfrYKSQgZARh6p/fb4W+pt5jw2CchL6wE1Q2v7dPcaCsZie7J bYJw== X-Gm-Message-State: AOAM532+lrbW4Cly5bOvAD9OQCrTiPjtSIZXeRO6efJSvIrodCIB8wu7 yndmqK395uxjTcKUKKX1qLO4Dosp X-Google-Smtp-Source: ABdhPJyo0Lz3i9JYlUMxAB9zd0amK9hWP4bnWao5ZfMJ+poN1r7TOI/PEpGEq0mZXHxKtSfoQbC+uQ== X-Received: by 2002:a17:907:d13:b0:6fe:ece3:64e1 with SMTP id gn19-20020a1709070d1300b006feece364e1mr4878494ejc.584.1654185884195; Thu, 02 Jun 2022 09:04:44 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:907:6e11:b0:6ff:232a:2406 with SMTP id sd17-20020a1709076e1100b006ff232a2406ls2157396ejc.0.gmail; Thu, 02 Jun 2022 09:04:43 -0700 (PDT) X-Received: by 2002:a17:906:dc8b:b0:6f9:9d73:785 with SMTP id cs11-20020a170906dc8b00b006f99d730785mr4858212ejc.688.1654185883003; Thu, 02 Jun 2022 09:04:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654185882; cv=none; d=google.com; s=arc-20160816; b=vmcmB8OzIR5wnj5atebTjCjvlAmoNXh9C3rx/LDuRxx6iQh71XLzwZueU6UiMvgYWs I7X6KXh0eJMypEA9KeI1B4/riO66EkY8ucV08Md8rODLSZYWrkrKj+Yic9/35a7uuT7e ls84fb/gXq3GMMCPmbtDgr/OMUiG2h6x6y0S3Klv4vzgctv07N7ND44AvWrCuLYW8Wx9 fyZqcrrixqEadEkwhWNDHSmGM18wiGaBHOMjX7cp3Bc4mKaG5QmDOInTaMcCIwU7U+vV xnKkG0cHmzqrXsVfv7oFs33aJdMgXUdaxxYFuuUebLzUrpO2dMKS8Z8RLJ0bzkOXqeKA eHBg== 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=mgOBpdUKD2mVSwxb7jI9bNjFb+SOWyH320JLUpxL3kM=; b=gTJtuwlGcncQMgJq3hYeZqcH3wAnq/sK5MYicGFF79FXzMFp99Ox+Q2yVHnxRzanGH 4NAMFVEWWPq4A5I8ntJBoSNLHQFpEcH097vz5VAhvtD2fpXI12lOmD5I6lvcWKhpewpE ys2UoYRKroDEaPmYJ+EKUJc72S0OFEalfzg1yala7+azLavFPnzYWLjBHjOYfgatOTEg D/klcZfklBU8qszrUbmKhs35Anc8ZO8I9yXosoqMXLCkdEgXZTfLFO2CY3T2Jp5YQO4y bQ2oAtpzzX3kU3jduIeH9XDczgVDNeikIrg1kPGvCkEyWznUHfMsgbA4lmLqXfzSy02r jHNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=p6WNLq9b; 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 l2-20020a1709063d2200b00704dc822cffsor2682611ejf.31.2022.06.02.09.04.42 for (Google Transport Security); Thu, 02 Jun 2022 09:04:42 -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:a17:907:8a25:b0:6fe:ff5b:81f8 with SMTP id sc37-20020a1709078a2500b006feff5b81f8mr4921963ejc.184.1654185882391; Thu, 02 Jun 2022 09:04:42 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-80-116-90-174.pool80116.interbusiness.it. [80.116.90.174]) by smtp.gmail.com with ESMTPSA id f3-20020a056402150300b0042dd3bf1403sm2637095edw.54.2022.06.02.09.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 09:04:41 -0700 (PDT) From: Dario Binacchi To: linux-amarula@amarulasolutions.com Cc: dario.binacchi@amarulasolutions.com, michael@amarulasolutions.com, tommaso.merciai@amarulasolutions.com Subject: [RFC PATCH v2 04/13] can: slcan: use CAN network device driver API Date: Thu, 2 Jun 2022 18:04:25 +0200 Message-Id: <20220602160434.225417-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220602160434.225417-1-dario.binacchi@amarulasolutions.com> References: <20220602160434.225417-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=p6WNLq9b; 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 --- Changes in v2: - Remove an useless check on bitrate. 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); }