From patchwork Tue Feb 2 16:16:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 374637 Delivered-To: patch@linaro.org Received: by 2002:a17:906:48d2:0:0:0:0 with SMTP id d18csp338861ejt; Tue, 2 Feb 2021 08:12:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJz58kXq1/RcWr87d7/X/MLgtqGw+YCVUXuQ93FATrMdZYVkMKmfZUN5cYps36lpUs1GYGAa X-Received: by 2002:a50:80c6:: with SMTP id 64mr15744944edb.209.1612282323970; Tue, 02 Feb 2021 08:12:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612282323; cv=none; d=google.com; s=arc-20160816; b=WKbKXisZle1uwV3Nm2gETCI0KOgeXuMBA4ag91XB+A4/wVVn6IfI0v9J7BY0FU0F85 Kthe+NT/+8dQHmr9TgWa1oL/EfGYsFjALAQYYYhVNpwGQF+XNwfR4/y10PsSgf8CVfO6 cbCtPekxoWi3yRvhQQWnaZJfXFOpUg3uUgDKEX9yDh2e0gwN0eC/Wajqc1WOjCnGOtVk vFIYjEQZqpNY90VtclNnrMRnqSfV9btoDetblbpONGQsyO2+NxdL3jmlLDgzXcG+YuWL yGyaBQ4KXeajiYEkvshabP4SOdheVDeUpwceNAR51XSlakURj1Av3kf2akCQqLv0pfLF 7CXQ== 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=I72tFhBGRzGArbTD6liOesUdXAfRQUF4SchJqYsqSSM=; b=gRZuWDRURrzzDiquTDRpwwc5DsWnTefYYfztNkbfDzi6Qx3tOtb8vhWz8HcPSYZdjC CncfHd+P0JJnLamy+6yUCN+oUTLhiS3BUC0nRSGybmz9W5z7iwibth7qYOpLqWEGDatq 73Zw3SkL9YMotIrlrrzk/AAdcY/f2w0yI7T0KMQ2oemu7iyf8gdenQzVL/VE1UT1vYTJ 8cZXxCh0sT5Fks8IFQ0ySoJtaHLnUvYn7b8nup4RTZgL7XwepZvZn61vi4T9wZB3JBvs 7D0M+KLA1WN+dDUSIhYgYS7lBPKAwHkJxppkpsqt1OkYl3QGGb3NsPAmeDyJ6aYmEEEI lUFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O4nU54pI; 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 n3si12832662ejh.49.2021.02.02.08.12.03; Tue, 02 Feb 2021 08:12:03 -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=O4nU54pI; 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 S236130AbhBBQL1 (ORCPT + 7 others); Tue, 2 Feb 2021 11:11:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236104AbhBBQJK (ORCPT ); Tue, 2 Feb 2021 11:09:10 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51F01C0613D6 for ; Tue, 2 Feb 2021 08:08:29 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id e15so2799625wme.0 for ; Tue, 02 Feb 2021 08:08:29 -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=I72tFhBGRzGArbTD6liOesUdXAfRQUF4SchJqYsqSSM=; b=O4nU54pILwA7XAPfd5F+ifqTrR/mODJtHpYiPNUe9lHg2joI+6OzA06BERZIGwPr/Z 9+MQWKjRnXVXe03S5lF3yRUReiiyBC+qhrZ9jJacIAYqnzsQzejvDXzza1EqFsA2txPf SMIIUw50ntFy0gzYFCyhaMCo1gSU6oukmZUcGabyQSoz7C+TE8jY0E/UCKRN7E08pzST c29VV7SC6mFuX2SnMukM/+L0GMFEu/q4tYqD9HACOI4RmzXuuCuvKAcQxEbfyo/y/VgY R1LcIYhl2+U33LzkuGma5gIXAWtKKlDBBiQSVZt8UMUT3F5YJH1rx3moRlGaMo0KOtOT 4P7A== 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=I72tFhBGRzGArbTD6liOesUdXAfRQUF4SchJqYsqSSM=; b=oflGmOgs5sY05l5lMC0x9FE4109k+XCZte57OBW+Y9aLFkMb1uzFmNrownOhFu3lVO Qf6yxwgqwb7MEk4ywKaY5a4IZqYT6+8KHFsC51bHv+A2TSW/OTeCZ1jy1wHx88Nzguw3 hazQum9D4frROeX2Fgvw0Tm1EKehWYBw4wMOqGz+dlWk/w3yhGuEDBJn94uiOAJWH5pO L9jNieCvbvLHbWJKUtKDeIwck7H0OjYQ7CogkcTog3VSKCGYUMUomALd72ZZtMXSDxOg Ocj+sn9WbP6FGmM+I+CdPIRXxFCQSXpc2fJWt6qcfcAxiUmhYuWP63FV5vHWD3kn5I5g BwsA== X-Gm-Message-State: AOAM533wzSgYjULLy6Gu9oDxu1MSYyXjibDsOAlq2rZRFRiF8UzB/y4s ziLL3rkir/ICPJwW8sFnTAF1Rg== X-Received: by 2002:a1c:408a:: with SMTP id n132mr4273380wma.86.1612282107920; Tue, 02 Feb 2021 08:08:27 -0800 (PST) Received: from localhost.localdomain ([88.122.66.28]) by smtp.gmail.com with ESMTPSA id y6sm3900491wma.19.2021.02.02.08.08.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Feb 2021 08:08:27 -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 v2 1/2] net: mhi-net: Add de-aggeration support Date: Tue, 2 Feb 2021 17:16:07 +0100 Message-Id: <1612282568-14094-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 previoulsy 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. drivers/net/mhi_net.c | 79 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 69 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c index 4f512531..be39779 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,37 @@ 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; + + /* data_len is normally the size of paged data, in our case there is no + * paged data (nr_frags = 0), so it represents the size of chained skbs, + * This way, net core will consider skb->frag_list. + */ + 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 +175,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 +225,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 +322,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 +357,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); } From patchwork Tue Feb 2 16:16:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 374636 Delivered-To: patch@linaro.org Received: by 2002:a17:906:48d2:0:0:0:0 with SMTP id d18csp338826ejt; Tue, 2 Feb 2021 08:12:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJxiNV7//21cEJEhssJVwJNdOnx7y6CZgvYvBIbf2vwp7tXEteboxVcIa10rkC1EO8fVgTev X-Received: by 2002:a05:6402:10ce:: with SMTP id p14mr24316903edu.261.1612282322070; Tue, 02 Feb 2021 08:12:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612282322; cv=none; d=google.com; s=arc-20160816; b=hZX6p8zOVnWDnQKL45VwokNmThQebYBfNUtbK/OGNmcl4KoY21OTlwRxClkFeyoqxB aaJc0P/9pVCOE8rjSYUd3r7ImC3qu5+DrpIfSM7iCSQs5F5px7fXt6Uo11hCdKpwOXmy WKbhXEpnKzvlEdmnhlJ0SW5jpX921ym+dP2rgsNxBwadqVySNB2kdPEriC8V4T+GCMDw 3KMKtk3kdpTANJn/dBNVnhTo5HrD2w6z3sDZN0NtWLk2l02FKA2pW3uW2cmTP2RbENsX Bj0B6vxBKUSz1dusRMHVZAnc+QSS3eLeP5jgGA6cIHYEX4aJZkmmhuiq9elZyxbLq6iv HyEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=YN/6Ava32WxBGn762wuDrCY8IUGtDZjss5W6LAtfN1M=; b=J9UZQD1XrV7adDxP1ABxn1Rmdx+TKQsCjANSrR4a3t5X1ReZxyGCKM4h01g7xsK131 toSsIejoei+eqVPIwjJgC+yIklZlDuAunvg2ywNevWQY6Ub3FxjgPhW3q7/ITnfeGLHB wnfWWEhHK3/5ZpTw4lGpAqU7zXcj2dx9MWJeWQnDHPT3FWud1Gxa9LOh5OFRBsiKeZ8m CZyyMjCWtu1rhVbX+/toYkoXeXgqxz8QJpSVNtF8g/AV6BiLvNCpJLMQM1wWyb3XWvwJ ECpBlfKjqTjujh5UwNoYjhpyZ9LsCIUTKM1e06hlPte8G8hyP3VA1IzTYxAs4Lmua5Y8 NGsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AYKk/ile"; 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 n3si12832662ejh.49.2021.02.02.08.12.01; Tue, 02 Feb 2021 08:12:02 -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="AYKk/ile"; 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 S236100AbhBBQLT (ORCPT + 7 others); Tue, 2 Feb 2021 11:11:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235874AbhBBQJL (ORCPT ); Tue, 2 Feb 2021 11:09:11 -0500 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FEA5C0613ED for ; Tue, 2 Feb 2021 08:08:30 -0800 (PST) Received: by mail-wm1-x329.google.com with SMTP id j11so2165028wmi.3 for ; Tue, 02 Feb 2021 08:08:30 -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:in-reply-to:references; bh=YN/6Ava32WxBGn762wuDrCY8IUGtDZjss5W6LAtfN1M=; b=AYKk/ileFI7PNo79nhx+39cSceU5+W5ywf7Epw7g8EZpj3KqBUjlEYY82Wx8Is5PwM EtjlYHdUtJ3XF8nczNueEiJYqTTslRz4Ne6ohIltWXOckTG9SLH0BFIy7e72tn1OOue0 D83AkIjy4jFHeC4AjO6/PO+0RCfxfcZIPNxA+IQxCX4HkwVzx1q1cNHGQUzjzQ3l/fWs bYS/lEATHKhcFYflrqcrcn6zRCWzgJVmWAsoobYGpQx9Mm01vCQkX13vOK7y+7boQ4g2 48XcjgUkWwZ8jgq3uHY4leab5ezBis2nLB375CULj4FSFu/R7azJJjiQRfK/AJK1LfK2 1mxg== 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:in-reply-to :references; bh=YN/6Ava32WxBGn762wuDrCY8IUGtDZjss5W6LAtfN1M=; b=sn4zrm/KwqbqTxPXs3DFXhEkdMqOqbZQ2pPK4VW9sV2kdBuNVwdZaArc3Whbpy38zi uOFQavTKecKxDzJSU5lvgCNqK6gmPbQvdAq3q9jaUxAHEzTq9ZXjQ5lxkdxkSoWCg0DG O3Y/rg/Q8XIf8tjS/OADkQHpuCo4DX+O+NKJAzzaGxVB/zbmEHnx0nbPber+3zuRr4WZ W1VBiWLcuN/PrI8ViaU8vu6JLB8hPaepaFT+q9PZQ+7jbhR7zSRoEnM2IfnXWPmPyL8m 2vxMwJyLd2fALQwJIRqkTtPAZnKyurDoBcpYIeeyGjk/KNsbZuG6/YFtCccEdDCqa1e2 ABxQ== X-Gm-Message-State: AOAM530K+t/9CIidPpsFPBtvjgs1ZBCfDfKvikAm1ZT+pa+PwMYcasQN cKACz/LII8n6Cl1ofwnn1+LYJw== X-Received: by 2002:a1c:2e04:: with SMTP id u4mr4391698wmu.79.1612282109043; Tue, 02 Feb 2021 08:08:29 -0800 (PST) Received: from localhost.localdomain ([88.122.66.28]) by smtp.gmail.com with ESMTPSA id y6sm3900491wma.19.2021.02.02.08.08.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Feb 2021 08:08:28 -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 v2 2/2] net: qualcomm: rmnet: Fix rx_handler for non-linear skbs Date: Tue, 2 Feb 2021 17:16:08 +0100 Message-Id: <1612282568-14094-2-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1612282568-14094-1-git-send-email-loic.poulain@linaro.org> References: <1612282568-14094-1-git-send-email-loic.poulain@linaro.org> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no guarantee that rmnet rx_handler is only fed with linear skbs, but current rmnet implementation does not check that, leading to crash in case of non linear skbs processed as linear ones. Fix that by ensuring skb linearization before processing. Signed-off-by: Loic Poulain --- v2: Add this patch to the series to prevent crash drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 Acked-by: Willem de Bruijn Reviewed-by: Subash Abhinov Kasiviswanathan diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c index 3d7d3ab..2776c32 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c @@ -180,7 +180,7 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb) struct rmnet_port *port; struct net_device *dev; - if (!skb) + if (!skb || skb_linearize(skb)) goto done; if (skb->pkt_type == PACKET_LOOPBACK)