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 C8C5DC43381 for ; Thu, 28 Feb 2019 21:54:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9558020675 for ; Thu, 28 Feb 2019 21:54:53 +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="DxWCBkln" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732899AbfB1Vyw (ORCPT ); Thu, 28 Feb 2019 16:54:52 -0500 Received: from mail-pg1-f178.google.com ([209.85.215.178]:40605 "EHLO mail-pg1-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732812AbfB1Vyu (ORCPT ); Thu, 28 Feb 2019 16:54:50 -0500 Received: by mail-pg1-f178.google.com with SMTP id u9so10355913pgo.7 for ; Thu, 28 Feb 2019 13:54:50 -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=GQuGmV/bAF6Cq2Umbhl3JObjXKQnisZrA0HFC0y3B44=; b=DxWCBklnMa43Bh+g1U+yWFP+Dut79CdKgnUy3Z7gXLpZ+7tFma0XxMKSIPrqf277mM paV8PHrYVpVC0AHg8q6GHllOJ/cPuxh2DIsDGziB7CtK4DMRzo5W2LcH7Fa9wTi0i17N q6udYhMd7IyY03AGlfC/vmt2vgh0D1VZwGjOmQ5Ghoi9Z2bkF7HPrMXeD1IIp9r3TIo6 NHorPczVOonzrU9ILKold8OF2Bkj9hXkeC/c6g8MFd+hdnweu5NYfJBs6Z7+oJ6RLf8q FdjFWs0wTGBM49YeiEhfebH/ysJbY2E8qRtaLvWHTTHOdOIYLRBQqi5Zzo7Byh40hiCa xbYA== 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=GQuGmV/bAF6Cq2Umbhl3JObjXKQnisZrA0HFC0y3B44=; b=PgKIhkr6eK1V1fZtG4l2vWVyn4jcmr79c7urrgS/6XMugKDgzZkdpsOjEUBL8HBP6e 8ILXsn62s6QeFKybe/jiGSuaX4RiQPWYnlNOO4agwB7wqd585v3bx311V+RBZXptoXcz +E+R1ydT54iY4d4Dx4MncnjxbhnLnvpkWDhjR0SnwuNnOOl3o2gBsSs22KIzeRWwrpjC apOkvdBcaVRmjeRKBBkJkjflf/HwxfjTMIrgcTUg8jdGRUjtLCP0nMZeeD/NiV5NJGvl XnaVp66cIIIQ6eCpo8g9Cbzadead38PMFCue+zkX4OFUOhwCs0iaBIRVQIMSfMTZo/1c rcQA== X-Gm-Message-State: APjAAAW+8d1J3aAmMuspYrRM5FZ15pUsYYx6p10B1pIxAabPgQWT9uJ5 lk7OR1qXICitTZSA2yIDAL6OTHON/Xc= X-Google-Smtp-Source: APXvYqy+bpca7RxCaydtAlseW58TKSEKtPRrNV/WqDxa4bq0Hxl1j+L4mJz073dlHBgWSbf1VMgkpg== X-Received: by 2002:a65:60d8:: with SMTP id r24mr1383502pgv.6.1551390889418; Thu, 28 Feb 2019 13:54:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 13:54:48 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [RFC v2 3/6] i40e: use extack for bpf errors Date: Thu, 28 Feb 2019 13:54:38 -0800 Message-Id: <20190228215441.28275-4-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 If ndo_bpf fails fill in error string with reason. Signed-off-by: Stephen Hemminger --- drivers/net/ethernet/intel/i40e/i40e_main.c | 15 +++++++++++---- 1 file changed, 11 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..a6a5866d79a8 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,11 @@ 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_MOD(extack, + "XDP does not support multiple buffers"); return -EINVAL; + } if (!i40e_enabled_xdp_vsi(vsi) && !prog) return 0; @@ -12140,12 +12144,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_MOD(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 +12159,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_MOD(xdp->extack, "Unknown XDP command"); return -EINVAL; } } -- 2.17.1