From patchwork Tue Dec 1 00:25:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 11941673 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B7BDC71156 for ; Tue, 1 Dec 2020 00:26:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4E39207FF for ; Tue, 1 Dec 2020 00:26:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=pensando.io header.i=@pensando.io header.b="sDGoNzgA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389116AbgLAA0i (ORCPT ); Mon, 30 Nov 2020 19:26:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389108AbgLAA0h (ORCPT ); Mon, 30 Nov 2020 19:26:37 -0500 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BF2BC0613D3 for ; Mon, 30 Nov 2020 16:25:56 -0800 (PST) Received: by mail-pl1-x643.google.com with SMTP id p6so88736plr.7 for ; Mon, 30 Nov 2020 16:25:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G3VQbjm0y4Z02ETG2i1t0wc1IBQxjIaQMqDP66FdEXQ=; b=sDGoNzgAXMZwSosyJpsGBFkWfu3+WdwFNlJAfzoUwdgbGcK6pFACn1kXMbtGI+8hFK LPP3LgMHES8xhiEiVCiZlydr1v+7kwX50TnxR2X60MEMgjOXtENHth59rrzM7VmucdC6 oxHxYKNrqZpjECHYREBaNr3kUVVb5+uVzCWhuD3jp/LX7lPCMd+T1oiy5XLZnfgOLBbO 5QG7QijsUoXi3MvfUdC7VvxT14PClS1LH7JmUAYFpgVqgimdLtN4uPp2XJjQEdGrWjFn x/XFNZo0vhW+crJlEXWdnSAbt+luy0K2KKzFBTBUPp/O9bq+psOcMEPL692zYCzCNgrG yYog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G3VQbjm0y4Z02ETG2i1t0wc1IBQxjIaQMqDP66FdEXQ=; b=tm5vWY+vHYiO05O03wJgoGfHXOcacnaInkY4yvWvDt6Rx874HlXIjYV/Yc/0EscQyC cvwQxVOnbGDueE6jU+7sKmZ1kWKvBV0yENFqdnSzfaMZ3NAYcaTTL92hzuynTRW0ueSH eZZYdO5yWcEXKKRLYZVnFvQCmcMPz2y1pVuR/CEFFgDa5CW1jrbaHp7H6addeWV3sQoh CEvzaaGRuROLXvA/j0jyLgH4szwVU3fwpPmBMpXaPSv9ZTMsZ8oDBV0mIaFbgL7SrpGU 4d7ibQL0FgW/InP/4hZMV8QV8S6snglicV/UCrpw6LwrH1QRBOAKDdNWDYfELYs69wKy hJ1g== X-Gm-Message-State: AOAM531GE9oBbzZCfhS7LHXe2oo5fQUQ2bxLexNg8eC2K8mMUwknDsC3 Uy5EJUJvZiHVqdXER19Ghi34ZEdXGHh/yA== X-Google-Smtp-Source: ABdhPJwe1N6F7gTIVz1AARnwILK48JMI1aDWlUBAYXa8icVQIl9sjVgghkIpK9u6PSbAPSlQYTit1A== X-Received: by 2002:a17:90a:f694:: with SMTP id cl20mr403909pjb.179.1606782355877; Mon, 30 Nov 2020 16:25:55 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id q12sm172632pgv.91.2020.11.30.16.25.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Nov 2020 16:25:55 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org Cc: Shannon Nelson Subject: [PATCH net-next 1/2] ionic: remove some unnecessary oom messages Date: Mon, 30 Nov 2020 16:25:45 -0800 Message-Id: <20201201002546.4123-2-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201201002546.4123-1-snelson@pensando.io> References: <20201201002546.4123-1-snelson@pensando.io> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Remove memory allocation fail messages where the OOM stack trace will make it obvious which allocation request failed. Signed-off-by: Shannon Nelson --- 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(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_dev.c b/drivers/net/ethernet/pensando/ionic/ionic_dev.c index 318db5f77fdb..fb2b5bf179d7 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_dev.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_dev.c @@ -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 && diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 0afec2fa572d..0b7f2def423c 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -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; diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c index d355676f6c16..fbc57de6683e 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c @@ -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)); From patchwork Tue Dec 1 00:25:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 11941669 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80E64C8300F for ; Tue, 1 Dec 2020 00:26:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A479208FE for ; Tue, 1 Dec 2020 00:26:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=pensando.io header.i=@pensando.io header.b="LGN6vQ7b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389117AbgLAA0o (ORCPT ); Mon, 30 Nov 2020 19:26:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726316AbgLAA0n (ORCPT ); Mon, 30 Nov 2020 19:26:43 -0500 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B95AEC0613D4 for ; Mon, 30 Nov 2020 16:25:57 -0800 (PST) Received: by mail-pj1-x1042.google.com with SMTP id t12so127830pjq.5 for ; Mon, 30 Nov 2020 16:25:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dyAxNjo17ZUIGlsMvPKiZqDZ4nUH9vd0xfyYvJND1Zo=; b=LGN6vQ7bkbR8ogcFrs0b8eFPUFYEz8wqVeIvMY3n7jJESPtegf2OT8H6Zn5obuMxzV jFYP5p/QLPKToiv0PP9/KAf/4qxKRDsp5NTqGe4MHR7uXSRrL4K7jHg8C0Tat3KZPCAJ xeaSyK3MOUU4GurhkqRCe365g/szbR9/zFjXoF20CVSTD78htVRv9ly4E7D8Qc8ueRdU CxDpjzaMRj4L8IXIUt1bcsgojYnBlEH/uziEF1hB084a6MVFuc9lE+PUHn/L0QHhqm0E DglLuTzNstWms5D4q2dgXujGmH/qsM9nVt/2wHFeoHYxW8Jvc68LvaStfHahXFFPRml8 itlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dyAxNjo17ZUIGlsMvPKiZqDZ4nUH9vd0xfyYvJND1Zo=; b=Do93kN93wRYqREMoobt1tcR477Qp6Ghp6xBPeyQ01jiiLsmB0DB7Y2G2m3nzaQvUtl hEV4pvi9CgXHei0+WQCckvmEsOp7ZXJ1SbGENley6xrl2CGGKVoF5H4I8ha2Ujfu+JdI YjF8x6Itm/DLvhHmlJtcM3tunntn2WedoZd9inw4vmLi3G762eTLZQRKXtfD/yoHzecb 7dRbVAit2e/cTtthZv9Mdvp8z/L4UVfdRz7/btov1mDnveQKPunYEdLMO+zmvo5Us0nq u3pMYlfYDezYIvbLLXg/Y9/PF6AzaurZXKqha3xwPAg+HH80iImThN0SgSyUqx1QzNTR tnJQ== X-Gm-Message-State: AOAM530fRwWghZiGpzv3DbiFAGXCP8ncakeHftWJTWHk6NqrfrMYQo8N Cwd12sjyrBQVaLaLu6p7pf/jzXo+C99asw== X-Google-Smtp-Source: ABdhPJzazM6uJtXudQR5sOwyXp/N0nSxQ6bicSYAOSmUN6Us+uRZoTLXNwQIns2q6w9X+Z/JGCU8Hg== X-Received: by 2002:a17:902:6bc2:b029:d6:e0ba:f2ff with SMTP id m2-20020a1709026bc2b02900d6e0baf2ffmr186568plt.10.1606782357070; Mon, 30 Nov 2020 16:25:57 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id q12sm172632pgv.91.2020.11.30.16.25.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Nov 2020 16:25:56 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org Cc: Shannon Nelson Subject: [PATCH net-next 2/2] ionic: change mtu after queues are stopped Date: Mon, 30 Nov 2020 16:25:46 -0800 Message-Id: <20201201002546.4123-3-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201201002546.4123-1-snelson@pensando.io> References: <20201201002546.4123-1-snelson@pensando.io> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Order 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 --- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 0b7f2def423c..11140915c2da 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -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); }