From patchwork Thu Feb 28 18:38:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 1049697 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="1wSoixtJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449LsS30Hwz9s4Z for ; Fri, 1 Mar 2019 05:38:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387399AbfB1SiR (ORCPT ); Thu, 28 Feb 2019 13:38:17 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:43140 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726371AbfB1SiP (ORCPT ); Thu, 28 Feb 2019 13:38:15 -0500 Received: by mail-pg1-f194.google.com with SMTP id l11so10113838pgq.10 for ; Thu, 28 Feb 2019 10:38:15 -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=qD8EDSgObe1YWVAl1SSaUf6CKJLtcuEe+S2NJXza7HM=; b=1wSoixtJtBExYCTInPNKF2QnXrzOeF71q2gKqDTgOrXR2qwTwANFGKGrDa5mb01QRT TZqtkyoFAsMx0RevjSs9SYV2AiS03hMW8g9UUi1r/+3yX5F3B8c+X4WxaeVAQDF+ei8V cH1DRJGKNaFzOZIyyU8tu9ZDGnQoRPvRGCudfGKZyKOc8dDf1HekK1oT9A+yq+T8stpV I6yL7Bg5AR2c74EcbhsRPofNnshy0vgmZRq2r90vuO8w8f2tFs/qPayTjXF80X6lbOpv HeQZ/HKjiSWuTJ7RQ4YKuxqrXFSZgVmn5FxWXzIskwUGwNGyXV+Jb6EuXWqQD67p8Lb4 Y2TQ== 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=qD8EDSgObe1YWVAl1SSaUf6CKJLtcuEe+S2NJXza7HM=; b=Pc/xz2nEKzPtYTTfrqQidvvJQsbcHZIL03rxJyift3326AIoog6vSzNxt2E6NNC2/u WRitDF8mrPIqG/rWEEdcrMaV6FvluVZjptp0bmdj65zHAvll8vIcalsWqrD9CUUPy7kE XQjzZp9yDch0iseJs8wSwbmuIWPFVZwCpS2GyqxiGYZYdVkj9WDFfG0lM5l6gMtfOwnm j8Sd5vwkY7apot9EPkNMQI4a8H3r+KATd7l9ZSs+4/oqc8Bk9ly5XAggbxhF+TmjzQoH sApKrH//rBFgcOoXzop4k/LADVIW56NlpzERE/PFy1/CTpuNzOdDdWYF6VrdeY5f3WiO iVjQ== X-Gm-Message-State: AHQUAuaBQ/OV9fliHrKKWSLBm4qixAyDbcf7RfS1bxGro9coJk0KLzhT DGoO6Td6DB1D0wdxvLp1WLavOs1JWNs= X-Google-Smtp-Source: AHgI3IbqTe0PMocKH3AsNIFF/3MECmC219xzbZ625AufdaM0E7nDZ/mNdKnzdG3RvFsgl2OD8bx9pw== X-Received: by 2002:a62:f5c8:: with SMTP id b69mr1010683pfm.128.1551379094399; Thu, 28 Feb 2019 10:38:14 -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.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 10:38:13 -0800 (PST) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [RFC 1/6] bnxt: use extack for xdp error messages Date: Thu, 28 Feb 2019 10:38:04 -0800 Message-Id: <20190228183809.25417-2-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 has a netlink error message buffer available that should be used for errors instead of console logging. Signed-off-by: Stephen Hemminger --- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c index 0184ef6f05a7..a894a10726af 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c @@ -150,19 +150,21 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons, } /* Under rtnl_lock */ -static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) +static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog, + struct netlink_ext_ack *extack) { struct net_device *dev = bp->dev; int tx_xdp = 0, rc, tc; struct bpf_prog *old; if (prog && bp->dev->mtu > BNXT_MAX_PAGE_MODE_MTU) { - netdev_warn(dev, "MTU %d larger than largest XDP supported MTU %d.\n", - bp->dev->mtu, BNXT_MAX_PAGE_MODE_MTU); + NL_SET_ERR_MSG(extack, + "MTU larger than largest XDP supported MTU"); return -EOPNOTSUPP; } if (!(bp->flags & BNXT_FLAG_SHARED_RINGS)) { - netdev_warn(dev, "ethtool rx/tx channels must be combined to support XDP.\n"); + NL_SET_ERR_MSG(extack, + "ethtool rx/tx channels must be combined to support XDP"); return -EOPNOTSUPP; } if (prog) @@ -174,7 +176,8 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) rc = bnxt_check_rings(bp, bp->tx_nr_rings_per_tc, bp->rx_nr_rings, true, tc, tx_xdp); if (rc) { - netdev_warn(dev, "Unable to reserve enough TX rings to support XDP.\n"); + NL_SET_ERR_MSG(extack, + "Unable to reserve enough TX rings to support XDP.\n"); return rc; } if (netif_running(dev)) @@ -211,19 +214,16 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) int bnxt_xdp(struct net_device *dev, struct netdev_bpf *xdp) { struct bnxt *bp = netdev_priv(dev); - int rc; switch (xdp->command) { case XDP_SETUP_PROG: - rc = bnxt_xdp_set(bp, xdp->prog); - break; + return bnxt_xdp_set(bp, xdp->prog, xdp->extack); + case XDP_QUERY_PROG: xdp->prog_id = bp->xdp_prog ? bp->xdp_prog->aux->id : 0; - rc = 0; - break; + return 0; default: - rc = -EINVAL; - break; + NL_SET_ERR_MSG(xdp->extack, "Unsupported XDP command"); + return -EINVAL; } - return rc; }