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 57B24C10F00 for ; Thu, 28 Feb 2019 18:38:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BD95218AE for ; Thu, 28 Feb 2019 18:38:24 +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="orFq5dML" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387812AbfB1SiX (ORCPT ); Thu, 28 Feb 2019 13:38:23 -0500 Received: from mail-pg1-f173.google.com ([209.85.215.173]:32808 "EHLO mail-pg1-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727649AbfB1SiS (ORCPT ); Thu, 28 Feb 2019 13:38:18 -0500 Received: by mail-pg1-f173.google.com with SMTP id h11so10146500pgl.0 for ; Thu, 28 Feb 2019 10:38:18 -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=zreFLAMdahFm0NWPAxm8ngg6sQlf9tN9dg7tLVCmnpg=; b=orFq5dMLT5/ZtqQ209D/xwL6S8MLFPBSNt/pPORxOSdej2PkDAGEpvoD+SK19fUnG/ zQe0ohjwUJHvlH5B41FfOYtLoNjkGyV1yp/4zgaG3mxMM4H/uRO6tddLxWllNLz1F1L/ ICpubv2Pw2H8+asa+p28/M7KsTDtZ5+uAsta9l0Q4ctbdBkrsDprh95WvRzXNLHIB9NQ HJUZ8mbW7aofkcmMQIY163iwF3WPEYdloTIIRw23z13FhWFUlN67rKvIdhv277BoZS3x 4cllAZf5hDExVLuexJblS9RLVaZlTVmFAH3XQlV6Yqyx9cPAc3RgQUecSbkWGLn5XyaW vMJg== 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=zreFLAMdahFm0NWPAxm8ngg6sQlf9tN9dg7tLVCmnpg=; b=BulaTzKVVOP+kovRmVRtmLwU4Y1aM/mC22DR07Xh//2opEOzCDz8l0zs6h2U8l0PRM FmF4k26iMpthBpH02WXOx+3q769R866XTraPs3s7s92NWvuhhqedViIojOaWxhGqTYqw U+EvHlFBYBruq40t52VhjAszq2udOaptIit4/juAIs8gJAO908EUHWL6ojHOiuY41lUp O2zTW5pd+sVyF43cLnSBT9vlZkiQaltrFDg0GqxQdJU21S2Np9g+zt9sGjzQXKe5vAQG 0Y4t62DQoOiu0vycRTL1/6l5KgR/JBXIt3+7XNiHJg5cqiQdTx4NBdSFZY78VDWCCOEI XqBg== X-Gm-Message-State: AHQUAuZTdmCjeCNcsoj3Wmjj24ZlERuEkBmilmV8wlpsV2X4qyLRsVyf UuzY5yim3VJSteKhiMfAe8GrMyOzX04= X-Google-Smtp-Source: AHgI3IZLWSAzOaPJW0ZjHJe5VjJSH1J6RC56ijSfJ4fM3thG6NC15ddETPlGNYldu4bg5M8s1EifBg== X-Received: by 2002:a62:76c9:: with SMTP id r192mr986941pfc.251.1551379097626; Thu, 28 Feb 2019 10:38:17 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 10:38:16 -0800 (PST) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [RFC 3/6] i40e: use extack for bpf errors Date: Thu, 28 Feb 2019 10:38:06 -0800 Message-Id: <20190228183809.25417-4-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 If ndo_bpf fails fill in error string with reason. Signed-off-by: Stephen Hemminger --- drivers/net/ethernet/intel/i40e/i40e_main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index da62218eb70a..3de1f2590ca0 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -11831,7 +11831,8 @@ static netdev_features_t i40e_features_check(struct sk_buff *skb, * @prog: XDP program **/ static int i40e_xdp_setup(struct i40e_vsi *vsi, - struct bpf_prog *prog) + struct bpf_prog *prog, + struct netlink_ext_ack *extack) { int frame_size = vsi->netdev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN; struct i40e_pf *pf = vsi->back; @@ -11840,8 +11841,10 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi, int i; /* Don't allow frames that span over multiple buffers */ - if (frame_size > vsi->rx_buf_len) + if (frame_size > vsi->rx_buf_len) { + NL_SET_ERR_MSG(extack, "XDP does not support multiple buffers"); return -EINVAL; + } if (!i40e_enabled_xdp_vsi(vsi) && !prog) return 0; @@ -12140,12 +12143,14 @@ static int i40e_xdp(struct net_device *dev, struct i40e_netdev_priv *np = netdev_priv(dev); struct i40e_vsi *vsi = np->vsi; - if (vsi->type != I40E_VSI_MAIN) + if (vsi->type != I40E_VSI_MAIN) { + NL_SET_ERR_MSG(xdp->extack, "XDP not allowed on VF"); return -EINVAL; + } switch (xdp->command) { case XDP_SETUP_PROG: - return i40e_xdp_setup(vsi, xdp->prog); + return i40e_xdp_setup(vsi, xdp->prog, xdp->extack); case XDP_QUERY_PROG: xdp->prog_id = vsi->xdp_prog ? vsi->xdp_prog->aux->id : 0; return 0; @@ -12153,6 +12158,7 @@ static int i40e_xdp(struct net_device *dev, return i40e_xsk_umem_setup(vsi, xdp->xsk.umem, xdp->xsk.queue_id); default: + NL_SET_ERR_MSG(xdp->extack, "Unknown XDP command"); return -EINVAL; } } -- 2.17.1