From patchwork Thu Jan 25 22:00:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866044 X-Patchwork-Delegate: davem@davemloft.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="1ozREJZl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGH03bwDz9s7F for ; Fri, 26 Jan 2018 09:02:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751537AbeAYWBa (ORCPT ); Thu, 25 Jan 2018 17:01:30 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:46875 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522AbeAYWB2 (ORCPT ); Thu, 25 Jan 2018 17:01:28 -0500 Received: by mail-pg0-f67.google.com with SMTP id s9so5930368pgq.13 for ; Thu, 25 Jan 2018 14:01:28 -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=/Z6Sa33ZJIs4gU53/GXQDfHUJcCRQsL3BZ+mlAyJitM=; b=1ozREJZlOaMLaMzMuwXjp4faJtdXO1sM0+v8BpEXL+4djAdye+tbCH5ux3b76qDvnJ q8eEcbbatvQKiUHSEnFy737v4CXw9d1Lvxs2Uxk9tTIIAfvw/8YDQvNT/MSPNjuXVst5 hogbkj8G7e/VEsbrcjiVaDJboRevWEbYc3UjGOUETUnMD0hvZmkC5WPdihn1jpntvHHB 98O//RPtqht0wLh9cHPyoaam7uilTK7I17HkWAbzkVyBucVByhZv2eWTpl/0lgBqMKHq 7X+cdkXGttO14LzredRT6O14xL847gtVoX7s+gRiEJ+UIRbGiWA8hPtgV6jx+NGlVj3c nTTg== 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=/Z6Sa33ZJIs4gU53/GXQDfHUJcCRQsL3BZ+mlAyJitM=; b=U6aFO1IAPw6AiSpL5/RBb3h1JrjrG3T1ycs7Ow2tHAOFYdU8ao/dkERmtYrjxejZTF tZ7+JoVKazzxbtQn1EVOLtHOB0akvvLqbUm7CNUuR//DzCkp+aQlN8bCitLAPIWWNbuw 4Y/gUz8KOlvsfyyLfimPY56Ebsxlr4QWyfw4wh8SBRlTde6SJ6ays3BPna9WOzHjST15 +J3CMr1ncMEjDgrtnMLtKpijcTSlqx9Z2HKEIEnqbyU69jndsqIdTKd+Q6NrKXesBUYE +mb1jSAzHBwiVeMhifMgelo4E9x9Rcn4Ez2s1x2ZPmfT6YQLxvycKZvhO05WS4EfTHg7 rdAw== X-Gm-Message-State: AKwxytc65jEyD99FogceDlzxo9LEOtOtFu8OxcdFn7MBE4S10Z4LoDZX +0gaS2BqW8yZHL4fNg0azLSzXw== X-Google-Smtp-Source: AH8x226ETv00BeWj7oyLfqbppaI/ozYvWdgNRhVNYPTQx8CsTsrc6BZPiDG8uCDzwXmU8IvAiPqS6A== X-Received: by 10.99.103.198 with SMTP id b189mr13827850pgc.20.1516917686663; Thu, 25 Jan 2018 14:01:26 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:26 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 01/11] pkt_cls: add new tc cls helper to check offload flag and chain index Date: Thu, 25 Jan 2018 14:00:43 -0800 Message-Id: <20180125220053.30040-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Very few (mlxsw) upstream drivers seem to allow offload of chains other than 0. Save driver developers typing and add a helper for checking both if ethtool's TC offload flag is on and if chain is 0. This helper will set the extack appropriately in both error cases. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- include/net/pkt_cls.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index fa2f6fb14093..87406252f0a3 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -656,6 +656,20 @@ static inline bool tc_can_offload_extack(const struct net_device *dev, return can; } +static inline bool +tc_cls_can_offload_and_chain0(const struct net_device *dev, + struct tc_cls_common_offload *common) +{ + if (!tc_can_offload_extack(dev, common->extack)) + return false; + if (common->chain_index) { + NL_SET_ERR_MSG(common->extack, + "Driver supports only offload of chain 0"); + return false; + } + return true; +} + static inline bool tc_skip_hw(u32 flags) { return (flags & TCA_CLS_FLAGS_SKIP_HW) ? true : false; From patchwork Thu Jan 25 22:00:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866047 X-Patchwork-Delegate: davem@davemloft.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="zF6w7b3L"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGHH66Mdz9s7F for ; Fri, 26 Jan 2018 09:02:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751715AbeAYWCd (ORCPT ); Thu, 25 Jan 2018 17:02:33 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:41162 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751259AbeAYWB2 (ORCPT ); Thu, 25 Jan 2018 17:01:28 -0500 Received: by mail-pf0-f196.google.com with SMTP id c6so6797938pfi.8 for ; Thu, 25 Jan 2018 14:01:28 -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=WknaxqYxt+PtRur5EVyEHdmNuIADFZG2kKEifSGKTXs=; b=zF6w7b3LHcuQ7CFCjpJ8z6rHLYkN6nGUlrHCrN89Uw7C6lsvQ+Q1zmVNlB1HD6xWrT W2TIsRmRngTvtri+HavUSfsYGVpY06wal1xps9WEI54eMWm/bz+NjpzogGIMEvhrHUUb v1xOHEGTZHD0BWkImHeZkR4hdKS6dYZhqlTCV2pzanvI/vv4l4INerDDQ4Yd+e3cZB5N 9j/nl0oeqjboDClSJcVm+2z6OlZ9RVI2dcngxCupIViOzpdnyP7jrF78aCZTDm4NO9vM mkAdfmSJpQx2ggBkQ7US3KQC6j5bde95POdcYxhm/Jua3YlXFaIg+r4sDxnCMUZsGo86 QjBw== 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=WknaxqYxt+PtRur5EVyEHdmNuIADFZG2kKEifSGKTXs=; b=iV0xSPWbh99I2jOYD3ENUse/xsLuPoKt7OZ1Hmf5D2YPU99XYR2pcSmz7zWtGHSgg2 /J8NsTSFPunjSmGyADQDdEk42M9F4YCq14+35AdOVFUXuapO63mkdHsFnLPyf2AO7Oq7 /pELg8crl7p/wm6ZE0nbvlZakz+L/LmdR4GM4syEwA5gqCEgP3FsddVTc8yRm9iMfn3p NYyz56dk0XsMzDQKzPfNvVpWpvIYSmFiwuP983ek9mPAbEXN0lR5UBnBLGYKbR9cVy+Q 1szL9IWFnBkZjczQFD4vKn33kMIPNXd+5PAES0/WYeTVPOSQtGHjQvBhJ4M8T+5pvAPC Dh5Q== X-Gm-Message-State: AKwxytcskReqk4yolkk8UqtvqhkJVeq11VHTjD/V6i2CaF/S6RbhaDzk KGD4YKVi1DybkuAsh3542Zj9xw== X-Google-Smtp-Source: AH8x224rmM9da9T4kjnUHNbRs8Oo82kfWpdH72sz+gC77mqVAF+ACD9m1ulB5oNX/L9rnShL+XhZUQ== X-Received: by 10.98.97.4 with SMTP id v4mr6965179pfb.160.1516917687507; Thu, 25 Jan 2018 14:01:27 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:27 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 02/11] netdevsim: use tc_cls_can_offload_and_chain0() Date: Thu, 25 Jan 2018 14:00:44 -0800 Message-Id: <20180125220053.30040-3-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of tc_cls_can_offload_and_chain0() to set extack msg in case ethtool tc offload flag is not set or chain unsupported. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- drivers/net/netdevsim/bpf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/netdevsim/bpf.c b/drivers/net/netdevsim/bpf.c index 8166f121bbcc..de73c1ff0939 100644 --- a/drivers/net/netdevsim/bpf.c +++ b/drivers/net/netdevsim/bpf.c @@ -135,7 +135,7 @@ int nsim_bpf_setup_tc_block_cb(enum tc_setup_type type, return -EOPNOTSUPP; } - if (!tc_can_offload_extack(ns->netdev, cls_bpf->common.extack)) + if (!tc_cls_can_offload_and_chain0(ns->netdev, &cls_bpf->common)) return -EOPNOTSUPP; if (cls_bpf->common.protocol != htons(ETH_P_ALL)) { @@ -144,9 +144,6 @@ int nsim_bpf_setup_tc_block_cb(enum tc_setup_type type, return -EOPNOTSUPP; } - if (cls_bpf->common.chain_index) - return -EOPNOTSUPP; - if (!ns->bpf_tc_accept) { NSIM_EA(cls_bpf->common.extack, "netdevsim configured to reject BPF TC offload"); From patchwork Thu Jan 25 22:00:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866037 X-Patchwork-Delegate: davem@davemloft.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="ylG42dTc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGG6276Nz9s7F for ; Fri, 26 Jan 2018 09:01:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751546AbeAYWBb (ORCPT ); Thu, 25 Jan 2018 17:01:31 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:40900 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751526AbeAYWB3 (ORCPT ); Thu, 25 Jan 2018 17:01:29 -0500 Received: by mail-pg0-f65.google.com with SMTP id g16so5941410pgn.7 for ; Thu, 25 Jan 2018 14:01:28 -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=cZ3BLW41LhtUTelaoYC6ZIFiDF9VemI0rSJBNKUOf3c=; b=ylG42dTcDMvd21S/ypUXqS0sC0S2JLgk+WTbbxPti06tZmtzUbbJlabydHXJmPDPCv tRIOykAiL6hgRDEe8N9Apanp8W6jkCpNDvw8NGMvfeVZg9yCn2RRWEkInM/L1ZCTHEdS 3rSsis0+GBzz74E1qui0WtlB6byyTD3HBWMlxRIXf/tfuontu66zDD5fW4tI+cdQuiOT DToKyeyxeJu0E1LgN8IdzNkk+oFox6ja1jHzw3NtRVd0yXC//SKULxQew5UqvCPDN2Sd hLv2JZRoc2ZSwam9Fng8Br1yF5BZzYzGF2nk9tzGhdzNZNN3ERH/W4fxEMOj+DDJ/MY3 5fCA== 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=cZ3BLW41LhtUTelaoYC6ZIFiDF9VemI0rSJBNKUOf3c=; b=DDOsXa0waS47SVh3gfNeR7T4veML5SIJ6JtRyq34Gh9gx46ZD+ady1rEv+kSviHSqJ fAXRmgiXmBcxji+tn1LsHSL41KG4JQHx0c8TZBpRr3f2dxjPfR4YQZem1d1Rh4fs5t7p CgHYLGYeXYqhKG4BsxAhVVrO7wZTAg9yFU4+CUua7d/BzkzOnxPcutCwEW3/McO9e9e4 64bo9NVpSuXN0gqLc2qgYn8dbaRKxYxadzj6GsRN2NNz9+Zzj0oPVoI0MZfpCtqPRUVJ 4VdWBsVjVzy4J/VRTCfR78zqhopVjnWizVvfCbf2EjCmEJAQlrmSdIzb7hLN+cKAGdGp 0yEA== X-Gm-Message-State: AKwxytexoMO6e8MwKMdjHYzWBFbv1v/v/PMPrL8fSoia7h+Ke0hlfJgb K5TlgIEX4LW9IVRCfSXjMfVQ+Q== X-Google-Smtp-Source: AH8x2275sTlv/t9dmgnviP3Z6hy1n3YtDjFn3vHUtF2QqD/+a7t+97OT32dUZCZ8Wd+5aafxFHQDYA== X-Received: by 10.98.93.65 with SMTP id r62mr17183930pfb.55.1516917688381; Thu, 25 Jan 2018 14:01:28 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:27 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 03/11] nfp: use tc_cls_can_offload_and_chain0() Date: Thu, 25 Jan 2018 14:00:45 -0800 Message-Id: <20180125220053.30040-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of tc_cls_can_offload_and_chain0() to set extack msg in case ethtool tc offload flag is not set or chain unsupported. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- drivers/net/ethernet/netronome/nfp/bpf/main.c | 4 +--- drivers/net/ethernet/netronome/nfp/flower/offload.c | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c index b3206855535a..322027792fe8 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/main.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c @@ -130,7 +130,7 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type, "only offload of BPF classifiers supported"); return -EOPNOTSUPP; } - if (!tc_can_offload_extack(nn->dp.netdev, cls_bpf->common.extack)) + if (!tc_cls_can_offload_and_chain0(nn->dp.netdev, &cls_bpf->common)) return -EOPNOTSUPP; if (!nfp_net_ebpf_capable(nn)) { NL_SET_ERR_MSG_MOD(cls_bpf->common.extack, @@ -142,8 +142,6 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type, "only ETH_P_ALL supported as filter protocol"); return -EOPNOTSUPP; } - if (cls_bpf->common.chain_index) - return -EOPNOTSUPP; /* Only support TC direct action */ if (!cls_bpf->exts_integrated || diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c index 837134a9137c..08c4c6dc5f7f 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/offload.c +++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c @@ -483,8 +483,7 @@ static int nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev, struct tc_cls_flower_offload *flower, bool egress) { - if (!eth_proto_is_802_3(flower->common.protocol) || - flower->common.chain_index) + if (!eth_proto_is_802_3(flower->common.protocol)) return -EOPNOTSUPP; switch (flower->command) { @@ -504,7 +503,7 @@ int nfp_flower_setup_tc_egress_cb(enum tc_setup_type type, void *type_data, { struct nfp_repr *repr = cb_priv; - if (!tc_can_offload(repr->netdev)) + if (!tc_cls_can_offload_and_chain0(repr->netdev, type_data)) return -EOPNOTSUPP; switch (type) { @@ -521,7 +520,7 @@ static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type, { struct nfp_repr *repr = cb_priv; - if (!tc_can_offload(repr->netdev)) + if (!tc_cls_can_offload_and_chain0(repr->netdev, type_data)) return -EOPNOTSUPP; switch (type) { From patchwork Thu Jan 25 22:00:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866045 X-Patchwork-Delegate: davem@davemloft.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="d5GcPCCe"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGH32pxqz9s7F for ; Fri, 26 Jan 2018 09:02:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751698AbeAYWCU (ORCPT ); Thu, 25 Jan 2018 17:02:20 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:46878 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522AbeAYWBa (ORCPT ); Thu, 25 Jan 2018 17:01:30 -0500 Received: by mail-pg0-f65.google.com with SMTP id s9so5930429pgq.13 for ; Thu, 25 Jan 2018 14:01:30 -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=N6jHmhkeawaamRLGoCJej5vn2FxPAibAxUmN/vDsFVs=; b=d5GcPCCe6L1enJ5q7x1AM2DB4ou4L0Z6R4HeOv2gxcobeVinPqd1Pz7iN484LYJwke ngDA7f9thrI01bkrMzaLP/Wp5cxCnnqJGcRJ1qUNcNyJA1/A3n1QQ/ZrsPlm5GsllkNw j7cyyk64MSy5bIKGMhOdSfbqLEYJjU5a5U8qDvbtlUq/B7vEC+zlH7428/tbuOhspL9Y MCG+wTAeUPjVLecDKf/KO2FwHKDGnO4ewoKMuDhYLVek95vk/yUtRjNkR9g95bgLAtkg 15EV7XHQS94gisjKJaDewa7AbqnzVGjuhHdjZNez/kACsDGwIgoahaY9k4DlqFUTtcWM c1/A== 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=N6jHmhkeawaamRLGoCJej5vn2FxPAibAxUmN/vDsFVs=; b=RAvh9ZRJJZpONtUrJHuY6RQvloVbV/TuHG6OQmnfG23n+Ce6c20zWM6XkdeFCtOzLi EI1Ywu/GP4ge/M9sjairr9wwZrwfdDFtB7u276nFkQ5B4tYu6TpMGUiFwRx0OWKOlVNE qvQOZqiCM1KozgDL0A16nvgsrcZ+R9GrqAVCUcUZDJ1nd5r7kxM0ma8/U2fj7RlKWdin 6uauAc+0VugWn1O/zZwaWoCKAI2dpFDKXSlpr3p4EQNfaGGuPGELGul3git3RxM8+vdW 8aCFkfGwBzhQC9oNJfmg4u47nYtgqzUCCMu+axk+yR6WZX5IOVGrhQ7UgNx8t4T1I1y1 QTVw== X-Gm-Message-State: AKwxytdJzRzqqXJ+eqMYImFomE1RSKJRTqXaABZb8XtZWPX8Ja1mwt4t hHxj6lM/WXe8ZStquSMjveCTKvvB X-Google-Smtp-Source: AH8x227vUmZAXranlYF2K62eUgrQCUnScDNZU0ikoVy8hNOH3eB1MzIHp055YZpdzb40ahgXfobZ9w== X-Received: by 10.98.105.199 with SMTP id e190mr17005332pfc.233.1516917689986; Thu, 25 Jan 2018 14:01:29 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:29 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Ganesh Goudar Subject: [PATCH net-next v2 04/11] cxgb4: use tc_cls_can_offload_and_chain0() Date: Thu, 25 Jan 2018 14:00:46 -0800 Message-Id: <20180125220053.30040-5-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of tc_cls_can_offload_and_chain0() to set extack msg in case ethtool tc offload flag is not set or chain unsupported. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- CC: Ganesh Goudar --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index f0fd2eba30c2..1e3cd8abc56d 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -2928,9 +2928,6 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate) static int cxgb_setup_tc_flower(struct net_device *dev, struct tc_cls_flower_offload *cls_flower) { - if (cls_flower->common.chain_index) - return -EOPNOTSUPP; - switch (cls_flower->command) { case TC_CLSFLOWER_REPLACE: return cxgb4_tc_flower_replace(dev, cls_flower); @@ -2946,9 +2943,6 @@ static int cxgb_setup_tc_flower(struct net_device *dev, static int cxgb_setup_tc_cls_u32(struct net_device *dev, struct tc_cls_u32_offload *cls_u32) { - if (cls_u32->common.chain_index) - return -EOPNOTSUPP; - switch (cls_u32->command) { case TC_CLSU32_NEW_KNODE: case TC_CLSU32_REPLACE_KNODE: @@ -2974,7 +2968,7 @@ static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data, return -EINVAL; } - if (!tc_can_offload(dev)) + if (!tc_cls_can_offload_and_chain0(dev, type_data)) return -EOPNOTSUPP; switch (type) { From patchwork Thu Jan 25 22:00:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866042 X-Patchwork-Delegate: davem@davemloft.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="DZNG9Kyb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGGq1qzgz9s7F for ; Fri, 26 Jan 2018 09:02:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751568AbeAYWBg (ORCPT ); Thu, 25 Jan 2018 17:01:36 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:44713 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751547AbeAYWBb (ORCPT ); Thu, 25 Jan 2018 17:01:31 -0500 Received: by mail-pf0-f194.google.com with SMTP id m26so6793052pfj.11 for ; Thu, 25 Jan 2018 14:01:31 -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=4mh2ymeLQ2fjVScX3H0KqQdEamQ0F6iUQwOWInDTsoA=; b=DZNG9KybSqjjVvKdPQdzGEOlQZKm3jmtMTqbGelTs+b5G+xqt4YkAB7EHEmV8kl8ro A6csEykq9Yd7D7L08XOpK6seuFlaEt6eMuKEkKHbvp8ObuNrNhaMnNuE3X+UhbBZImo3 c6k7+a3XSZVFQZrmGI3uGAk7UDuziaLuuw2qd7rEa3oFdw62Ln5VSOKxLlnWn63Q6E7M I7OxLmMVYkkReDDzvCbHHz3blQnuWvESeXjJlZxElSKt7Z/HLwchcb+1kFUK89WG/d3U 70r1ZaezlxKmpmaIpsmwLTaTG+rh0aa+bim58ZkSB9+F0rBXxFfTnTfC8uuBbol/uHeo GBtA== 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=4mh2ymeLQ2fjVScX3H0KqQdEamQ0F6iUQwOWInDTsoA=; b=Y6rWFL5sKREWHQVrULLFAIey/758diKpCTjwZF3pPrw+KZvvGTyI8GKMwDjWRAoFtq cP04OtO8aGbvT2IWvKwrbq6AO+JrACKc7w0MRVChDTHr3ffX2xpNdR3PXM8OgxloSA+G vgne5pL81RBYeWW/2Nxj3YU/DUqYxPbvg/9DZIMqofGO5W8uNBDkWn386n/Wso67QS6E HDvUXwspgMCRNqg0bJjpqDt8UDpl3qwH9/UFb5mntBkK82MpjwafxzUtIs7vkEShy/AX CFiWJ7TsTdwC50ive8d957a4Ue1nnQOnE0LELUXgGoMZlOY5a92tzg9yG0n5NkKfjS9T BoBQ== X-Gm-Message-State: AKwxytcRWcAJbLVcwUVH74hBTpiLfES03U/V/LTR1Tgd91gqK7G9p2V8 YfVazTdH/hFcItA0K0f4lPrBHA== X-Google-Smtp-Source: AH8x224IUGc84pn4mbEVPLXwd8zkR1umexNhrLMfPjDqgXz4N3JPEaBa6GCwcEIAM/l8UqyAk31O1g== X-Received: by 10.98.7.73 with SMTP id b70mr16967531pfd.39.1516917691346; Thu, 25 Jan 2018 14:01:31 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:30 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Saeed Mahameed , Or Gerlitz Subject: [PATCH net-next v2 05/11] mlx5: use tc_cls_can_offload_and_chain0() Date: Thu, 25 Jan 2018 14:00:47 -0800 Message-Id: <20180125220053.30040-6-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of tc_cls_can_offload_and_chain0() to set extack msg in case ethtool tc offload flag is not set or chain unsupported. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman Acked-by: Or Gerlitz --- CC: Saeed Mahameed CC: Or Gerlitz --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +---- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 8530c770c873..47bab842c5ee 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -2944,9 +2944,6 @@ static int mlx5e_setup_tc_mqprio(struct net_device *netdev, static int mlx5e_setup_tc_cls_flower(struct mlx5e_priv *priv, struct tc_cls_flower_offload *cls_flower) { - if (cls_flower->common.chain_index) - return -EOPNOTSUPP; - switch (cls_flower->command) { case TC_CLSFLOWER_REPLACE: return mlx5e_configure_flower(priv, cls_flower); @@ -2964,7 +2961,7 @@ int mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, { struct mlx5e_priv *priv = cb_priv; - if (!tc_can_offload(priv->netdev)) + if (!tc_cls_can_offload_and_chain0(priv->netdev, type_data)) return -EOPNOTSUPP; switch (type) { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 10fa6a18fcf9..363d8dcb7f17 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -719,9 +719,6 @@ static int mlx5e_rep_setup_tc_cls_flower(struct mlx5e_priv *priv, struct tc_cls_flower_offload *cls_flower) { - if (cls_flower->common.chain_index) - return -EOPNOTSUPP; - switch (cls_flower->command) { case TC_CLSFLOWER_REPLACE: return mlx5e_configure_flower(priv, cls_flower); @@ -739,7 +736,7 @@ static int mlx5e_rep_setup_tc_cb(enum tc_setup_type type, void *type_data, { struct mlx5e_priv *priv = cb_priv; - if (!tc_can_offload(priv->netdev)) + if (!tc_cls_can_offload_and_chain0(priv->netdev, type_data)) return -EOPNOTSUPP; switch (type) { From patchwork Thu Jan 25 22:00:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866038 X-Patchwork-Delegate: davem@davemloft.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="2AePCzdJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGGB2Mptz9s7F for ; Fri, 26 Jan 2018 09:01:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751576AbeAYWBh (ORCPT ); Thu, 25 Jan 2018 17:01:37 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:43140 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751534AbeAYWBd (ORCPT ); Thu, 25 Jan 2018 17:01:33 -0500 Received: by mail-pf0-f193.google.com with SMTP id y26so6793671pfi.10 for ; Thu, 25 Jan 2018 14:01:33 -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=TWYEX6SYBfTBSMcHm66EDgcgJL1NjaIyPOWwiEZh480=; b=2AePCzdJryKKnXZPbGY3Nwzo1Jq7v8Zx4zbNTZw5T8uW++BXgDXnO7lz4PfVo4y50s G12OiJ6YyHPb5VjfWJA35BzlbuUUWtZ2VYx6mwpWm0tcmcDIF9tEdqdPlSbnZJeHp8th sCFP4fYxoMiY9fhntVIM3r1xLVBCvu5ol1rKbonzGNQlL7ta21eR3DS0PVpig0y4rx8W NQraYjFI/d972i+cw3DMwlvcwrA+UbzA2XMi/vwUraNW60Rr9NgksupGYXPc16d4rnXR maSqjA1C/kvMjPEV4f6BJqdTMETCSjcMUAygU92K6om+eJFy7hfmbj8vDYg9d4YZXz1Q virA== 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=TWYEX6SYBfTBSMcHm66EDgcgJL1NjaIyPOWwiEZh480=; b=XJORV8wh4+f6KnQiZBXqrMGOhxAtCWPqeLvX1pgRVNL6XCIM/51uv9HfWxw1LpA0R/ P8jMaekFEuOdwtOAp2Nj775jy16zSfMiyMPxf5vbp+a1qgzlj0Kt6tfRuNl7oL6sZ34p fJFrs5bViS0SeIzmGD+dvITYwq/smFbOPxNt7kC25W2F+si1VhoyGYidt3XOvBNRF5m3 8o2WZ/fRKqDszyJ5hREiAwMw6dyIaYgmhvr+4lLvZp1umHXc7Jg75lPNzYQ8K9u1TWZC aTdCQ2A2OByJVIQRQvbBp2x8XoPuiPmmiTMJMMlw7f4ZPmxsAvnaINID0JENT8blr/kT l7OQ== X-Gm-Message-State: AKwxytcyoHlY7+7xMUOMRGcPPAE1BZs814BdOVPjyNvDc4b/YXvmyVah VKYJx3EUG47lmWlQmt63lRCXSg== X-Google-Smtp-Source: AH8x227SQSMqNE9n3sEn+PXgtRteFt7nWFDpRt0xMYDA/0UJ91Bihu0dse+Pjj/U8UdfahcajF/XBg== X-Received: by 2002:a17:902:7483:: with SMTP id h3-v6mr2670993pll.308.1516917693101; Thu, 25 Jan 2018 14:01:33 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:32 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Michael Chan Subject: [PATCH net-next v2 06/11] bnxt: use tc_cls_can_offload_and_chain0() Date: Thu, 25 Jan 2018 14:00:48 -0800 Message-Id: <20180125220053.30040-7-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of tc_cls_can_offload_and_chain0() to set extack msg in case ethtool tc offload flag is not set or chain unsupported. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- CC: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 ++- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 3 --- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 6b7e99675571..4b001d2050c2 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -7778,7 +7778,8 @@ static int bnxt_setup_tc_block_cb(enum tc_setup_type type, void *type_data, { struct bnxt *bp = cb_priv; - if (!bnxt_tc_flower_enabled(bp) || !tc_can_offload(bp->dev)) + if (!bnxt_tc_flower_enabled(bp) || + !tc_cls_can_offload_and_chain0(bp->dev, type_data)) return -EOPNOTSUPP; switch (type) { diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c index 2ece1645f55d..fbe6e208e17b 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c @@ -1474,9 +1474,6 @@ int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid, { int rc = 0; - if (cls_flower->common.chain_index) - return -EOPNOTSUPP; - switch (cls_flower->command) { case TC_CLSFLOWER_REPLACE: rc = bnxt_tc_add_flow(bp, src_fid, cls_flower); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c index 2ca11be64182..26290403f38f 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c @@ -124,7 +124,8 @@ static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type, struct bnxt *bp = vf_rep->bp; int vf_fid = bp->pf.vf[vf_rep->vf_idx].fw_fid; - if (!bnxt_tc_flower_enabled(vf_rep->bp) || !tc_can_offload(bp->dev)) + if (!bnxt_tc_flower_enabled(vf_rep->bp) || + !tc_cls_can_offload_and_chain0(bp->dev, type_data)) return -EOPNOTSUPP; switch (type) { From patchwork Thu Jan 25 22:00:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866046 X-Patchwork-Delegate: davem@davemloft.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="BP3D3UJS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGH61yQzz9s7F for ; Fri, 26 Jan 2018 09:02:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751694AbeAYWCT (ORCPT ); Thu, 25 Jan 2018 17:02:19 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:46515 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbeAYWBf (ORCPT ); Thu, 25 Jan 2018 17:01:35 -0500 Received: by mail-pf0-f195.google.com with SMTP id y5so6790487pff.13 for ; Thu, 25 Jan 2018 14:01:34 -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=dMpCtoqDTDI0xqskVruSctIvUrpYImKOmLTjclvR8vk=; b=BP3D3UJSM0OqD0dOaZZ8/KLa3uivYCI5AClRfSZmBDJCxMKA7la4xiZpIHrwgVEBDU 4kKwdF7Xa8xjM6i8h8lrpggupU1c08e6UfipK6bQ5VErZqFxyxu2TjPBGokivvLpF8DV O/mSkvpzfrxBJcOwwdCNP+Um97sm5Hqx8M8USB/FrjEOgJhuO47eSKlJPK5cyGa7ehlt QyCfElLKJqhcIGbkxXvV3m72RhIiG82z295JEAZ5zuZ2iWSSyL+9EiMBf3BSCl8q5gDk rPuAoPYmIajn2N2H4zdZrC0luIti62g+4IaX2WpSW9wl6Wow1v3DjdvaFxi8XTeRw/DC nWNg== 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=dMpCtoqDTDI0xqskVruSctIvUrpYImKOmLTjclvR8vk=; b=tfrzhvHRlWllxkeG0ujEIFb7l8IUGzdk80vsrTdtdOu19B1xIKk668Xw26+B6qD+7V oGfhb0ATfh/iUEuJOZvhLFYPfoIjfFhEXxVDOq/yhxmE2QjNIKGDvmUrDM9wedWa0SLz UaK/jEZGlprEMk4KyNz+7iUj8BepM95icNTg7cWXK63nq09pCJ/0WcOrDwgpJOArkM+X LGXtMtP3ALaritAykKAK3qXXy2YZbX7sBF3qR3lxJ3oM/peIq9EMbUAFMYceuYsOFn3o vhnWWUWbsDBZ9A4RvPPe/Ojl7Q8PlqwGta1+jIyGJ2JLwRmHyhpw/0P2veWsUohT9tCt 3nbg== X-Gm-Message-State: AKwxytfcP7dQTRxcXCxSgjnbZP6VLDiW281XCB0qIjnUgotqTKt+PRXC HBUVT3yt7N0TsNw8T65CXN/69A== X-Google-Smtp-Source: AH8x227kHYXMW28pdRqsZwd4JtDSbyuSgVOnBzicBvwPYA4M+0A4fL6yJxoWs4VRLHiiqJCjoSaMyg== X-Received: by 2002:a17:902:bb91:: with SMTP id m17-v6mr12623141pls.315.1516917694098; Thu, 25 Jan 2018 14:01:34 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:33 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Jeff Kirsher Subject: [PATCH net-next v2 07/11] ixgbe: use tc_cls_can_offload_and_chain0() Date: Thu, 25 Jan 2018 14:00:49 -0800 Message-Id: <20180125220053.30040-8-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of tc_cls_can_offload_and_chain0() to set extack msg in case ethtool tc offload flag is not set or chain unsupported. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- CC: Jeff Kirsher --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 722cc3153a99..bbb622f15a77 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -9303,9 +9303,6 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter, static int ixgbe_setup_tc_cls_u32(struct ixgbe_adapter *adapter, struct tc_cls_u32_offload *cls_u32) { - if (cls_u32->common.chain_index) - return -EOPNOTSUPP; - switch (cls_u32->command) { case TC_CLSU32_NEW_KNODE: case TC_CLSU32_REPLACE_KNODE: @@ -9327,7 +9324,7 @@ static int ixgbe_setup_tc_block_cb(enum tc_setup_type type, void *type_data, { struct ixgbe_adapter *adapter = cb_priv; - if (!tc_can_offload(adapter->netdev)) + if (!tc_cls_can_offload_and_chain0(adapter->netdev, type_data)) return -EOPNOTSUPP; switch (type) { From patchwork Thu Jan 25 22:00:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866043 X-Patchwork-Delegate: davem@davemloft.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="BmWb3+1q"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGGq6z6Mz9sBZ for ; Fri, 26 Jan 2018 09:02:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751678AbeAYWCK (ORCPT ); Thu, 25 Jan 2018 17:02:10 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:41216 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751561AbeAYWBf (ORCPT ); Thu, 25 Jan 2018 17:01:35 -0500 Received: by mail-pg0-f66.google.com with SMTP id 136so5938543pgd.8 for ; Thu, 25 Jan 2018 14:01:35 -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=IamUar72kuqCVbbCwbH0nmIHNkUv6hLLJyTmyqCDS0A=; b=BmWb3+1q2sjU9FNdJb4nr6uh+Uu9XeeFqhuAytiKVM6crlPb909eHsTMXCwTRme52J LH2aFQDhhbar8bo7hfiY3RhtyDdzCi6+fqdAUIIGFhJrAclvA7IkE6YTVA7YOcnhonHm vhGNJveCg72qm85sScH3ivcjWZtNLgTRtszNqlsmxTSf8Ji+Z8evDEzBrWPVAEjq3GoL qZ+so28whd3Q7SZYY0+TGPlf1ukYiX7KzFdQ5V+TpWATng+vUwq4lgy3q2Zgqo7GCtDT s/mbXZlh8sGxwAb2aCfcTzdfMHCjPlvAxYPf7AznU/8dGD3wi6CvptpuFnfp++ofE5RV LlHQ== 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=IamUar72kuqCVbbCwbH0nmIHNkUv6hLLJyTmyqCDS0A=; b=abfRGJRQzHK0XFyvJEiaJkQprO1/aYkqzeLhi4TEgp96VaICCu5fKEYGL57UCJeg8L cElfAoAT7W2uYliW7JSvPZZ8IhV0C/WaK3IoNii0S3ov6xi6yhs8G5voG2t7gmY/NQ5X TG/+49H6IRi8YePWSJg3WoXupNfOFJSDD3aAQM2acq4z5B/o1FEALmFF2nUNgAC9F1oN y07xLg1TU8PfBVvpsfVRiX7Ky61d8aD35PfcP6yHAT1JwvVxQHVUUL6Bf6Zdx4wcv+iP VrwVOo3FD01ZWujqHWJ2MAy1jljBS8fr3erzBEC5SSaHRZBOie6hes0kGTuxYbZulxS8 FweQ== X-Gm-Message-State: AKwxytf966qTzaqlFc8Nf8Ddwz2KMk0FRPv3aFEqdBULBIOf4kLa+Tqp /0ENqAZLxNACgHDyzIvLiYGo/A== X-Google-Smtp-Source: AH8x2273YTREJ+GXu/IinD3/rWxVTK/VeHJQEoKAkEUIqa/HslJy6BKyylMVL24Ym4WB1INmNpQSYw== X-Received: by 10.99.62.10 with SMTP id l10mr13638249pga.288.1516917695131; Thu, 25 Jan 2018 14:01:35 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:34 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Jeff Kirsher Subject: [PATCH net-next v2 08/11] i40e: use tc_cls_can_offload_and_chain0() Date: Thu, 25 Jan 2018 14:00:50 -0800 Message-Id: <20180125220053.30040-9-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of tc_cls_can_offload_and_chain0() to set extack msg in case ethtool tc offload flag is not set or chain unsupported. Signed-off-by: Jakub Kicinski --- CC: Jeff Kirsher --- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index a222d691958d..2703a92f3778 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -7437,11 +7437,6 @@ static int i40e_setup_tc_cls_flower(struct i40e_netdev_priv *np, { struct i40e_vsi *vsi = np->vsi; - if (!tc_can_offload(vsi->netdev)) - return -EOPNOTSUPP; - if (cls_flower->common.chain_index) - return -EOPNOTSUPP; - switch (cls_flower->command) { case TC_CLSFLOWER_REPLACE: return i40e_configure_clsflower(vsi, cls_flower); @@ -7459,6 +7454,9 @@ static int i40e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, { struct i40e_netdev_priv *np = cb_priv; + if (!tc_cls_can_offload_and_chain0(np->vsi->netdev, type_data)) + return -EOPNOTSUPP; + switch (type) { case TC_SETUP_CLSFLOWER: return i40e_setup_tc_cls_flower(np, type_data); From patchwork Thu Jan 25 22:00:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866039 X-Patchwork-Delegate: davem@davemloft.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="paTCVV8b"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGGF6xp5z9sBZ for ; Fri, 26 Jan 2018 09:01:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751595AbeAYWBj (ORCPT ); Thu, 25 Jan 2018 17:01:39 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:41218 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751547AbeAYWBg (ORCPT ); Thu, 25 Jan 2018 17:01:36 -0500 Received: by mail-pg0-f66.google.com with SMTP id 136so5938582pgd.8 for ; Thu, 25 Jan 2018 14:01:36 -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=brXEIXBPX4Yt4/3EVTHZpRNWBp2BGsnBYfgHFbJy0QY=; b=paTCVV8b+jq20jWpD5k1oKKI8pjuiQgjgJgWo6H8kZ+OAFCKpLF+BFLED372Jno/27 0kt6Z6zbu0Y9cfwGASJLwKr7ZXKoDnk5JyKauhX6nQZXrBILmlUbN/6T7w3fUh58PkDn YOAj1uNLpsmDpXnAnCSAK3PhFd8MbFgrkkDak3ZPsyr7hu4ajNBHLZ4704C/OiCBJFJ5 E0rdOcRf4qbx5/4bqZOih6G/mJza62w/enav3Kw+DaUoR/L4FAmCvEsWx9rdtc2XnUJ7 fRTaXOAjrVDLsmpziDVEq+vToKt/D1zRVqGp7vhknUakYZnlmnJwMTInowFHBcrqQutn j5Lg== 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=brXEIXBPX4Yt4/3EVTHZpRNWBp2BGsnBYfgHFbJy0QY=; b=WM2A5yLsAlzC1i9T2Lrl7uLXOo1CWd3TmSKHvHqas7gcIaJZ/nvIv9zv0c/cGM1HGW Xp1VH0jezJSAK3hhx2XDA5gYfogpdkCrFz6huAs0TdXFR6XJRCTQ83lZlSwjJpV3CIxN 8LVUGqipM7EhomB6aCMKeq+Kh79NIVp2uq62WGKhpipL2D6Fr7ZU9r+om5D87cs2Udh/ +2F3qtVz8/F7DCDRzimTspjqhoEf4ds4zMsMXeoR1mls0xUIG00SG9Bk3s41kDpQWZ67 bkaIZMt5CWFUbCxs3tjWZNxF9B4RimfPR968OzoGDTUdgJ6rlB9lcr7LBJdXKcY1ID0l j82Q== X-Gm-Message-State: AKwxytcTPdPikaXKG8+Tj4Z1tbTxNf6x+Tzq4AEys7CJTKWMB5dvyXau 0M69RRSv9LZtVHK7g0N0ZLN0MA== X-Google-Smtp-Source: AH8x227P377N4dXCCGsJ3kYF/n8J04K6kGTUSMyze3vbTOVnQI2AfJ6SuAmBvsH6fY5fs/OJRHPJPg== X-Received: by 10.101.77.144 with SMTP id p16mr14496359pgq.106.1516917696146; Thu, 25 Jan 2018 14:01:36 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:35 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Jiri Pirko , Ido Schimmel Subject: [PATCH net-next v2 09/11] mlxsw: use tc_cls_can_offload_and_chain0() Date: Thu, 25 Jan 2018 14:00:51 -0800 Message-Id: <20180125220053.30040-10-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of tc_cls_can_offload_and_chain0() to set extack msg in case ethtool tc offload flag is not set or chain unsupported. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- CC: Jiri Pirko CC: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 833cd0a96fd9..3dcc58d61506 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1738,9 +1738,6 @@ static int mlxsw_sp_setup_tc_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port, struct tc_cls_matchall_offload *f, bool ingress) { - if (f->common.chain_index) - return -EOPNOTSUPP; - switch (f->command) { case TC_CLSMATCHALL_REPLACE: return mlxsw_sp_port_add_cls_matchall(mlxsw_sp_port, f, @@ -1780,7 +1777,8 @@ static int mlxsw_sp_setup_tc_block_cb_matchall(enum tc_setup_type type, switch (type) { case TC_SETUP_CLSMATCHALL: - if (!tc_can_offload(mlxsw_sp_port->dev)) + if (!tc_cls_can_offload_and_chain0(mlxsw_sp_port->dev, + type_data)) return -EOPNOTSUPP; return mlxsw_sp_setup_tc_cls_matchall(mlxsw_sp_port, type_data, From patchwork Thu Jan 25 22:00:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866041 X-Patchwork-Delegate: davem@davemloft.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="A07rsnpp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGGR3z3Fz9s7F for ; Fri, 26 Jan 2018 09:01:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751612AbeAYWBp (ORCPT ); Thu, 25 Jan 2018 17:01:45 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36567 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751581AbeAYWBi (ORCPT ); Thu, 25 Jan 2018 17:01:38 -0500 Received: by mail-pf0-f194.google.com with SMTP id 23so6808620pfp.3 for ; Thu, 25 Jan 2018 14:01:38 -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=1PmzIsgYVG0FSWCH9sRz75G5tbUToaKEKgVWOFi7Lus=; b=A07rsnppC2VFhKqImGQpGvbzjzuowyT8U8VhYwRCspSGEJmRkemCck/SHog1QZNvbL KOo918lsriNRtTN1Olegq9fpiW0tevsoHekUpwqDhpoUMA+lJa3d0Lj2Qj7/PSMLz0hL ELLoSdpVw0TFb5jyNF/Z/p18Ajc0o/q0UHKamCNEcEXzA42h09ckf1GfrDyrdrmOXnUm 8cEV30wtIbJ4BzOo2nfe7PNljOFALVJipud5sXwh5CMyjeqdCc/EG4BrOrqz7rqjov7b SjC/IXeGqvaq+inGsFXDn/cGW8tWVY1qDWWQtPM5AyIlN2bnNRwEfHVWajBVHBMBaLGC IcCA== 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=1PmzIsgYVG0FSWCH9sRz75G5tbUToaKEKgVWOFi7Lus=; b=fECHvDxNElxlEO7Ip88lmbG2SVIl+fQsKRtDG4g6ryOv6HBBeYuGMs8pw04/lniwEf VudU9dehPRFqciTi2Yi+s+TNHJdDMmO6RFQT94KjOsJte+X+Yd6Khxlk3MxTqzc8oCwT FEmyKb9UanB0TkyqFcYeGAm+HwewVT2DBf6zOvboNix4+N2pAOPERgbO2B0Zc5IBBxgB fznpcsBIyYfHxch2lS6+egcZAhtz+Em+O+wQbA1Wj9oCazdHdC3fM9uofaWP6H7P5LA2 75ZRR5zgV6YmiUzVS70t/bVXjVMuxUYo4olMrb0vffncqdFHlvgbuvKbcOG1jeLiK4q5 gkkQ== X-Gm-Message-State: AKwxytertHTivDKRgTp9VRILahFuusW/lMIaRzQkvP+3C4DcG6TXtNSz OXXXI16muOFrjnOsOW9HnQ7Kgg== X-Google-Smtp-Source: AH8x225ha6gyRP1gzFLBzgo0OlVZmzJoxPBjtWMgzrdIQuRQL7qun7SkYyS0uoCnroRuK4XDMY6l/g== X-Received: by 2002:a17:902:598e:: with SMTP id p14-v6mr11932570pli.289.1516917697160; Thu, 25 Jan 2018 14:01:37 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:36 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 10/11] selftests/bpf: check for spurious extacks from the driver Date: Thu, 25 Jan 2018 14:00:52 -0800 Message-Id: <20180125220053.30040-11-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Drivers should not report errors when offload is not forced. Check stdout and stderr for familiar messages when with no skip flags and with skip_hw. Check for add, replace, and destroy. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- tools/testing/selftests/bpf/test_offload.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index ae3eea3ab820..49f5ceeabfa6 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -543,6 +543,10 @@ netns = [] # net namespaces to be removed def check_extack_nsim(output, reference, args): check_extack(output, "Error: netdevsim: " + reference, args) +def check_no_extack(res, needle): + fail((res[1] + res[2]).count(needle) or (res[1] + res[2]).count("Warning:"), + "Found '%s' in command output, leaky extack?" % (needle)) + def check_verifier_log(output, reference): lines = output.split("\n") for l in reversed(lines): @@ -550,6 +554,18 @@ netns = [] # net namespaces to be removed return fail(True, "Missing or incorrect message from netdevsim in verifier log") +def test_spurios_extack(sim, obj, skip_hw, needle): + res = sim.cls_bpf_add_filter(obj, prio=1, handle=1, skip_hw=skip_hw, + include_stderr=True) + check_no_extack(res, needle) + res = sim.cls_bpf_add_filter(obj, op="replace", prio=1, handle=1, + skip_hw=skip_hw, include_stderr=True) + check_no_extack(res, needle) + res = sim.cls_filter_op(op="delete", prio=1, handle=1, cls="bpf", + include_stderr=True) + check_no_extack(res, needle) + + # Parse command line parser = argparse.ArgumentParser() parser.add_argument("--log", help="output verbose log to given file") @@ -687,6 +703,17 @@ netns = [] (j)) sim.cls_filter_op(op="delete", prio=1, handle=1, cls="bpf") + start_test("Test spurious extack from the driver...") + test_spurios_extack(sim, obj, False, "netdevsim") + test_spurios_extack(sim, obj, True, "netdevsim") + + sim.set_ethtool_tc_offloads(False) + + test_spurios_extack(sim, obj, False, "TC offload is disabled") + test_spurios_extack(sim, obj, True, "TC offload is disabled") + + sim.set_ethtool_tc_offloads(True) + sim.tc_flush_filters() start_test("Test TC offloads work...") From patchwork Thu Jan 25 22:00:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 866040 X-Patchwork-Delegate: davem@davemloft.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="aIEI3uwZ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSGGN1tlBz9s7F for ; Fri, 26 Jan 2018 09:01:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751615AbeAYWBq (ORCPT ); Thu, 25 Jan 2018 17:01:46 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35058 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751580AbeAYWBi (ORCPT ); Thu, 25 Jan 2018 17:01:38 -0500 Received: by mail-pf0-f195.google.com with SMTP id t12so6799580pfg.2 for ; Thu, 25 Jan 2018 14:01:38 -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=K3/sbvlC5gLjKknJvU/sn6TVZDocHOiT+DaGNYYrhcU=; b=aIEI3uwZYXUKhwIEkiEk8+vtua0HRuIV6uhSWaLHQSkNjq7zG2jP7z5nV/zf94Mxe9 AlE9bAEdP0e5hd42WcVhz5fcSuXRWjimCzDsyjBT5NtauaQm1hAx+y3neNIQ340orKoX K5FP0aHfsEqieSq/Qiq8KwlLUT/ClzilvwjWrUrYX9mTZMmvr4LmgqAImJYB84y/u99Q C7MGGMz3fWq9JowqZUgIsyAa4CHyf+VQ3xSpmMIggwi5xdA6yRb35wAvmVTy49bhQEqo 380ioL8nMWyKcyAV4vJSuA0t0354FgfmmlYzkY070GdHK0xOjicj9/NKiLY2+5y1yB7H 3oCQ== 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=K3/sbvlC5gLjKknJvU/sn6TVZDocHOiT+DaGNYYrhcU=; b=QLUzE4OU1KGcttNUgk9tdRxFthTmx3LFhxdKtGn69+Sgs38ApPOlcWEwxxjoih+t9a rJRrZ6DEy0FwV5FFOx37ZYqpGzdSqV46DuZGpewQRp2yIuULzEGMwPNVT7itRGacDJK9 xVssvyZjbyJwVcmaMI34ra/1/IAUp6yzvBbAwRPCt7oYBQAEVbaSQMdDyuwsQldWClzx h5oGlB7moiFqyKiSyv8BXuAHiC5yLaHgHjaYkddWR4Tgvr4cAPojhbuNzQaOyEn4834R DIU+3JosCVRn0+DuJQc1EHL04LHXEMqQpqSsUMIEQY1vXbvxdpq1MD9/jw+r4c62V8Fz Jffg== X-Gm-Message-State: AKwxytc8anrhY9NCtzHqRL7oLADDjNBqH0ls46mwhGibES3m3anK947l LtTYlV7ZHBZHLeKpijhHg7v6rQ== X-Google-Smtp-Source: AH8x227oNNqb0hrC6mmtPy0OUb7deusWcdPr/9dAvfpiyAFdLZLzniOZ+ycs3HInacQSz9LgSDE3Zg== X-Received: by 2002:a17:902:8f86:: with SMTP id z6-v6mr12489115plo.352.1516917697979; Thu, 25 Jan 2018 14:01:37 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id l88sm17977578pfb.149.2018.01.25.14.01.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 14:01:37 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 11/11] selftests/bpf: check for chain-non-0 extack message Date: Thu, 25 Jan 2018 14:00:53 -0800 Message-Id: <20180125220053.30040-12-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125220053.30040-1-jakub.kicinski@netronome.com> References: <20180125220053.30040-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure netdevsim doesn't allow offload of chains other than 0, and that it reports the expected extack message. Signed-off-by: Jakub Kicinski --- tools/testing/selftests/bpf/test_offload.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index 49f5ceeabfa6..e78aad0a68bb 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -430,13 +430,15 @@ netns = [] # net namespaces to be removed return filters def cls_filter_op(self, op, qdisc="ingress", prio=None, handle=None, - cls="", params="", + chain=None, cls="", params="", fail=True, include_stderr=False): spec = "" if prio is not None: spec += " prio %d" % (prio) if handle: spec += " handle %s" % (handle) + if chain is not None: + spec += " chain %d" % (chain) return tc("filter {op} dev {dev} {qdisc} {spec} {cls} {params}"\ .format(op=op, dev=self['ifname'], qdisc=qdisc, spec=spec, @@ -444,7 +446,7 @@ netns = [] # net namespaces to be removed fail=fail, include_stderr=include_stderr) def cls_bpf_add_filter(self, bpf, op="add", prio=None, handle=None, - da=False, verbose=False, + chain=None, da=False, verbose=False, skip_sw=False, skip_hw=False, fail=True, include_stderr=False): cls = "bpf " + bpf @@ -460,7 +462,7 @@ netns = [] # net namespaces to be removed params += " skip_hw" return self.cls_filter_op(op=op, prio=prio, handle=handle, cls=cls, - params=params, + chain=chain, params=params, fail=fail, include_stderr=include_stderr) def set_ethtool_tc_offloads(self, enable, fail=True): @@ -679,6 +681,14 @@ netns = [] args) sim.wait_for_flush() + start_test("Test non-0 chain offload...") + ret, _, err = sim.cls_bpf_add_filter(obj, chain=1, prio=1, handle=1, + skip_sw=True, + fail=False, include_stderr=True) + fail(ret == 0, "Offloaded a filter to chain other than 0") + check_extack(err, "Error: Driver supports only offload of chain 0.", args) + sim.tc_flush_filters() + start_test("Test TC replace...") sim.cls_bpf_add_filter(obj, prio=1, handle=1) sim.cls_bpf_add_filter(obj, op="replace", prio=1, handle=1)