netdevsim: don't overwrite read only ethtool parms
authorFilip Pokryvka <fpokryvk@redhat.com>
Fri, 10 Dec 2021 17:50:32 +0000 (18:50 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Dec 2021 08:32:40 +0000 (09:32 +0100)
[ Upstream commit ee60e626d536da4c710b3634afe68fe7c6d69b59 ]

Ethtool ring feature has _max_pending attributes read-only.
Set only read-write attributes in nsim_set_ringparam.

This patch is useful, if netdevsim device is set-up using NetworkManager,
because NetworkManager sends 0 as MAX values, as it is pointless to
retrieve them in extra call, because they should be read-only. Then,
the device is left in incosistent state (value > MAX).

Fixes: a7fc6db099b5 ("netdevsim: support ethtool ring and coalesce settings")
Signed-off-by: Filip Pokryvka <fpokryvk@redhat.com>
Link: https://lore.kernel.org/r/20211210175032.411872-1-fpokryvk@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/netdevsim/ethtool.c

index b03a0513eb7e7bd7ce7b3407ab79bbb728f37197..2e7c1cc16cb93e3512f93590568517f8d8c4f695 100644 (file)
@@ -77,7 +77,10 @@ static int nsim_set_ringparam(struct net_device *dev,
 {
        struct netdevsim *ns = netdev_priv(dev);
 
-       memcpy(&ns->ethtool.ring, ring, sizeof(ns->ethtool.ring));
+       ns->ethtool.ring.rx_pending = ring->rx_pending;
+       ns->ethtool.ring.rx_jumbo_pending = ring->rx_jumbo_pending;
+       ns->ethtool.ring.rx_mini_pending = ring->rx_mini_pending;
+       ns->ethtool.ring.tx_pending = ring->tx_pending;
        return 0;
 }