From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 03528C43381 for ; Thu, 28 Feb 2019 18:38:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC75E218AE for ; Thu, 28 Feb 2019 18:38:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="JQrhDyEw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388140AbfB1Si2 (ORCPT ); Thu, 28 Feb 2019 13:38:28 -0500 Received: from mail-pl1-f182.google.com ([209.85.214.182]:46791 "EHLO mail-pl1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387525AbfB1SiV (ORCPT ); Thu, 28 Feb 2019 13:38:21 -0500 Received: by mail-pl1-f182.google.com with SMTP id c17so6978632plz.13 for ; Thu, 28 Feb 2019 10:38:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u8d0yt0X2M0G0gyxHVkWKCU8qZjC1XadgaQdmTETUQA=; b=JQrhDyEwwAmiE+onbiKyNMnrPEzcJP+S7jRillrLeqLfohsJgXi/Hyval+3vGM757N JVVYu5Kcccgaoxl4oXfgiDunMnOF/qdOeUj6CeQ3NoVDi81MtpLUHCaUO28FynUHTDGh xZWpGbIAHH5f+Yr2dDAtJQFgC2dJ3E8J1Wl4WR12mO7lasz2iu43PdsHMwSSZK9WBkyX axmzvm5BndodupPBCzr+IPcGIwZ5ivWmLKNPiD1/OtkUEMarmtn+rqqIi0v3jcILDvcl uchBlozDj+GSxFNHvMs36zG7JVM+F7nNEXsV41FZ3ZAdqXiZbQ5iHX0ih+SDtXkzadpZ BfGA== 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=u8d0yt0X2M0G0gyxHVkWKCU8qZjC1XadgaQdmTETUQA=; b=RAW50Xjt0eUebfB8GxIVB5dE3Zy2JQgn8l+YFuQSj9OOVyWqbOkLNoLHVC4lea7FJM 6GCizEAmGAvdfBFtDvjSWDHqnvmkr25SlmIq9ibQ1/N3qbn6I+83k6WIXZm3u/s+hF+2 1vUGPN1DSYleQPXnAZrNLksP/hLEHfYvQa6eGAgfiQNcKDrMHSQGt16LhlIL/pn66U2Z 2I5qUwZgttZfmagyUqwjjMQsxBk3S1nvYlEccIL3WOaHPYCsM/vL8yPw1IiTA30TurMh iApgkvc+ZdRqj/SmnIwJPoXLqSGux9Fm0+e4zJQnbs1AhV64DdGFBEQuQ/amnTAF5+zr QlNw== X-Gm-Message-State: APjAAAXTJYYbekYFWiOoLOQWgWIMOul3HFtKBxzKe/C7Lu3x+o63UMgF lYiN8zp4QGt+smYE3Xge4jXiS/9MCW0= X-Google-Smtp-Source: APXvYqyfIv4qAr7nTdwEwVRSfdB5twgsWJyTVAEl0CcAIO56nrc3E99h7CiPImE2hyp/7A1uKEOB1w== X-Received: by 2002:a17:902:5066:: with SMTP id f35mr854590plh.184.1551379100714; Thu, 28 Feb 2019 10:38:20 -0800 (PST) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id c10sm25262702pfo.19.2019.02.28.10.38.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 10:38:19 -0800 (PST) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [RFC 5/6] mlx4: report errors through extack Date: Thu, 28 Feb 2019 10:38:08 -0800 Message-Id: <20190228183809.25417-6-sthemmin@microsoft.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228183809.25417-1-sthemmin@microsoft.com> References: <20190228183809.25417-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Stephen Hemminger XDP errors should be reported via extack (back to command) rather than on console. Signed-off-by: Stephen Hemminger --- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index c1438ae52a11..72fb5570df20 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -2779,7 +2779,8 @@ static int mlx4_en_set_tx_maxrate(struct net_device *dev, int queue_index, u32 m return err; } -static int mlx4_xdp_set(struct net_device *dev, struct bpf_prog *prog) +static int mlx4_xdp_set(struct net_device *dev, struct bpf_prog *prog, + struct netlink_ext_ack *extack) { struct mlx4_en_priv *priv = netdev_priv(dev); struct mlx4_en_dev *mdev = priv->mdev; @@ -2816,8 +2817,10 @@ static int mlx4_xdp_set(struct net_device *dev, struct bpf_prog *prog) return 0; } - if (!mlx4_en_check_xdp_mtu(dev, dev->mtu)) + if (!mlx4_en_check_xdp_mtu(dev, dev->mtu)) { + NL_SET_ERR_MSG(extack, "MTU exceeds support XDP maximum"); return -EOPNOTSUPP; + } tmp = kzalloc(sizeof(*tmp), GFP_KERNEL); if (!tmp) @@ -2870,8 +2873,8 @@ static int mlx4_xdp_set(struct net_device *dev, struct bpf_prog *prog) if (port_up) { err = mlx4_en_start_port(dev); if (err) { - en_err(priv, "Failed starting port %d for XDP change\n", - priv->port); + NL_SET_ERR_MSG(extack, + "Failed starting port for XDP change"); queue_work(mdev->workqueue, &priv->watchdog_task); } } @@ -2908,11 +2911,12 @@ static int mlx4_xdp(struct net_device *dev, struct netdev_bpf *xdp) { switch (xdp->command) { case XDP_SETUP_PROG: - return mlx4_xdp_set(dev, xdp->prog); + return mlx4_xdp_set(dev, xdp->prog, xdp->extack); case XDP_QUERY_PROG: xdp->prog_id = mlx4_xdp_query(dev); return 0; default: + NL_SET_ERR_MSG(xdp->extack, "Unsupported XDP command"); return -EINVAL; } } -- 2.17.1