Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: subashab@codeaurora.org
To: "Aleksander Morgado" <aleksander@aleksander.es>,
"Bjørn Mork" <bjorn@mork.no>
Cc: Daniele Palmas <dnlplm@gmail.com>,
Network Development <netdev@vger.kernel.org>,
Sean Tranchetti <stranche@codeaurora.org>
Subject: Re: RMNET QMAP data aggregation with size greater than 16384
Date: Fri, 06 Aug 2021 16:30:42 -0600 [thread overview]
Message-ID: <2c2d1204842f457bb0d0b2c4cd58847d@codeaurora.org> (raw)
In-Reply-To: <CAAP7ucLDFPMG08syrcnKKrX-+MS4_-tpPzZSfMOD6_7G-zq4gQ@mail.gmail.com>
> That default fixed size you're suggesting for the rx_urb_size, isn't
> it supposed to have the same logical meaning as RMNET_MAX_PACKET_SIZE
> at the end?
RMNET_MAX_PACKET_SIZE is the maximum size for uplink. I probably should
have
named it more clearly. We would need a different value for downlink.
>> Yes, I think it would be good to make the driver DTRT automatically.
>> Coding driver specific quirks into ModemManager might work, but it
>> feels
>> wrong to work around a Linux driver bug. We don't have to do that. We
>> can fix the driver.
>> Why can't we break the rx_urb_size dependency on MTU automatically
>> when
>> pass_through or qmi_wwan internal muxing is enabled? Preferably with
>> some fixed default size which would Just Work for everyone.
>>
>
Would something like this work-
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 6a2e4f8..c49827e 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -75,6 +75,8 @@ struct qmimux_priv {
u8 mux_id;
};
+#define MAP_DL_URB_SIZE (32768)
+
static int qmimux_open(struct net_device *dev)
{
struct qmimux_priv *priv = netdev_priv(dev);
@@ -303,6 +305,33 @@ static void qmimux_unregister_device(struct
net_device *dev,
dev_put(real_dev);
}
+static int qmi_wwan_change_mtu(struct net_device *net, int new_mtu)
+{
+ struct usbnet *dev = netdev_priv(net);
+ struct qmi_wwan_state *info = (void *)&dev->data;
+ int old_rx_urb_size = dev->rx_urb_size;
+
+ /* mux and pass through modes use a fixed rx_urb_size and the
value
+ * is independent of mtu
+ */
+ if (info->flags & (QMI_WWAN_FLAG_MUX |
QMI_WWAN_FLAG_PASS_THROUGH)) {
+ if (old_rx_urb_size == MAP_DL_URB_SIZE)
+ return 0;
+
+ if (old_rx_urb_size < MAP_DL_URB_SIZE) {
+ usbnet_pause_rx(dev);
+ usbnet_unlink_rx_urbs(dev);
+ usbnet_resume_rx(dev);
+ usbnet_update_max_qlen(dev);
+ }
+
+ return 0;
+ }
+
+ /* rawip mode uses existing logic of setting rx_urb_size based
on mtu */
+ return usbnet_change_mtu(net, new_mtu);
+}
+
static void qmi_wwan_netdev_setup(struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
@@ -326,7 +355,7 @@ static void qmi_wwan_netdev_setup(struct net_device
*net)
}
/* recalculate buffers after changing hard_header_len */
- usbnet_change_mtu(net, net->mtu);
+ qmi_wwan_change_mtu(net, net->mtu);
}
static ssize_t raw_ip_show(struct device *d, struct device_attribute
*attr, char *buf)
@@ -433,6 +462,7 @@ static ssize_t add_mux_store(struct device *d,
struct device_attribute *attr, c
if (!ret) {
info->flags |= QMI_WWAN_FLAG_MUX;
ret = len;
+ qmi_wwan_change_mtu(dev->net, dev->net->mtu);
}
err:
rtnl_unlock();
@@ -514,6 +544,8 @@ static ssize_t pass_through_store(struct device *d,
else
info->flags &= ~QMI_WWAN_FLAG_PASS_THROUGH;
+ qmi_wwan_change_mtu(dev->net, dev->net->mtu);
+
return len;
}
@@ -643,7 +675,7 @@ static const struct net_device_ops
qmi_wwan_netdev_ops = {
.ndo_stop = usbnet_stop,
.ndo_start_xmit = usbnet_start_xmit,
.ndo_tx_timeout = usbnet_tx_timeout,
- .ndo_change_mtu = usbnet_change_mtu,
+ .ndo_change_mtu = qmi_wwan_change_mtu,
.ndo_get_stats64 = dev_get_tstats64,
.ndo_set_mac_address = qmi_wwan_mac_addr,
.ndo_validate_addr = eth_validate_addr,
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2021-08-06 22:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-31 22:45 Aleksander Morgado
2021-08-05 19:10 ` subashab
2021-08-05 20:32 ` Aleksander Morgado
[not found] ` <CAGRyCJHYkH4_FvTzk7BFwjMN=iOTN_Y2=4ueY=s3rJMQO9j7uw@mail.gmail.com>
2021-08-05 21:01 ` Aleksander Morgado
2021-08-05 21:12 ` Daniele Palmas
2021-08-05 22:57 ` subashab
2021-08-06 14:08 ` Aleksander Morgado
2021-08-06 18:42 ` subashab
2021-08-06 19:58 ` Bjørn Mork
2021-08-06 20:22 ` Aleksander Morgado
2021-08-06 22:30 ` subashab [this message]
2021-08-07 10:55 ` Bjørn Mork
2021-08-09 21:40 ` subashab
2021-08-12 12:02 ` Daniele Palmas
2021-08-13 6:21 ` subashab
2021-08-13 6:25 ` Bjørn Mork
2021-09-03 13:55 ` Daniele Palmas
2021-09-08 6:21 ` subashab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c2d1204842f457bb0d0b2c4cd58847d@codeaurora.org \
--to=subashab@codeaurora.org \
--cc=aleksander@aleksander.es \
--cc=bjorn@mork.no \
--cc=dnlplm@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=stranche@codeaurora.org \
--subject='Re: RMNET QMAP data aggregation with size greater than 16384' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).