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 156BBC43381 for ; Thu, 28 Feb 2019 21:54:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D197C20675 for ; Thu, 28 Feb 2019 21:54:58 +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="UHS6pBkL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733103AbfB1Vy6 (ORCPT ); Thu, 28 Feb 2019 16:54:58 -0500 Received: from mail-pl1-f182.google.com ([209.85.214.182]:39505 "EHLO mail-pl1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732403AbfB1Vy4 (ORCPT ); Thu, 28 Feb 2019 16:54:56 -0500 Received: by mail-pl1-f182.google.com with SMTP id b65so7362297plb.6 for ; Thu, 28 Feb 2019 13:54:55 -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=qZ3Yy5sZ2YWlfWeCKnHHjf99PCR+Sy7bwFutm61DFwg=; b=UHS6pBkLBjFLsG0ekw+0bPwaxxBkZ7+6NGrCJoNnrnhBOx1X07OOzu0jlyyMyPfQv0 E1/bFiCF9qDdLuTg9lQm8fBPAfQf/9JryzQrp7jbJShe4ClIHVbWcZFgWkBpCTnTxVtW ZaNeOcd6sBWYHoL+4XsO+HBmr9JN4ZUKgvmFyctH7RtjBCIKBp9HynlsQNif5c0suvYA jBQn/HHZpk6Qu1sIDe8d2RHXQfxqrDOQw+miJDqCIaC48MDPzgtAh/pQw1A0HR6xWDzG x6Z0CuahYVv7PgbUc2EWHlhhjnKqNmR36kmS4XsLAhV6hDLbvgQxUV37bzjzpXvmytLb F/VA== 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=qZ3Yy5sZ2YWlfWeCKnHHjf99PCR+Sy7bwFutm61DFwg=; b=bJG0uAbEQfU6I/gONb8sSSIOqdyYlS7kTF+yjjR1cN+49wSYXDLSoGePelBM2kx3Ff AO3nBR7WiXwKzAHbK74rF3TOfXeHA7X0xrUsv7noGqHU7RMhj0j2zvRePOMnd6wfepN2 BfMSBDojLmOCAoGkydlvpDmtPjdjTDKQFv/NIxx+0XzDbHMeBsUeGz/QMcvlIuhkiOzG YXtAPpLHVsu+DaG6wq0eoeUWek5JoFKARHdJRQXPCDutoqzatvDchn3ogtHqpYNgXdzC 1ec3mNtOmWwb0pivD/fj4mCvvevPa6A/Cc6bQorJJLZvdruOHUDn5jGUmGFeUpr+oeai uzWQ== X-Gm-Message-State: APjAAAWZLJnny84tikIZOWzr3FNhbswSE3cbhUCcA9biY8FTFr+CJ3fJ gPf1aCstPRymNYpLoHN/yg/3EMlkybU= X-Google-Smtp-Source: APXvYqw56roaywbIOwoBWtqT+54jw4pHh8xTjlfgUIX9aYE9oU6jLke46EkgDtktKBHyuohmoTdqww== X-Received: by 2002:a17:902:9683:: with SMTP id n3mr1662677plp.333.1551390895237; Thu, 28 Feb 2019 13:54:55 -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 b138sm40078643pfb.48.2019.02.28.13.54.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 13:54:54 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [RFC v2 6/6] mlx5: report XDP errors through extack Date: Thu, 28 Feb 2019 13:54:41 -0800 Message-Id: <20190228215441.28275-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228215441.28275-1-stephen@networkplumber.org> References: <20190228215441.28275-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case of errors in setting up XDP, report error through extack string rather than console log. Signed-off-by: Stephen Hemminger --- .../net/ethernet/mellanox/mlx5/core/en_main.c | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index e5f74eb986b3..555d72fb6b40 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -4177,18 +4177,20 @@ static void mlx5e_tx_timeout(struct net_device *dev) queue_work(priv->wq, &priv->tx_timeout_work); } -static int mlx5e_xdp_allowed(struct mlx5e_priv *priv, struct bpf_prog *prog) +static int mlx5e_xdp_allowed(struct mlx5e_priv *priv, struct bpf_prog *prog, + struct netlink_ext_ack *extack) { - struct net_device *netdev = priv->netdev; struct mlx5e_channels new_channels = {}; if (priv->channels.params.lro_en) { - netdev_warn(netdev, "can't set XDP while LRO is on, disable LRO first\n"); + NL_SET_ERR_MSG_MOD(extack, + "can't set XDP while LRO is on, disable LRO first"); return -EINVAL; } if (MLX5_IPSEC_DEV(priv->mdev)) { - netdev_warn(netdev, "can't set XDP with IPSec offload\n"); + NL_SET_ERR_MSG_MOD(extack, + "can't set XDP with IPSec offload"); return -EINVAL; } @@ -4196,15 +4198,16 @@ static int mlx5e_xdp_allowed(struct mlx5e_priv *priv, struct bpf_prog *prog) new_channels.params.xdp_prog = prog; if (!mlx5e_rx_is_linear_skb(priv->mdev, &new_channels.params)) { - netdev_warn(netdev, "XDP is not allowed with MTU(%d) > %d\n", - new_channels.params.sw_mtu, MLX5E_XDP_MAX_MTU); + NL_SET_ERR_MSG_MOD(extack, + "XDP is not allowed with large MTU"); return -EINVAL; } return 0; } -static int mlx5e_xdp_set(struct net_device *netdev, struct bpf_prog *prog) +static int mlx5e_xdp_set(struct net_device *netdev, struct bpf_prog *prog, + struct netlink_ext_ack *extack) { struct mlx5e_priv *priv = netdev_priv(netdev); struct bpf_prog *old_prog; @@ -4215,7 +4218,7 @@ static int mlx5e_xdp_set(struct net_device *netdev, struct bpf_prog *prog) mutex_lock(&priv->state_lock); if (prog) { - err = mlx5e_xdp_allowed(priv, prog); + err = mlx5e_xdp_allowed(priv, prog, extack); if (err) goto unlock; } @@ -4297,11 +4300,12 @@ static int mlx5e_xdp(struct net_device *dev, struct netdev_bpf *xdp) { switch (xdp->command) { case XDP_SETUP_PROG: - return mlx5e_xdp_set(dev, xdp->prog); + return mlx5e_xdp_set(dev, xdp->prog, xdp->extack); case XDP_QUERY_PROG: xdp->prog_id = mlx5e_xdp_query(dev); return 0; default: + NL_SET_ERR_MSG_MOD(xdp->extack, "Unsupported XDP command"); return -EINVAL; } } -- 2.17.1