From patchwork Thu Feb 4 08:40:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 376237 Delivered-To: patch@linaro.org Received: by 2002:a17:906:48d2:0:0:0:0 with SMTP id d18csp1095259ejt; Thu, 4 Feb 2021 00:34:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJy8o+D3JUSqToqKKif6+iO+bKD5Jza1AKYPVWcm7X0ouejRJjNrwQnq4UJqpWBwkCp32QZK X-Received: by 2002:a05:6402:374:: with SMTP id s20mr5591916edw.56.1612427662414; Thu, 04 Feb 2021 00:34:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612427662; cv=none; d=google.com; s=arc-20160816; b=RqdS1e68qpo1tPMAfZSK24WTvjH4o0+6lxmjZxQ+BfxZR6iqfpJ5fCy3foH1SVKaMe IrwGSQ8ioy3VcXsbtnQUf3lsJzeGgyQ3KPsSvBxg4nO6JLBF31Iy7jpWv1ePaaxZfjiv qAJxrMs6UnHh+E9EVXsK8mkKUaQYvWud1sYxTiR/HBvEKCzBdOiPNbu7AtOjd2cShv+d ciI9MD05ZjPZGMA2I6Efki8XDzig82neoSdRoGWpCmgJEmKUu2LrvKSTiYNwciK8XtV/ PKpHC1fAY22OzKaaOPpoh8hi/D9MEqgQZXSZebRyJtsdHjrBBKMP2J2Z/JOhjVHn3Hg2 ZYFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=5ATuC3/xAbdujnqGOzixG91x6Lw0X76VRuGRM6RrgRo=; b=WJ0JBVRk8x6fH1I/5YbPJEHghk19kVRsRYW3yuuaG5IY2I45fAhmSXsvEB87JZ75Pi 6KUhs9N+Z+SBMDN8pKOpDObjOLC1VvTh7mmmGWF43hVuAH8tZA/TCYfnPFUhANf2MSgZ C1m9K3rqawikM9ElBLU4tyrP5ImDeDc32P8OtOuC3kKoR2iwPGyV56gewkyT5Jn3JPal Ot/UjvnPpYeCq/cAxZ0m3BW4Cr7jknlt2xfWuW3B05KZRwN8PbeQa0si9AsMQgyxYyhE 4c224mR9YuuYEvWQcnhJoywBM76JBwUNFC5HdRkM4nUdBSJgFC6iumdra1RyW4hGZG6e azoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pg8xDZxm; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g7si2647721edh.31.2021.02.04.00.34.22; Thu, 04 Feb 2021 00:34:22 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pg8xDZxm; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235007AbhBDIdF (ORCPT + 7 others); Thu, 4 Feb 2021 03:33:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234953AbhBDIdC (ORCPT ); Thu, 4 Feb 2021 03:33:02 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CD4CC061573 for ; Thu, 4 Feb 2021 00:32:21 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id g10so2479324wrx.1 for ; Thu, 04 Feb 2021 00:32:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=5ATuC3/xAbdujnqGOzixG91x6Lw0X76VRuGRM6RrgRo=; b=pg8xDZxmCO+6+B4ZWu2R2h7DUGOkcPicFllwCyyumv0NzOpepuvGXN/DN7LJtfKlTM 17CH/qdetHeoFa7sXYNk33edA8Iid91KPu9SDwSmYWGa440nNdRgwK+FhGn/d660pOW4 jdqBfyNE2p407ff8bP40aV+C0XrkLPG9/P0n9X+CA8M9h3TJwj8iPK2FjwOz8H7OibPZ 2yNPuFaYwj/+/zdNgkld+LObhU5MifXMwEY2ApfRKeg/NJPFUS49BUg9QHZElC/CCYSQ MyncV//4c1Wo2xK7ubhVrZ6yESyLxpQrF4/I2mDQ4Valu4eJpRvp8rni6ibivj5OtrFQ Bd0A== 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=5ATuC3/xAbdujnqGOzixG91x6Lw0X76VRuGRM6RrgRo=; b=M/T4+3blTskDNy3BKNacOAeoujP5CAhHViTBNIhMI67gCmUoZt/MtXbjHu/pNGt93D U77p6vSXDvu3s9fICSRlduoa/Cf+tFFwg4zb3fjx6+oryZM5YedBc5wOI/ZI7r/io8+9 Ar9VD61Wfj/xJD/ikpwo9SpfSaE7yhwPW9w+2HmbOQJqHUar0RNbSoeU8X77rNWK5jTk 2ysfz7wyY2FTl3qt519Ghi8V5Pi2NMDbovqgAIm4kqbTr6MTmrF4MkgPz4eBpmqfPZrv hIVHLvkprlXfiPhQMyX01qnh/1RWE/5PiCArNe2uR3Pv8wsegaDcCfINVdrbH6C6ad2p 9mtg== X-Gm-Message-State: AOAM530l6QWgxXbYeM1FfsqSuIU9+iJdaoTXgnUwfL7lyGwXz2m5aS/Q tMmNewXqgVL/lUgKij+PljsmPw== X-Received: by 2002:a5d:4a50:: with SMTP id v16mr7964947wrs.241.1612427540331; Thu, 04 Feb 2021 00:32:20 -0800 (PST) Received: from localhost.localdomain ([88.122.66.28]) by smtp.gmail.com with ESMTPSA id x9sm5657238wmb.14.2021.02.04.00.32.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Feb 2021 00:32:19 -0800 (PST) From: Loic Poulain To: kuba@kernel.org, davem@davemloft.net Cc: willemdebruijn.kernel@gmail.com, netdev@vger.kernel.org, stranche@codeaurora.org, subashab@codeaurora.org, Loic Poulain Subject: [PATCH net-next v5 1/2] net: mhi-net: Add re-aggregation of fragmented packets Date: Thu, 4 Feb 2021 09:40:00 +0100 Message-Id: <1612428002-12333-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 When device side MTU is larger than host side MTU, the packets (typically rmnet packets) are split over multiple MHI transfers. In that case, fragments must be re-aggregated to recover the packet before forwarding to upper layer. A fragmented packet result in -EOVERFLOW MHI transaction status for each of its fragments, except the final one. Such transfer was previously considered as error and fragments were simply dropped. This change adds re-aggregation mechanism using skb chaining, via skb frag_list. A warning (once) is printed since this behavior usually comes from a misconfiguration of the device (e.g. modem MTU). Signed-off-by: Loic Poulain --- v2: use zero-copy skb chaining instead of skb_copy_expand. v3: Fix nit in commit msg + remove misleading inline comment for frag_list v4: no change v5: reword/fix commit subject drivers/net/mhi_net.c | 74 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 64 insertions(+), 10 deletions(-) -- 2.7.4 Acked-by: Jesse Brandeburg diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c index 4f512531..8800991 100644 --- a/drivers/net/mhi_net.c +++ b/drivers/net/mhi_net.c @@ -32,6 +32,8 @@ struct mhi_net_stats { struct mhi_net_dev { struct mhi_device *mdev; struct net_device *ndev; + struct sk_buff *skbagg_head; + struct sk_buff *skbagg_tail; struct delayed_work rx_refill; struct mhi_net_stats stats; u32 rx_queue_sz; @@ -132,6 +134,32 @@ static void mhi_net_setup(struct net_device *ndev) ndev->tx_queue_len = 1000; } +static struct sk_buff *mhi_net_skb_agg(struct mhi_net_dev *mhi_netdev, + struct sk_buff *skb) +{ + struct sk_buff *head = mhi_netdev->skbagg_head; + struct sk_buff *tail = mhi_netdev->skbagg_tail; + + /* This is non-paged skb chaining using frag_list */ + if (!head) { + mhi_netdev->skbagg_head = skb; + return skb; + } + + if (!skb_shinfo(head)->frag_list) + skb_shinfo(head)->frag_list = skb; + else + tail->next = skb; + + head->len += skb->len; + head->data_len += skb->len; + head->truesize += skb->truesize; + + mhi_netdev->skbagg_tail = skb; + + return mhi_netdev->skbagg_head; +} + static void mhi_net_dl_callback(struct mhi_device *mhi_dev, struct mhi_result *mhi_res) { @@ -142,19 +170,42 @@ static void mhi_net_dl_callback(struct mhi_device *mhi_dev, free_desc_count = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE); if (unlikely(mhi_res->transaction_status)) { - dev_kfree_skb_any(skb); - - /* MHI layer stopping/resetting the DL channel */ - if (mhi_res->transaction_status == -ENOTCONN) + switch (mhi_res->transaction_status) { + case -EOVERFLOW: + /* Packet can not fit in one MHI buffer and has been + * split over multiple MHI transfers, do re-aggregation. + * That usually means the device side MTU is larger than + * the host side MTU/MRU. Since this is not optimal, + * print a warning (once). + */ + netdev_warn_once(mhi_netdev->ndev, + "Fragmented packets received, fix MTU?\n"); + skb_put(skb, mhi_res->bytes_xferd); + mhi_net_skb_agg(mhi_netdev, skb); + break; + case -ENOTCONN: + /* MHI layer stopping/resetting the DL channel */ + dev_kfree_skb_any(skb); return; - - u64_stats_update_begin(&mhi_netdev->stats.rx_syncp); - u64_stats_inc(&mhi_netdev->stats.rx_errors); - u64_stats_update_end(&mhi_netdev->stats.rx_syncp); + default: + /* Unknown error, simply drop */ + dev_kfree_skb_any(skb); + u64_stats_update_begin(&mhi_netdev->stats.rx_syncp); + u64_stats_inc(&mhi_netdev->stats.rx_errors); + u64_stats_update_end(&mhi_netdev->stats.rx_syncp); + } } else { + skb_put(skb, mhi_res->bytes_xferd); + + if (mhi_netdev->skbagg_head) { + /* Aggregate the final fragment */ + skb = mhi_net_skb_agg(mhi_netdev, skb); + mhi_netdev->skbagg_head = NULL; + } + u64_stats_update_begin(&mhi_netdev->stats.rx_syncp); u64_stats_inc(&mhi_netdev->stats.rx_packets); - u64_stats_add(&mhi_netdev->stats.rx_bytes, mhi_res->bytes_xferd); + u64_stats_add(&mhi_netdev->stats.rx_bytes, skb->len); u64_stats_update_end(&mhi_netdev->stats.rx_syncp); switch (skb->data[0] & 0xf0) { @@ -169,7 +220,6 @@ static void mhi_net_dl_callback(struct mhi_device *mhi_dev, break; } - skb_put(skb, mhi_res->bytes_xferd); netif_rx(skb); } @@ -267,6 +317,7 @@ static int mhi_net_probe(struct mhi_device *mhi_dev, dev_set_drvdata(dev, mhi_netdev); mhi_netdev->ndev = ndev; mhi_netdev->mdev = mhi_dev; + mhi_netdev->skbagg_head = NULL; SET_NETDEV_DEV(ndev, &mhi_dev->dev); SET_NETDEV_DEVTYPE(ndev, &wwan_type); @@ -301,6 +352,9 @@ static void mhi_net_remove(struct mhi_device *mhi_dev) mhi_unprepare_from_transfer(mhi_netdev->mdev); + if (mhi_netdev->skbagg_head) + kfree_skb(mhi_netdev->skbagg_head); + free_netdev(mhi_netdev->ndev); }