ionic updates
Subsystems (3)
cover ionic updates
These are a pair of small code cleanups.
Shannon Nelson (2):
ionic: remove some unnecessary oom messages
ionic: change mtu after queues are stopped
drivers/net/ethernet/pensando/ionic/ionic_dev.c | 2 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 14 +++++++------- drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +--- 3 files changed, 9 insertions(+), 11 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 ionic: remove some unnecessary oom messages
Remove memory allocation fail messages where the OOM stack trace will make it obvious which allocation request failed.
Signed-off-by Shannon Nelson <[email protected]>
--- drivers/net/ethernet/pensando/ionic/ionic_dev.c | 2 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 8 +++----- drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_dev.c +1 -1
@@ -142,7 +142,7 @@ int ionic_heartbeat_check(struct ionic *ionic) work =kzalloc (sizeof (*work),GFP_ATOMIC );if (!work) { -dev_err (ionic->dev,"%s OOM\n" , __func__); +dev_err (ionic->dev,"LIF reset trigger dropped\n" ); }else { work->type =IONIC_DW_TYPE_LIF_RESET ; if (fw_status & IONIC_FW_STS_F_RUNNING &&
drivers/net/ethernet/pensando/ionic/ionic_lif.c +3 -5
@@ -842,7 +842,7 @@ static bool ionic_notifyq_service(struct ionic_cq *cq,case IONIC_EVENT_RESET : work =kzalloc (sizeof (*work),GFP_ATOMIC );if (!work) { -netdev_err (lif->netdev,"%s OOM\n" , __func__); +netdev_err (lif->netdev,"Reset event dropped\n" ); }else { work->type =IONIC_DW_TYPE_LIF_RESET ;ionic_lif_deferred_enqueue (&lif->deferred, work);
@@ -1051,10 +1051,8 @@ static int ionic_lif_addr(struct ionic_lif *lif, const u8 *addr, bool add,if (!can_sleep) { work =kzalloc (sizeof (*work),GFP_ATOMIC ); -if (!work) { -netdev_err (lif->netdev,"%s OOM\n" , __func__); +if (!work)return -ENOMEM ; - } work->type = add ?IONIC_DW_TYPE_RX_ADDR_ADD :IONIC_DW_TYPE_RX_ADDR_DEL ;memcpy (work->addr, addr,ETH_ALEN );
@@ -1183,7 +1181,7 @@ static void ionic_set_rx_mode(struct net_device *netdev, bool can_sleep)if (!can_sleep) { work =kzalloc (sizeof (*work),GFP_ATOMIC );if (!work) { -netdev_err (lif->netdev,"%s OOM\n" , __func__); +netdev_err (lif->netdev,"rxmode change dropped\n" );return ; } work->type =IONIC_DW_TYPE_RX_MODE ;
drivers/net/ethernet/pensando/ionic/ionic_main.c +1 -3
@@ -511,10 +511,8 @@ int ionic_port_init(struct ionic *ionic) idev->port_info_sz, &idev->port_info_pa, GFP_KERNEL); -if (!idev->port_info) { -dev_err (ionic->dev,"Failed to allocate port info\n" ); +if (!idev->port_info)return -ENOMEM ; - } } sz =min (sizeof (ident->port.config),sizeof (idev->dev_cmd_regs->data));
Signature · 1 line
2.17.1
PATCH 2/2 ionic: change mtu after queues are stopped
In reply to Shannon NelsonOrder of operations is slightly more correct in the driver to change the netdev->mtu after the queues have been stopped rather than before.
Signed-off-by Shannon Nelson <[email protected]>
--- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +4 -2
@@ -1465,12 +1465,14 @@ static int ionic_change_mtu(struct net_device *netdev, int new_mtu)if (err)return err; - netdev->mtu = new_mtu;/* if we're not running, nothing more to do */ -if (!netif_running (netdev)) +if (!netif_running (netdev)) { + netdev->mtu = new_mtu;return 0 ; + }ionic_stop_queues_reconfig (lif); + netdev->mtu = new_mtu;return ionic_start_queues_reconfig (lif); }
Signature · 1 line
2.17.1
Quoted 1 line · On Mon, 30 Nov 2020 16:25:44 -0800 Shannon Nelson wrote:
These are a pair of small code cleanups.
Applied, thanks!