lkml.org 
[lkml]   [2021]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 063/177] netdevsim: dont overwrite read only ethtool parms
    Date
    From: Filip Pokryvka <fpokryvk@redhat.com>

    [ 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 | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/netdevsim/ethtool.c b/drivers/net/netdevsim/ethtool.c
    index b03a0513eb7e7..2e7c1cc16cb93 100644
    --- a/drivers/net/netdevsim/ethtool.c
    +++ b/drivers/net/netdevsim/ethtool.c
    @@ -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;
    }

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-12-20 16:11    [W:4.545 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site