{"id":832921,"url":"http://patchwork.ozlabs.org/api/1.2/patches/832921/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171101104741.2216-3-jiri@resnulli.us/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171101104741.2216-3-jiri@resnulli.us>","list_archive_url":null,"date":"2017-11-01T10:47:39","name":"[net-next,v2,2/4] net: sched: move the can_offload check from binding phase to rule insertion phase","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"db85f0f4e37201a77731d4e30c329a6f49fc23ac","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/1.2/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171101104741.2216-3-jiri@resnulli.us/mbox/","series":[{"id":11313,"url":"http://patchwork.ozlabs.org/api/1.2/series/11313/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11313","date":"2017-11-01T10:47:37","name":"net: sched: block callbacks follow-up","version":2,"mbox":"http://patchwork.ozlabs.org/series/11313/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/832921/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/832921/checks/","tags":{},"related":[],"headers":{"Return-Path":"<netdev-owner@vger.kernel.org>","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"j1PapqX5\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yRlL01VR1z9sNd\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed,  1 Nov 2017 21:47:52 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752299AbdKAKrt (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tWed, 1 Nov 2017 06:47:49 -0400","from mail-wm0-f68.google.com ([74.125.82.68]:52458 \"EHLO\n\tmail-wm0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752019AbdKAKrp (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Wed, 1 Nov 2017 06:47:45 -0400","by mail-wm0-f68.google.com with SMTP id t139so4090099wmt.1\n\tfor <netdev@vger.kernel.org>; Wed, 01 Nov 2017 03:47:45 -0700 (PDT)","from localhost (jirka.pirko.cz. [84.16.102.26])\n\tby smtp.gmail.com with ESMTPSA id\n\ta79sm409224wma.14.2017.11.01.03.47.44\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 01 Nov 2017 03:47:44 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=fbhbyn1nAaPOtZdlkyN7Z3zebkzaOAjEns/4lolFKNs=;\n\tb=j1PapqX5ty0ykJI0tHFW6fWWP8uUgxXaEeNhxEwqcMpZrRX8wzjiv4SyQ3YmIlhinV\n\tcSc/G/YOIgAK2dQC6vFn1TPHJwLcKOIP43EUHjwAvKh0oQ64wSQRvRFasfHprKBWKDTK\n\twVFn9RieKIkqCY+rTfQ6KTedKsKPdhU9lBKqY445NqcP2yr4OtS/IjTlVnXr3y5yoG+A\n\tij3RORW9Nk3uYg8VpJcbz0fvtXPGGFxz6kvVDe23vbpQL77i+lWv0klhnLutT3UJWZ84\n\txjAek1kVnr0Jb2FuGRWMFgRdb3b9jAAXC7gxevezCjoor5fjaCQ0O7C6eM7Meff1/hLi\n\taUyg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=fbhbyn1nAaPOtZdlkyN7Z3zebkzaOAjEns/4lolFKNs=;\n\tb=Rl9lkAXEvew9oULRfwCwdtQ6wQVBPJ/NTIvHdex1D6oanGrloDKEqsNy6Uxo37e1jk\n\tEgAGk4qsO+gFcGZ2MnhBDICZMo1Am5zUK1/pPS+h97AyPphKeItAT4+Ee43/7TPSE97Q\n\tGlwSdjitzaw3JIaUhNRaTXwFQPH+c/ETrfXnCzg6Z3IC0JBWex/L9o9xrOi+ozOYMElN\n\tzv06ma319aborpImMJlWfwGKNNZ9VQv5I4McZkCzlsVOI9LSRxNvRgsQtza0WnTqvz77\n\t2zSStJuDEcmnM6Fpz4cu9iKBEhMTInxgPvJnKEfiQ2vu2uQXVwoEOzaHAhtz3pVi6x7n\n\tYy1w==","X-Gm-Message-State":"AMCzsaUjn3rGAr14u+ej028K3ISvZdeslDW+jEhEkhO8XWAZt1TnFcp0\n\tVVa5EtSGOd2o4f2NiS02kcLdN12o","X-Google-Smtp-Source":"ABhQp+Qti6XJ8yKVXgU4uN1u7TZ9gqgN45a/kEhFcmEZrHxX3g6M5ih7zWIukeAqp3itVqOFJ8HfTA==","X-Received":"by 10.28.47.144 with SMTP id v138mr4768321wmv.11.1509533264529; \n\tWed, 01 Nov 2017 03:47:44 -0700 (PDT)","From":"Jiri Pirko <jiri@resnulli.us>","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, nogahf@mellanox.com, jhs@mojatatu.com,\n\txiyou.wangcong@gmail.com, mlxsw@mellanox.com, andrew@lunn.ch,\n\tvivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com,\n\tmichael.chan@broadcom.com, ganeshgr@chelsio.com,\n\tsaeedm@mellanox.com, matanb@mellanox.com, leonro@mellanox.com,\n\tidosch@mellanox.com, jakub.kicinski@netronome.com,\n\tsimon.horman@netronome.com, pieter.jansenvanvuuren@netronome.com,\n\tjohn.hurley@netronome.com, alexander.h.duyck@intel.com","Subject":"[patch net-next v2 2/4] net: sched: move the can_offload check from\n\tbinding phase to rule insertion phase","Date":"Wed,  1 Nov 2017 11:47:39 +0100","Message-Id":"<20171101104741.2216-3-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20171101104741.2216-1-jiri@resnulli.us>","References":"<20171101104741.2216-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"<netdev.vger.kernel.org>","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Jiri Pirko <jiri@mellanox.com>\n\nThis restores the original behaviour before the block callbacks were\nintroduced. Allow the drivers to do binding of block always, no matter\nif the NETIF_F_HW_TC feature is on or off. Move the check to the block\ncallback which is called for rule insertion.\n\nReported-by: Alexander Duyck <alexander.duyck@gmail.com>\nSigned-off-by: Jiri Pirko <jiri@mellanox.com>\n---\n drivers/net/ethernet/broadcom/bnxt/bnxt.c           | 2 +-\n drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c       | 2 +-\n drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c     | 3 +++\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c       | 3 +++\n drivers/net/ethernet/mellanox/mlx5/core/en_main.c   | 3 +++\n drivers/net/ethernet/mellanox/mlx5/core/en_rep.c    | 3 +++\n drivers/net/ethernet/mellanox/mlxsw/spectrum.c      | 3 +++\n drivers/net/ethernet/netronome/nfp/bpf/main.c       | 3 +++\n drivers/net/ethernet/netronome/nfp/flower/offload.c | 3 +++\n net/dsa/slave.c                                     | 3 +++\n net/sched/cls_api.c                                 | 2 +-\n 11 files changed, 27 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c\nindex 5ce9506..c3dfaa5 100644\n--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c\n+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c\n@@ -7347,7 +7347,7 @@ static int bnxt_setup_tc_block_cb(enum tc_setup_type type, void *type_data,\n {\n \tstruct bnxt *bp = cb_priv;\n \n-\tif (!bnxt_tc_flower_enabled(bp))\n+\tif (!bnxt_tc_flower_enabled(bp) || !tc_can_offload(bp->dev))\n \t\treturn -EOPNOTSUPP;\n \n \tswitch (type) {\ndiff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c\nindex c1761ed..b6aa7db9 100644\n--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c\n+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c\n@@ -124,7 +124,7 @@ static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type,\n \tstruct bnxt *bp = vf_rep->bp;\n \tint vf_fid = bp->pf.vf[vf_rep->vf_idx].fw_fid;\n \n-\tif (!bnxt_tc_flower_enabled(vf_rep->bp))\n+\tif (!bnxt_tc_flower_enabled(vf_rep->bp) || !tc_can_offload(bp->dev))\n \t\treturn -EOPNOTSUPP;\n \n \tswitch (type) {\ndiff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c\nindex e16078d..b07eecf 100644\n--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c\n+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c\n@@ -2935,6 +2935,9 @@ static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data,\n \t\treturn -EINVAL;\n \t}\n \n+\tif (!tc_can_offload(dev))\n+\t\treturn -EOPNOTSUPP;\n+\n \tswitch (type) {\n \tcase TC_SETUP_CLSU32:\n \t\treturn cxgb_setup_tc_cls_u32(dev, type_data);\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 38bd2e3..5079779 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -9386,6 +9386,9 @@ static int ixgbe_setup_tc_block_cb(enum tc_setup_type type, void *type_data,\n {\n \tstruct ixgbe_adapter *adapter = cb_priv;\n \n+\tif (!tc_can_offload(adapter->netdev))\n+\t\treturn -EOPNOTSUPP;\n+\n \tswitch (type) {\n \tcase TC_SETUP_CLSU32:\n \t\treturn ixgbe_setup_tc_cls_u32(adapter, type_data);\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\nindex 560b208..28ae00b 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\n@@ -3106,6 +3106,9 @@ int mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data,\n {\n \tstruct mlx5e_priv *priv = cb_priv;\n \n+\tif (!tc_can_offload(priv->netdev))\n+\t\treturn -EOPNOTSUPP;\n+\n \tswitch (type) {\n \tcase TC_SETUP_CLSFLOWER:\n \t\treturn mlx5e_setup_tc_cls_flower(priv, type_data);\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c\nindex 0edb706..2c43606 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c\n@@ -682,6 +682,9 @@ static int mlx5e_rep_setup_tc_cb(enum tc_setup_type type, void *type_data,\n {\n \tstruct mlx5e_priv *priv = cb_priv;\n \n+\tif (!tc_can_offload(priv->netdev))\n+\t\treturn -EOPNOTSUPP;\n+\n \tswitch (type) {\n \tcase TC_SETUP_CLSFLOWER:\n \t\treturn mlx5e_rep_setup_tc_cls_flower(priv, type_data);\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c\nindex 0219269..3f4be95 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c\n@@ -1738,6 +1738,9 @@ static int mlxsw_sp_setup_tc_block_cb(enum tc_setup_type type, void *type_data,\n {\n \tstruct mlxsw_sp_port *mlxsw_sp_port = cb_priv;\n \n+\tif (!tc_can_offload(mlxsw_sp_port->dev))\n+\t\treturn -EOPNOTSUPP;\n+\n \tswitch (type) {\n \tcase TC_SETUP_CLSMATCHALL:\n \t\treturn mlxsw_sp_setup_tc_cls_matchall(mlxsw_sp_port, type_data,\ndiff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c\nindex f15a186..04424db 100644\n--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c\n+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c\n@@ -121,6 +121,9 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type,\n \tstruct tc_cls_bpf_offload *cls_bpf = type_data;\n \tstruct nfp_net *nn = cb_priv;\n \n+\tif (!tc_can_offload(nn->dp.netdev))\n+\t\treturn -EOPNOTSUPP;\n+\n \tswitch (type) {\n \tcase TC_SETUP_CLSBPF:\n \t\tif (!nfp_net_ebpf_capable(nn) ||\ndiff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c\nindex c47753f..7c6cab1 100644\n--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c\n+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c\n@@ -470,6 +470,9 @@ static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type,\n {\n \tstruct nfp_net *nn = cb_priv;\n \n+\tif (!tc_can_offload(nn->dp.netdev))\n+\t\treturn -EOPNOTSUPP;\n+\n \tswitch (type) {\n \tcase TC_SETUP_CLSFLOWER:\n \t\treturn nfp_flower_repr_offload(nn->app, nn->port->netdev,\ndiff --git a/net/dsa/slave.c b/net/dsa/slave.c\nindex 48b954a..9b75d0a 100644\n--- a/net/dsa/slave.c\n+++ b/net/dsa/slave.c\n@@ -799,6 +799,9 @@ static int dsa_slave_setup_tc_block_cb(enum tc_setup_type type, void *type_data,\n {\n \tstruct net_device *dev = cb_priv;\n \n+\tif (!tc_can_offload(dev))\n+\t\treturn -EOPNOTSUPP;\n+\n \tswitch (type) {\n \tcase TC_SETUP_CLSMATCHALL:\n \t\treturn dsa_slave_setup_tc_cls_matchall(dev, type_data, ingress);\ndiff --git a/net/sched/cls_api.c b/net/sched/cls_api.c\nindex d9d54b3..fe09071 100644\n--- a/net/sched/cls_api.c\n+++ b/net/sched/cls_api.c\n@@ -256,7 +256,7 @@ static void tcf_block_offload_cmd(struct tcf_block *block, struct Qdisc *q,\n \tstruct net_device *dev = q->dev_queue->dev;\n \tstruct tc_block_offload bo = {};\n \n-\tif (!tc_can_offload(dev))\n+\tif (!dev->netdev_ops->ndo_setup_tc)\n \t\treturn;\n \tbo.command = command;\n \tbo.binder_type = ei->binder_type;\n","prefixes":["net-next","v2","2/4"]}