From patchwork Tue Jan 16 00:30:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 861147 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="pK7VAXdR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zLB4856T5z9sCZ for ; Tue, 16 Jan 2018 11:31:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750990AbeAPAbt (ORCPT ); Mon, 15 Jan 2018 19:31:49 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:40438 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750918AbeAPAbq (ORCPT ); Mon, 15 Jan 2018 19:31:46 -0500 Received: by mail-pg0-f66.google.com with SMTP id g16so2044159pgn.7 for ; Mon, 15 Jan 2018 16:31:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1ZmQbtCCqzPGq3RtNio7cO/WvVxQlPXK+KyhhP6b7UI=; b=pK7VAXdRVEaluzp8zViqrllkilnTDANA2+ipH7TBylX967EDQLSRY3mhpLbLS5iHc9 piMNhkbwtF0gmd9oEUtre3H1T2iAxaXJog4hJZDXCaFoQqHD5TNBbRBJXFm5mBIHUBIx TOn12LV9hsKnCkPTeCJxBnvXQ2ZZPpj7h9HkawXGGnnPnJATZHO/CGPl5CrSShUdxenB dba0e0WBMO99zTveiM+ukdsTsf566eadJ2kCJsLWEVvIU4mNouRasw/ff3BlQYSKZy1d mB8Ee9TOyFRRu3aIXTlZOld0IqHhJ1amIk+mRDyfE0IwLHpfJkiRsG7rIh0JDA1tVEEH VJJg== 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=1ZmQbtCCqzPGq3RtNio7cO/WvVxQlPXK+KyhhP6b7UI=; b=XMr8Ok1DmfYFnZSgtlEk3THp9tJMTtUn6f3OcCe2+jln2dnw/+dpt5+U9gKjBFHOGa BxhCbOlPH3i7CAZfzTP8NCpBgdA8EP6sj3TDnUvxH/amPbM0qb0C9Frrzs0qyk2tE4ws mUtmBGXMHmD6ElJqeBtOdjvKbLxFl7XY8kqH5dhmAJ9b5HeGPYdqoEeG5eLkQBoB1rDr KvTgIlicr4sM1ENmEgRvoRS9XrYPt1RsSn/IxtKRejIXofVG+nPFgAJ01p954euZ6IAY qttj4D1eKxFR2tvkfkVAJrWrsXhGnZhgDu8NSrQbx9Vhta9sgkOWN/pO3iOm7zfUMxwu 2b8g== X-Gm-Message-State: AKGB3mKtXMmWw9eA18KI03L3B1s35jzlcgZ78+jTpknMkIoEKe/q/+GR rOMtXqwb1tVZ9hQfbMwL0Dwj2g== X-Google-Smtp-Source: ACJfBosYLjVWfYA0qHlJw0jvXXt36mDSNr0aFtfjZUwnAmMbGAodmgv3uSMWYYEOI6sCt7yRSrE6lA== X-Received: by 10.98.59.149 with SMTP id w21mr25433799pfj.7.1516062705832; Mon, 15 Jan 2018 16:31:45 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id o64sm752839pga.1.2018.01.15.16.31.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Jan 2018 16:31:45 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, daniel@iogearbox.net, alexei.starovoitov@gmail.com, netdev@vger.kernel.org Cc: dsahern@gmail.com, oss-drivers@netronome.com, jiri@resnulli.us, john.fastabend@gmail.com, jhs@mojatatu.com, gerlitz.or@gmail.com, aring@mojatatu.com, xiyou.wangcong@gmail.com, Quentin Monnet Subject: [PATCH bpf-next 10/11] netdevsim: add extack support for TC eBPF offload Date: Mon, 15 Jan 2018 16:30:26 -0800 Message-Id: <20180116003027.9405-11-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116003027.9405-1-jakub.kicinski@netronome.com> References: <20180116003027.9405-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Quentin Monnet Use the recently added extack support for TC eBPF filters in netdevsim. Signed-off-by: Quentin Monnet Reviewed-by: Jakub Kicinski --- drivers/net/netdevsim/bpf.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/drivers/net/netdevsim/bpf.c b/drivers/net/netdevsim/bpf.c index 5134d5c1306c..0de8ba91b262 100644 --- a/drivers/net/netdevsim/bpf.c +++ b/drivers/net/netdevsim/bpf.c @@ -109,17 +109,35 @@ int nsim_bpf_setup_tc_block_cb(enum tc_setup_type type, struct netdevsim *ns = cb_priv; struct bpf_prog *oldprog; - if (type != TC_SETUP_CLSBPF || - !tc_can_offload(ns->netdev) || - cls_bpf->common.protocol != htons(ETH_P_ALL) || - cls_bpf->common.chain_index) + if (type != TC_SETUP_CLSBPF) { + NSIM_EA(cls_bpf->common.extack, + "only offload of BPF classifiers supported"); + return -EOPNOTSUPP; + } + + if (!tc_can_offload_extack(ns->netdev, cls_bpf->common.extack)) + return -EOPNOTSUPP; + + if (cls_bpf->common.protocol != htons(ETH_P_ALL)) { + NSIM_EA(cls_bpf->common.extack, + "only ETH_P_ALL supported as filter protocol"); + return -EOPNOTSUPP; + } + + if (cls_bpf->common.chain_index) return -EOPNOTSUPP; - if (!ns->bpf_tc_accept) + if (!ns->bpf_tc_accept) { + NSIM_EA(cls_bpf->common.extack, + "netdevsim configured to reject BPF TC offload"); return -EOPNOTSUPP; + } /* Note: progs without skip_sw will probably not be dev bound */ - if (prog && !prog->aux->offload && !ns->bpf_tc_non_bound_accept) + if (prog && !prog->aux->offload && !ns->bpf_tc_non_bound_accept) { + NSIM_EA(cls_bpf->common.extack, + "netdevsim configured to reject unbound programs"); return -EOPNOTSUPP; + } if (cls_bpf->command != TC_CLSBPF_OFFLOAD) return -EOPNOTSUPP; @@ -131,8 +149,11 @@ int nsim_bpf_setup_tc_block_cb(enum tc_setup_type type, oldprog = NULL; if (!cls_bpf->prog) return 0; - if (ns->bpf_offloaded) + if (ns->bpf_offloaded) { + NSIM_EA(cls_bpf->common.extack, + "driver and netdev offload states mismatch"); return -EBUSY; + } } return nsim_bpf_offload(ns, cls_bpf->prog, oldprog);