From patchwork Fri Feb 1 21:42:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1035215 X-Patchwork-Delegate: bpf@iogearbox.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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eW2ZXFFA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rrLm5NPmz9sBZ for ; Sat, 2 Feb 2019 08:48:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726697AbfBAVr7 (ORCPT ); Fri, 1 Feb 2019 16:47:59 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:35201 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726664AbfBAVr6 (ORCPT ); Fri, 1 Feb 2019 16:47:58 -0500 Received: by mail-lf1-f66.google.com with SMTP id v195so1809559lfa.2 for ; Fri, 01 Feb 2019 13:47:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YnygexcWmAWno9DxbFrzjHZZHgVizaFM8td55WoXSMo=; b=eW2ZXFFA2td4tunhLeSmyV7nu3azrTuiJJOtC/H6mheBEKAv5pYd8qPg0f2ctNqlpQ 4ijt7k39cFZD8c0BB3yUdOXWrJ/Ero7+/bNAGZwglpzSxDpU2XPzJfk2UFP5s4FoY6Ju wPfELnx25AUR8EUmpV88tuQGsMy4qwyvO/BfuZ0RonzOCf7c06W1FJMYEHtJujaX8HRg zYWS2FPP89f6lSSQKioS8MdpCBrcAPvYXNmr37H5uQk63QjauqFjfn8TuUMOGAjmkL6F D8JYuQWRK545gcnkR64e/xYtAox4MTIkTxfKJy9u/ge413v1pOUMwneYH6yUsNQpjr2m 9vbw== 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=YnygexcWmAWno9DxbFrzjHZZHgVizaFM8td55WoXSMo=; b=mQuR/ZTbjmawPxlQNt24ZEGcEWGajU1Vp5Uc+24LKNUSIVMMxbaXgUY3MGbllFP7JT AE7knxhkpgLjryZoLq8abnJsWg0CcmR+vup7n9WVJCceUVBZEXZQ40N0C+bO/m2jpEYl s5FlWMuKvN8pJKfIZjYkYqw1Xyk+YG8NQ2UobZb2c1J8rI0p8CpOletbABgX2gXV0l7O KnUvq6TJuxCUPGkvk+KLNbiHYPFlAPGUXq8eN1okPoMpHGwCNnzZTf2MtBpcjKCslCI1 WvYLT/g7E4JMYUZcr/U7olU1zDBJdwK2j68nk8NJ32D1I7qlVEOQXwhqAIFSPq6Zs7ou yc7Q== X-Gm-Message-State: AJcUukenmhXraCLAL7Q6BETEPi+XIqs+RDJ7MrH0On9qTDwn+ZSV0mXo bpclWtoYBxPEgVOTd76DA30= X-Google-Smtp-Source: ALg8bN5bg7wQQwIsofGoaq2evUXrlauDAT6lbIGmxEw81fc8lCjtjWtwiEbm8OWvKWhqG/6g9qf1IA== X-Received: by 2002:a19:1a14:: with SMTP id a20mr31346936lfa.1.1549057676398; Fri, 01 Feb 2019 13:47:56 -0800 (PST) Received: from localhost.localdomain (host-185-93-94-63.ip-point.pl. [185.93.94.63]) by smtp.gmail.com with ESMTPSA id d24-v6sm1456213ljg.2.2019.02.01.13.47.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Feb 2019 13:47:54 -0800 (PST) From: Maciej Fijalkowski X-Google-Original-From: Maciej Fijalkowski To: daniel@iogearbox.net, ast@kernel.org Cc: netdev@vger.kernel.org, jakub.kicinski@netronome.com, brouer@redhat.com, john.fastabend@gmail.com Subject: [PATCH bpf-next v6 5/8] xdp: Provide extack messages when prog attachment failed Date: Fri, 1 Feb 2019 22:42:27 +0100 Message-Id: <20190201214230.1441-6-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20190201214230.1441-1-maciej.fijalkowski@intel.com> References: <20190201214230.1441-1-maciej.fijalkowski@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order to provide more meaningful messages to user when the process of loading xdp program onto network interface failed, let's add extack messages within dev_change_xdp_fd. Suggested-by: Jakub Kicinski Signed-off-by: Maciej Fijalkowski Acked-by: Jesper Dangaard Brouer --- net/core/dev.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 8e276e0192a1..bfa4be42afff 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7983,8 +7983,10 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, query = flags & XDP_FLAGS_HW_MODE ? XDP_QUERY_PROG_HW : XDP_QUERY_PROG; bpf_op = bpf_chk = ops->ndo_bpf; - if (!bpf_op && (flags & (XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE))) + if (!bpf_op && (flags & (XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE))) { + NL_SET_ERR_MSG(extack, "underlying driver does not support XDP in native mode"); return -EOPNOTSUPP; + } if (!bpf_op || (flags & XDP_FLAGS_SKB_MODE)) bpf_op = generic_xdp_install; if (bpf_op == bpf_chk) @@ -7992,11 +7994,15 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, if (fd >= 0) { if (__dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG) || - __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG_HW)) + __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG_HW)) { + NL_SET_ERR_MSG(extack, "native and generic XDP can't be active at the same time"); return -EEXIST; + } if ((flags & XDP_FLAGS_UPDATE_IF_NOEXIST) && - __dev_xdp_query(dev, bpf_op, query)) + __dev_xdp_query(dev, bpf_op, query)) { + NL_SET_ERR_MSG(extack, "XDP program already attached"); return -EBUSY; + } prog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP, bpf_op == ops->ndo_bpf);