From patchwork Fri Feb 1 00:19:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1034536 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="ohtj3w6e"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rHn62DfJz9sMp for ; Fri, 1 Feb 2019 11:20:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728850AbfBAAUY (ORCPT ); Thu, 31 Jan 2019 19:20:24 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:35753 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728569AbfBAAUV (ORCPT ); Thu, 31 Jan 2019 19:20:21 -0500 Received: by mail-lj1-f196.google.com with SMTP id x85-v6so4312192ljb.2 for ; Thu, 31 Jan 2019 16:20:20 -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=9yPwkdWka8NtsQPFCt09m4xG671bXG9Sy3dZuVbUFS0=; b=ohtj3w6eRHUGE3MuYRdFC2R6JnHdUgWnbsbA0ib01LYrmWFCf77poSIqsFWF30ChKI LsNMUTOqEuGbwZ3UYBQaQ3jDAzqf5gFZ1t9XoM144t9VdzJVqcOI8oCRDg3oiPb3+K+f g9BUscpaB1A1dWnWDxv7Lsw44Y30smf84TokNqxHuU1LQ/5TRx60iBnfvPkrE1LU/Fru xnZa32/D4iSluiB11InM4ez2mc4D/3ICVirIaO573zsYfrPzEDGpXw3rc3C6DKQe43P0 7vvbh7dIJAapvOOe0qnwG3CS3l70EuK1+Bi/r3XHSC6uUekKN/swG8JaqZIECPkSr/ed yb/w== 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=9yPwkdWka8NtsQPFCt09m4xG671bXG9Sy3dZuVbUFS0=; b=LT9oyvdS6cfcUbpCY7O2JfIPBVKMSuCpj1UNgOZV7q7PJby2+b29NxjjVLpskNjR7g ycKwJ+qHQkkfipuHBdQ/sONnVKw2wnzxyqJDq/tLYFMFjceCxpRd3FE82ywYJNXYXS+U C1qfrUNqYlD7IZqYBnbHnZX5scCE1LBSWLD8tJsD9Fu25YbXVLoqoIE01foSt9fVfUKr Op1RVEs3nan7UPK8zGzBe23DnTFj3CMjYQtPAWx2WAAMD2VQb409NMV0jUrbjnVng31i U3/O8PktI7glZxxS9oZl+6lyWKUxa+4pOGQbgLbg9cKIKcY3n4apH1M3V7+F9DzqhedU q4sA== X-Gm-Message-State: AJcUukcvDDGSYtNKrN8csY1b44ZL5k9cKaHdYhwmQLop0mx0bE3M15RE U8YoURXkgPWEssPKl3iqpS2w+NSoUf0= X-Google-Smtp-Source: ALg8bN6SuGMsaMPBwVR9vhMd77E9IBsYDHEROyyU8hSD23xCIfOcuqFjoix3sL0JVNo0Q4OcA3SFrw== X-Received: by 2002:a2e:7615:: with SMTP id r21-v6mr29913180ljc.131.1548980419728; Thu, 31 Jan 2019 16:20:19 -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 j18-v6sm1005495ljc.52.2019.01.31.16.20.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Jan 2019 16:20:19 -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 v5 5/8] xdp: Provide extack messages when prog attachment failed Date: Fri, 1 Feb 2019 01:19:51 +0100 Message-Id: <20190201001954.4130-6-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20190201001954.4130-1-maciej.fijalkowski@intel.com> References: <20190201001954.4130-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 Reviewed-by: Jakub Kicinski 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);