From patchwork Thu Oct 15 10:31:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 1382559 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Gm22zEAk; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CBlmP6C3Lz9sTL for ; Thu, 15 Oct 2020 21:25:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731112AbgJOKZj (ORCPT ); Thu, 15 Oct 2020 06:25:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726678AbgJOKZj (ORCPT ); Thu, 15 Oct 2020 06:25:39 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B78E1C061755 for ; Thu, 15 Oct 2020 03:25:38 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id h7so2784329wre.4 for ; Thu, 15 Oct 2020 03:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=P9NbUSShrbJy/8vwuSmhX5nWcNsQIzK7wekco/25x+8=; b=Gm22zEAk4xSEZwxeNfIPKugbwSKZ2j5pDeDhKofkYe4aemDDkNrVeMyUAzWRuDWp2F kz+KwNp5Sce6RiuhzS5Y3O8MumjCjPyv7c9qRx/ryhsLzJIYE8lzMuZ7Shjiwc0Z5QDb w3f61STmn1z24exHBVD7xmY8S1eondKh9DPG5lJyOSH3HHh/ThRo1amuHC0s6zCGmncA JMf6r3rfyDJYiuKwYMBfsqzDy/cRYE3Y5RWRf6IEc704sjTW2+ZyaYdkW9xV/H9h3nZF fr+ohjY/U6PN3bmGHmqrNlIJ/1XL9w74TMdOMRGltKufE13LMNjmQZsvWPsz1k+lmUAR EYuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=P9NbUSShrbJy/8vwuSmhX5nWcNsQIzK7wekco/25x+8=; b=C2gL78MrrbAMC+AUGnQWh+5gqznJPvMJpQIbR6ObJIygcSWZIeFEmK7eGI4sbw7apj dAxl4agkKv5FMpS65PhMtZfj0IKy8LFv/hHUWegm72IXvitVsFfLvU8zM4zzm55eS8eg HDz7RxmHist2fIbYr3Ria8JIBTLpp+drq5RaMKIx+bRLKvNSYW9x3X2x7/LsZIODhVSk GQhVApzmSPtCCbP0CnU7r4FMKgG9+/Ojrm9ghVJSNGGAbP1IDSUrcnUYRFAhBQJgfDND 84v/eUZNCq7iTsc5l8F9BNJIwICqkoCLESrRTnWbYSS1XgJS1aQwFx2PC+xRhkBZaVDX rJEQ== X-Gm-Message-State: AOAM530yDY/4nEWOIRbED7NpEidLOe++RF9uGLUlvoVc9dNcnT7YoMjr usUD3bxrdAkNck7xVtwrLssrQA== X-Google-Smtp-Source: ABdhPJy64uqFg4SGpayU3744+3xKtpV+x/JXmRf0BD32rRTfaQ0537Qck4hlTIkC9LuLvKdEpjq3uQ== X-Received: by 2002:adf:9504:: with SMTP id 4mr3632167wrs.27.1602757537315; Thu, 15 Oct 2020 03:25:37 -0700 (PDT) Received: from localhost.localdomain ([88.122.66.28]) by smtp.gmail.com with ESMTPSA id g83sm3588648wmf.15.2020.10.15.03.25.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Oct 2020 03:25:36 -0700 (PDT) From: Loic Poulain To: davem@davemloft.net, kuba@kernel.org Cc: netdev@vger.kernel.org, hemantk@codeaurora.org, manivannan.sadhasivam@linaro.org, eric.dumazet@gmail.com, Loic Poulain Subject: [PATCH v4 1/2] net: Add mhi-net driver Date: Thu, 15 Oct 2020 12:31:28 +0200 Message-Id: <1602757888-3507-1-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds a new network driver implementing MHI transport for network packets. Packets can be in any format, though QMAP (rmnet) is the usual protocol (flow control + PDN mux). It support two MHI devices, IP_HW0 which is, the path to the IPA (IP accelerator) on qcom modem, And IP_SW0 which is the software driven IP path (to modem CPU). Signed-off-by: Loic Poulain --- v2: - rebase on net-next - remove useless skb_linearize - check error type on mhi_queue return - rate limited errors - Schedule RX refill only on 'low' buf level - SET_NETDEV_DEV in probe - reorder device remove sequence v3: - Stop channels on net_register error - Remove useles parentheses - Add driver .owner v4: - prevent potential cpu hog in rx-refill loop - Access mtu via READ_ONCE drivers/net/Kconfig | 7 ++ drivers/net/Makefile | 1 + drivers/net/mhi_net.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 297 insertions(+) create mode 100644 drivers/net/mhi_net.c diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 1368d1d..11a6357 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -426,6 +426,13 @@ config VSOCKMON mostly intended for developers or support to debug vsock issues. If unsure, say N. +config MHI_NET + tristate "MHI network driver" + depends on MHI_BUS + help + This is the network driver for MHI. It can be used with + QCOM based WWAN modems (like SDX55). Say Y or M. + endif # NET_CORE config SUNGEM_PHY diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 94b6080..8312037 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_GTP) += gtp.o obj-$(CONFIG_NLMON) += nlmon.o obj-$(CONFIG_NET_VRF) += vrf.o obj-$(CONFIG_VSOCKMON) += vsockmon.o +obj-$(CONFIG_MHI_NET) += mhi_net.o # # Networking Drivers diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c new file mode 100644 index 0000000..fe605a4 --- /dev/null +++ b/drivers/net/mhi_net.c @@ -0,0 +1,289 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* MHI Network driver - Network over MHI + * + * Copyright (C) 2020 Linaro Ltd + */ + +#include +#include +#include +#include +#include +#include + +#define MIN_MTU ETH_MIN_MTU +#define MAX_MTU 0xffff +#define DEFAULT_MTU 8192 + +struct mhi_net_stats { + u64 rx_packets; + u64 rx_bytes; + u64 rx_errors; + u64 rx_dropped; + u64 tx_packets; + u64 tx_bytes; + u64 tx_errors; + u64 tx_dropped; + atomic_t rx_queued; +}; + +struct mhi_net_dev { + struct mhi_device *mdev; + struct net_device *ndev; + struct delayed_work rx_refill; + struct mhi_net_stats stats; + u32 rx_queue_sz; +}; + +static int mhi_ndo_open(struct net_device *ndev) +{ + struct mhi_net_dev *mhi_netdev = netdev_priv(ndev); + + /* Feed the rx buffer pool */ + schedule_delayed_work(&mhi_netdev->rx_refill, 0); + + /* Carrier is established via out-of-band channel (e.g. qmi) */ + netif_carrier_on(ndev); + + netif_start_queue(ndev); + + return 0; +} + +static int mhi_ndo_stop(struct net_device *ndev) +{ + struct mhi_net_dev *mhi_netdev = netdev_priv(ndev); + + netif_stop_queue(ndev); + netif_carrier_off(ndev); + cancel_delayed_work_sync(&mhi_netdev->rx_refill); + + return 0; +} + +static int mhi_ndo_xmit(struct sk_buff *skb, struct net_device *ndev) +{ + struct mhi_net_dev *mhi_netdev = netdev_priv(ndev); + struct mhi_device *mdev = mhi_netdev->mdev; + int err; + + skb_tx_timestamp(skb); + + /* mhi_queue_skb is not thread-safe, but xmit is serialized by the + * network core. Once MHI core will be thread save, migrate to + * NETIF_F_LLTX support. + */ + err = mhi_queue_skb(mdev, DMA_TO_DEVICE, skb, skb->len, MHI_EOT); + if (err == -ENOMEM) { + netif_stop_queue(ndev); + return NETDEV_TX_BUSY; + } else if (unlikely(err)) { + net_err_ratelimited("%s: Failed to queue TX buf (%d)\n", + ndev->name, err); + mhi_netdev->stats.tx_dropped++; + kfree_skb(skb); + } + + return NETDEV_TX_OK; +} + +static void mhi_ndo_get_stats64(struct net_device *ndev, + struct rtnl_link_stats64 *stats) +{ + struct mhi_net_dev *mhi_netdev = netdev_priv(ndev); + + stats->rx_packets = mhi_netdev->stats.rx_packets; + stats->rx_bytes = mhi_netdev->stats.rx_bytes; + stats->rx_errors = mhi_netdev->stats.rx_errors; + stats->rx_dropped = mhi_netdev->stats.rx_dropped; + stats->tx_packets = mhi_netdev->stats.tx_packets; + stats->tx_bytes = mhi_netdev->stats.tx_bytes; + stats->tx_errors = mhi_netdev->stats.tx_errors; + stats->tx_dropped = mhi_netdev->stats.tx_dropped; +} + +static const struct net_device_ops mhi_netdev_ops = { + .ndo_open = mhi_ndo_open, + .ndo_stop = mhi_ndo_stop, + .ndo_start_xmit = mhi_ndo_xmit, + .ndo_get_stats64 = mhi_ndo_get_stats64, +}; + +static void mhi_net_setup(struct net_device *ndev) +{ + ndev->header_ops = NULL; /* No header */ + ndev->type = ARPHRD_NONE; /* QMAP... */ + ndev->hard_header_len = 0; + ndev->addr_len = 0; + ndev->flags = IFF_POINTOPOINT | IFF_NOARP; + ndev->netdev_ops = &mhi_netdev_ops; + ndev->mtu = DEFAULT_MTU; + ndev->min_mtu = MIN_MTU; + ndev->max_mtu = MAX_MTU; + ndev->tx_queue_len = 1000; +} + +static void mhi_net_dl_callback(struct mhi_device *mhi_dev, + struct mhi_result *mhi_res) +{ + struct mhi_net_dev *mhi_netdev = dev_get_drvdata(&mhi_dev->dev); + struct sk_buff *skb = mhi_res->buf_addr; + int remaining; + + remaining = atomic_dec_return(&mhi_netdev->stats.rx_queued); + + if (unlikely(mhi_res->transaction_status)) { + mhi_netdev->stats.rx_errors++; + kfree_skb(skb); + } else { + mhi_netdev->stats.rx_packets++; + mhi_netdev->stats.rx_bytes += mhi_res->bytes_xferd; + + skb->protocol = htons(ETH_P_MAP); + skb_put(skb, mhi_res->bytes_xferd); + netif_rx(skb); + } + + /* Refill if RX buffers queue becomes low */ + if (remaining <= mhi_netdev->rx_queue_sz / 2) + schedule_delayed_work(&mhi_netdev->rx_refill, 0); +} + +static void mhi_net_ul_callback(struct mhi_device *mhi_dev, + struct mhi_result *mhi_res) +{ + struct mhi_net_dev *mhi_netdev = dev_get_drvdata(&mhi_dev->dev); + struct net_device *ndev = mhi_netdev->ndev; + struct sk_buff *skb = mhi_res->buf_addr; + + /* Hardware has consumed the buffer, so free the skb (which is not + * freed by the MHI stack) and perform accounting. + */ + consume_skb(skb); + + if (unlikely(mhi_res->transaction_status)) { + mhi_netdev->stats.tx_errors++; + } else { + mhi_netdev->stats.tx_packets++; + mhi_netdev->stats.tx_bytes += mhi_res->bytes_xferd; + } + + if (netif_queue_stopped(ndev)) + netif_wake_queue(ndev); +} + +static void mhi_net_rx_refill_work(struct work_struct *work) +{ + struct mhi_net_dev *mhi_netdev = container_of(work, struct mhi_net_dev, + rx_refill.work); + struct net_device *ndev = mhi_netdev->ndev; + struct mhi_device *mdev = mhi_netdev->mdev; + int size = READ_ONCE(ndev->mtu); + struct sk_buff *skb; + int err; + + do { + skb = netdev_alloc_skb(ndev, size); + if (unlikely(!skb)) + break; + + err = mhi_queue_skb(mdev, DMA_FROM_DEVICE, skb, size, MHI_EOT); + if (err) { + if (unlikely(err != -ENOMEM)) + net_err_ratelimited("%s: Failed to queue RX buf (%d)\n", + ndev->name, err); + kfree_skb(skb); + break; + } + + atomic_inc(&mhi_netdev->stats.rx_queued); + + /* Do not hog the CPU if rx buffers are completed faster than + * queued (unlikely). + */ + cond_resched(); + } while (1); + + /* If we're still starved of rx buffers, reschedule latter */ + if (unlikely(!atomic_read(&mhi_netdev->stats.rx_queued))) + schedule_delayed_work(&mhi_netdev->rx_refill, HZ / 2); +} + +static int mhi_net_probe(struct mhi_device *mhi_dev, + const struct mhi_device_id *id) +{ + const char *netname = (char *)id->driver_data; + struct mhi_net_dev *mhi_netdev; + struct net_device *ndev; + struct device *dev = &mhi_dev->dev; + int err; + + ndev = alloc_netdev(sizeof(*mhi_netdev), netname, NET_NAME_PREDICTABLE, + mhi_net_setup); + if (!ndev) + return -ENOMEM; + + mhi_netdev = netdev_priv(ndev); + dev_set_drvdata(dev, mhi_netdev); + mhi_netdev->ndev = ndev; + mhi_netdev->mdev = mhi_dev; + SET_NETDEV_DEV(ndev, &mhi_dev->dev); + + /* All MHI net channels have 128 ring elements (at least for now) */ + mhi_netdev->rx_queue_sz = 128; + + INIT_DELAYED_WORK(&mhi_netdev->rx_refill, mhi_net_rx_refill_work); + + /* Start MHI channels */ + err = mhi_prepare_for_transfer(mhi_dev); + if (err) + goto out_err; + + err = register_netdev(ndev); + if (err) { + mhi_unprepare_from_transfer(mhi_dev); + goto out_err; + } + + return 0; + +out_err: + free_netdev(ndev); + return err; +} + +static void mhi_net_remove(struct mhi_device *mhi_dev) +{ + struct mhi_net_dev *mhi_netdev = dev_get_drvdata(&mhi_dev->dev); + + unregister_netdev(mhi_netdev->ndev); + + mhi_unprepare_from_transfer(mhi_netdev->mdev); + + free_netdev(mhi_netdev->ndev); +} + +static const struct mhi_device_id mhi_net_id_table[] = { + { .chan = "IP_HW0", .driver_data = (kernel_ulong_t)"mhi_hwip%d" }, + { .chan = "IP_SW0", .driver_data = (kernel_ulong_t)"mhi_swip%d" }, + {} +}; +MODULE_DEVICE_TABLE(mhi, mhi_net_id_table); + +static struct mhi_driver mhi_net_driver = { + .probe = mhi_net_probe, + .remove = mhi_net_remove, + .dl_xfer_cb = mhi_net_dl_callback, + .ul_xfer_cb = mhi_net_ul_callback, + .id_table = mhi_net_id_table, + .driver = { + .name = "mhi_net", + .owner = THIS_MODULE, + }, +}; + +module_mhi_driver(mhi_net_driver); + +MODULE_AUTHOR("Loic Poulain "); +MODULE_DESCRIPTION("Network over MHI"); +MODULE_LICENSE("GPL v2");