From patchwork Thu Feb 28 18:38:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 1049696 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="EEOkpm21"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449LsR4V2hz9s2R for ; Fri, 1 Mar 2019 05:38:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387512AbfB1SiR (ORCPT ); Thu, 28 Feb 2019 13:38:17 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:38788 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727649AbfB1SiQ (ORCPT ); Thu, 28 Feb 2019 13:38:16 -0500 Received: by mail-pl1-f193.google.com with SMTP id g37so7356445plb.5 for ; Thu, 28 Feb 2019 10:38:16 -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=MfB+8o/vpFR2hTlGxlEZPm+L/+gSSKCv319nb0Ctd38=; b=EEOkpm21qYP3E46LBdIj7LVg1iqgBmvfaThdSdURvefJzwMhxnEvolWts0jGAmw524 IgSpGuw6O1Opwr3Wh/rHs7GXWj8yYD2uwfc3DkGHiGneUaHpGxtwogIoB3dahSr/EoI9 Sp9XpdrQ+Adw7B5B0ouVtQmtWIteiILTMAXCiFsbr1gKFdbdT8n8kP6P9Fq4WJvVyOCg +Hkq6Qy2zgUGKjeLGZzOcDETwi3cx9B5iF6i2Cmf3Jp1He2JqHDQcKvTZMo24huDUp1r 4gtIv0HuTx3ibFhVmRwSM6f6OvR9gTa859LmSTXt80bvTvDC0eGij1GtgyU/VR+wSevL pVuw== 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=MfB+8o/vpFR2hTlGxlEZPm+L/+gSSKCv319nb0Ctd38=; b=LFXXLfCUDtFka7RkLmc2HBapwJ7IDbyZq9oFDdyIVNC6vfpazXwJ+xuxQZDnEeLE3q 34w7guiCZGkNGY1GGuVVDIkrd9ur7zPdO72wdOksRjGF9ffkgT4Lt9SJ1CKyVyZvk2U2 6W79isXz/jCpfRn2mhw4OBwmfTVyRCNoJXdsCd3fhxUVQY0QgwstFmU8nzVT59N5xaa+ 9/sdENgUqsd46InpqVUoJC+PV1f9XxIFXgDAv6Z8vlqTV8YMbV3g7oT08Kc5GJ6jAwWy Z45oxWGRLZjD0zRRHGJuW0w338vZ/1lVyuVo5LD2Ef8TE6e5YOqroXwZfbJC57vwP3Kt dO+A== X-Gm-Message-State: APjAAAVlRXFM6ix9lVEbMCZftwr1YxqoyoMiDL3GYJAgI+/wyWxhL4nS gSwF8bFfoX9YU/KFceksqDJL6qLy5qE= X-Google-Smtp-Source: APXvYqxwxl3Z2t5Ch+dan4qkRjRtvp02RdKFEeo19d/Fme5BqWoIz9LjJA5vSoOTvPkMDd8pssxJ1g== X-Received: by 2002:a17:902:f095:: with SMTP id go21mr766267plb.199.1551379095922; Thu, 28 Feb 2019 10:38:15 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 10:38:14 -0800 (PST) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [RFC 2/6] ixgbe: use extack for xdp errors Date: Thu, 28 Feb 2019 10:38:05 -0800 Message-Id: <20190228183809.25417-3-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 Give a reason for returning error for bpf setup. Signed-off-by: Stephen Hemminger --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index a4e7584a50cb..9a81123074ca 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -10224,18 +10224,23 @@ ixgbe_features_check(struct sk_buff *skb, struct net_device *dev, return features; } -static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog) +static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog, + struct netlink_ext_ack *extack) { int i, frame_size = dev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN; struct ixgbe_adapter *adapter = netdev_priv(dev); struct bpf_prog *old_prog; bool need_reset; - if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) + if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) { + NL_SET_ERR_MSG(extack, "XDP not support with SRIOV enabled"); return -EINVAL; + } - if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) + if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { + NL_SET_ERR_MSG(extack, "XDP not supported with DCB enabled"); return -EINVAL; + } /* verify ixgbe ring attributes are sufficient for XDP */ for (i = 0; i < adapter->num_rx_queues; i++) { @@ -10244,12 +10249,17 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog) if (ring_is_rsc_enabled(ring)) return -EINVAL; - if (frame_size > ixgbe_rx_bufsz(ring)) + if (frame_size > ixgbe_rx_bufsz(ring)) { + NL_SET_ERR_MSG(extack, + "XDP does not support multiple buffers"); return -EINVAL; + } } - if (nr_cpu_ids > MAX_XDP_QUEUES) + if (nr_cpu_ids > MAX_XDP_QUEUES) { + NL_SET_ERR_MSG(extack, "number of cpus > MAX_XDP_QUEUES"); return -ENOMEM; + } old_prog = xchg(&adapter->xdp_prog, prog); need_reset = (!!prog != !!old_prog); @@ -10260,7 +10270,7 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog) if (err) { rcu_assign_pointer(adapter->xdp_prog, old_prog); - return -EINVAL; + return err; } } else { for (i = 0; i < adapter->num_rx_queues; i++) @@ -10288,7 +10298,7 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp) switch (xdp->command) { case XDP_SETUP_PROG: - return ixgbe_xdp_setup(dev, xdp->prog); + return ixgbe_xdp_setup(dev, xdp->prog, xdp->extack); case XDP_QUERY_PROG: xdp->prog_id = adapter->xdp_prog ? adapter->xdp_prog->aux->id : 0; @@ -10298,6 +10308,7 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp) xdp->xsk.queue_id); default: + NL_SET_ERR_MSG(xdp->extack, "Unknown XDP command"); return -EINVAL; } }