rmnet_newlink() sizes the first rmnet device from the data format currently stored in the port, before the requested IFLA_RMNET_FLAGS have been applied. The MTU therefore does not match the egress header overhead of the format which ends up being used. Apply IFLA_RMNET_FLAGS first and pass the resulting data format to rmnet_vnd_newlink(), so that the headroom is calculated from the format being configured. Fixes: b7f5eb6ba21b ("net: qualcomm: rmnet: Update rmnet device MTU based on real device") Co-developed-by: Sean Tranchetti Signed-off-by: Sean Tranchetti Signed-off-by: Subash Abhinov Kasiviswanathan --- .../ethernet/qualcomm/rmnet/rmnet_config.c | 19 +++++----- .../net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 38 ++++++++++++------- .../net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 2 +- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c index 61b04c6c0390..40544b75e602 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c @@ -143,6 +143,14 @@ static int rmnet_newlink(struct net_device *dev, return -ENODEV; } + if (data[IFLA_RMNET_FLAGS]) { + struct ifla_rmnet_flags *flags; + + flags = nla_data(data[IFLA_RMNET_FLAGS]); + data_format &= ~flags->mask; + data_format |= flags->flags & flags->mask; + } + ep = kzalloc_obj(*ep); if (!ep) return -ENOMEM; @@ -154,7 +162,8 @@ static int rmnet_newlink(struct net_device *dev, goto err0; port = rmnet_get_port_rtnl(real_dev); - err = rmnet_vnd_newlink(mux_id, dev, port, real_dev, ep, extack); + err = rmnet_vnd_newlink(mux_id, dev, port, real_dev, ep, extack, + data_format); if (err) goto err1; @@ -167,14 +176,6 @@ static int rmnet_newlink(struct net_device *dev, hlist_add_head_rcu(&ep->hlnode, &port->muxed_ep[mux_id]); - if (data[IFLA_RMNET_FLAGS]) { - struct ifla_rmnet_flags *flags; - - flags = nla_data(data[IFLA_RMNET_FLAGS]); - data_format &= ~flags->mask; - data_format |= flags->flags & flags->mask; - } - netdev_dbg(dev, "data format [0x%08X]\n", data_format); WRITE_ONCE(port->data_format, data_format); diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c index fd10aa418be7..984c66bee863 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c @@ -66,29 +66,27 @@ static netdev_tx_t rmnet_vnd_start_xmit(struct sk_buff *skb, return NETDEV_TX_OK; } -static int rmnet_vnd_headroom(struct rmnet_port *port) +static int rmnet_vnd_headroom(u32 data_format) { u32 headroom; headroom = sizeof(struct rmnet_map_header); - if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4) + if (data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV4) headroom += sizeof(struct rmnet_map_ul_csum_header); - else if (port->data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5) + else if (data_format & RMNET_FLAGS_EGRESS_MAP_CKSUMV5) headroom += sizeof(struct rmnet_map_v5_csum_header); return headroom; } -static int rmnet_vnd_change_mtu(struct net_device *rmnet_dev, int new_mtu) +static int rmnet_vnd_change_mtu_with_format(struct net_device *rmnet_dev, + int new_mtu, u32 data_format) { struct rmnet_priv *priv = netdev_priv(rmnet_dev); - struct rmnet_port *port; u32 headroom; - port = rmnet_get_port_rtnl(priv->real_dev); - - headroom = rmnet_vnd_headroom(port); + headroom = rmnet_vnd_headroom(data_format); if (new_mtu < 0 || new_mtu > RMNET_MAX_PACKET_SIZE || new_mtu > (priv->real_dev->mtu - headroom)) @@ -98,6 +96,17 @@ static int rmnet_vnd_change_mtu(struct net_device *rmnet_dev, int new_mtu) return 0; } +static int rmnet_vnd_change_mtu(struct net_device *rmnet_dev, int new_mtu) +{ + struct rmnet_priv *priv = netdev_priv(rmnet_dev); + struct rmnet_port *port; + + port = rmnet_get_port_rtnl(priv->real_dev); + + return rmnet_vnd_change_mtu_with_format(rmnet_dev, new_mtu, + READ_ONCE(port->data_format)); +} + static int rmnet_vnd_get_iflink(const struct net_device *dev) { struct rmnet_priv *priv = netdev_priv(dev); @@ -310,8 +319,7 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev, struct rmnet_port *port, struct net_device *real_dev, struct rmnet_endpoint *ep, - struct netlink_ext_ack *extack) - + struct netlink_ext_ack *extack, u32 data_format) { struct rmnet_priv *priv = netdev_priv(rmnet_dev); u32 headroom; @@ -328,9 +336,11 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev, priv->real_dev = real_dev; - headroom = rmnet_vnd_headroom(port); + headroom = rmnet_vnd_headroom(data_format); - if (rmnet_vnd_change_mtu(rmnet_dev, real_dev->mtu - headroom)) { + if (rmnet_vnd_change_mtu_with_format(rmnet_dev, + real_dev->mtu - headroom, + data_format)) { NL_SET_ERR_MSG_MOD(extack, "Invalid MTU on real dev"); return -EINVAL; } @@ -387,7 +397,7 @@ int rmnet_vnd_validate_real_dev_mtu(struct net_device *real_dev) port = rmnet_get_port_rtnl(real_dev); - headroom = rmnet_vnd_headroom(port); + headroom = rmnet_vnd_headroom(READ_ONCE(port->data_format)); hash_for_each_safe(port->muxed_ep, bkt_ep, tmp_ep, ep, hlnode) { if (ep->egress_dev->mtu > (real_dev->mtu - headroom)) @@ -405,7 +415,7 @@ int rmnet_vnd_update_dev_mtu(struct rmnet_port *port, unsigned long bkt_ep; u32 headroom; - headroom = rmnet_vnd_headroom(port); + headroom = rmnet_vnd_headroom(READ_ONCE(port->data_format)); hash_for_each_safe(port->muxed_ep, bkt_ep, tmp_ep, ep, hlnode) { if (ep->egress_dev->mtu <= (real_dev->mtu - headroom)) diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h index c2b2baf86894..5d54c24f5c8c 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h @@ -12,7 +12,7 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev, struct rmnet_port *port, struct net_device *real_dev, struct rmnet_endpoint *ep, - struct netlink_ext_ack *extack); + struct netlink_ext_ack *extack, u32 data_format); int rmnet_vnd_dellink(u8 id, struct rmnet_port *port, struct rmnet_endpoint *ep); void rmnet_vnd_rx_fixup(struct sk_buff *skb, struct net_device *dev); -- 2.34.1