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,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 9D609C4360F for ; Thu, 28 Feb 2019 21:54:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DFDA20675 for ; Thu, 28 Feb 2019 21:54:51 +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="G7z8kpSB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732714AbfB1Vyt (ORCPT ); Thu, 28 Feb 2019 16:54:49 -0500 Received: from mail-pg1-f179.google.com ([209.85.215.179]:34895 "EHLO mail-pg1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732403AbfB1Vyt (ORCPT ); Thu, 28 Feb 2019 16:54:49 -0500 Received: by mail-pg1-f179.google.com with SMTP id e17so8309119pgd.2 for ; Thu, 28 Feb 2019 13:54:48 -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=zwhuwXBQZj4vS3zjw/e2KmWq4QZnVxTegjO6K44TkAY=; b=G7z8kpSBJCmeOG+bURPurPtz1rmgjE9IRwzIGDDnxzyB1CCM8CX6ezPA1qyOBYrxnI H8PJqF1Vkum4iYr4eupT3YfD+MzLiDPTdxMj0QO/9PIW4drN4g4whapkBqenHcfN8KwO EblqRiJ6dV6xnl2KWYnbr52jy56jBlSegG9zmc3U6UU35ud5ck0IZ5dD80p/PRRZHXPX ndDEWNw8PtLBgb3bn1NQMBvBtt5hykeDumd4nd6AIv2tQMIiV3TMZNy6qMqTQP0PpV+Y IKu9rDFGC/BFkBM4PYcaQ2DG+sd7CVeTqTAWQV9AMuZuj6NuwixHs0Zlaz3DdapOp/Uw yDLw== 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=zwhuwXBQZj4vS3zjw/e2KmWq4QZnVxTegjO6K44TkAY=; b=phX6TqhtVrk+RTqqR0gVnnrT/gtzSjtxkGDZUAKH1/iHYnvP1t3OHOIX6A/jqJFv3F zHSIXVwpu4fct1gxxcnzWoeRnDdJmiRa6wrBFk3c1r0kayD+k6c2akJ3ozWIfbJh9ayo QzIW1Hyn4/OYpGxUov63ETQ3q49wJd3y08oGee/CTdRlhbjTsQU8/p8g+VfVeiLFuTuR bVBOIR8eoLMqDMt2x1c82v+XnCitGFuMgtsAu+tfOZ7Ivv6W2iAfR+mxAyF1tS3PZDMh W6sdR6GJYpNljRYt/Hc3oLhPXA4efIWCuNgeA1IVD463Z7SAau5WhlPcJcK4kQ4Jp4Sc ZzBw== X-Gm-Message-State: APjAAAUt4PhL2Va+807oBFEmrIfpnFH5T7mEZMKMToO7oHdppyjPZKYB WJWM8p/DR2hxxVingd8D9Gb1/1GBCu4= X-Google-Smtp-Source: APXvYqzNNpck+lhp6vBjuBxCFTjJwBW58vnTU6f+eGWCVfQCLLpKjXoXHwlZDzYJ8XuDxxVZQwEySw== X-Received: by 2002:a63:cc05:: with SMTP id x5mr1329442pgf.31.1551390887918; Thu, 28 Feb 2019 13:54:47 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 13:54:46 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [RFC v2 2/6] ixgbe: use extack for xdp errors Date: Thu, 28 Feb 2019 13:54:37 -0800 Message-Id: <20190228215441.28275-3-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 Give a reason for returning error for bpf setup. Signed-off-by: Stephen Hemminger --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 27 ++++++++++++++----- 1 file changed, 20 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..d5bac44df793 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -10224,18 +10224,25 @@ 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_MOD(extack, + "XDP not supported with SRIOV enabled"); return -EINVAL; + } - if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) + if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { + NL_SET_ERR_MSG_MOD(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 +10251,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_MOD(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_MOD(extack, "number of cpus > MAX_XDP_QUEUES"); return -ENOMEM; + } old_prog = xchg(&adapter->xdp_prog, prog); need_reset = (!!prog != !!old_prog); @@ -10260,7 +10272,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 +10300,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 +10310,7 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp) xdp->xsk.queue_id); default: + NL_SET_ERR_MSG_MOD(xdp->extack, "Unknown XDP command"); return -EINVAL; } } -- 2.17.1