netfilter: add hardware offload infrastructure
Subsystems (18)
Pablo Neira Ayuso
maintainerv3 cover netfilter: add hardware offload infrastructure
Hi,
This patchset adds support for Netfilter hardware offloads.
This patchset reuses the existing block infrastructure, the netdev_ops->ndo_setup_tc() interface, TC_SETUP_CLSFLOWER classifier and the flow rule API.
Patch #1 adds flow_block_cb_setup_simple(), most drivers do the same thing
to set up flow blocks, to reduce the number of changes, consolidate codebase. Use _simple() postfix as requested by Jakub Kicinski. This new function resides in net/core/flow_offload.c
Patch #2 renames TC_BLOCK_{UN}BIND to FLOW_BLOCK_{UN}BIND.
Patch #3 renames TCF_BLOCK_BINDER_TYPE_* to FLOW_BLOCK_BINDER_TYPE_*.
Patch #4 adds flow_block_cb_alloc() and flow_block_cb_free() helper
functions, this is the first patch of the flow block API.
Patch #5 adds the helper to deal with list operations in the flow block API.
This includes flow_block_cb_lookup(), flow_block_cb_add() and flow_block_cb_remove().
Patch #6 adds flow_block_cb_priv(), flow_block_cb_incref() and
flow_block_cb_decref() which completes the flow block API.
Patch #7 updates the cls_api to use the flow block API from the new
tcf_block_setup(). This infrastructure transports these objects via list (through the tc_block_offload object) back to the core for registration.
CLS_API DRIVER
TC_SETUP_BLOCK ----------> setup flow_block_cb object &
it adds object to flow_block_offload->cb_list
|
CLS_API <-----------------------'
registers list with flow blocks
flow_block_cb & travels back to
calls ->reoffload the core for registration
drivers allocate and sets up (configure the blocks), then registration happens from the core (cls_api and netfilter).
Patch #8 updates drivers to use the flow block API.
Patch #9 removes the tcf block callback API, which is replaced by the
flow block API.
Patch #10 adds the flow_block_cb_is_busy() helper to check if the block
is already used by a subsystem. This helper is invoked from drivers. Once drivers are updated to support for multiple subsystems, they can remove this check.
Patch #11 introduces basic netfilter hardware offload infrastructure
for the ingress chain. This includes 5-tuple exact matching
and accept / drop rule actions. Only basechains are supported
at this stage, no .reoffload callback is implemented either.
Default policy to "accept" is only supported for now.
table netdev filter {
flags offload;
chain ingress {
type filter hook ingress device eth0 priority 0;
ip daddr 192.168.0.10 tcp dport 22 drop
}
}This patchset reuses the existing tcf block callback API and it places it in the flow block callback API in net/core/flow_offload.c.
This series aims to addres Jakub Kicinski's feedback, mostly targeting to reducing the batch size and reordering patches.
Please, apply. Thanks.
Pablo Neira Ayuso (11):
net: flow_offload: add flow_block_cb_setup_simple()
net: flow_offload: rename TC_BLOCK_{UN}BIND to FLOW_BLOCK_{UN}BIND
net: flow_offload: rename TCF_BLOCK_BINDER_TYPE_* to FLOW_BLOCK_BINDER_TYPE_*
net: flow_offload: add flow_block_cb_alloc() and flow_block_cb_free()
net: flow_offload: add list handling functions
net: flow_offload: add flow_block_cb_{priv,incref,decref}()
net: sched: use flow block API
drivers: net: use flow block API
net: sched: remove tcf block API
net: flow_offload: add flow_block_cb_is_busy() and use it
netfilter: nf_tables: add hardware offload support
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 27 +-- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 29 +-- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 27 +-- drivers/net/ethernet/intel/i40e/i40e_main.c | 27 +-- drivers/net/ethernet/intel/iavf/iavf_main.c | 36 +-- drivers/net/ethernet/intel/igb/igb_main.c | 27 +-- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 30 +-- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 30 +-- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 76 +++--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 103 +++++--- drivers/net/ethernet/mscc/ocelot_ace.h | 4 +- drivers/net/ethernet/mscc/ocelot_flower.c | 47 ++-- drivers/net/ethernet/mscc/ocelot_tc.c | 46 ++-- drivers/net/ethernet/netronome/nfp/abm/cls.c | 22 +- drivers/net/ethernet/netronome/nfp/abm/main.h | 2 +- drivers/net/ethernet/netronome/nfp/bpf/main.c | 30 +-- .../net/ethernet/netronome/nfp/flower/offload.c | 83 ++++--- drivers/net/ethernet/qlogic/qede/qede_main.c | 24 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +- drivers/net/netdevsim/netdev.c | 29 +-- include/net/flow_offload.h | 67 ++++++ include/net/netfilter/nf_tables.h | 13 + include/net/netfilter/nf_tables_offload.h | 76 ++++++ include/net/pkt_cls.h | 89 +------ include/uapi/linux/netfilter/nf_tables.h | 2 + net/core/flow_offload.c | 118 ++++++++++ net/dsa/slave.c | 33 ++- net/netfilter/Makefile | 2 +- net/netfilter/nf_tables_api.c | 22 +- net/netfilter/nf_tables_offload.c | 261 +++++++++++++++++++++ net/netfilter/nft_cmp.c | 53 +++++ net/netfilter/nft_immediate.c | 31 +++ net/netfilter/nft_meta.c | 27 +++ net/netfilter/nft_payload.c | 187 +++++++++++++++ net/sched/cls_api.c | 213 ++++++++--------- net/sched/sch_ingress.c | 6 +- 36 files changed, 1298 insertions(+), 624 deletions(-) create mode 100644 include/net/netfilter/nf_tables_offload.h create mode 100644 net/netfilter/nf_tables_offload.c
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH v3 1/11 net: flow_offload: add flow_block_cb_setup_simple()
Most drivers do the same thing to set up the flow block callbacks, this patch adds a helper function to do this.
This preparation patch reduces the number of changes to adapt the existing drivers to use the flow block callback API.
This new helper function takes a flow block list per-driver, which is set to NULL until this driver list is used.
This patch also introduces the flow_block_command and flow_block_binder_type enumerations, which are renamed to use FLOW_BLOCK_* in follow up patches.
There are three definitions (aliases) in order to reduce the number of updates in this patch, which go away once drivers are fully adapted to use this flow block API.
---
v3: use flow_block_cb_setup_simple() name - Jakub Kicinski.
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 26 ++++------------- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 28 ++++-------------- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 26 ++++------------- drivers/net/ethernet/intel/i40e/i40e_main.c | 26 ++++------------- drivers/net/ethernet/intel/iavf/iavf_main.c | 35 ++++------------------- drivers/net/ethernet/intel/igb/igb_main.c | 24 +++------------- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 27 ++++------------- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 27 ++++------------- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 26 ++++------------- drivers/net/ethernet/netronome/nfp/abm/cls.c | 17 ++--------- drivers/net/ethernet/netronome/nfp/bpf/main.c | 29 ++++--------------- drivers/net/ethernet/qlogic/qede/qede_main.c | 23 ++------------- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 ++------------ drivers/net/netdevsim/netdev.c | 26 ++++------------- include/net/flow_offload.h | 27 +++++++++++++++++ include/net/pkt_cls.h | 20 ++----------- net/core/flow_offload.c | 25 ++++++++++++++++ 17 files changed, 117 insertions(+), 317 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +5 -21
@@ -9847,32 +9847,16 @@ static int bnxt_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } -static int bnxt_setup_tc_block (struct net_device *dev, -struct tc_block_offload *f) -{ -struct bnxt *bp =netdev_priv (dev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, bnxt_setup_tc_block_cb, - bp, bp, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, bnxt_setup_tc_block_cb, bp); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int bnxt_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) { +struct bnxt *bp =netdev_priv (dev); +switch (type) {case TC_SETUP_BLOCK : -return bnxt_setup_tc_block (dev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + bnxt_setup_tc_block_cb, + bp, bp, true);case TC_SETUP_QDISC_MQPRIO : {struct tc_mqprio_qopt *mqprio = type_data;
drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c +5 -23
@@ -161,34 +161,16 @@ static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type, } } -static int bnxt_vf_rep_setup_tc_block (struct net_device *dev, -struct tc_block_offload *f) -{ -struct bnxt_vf_rep *vf_rep =netdev_priv (dev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, - bnxt_vf_rep_setup_tc_block_cb, - vf_rep, vf_rep, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, - bnxt_vf_rep_setup_tc_block_cb, vf_rep); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int bnxt_vf_rep_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) { +struct bnxt_vf_rep *vf_rep =netdev_priv (dev); +switch (type) {case TC_SETUP_BLOCK : -return bnxt_vf_rep_setup_tc_block (dev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + bnxt_vf_rep_setup_tc_block_cb, + vf_rep, vf_rep, true);default :return -EOPNOTSUPP ; }
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +5 -21
@@ -3190,32 +3190,16 @@ static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } -static int cxgb_setup_tc_block (struct net_device *dev, -struct tc_block_offload *f) -{ -struct port_info *pi =netdev2pinfo (dev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, cxgb_setup_tc_block_cb, - pi, dev, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, cxgb_setup_tc_block_cb, pi); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int cxgb_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) { +struct port_info *pi =netdev2pinfo (dev); +switch (type) {case TC_SETUP_BLOCK : -return cxgb_setup_tc_block (dev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + cxgb_setup_tc_block_cb, + pi, dev, true);default :return -EOPNOTSUPP ; }
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -21
@@ -8177,34 +8177,18 @@ static int i40e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } -static int i40e_setup_tc_block (struct net_device *dev, -struct tc_block_offload *f) -{ -struct i40e_netdev_priv *np =netdev_priv (dev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, i40e_setup_tc_block_cb, - np, np, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, i40e_setup_tc_block_cb, np); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int __i40e_setup_tc (struct net_device *netdev,enum tc_setup_type type,void *type_data) { +struct i40e_netdev_priv *np =netdev_priv (netdev); +switch (type) {case TC_SETUP_QDISC_MQPRIO :return i40e_setup_tc (netdev, type_data);case TC_SETUP_BLOCK : -return i40e_setup_tc_block (netdev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + i40e_setup_tc_block_cb, + np, np, true);default :return -EOPNOTSUPP ; }
drivers/net/ethernet/intel/iavf/iavf_main.c +5 -30
@@ -3114,35 +3114,6 @@ static int iavf_setup_tc_block_cb(enum tc_setup_type type, void *type_data, }/** -* iavf_setup_tc_block - register callbacks for tc -* @netdev: network interface device structure -* @f: tc offload data -* -* This function registers block callbacks for tc -* offloads -**/ -static int iavf_setup_tc_block (struct net_device *dev, -struct tc_block_offload *f) -{ -struct iavf_adapter *adapter =netdev_priv (dev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, iavf_setup_tc_block_cb, - adapter, adapter, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, iavf_setup_tc_block_cb, - adapter); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} - -/** * iavf_setup_tc - configure multiple traffic classes * @netdev: network interface device structure * @type: type of offload
@@ -3156,11 +3127,15 @@ static int iavf_setup_tc_block(struct net_device *dev,static int iavf_setup_tc (struct net_device *netdev,enum tc_setup_type type,void *type_data) { +struct iavf_adapter *adapter =netdev_priv (netdev); +switch (type) {case TC_SETUP_QDISC_MQPRIO :return __iavf_setup_tc (netdev, type_data);case TC_SETUP_BLOCK : -return iavf_setup_tc_block (netdev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + iavf_setup_tc_block_cb, + adapter, adapter, true);default :return -EOPNOTSUPP ; }
drivers/net/ethernet/intel/igb/igb_main.c +4 -20
@@ -2783,25 +2783,6 @@ static int igb_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } -static int igb_setup_tc_block (struct igb_adapter *adapter, -struct tc_block_offload *f) -{ -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, igb_setup_tc_block_cb, - adapter, adapter, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, igb_setup_tc_block_cb, - adapter); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int igb_offload_txtime (struct igb_adapter *adapter,struct tc_etf_qopt_offload *qopt) {
@@ -2834,7 +2815,10 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type,case TC_SETUP_QDISC_CBS :return igb_offload_cbs (adapter, type_data);case TC_SETUP_BLOCK : -return igb_setup_tc_block (adapter, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + igb_setup_tc_block_cb, + adapter, adapter, true); +case TC_SETUP_QDISC_ETF :return igb_offload_txtime (adapter, type_data);
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +5 -22
@@ -9607,27 +9607,6 @@ static int ixgbe_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } -static int ixgbe_setup_tc_block (struct net_device *dev, -struct tc_block_offload *f) -{ -struct ixgbe_adapter *adapter =netdev_priv (dev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, ixgbe_setup_tc_block_cb, - adapter, adapter, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, ixgbe_setup_tc_block_cb, - adapter); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int ixgbe_setup_tc_mqprio (struct net_device *dev,struct tc_mqprio_qopt *mqprio) {
@@ -9638,9 +9617,13 @@ static int ixgbe_setup_tc_mqprio(struct net_device *dev,static int __ixgbe_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) { +struct ixgbe_adapter *adapter =netdev_priv (dev); +switch (type) {case TC_SETUP_BLOCK : -return ixgbe_setup_tc_block (dev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + ixgbe_setup_tc_block_cb, + adapter, adapter, true);case TC_SETUP_QDISC_MQPRIO :return ixgbe_setup_tc_mqprio (dev, type_data);default :
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +5 -22
@@ -3457,36 +3457,19 @@ static int mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, return -EOPNOTSUPP; } } - -static int mlx5e_setup_tc_block (struct net_device *dev, -struct tc_block_offload *f) -{ -struct mlx5e_priv *priv =netdev_priv (dev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, mlx5e_setup_tc_block_cb, - priv, priv, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, mlx5e_setup_tc_block_cb, - priv); -return 0 ; -default : -return -EOPNOTSUPP ; - } -}#endif static int mlx5e_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) { +struct mlx5e_priv *priv =netdev_priv (dev); +switch (type) {#ifdef CONFIG_MLX5_ESWITCH case TC_SETUP_BLOCK : -return mlx5e_setup_tc_block (dev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + mlx5e_setup_tc_block_cb, + priv, priv, true);#endif case TC_SETUP_QDISC_MQPRIO :return mlx5e_setup_tc_mqprio (dev, type_data);
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +5 -21
@@ -1178,32 +1178,16 @@ static int mlx5e_rep_setup_tc_cb(enum tc_setup_type type, void *type_data, } } -static int mlx5e_rep_setup_tc_block (struct net_device *dev, -struct tc_block_offload *f) -{ -struct mlx5e_priv *priv =netdev_priv (dev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, mlx5e_rep_setup_tc_cb, - priv, priv, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, mlx5e_rep_setup_tc_cb, priv); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int mlx5e_rep_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) { +struct mlx5e_priv *priv =netdev_priv (dev); +switch (type) {case TC_SETUP_BLOCK : -return mlx5e_rep_setup_tc_block (dev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + mlx5e_rep_setup_tc_cb, + priv, priv, true);default :return -EOPNOTSUPP ; }
drivers/net/ethernet/netronome/nfp/abm/cls.c +2 -15
@@ -265,19 +265,6 @@ static int nfp_abm_setup_tc_block_cb(enum tc_setup_type type,int nfp_abm_setup_cls_block (struct net_device *netdev,struct nfp_repr *repr,struct tc_block_offload *f) { -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, - nfp_abm_setup_tc_block_cb, - repr, repr, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, nfp_abm_setup_tc_block_cb, - repr); -return 0 ; -default : -return -EOPNOTSUPP ; - } +return flow_block_cb_setup_simple (f,NULL , nfp_abm_setup_tc_block_cb, + repr, repr, true); }
drivers/net/ethernet/netronome/nfp/bpf/main.c +5 -24
@@ -160,35 +160,16 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type,return 0 ; } -static int nfp_bpf_setup_tc_block (struct net_device *netdev, -struct tc_block_offload *f) -{ -struct nfp_net *nn =netdev_priv (netdev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, - nfp_bpf_setup_tc_block_cb, - nn, nn, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, - nfp_bpf_setup_tc_block_cb, - nn); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int nfp_bpf_setup_tc (struct nfp_app *app,struct net_device *netdev,enum tc_setup_type type,void *type_data) { +struct nfp_net *nn =netdev_priv (netdev); +switch (type) {case TC_SETUP_BLOCK : -return nfp_bpf_setup_tc_block (netdev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + nfp_bpf_setup_tc_block_cb, + nn, nn, true);default :return -EOPNOTSUPP ; }
drivers/net/ethernet/qlogic/qede/qede_main.c +3 -20
@@ -579,25 +579,6 @@ static int qede_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } -static int qede_setup_tc_block (struct qede_dev *edev, -struct tc_block_offload *f) -{ -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, - qede_setup_tc_block_cb, - edev, edev, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, qede_setup_tc_block_cb, edev); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int qede_setup_tc_offload (struct net_device *dev,enum tc_setup_type type,void *type_data)
@@ -607,7 +588,9 @@ qede_setup_tc_offload(struct net_device *dev, enum tc_setup_type type,switch (type) {case TC_SETUP_BLOCK : -return qede_setup_tc_block (edev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + qede_setup_tc_block_cb, + edev, edev, true);case TC_SETUP_QDISC_MQPRIO : mqprio = type_data;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -19
@@ -3853,24 +3853,6 @@ static int stmmac_setup_tc_block_cb(enum tc_setup_type type, void *type_data,return ret; } -static int stmmac_setup_tc_block (struct stmmac_priv *priv, -struct tc_block_offload *f) -{ -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, stmmac_setup_tc_block_cb, - priv, priv, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, stmmac_setup_tc_block_cb, priv); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int stmmac_setup_tc (struct net_device *ndev,enum tc_setup_type type,void *type_data) {
@@ -3878,7 +3860,9 @@ static int stmmac_setup_tc(struct net_device *ndev, enum tc_setup_type type,switch (type) {case TC_SETUP_BLOCK : -return stmmac_setup_tc_block (priv, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + stmmac_setup_tc_block_cb, + priv, priv, true);case TC_SETUP_QDISC_CBS :return stmmac_tc_setup_cbs (priv, priv, type_data);default :
drivers/net/netdevsim/netdev.c +5 -21
@@ -78,26 +78,6 @@ nsim_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv)return nsim_bpf_setup_tc_block_cb (type, type_data, cb_priv); } -static int -nsim_setup_tc_block (struct net_device *dev,struct tc_block_offload *f) -{ -struct netdevsim *ns =netdev_priv (dev); - -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) -return -EOPNOTSUPP ; - -switch (f->command) { -case TC_BLOCK_BIND : -return tcf_block_cb_register (f->block, nsim_setup_tc_block_cb, - ns, ns, f->extack); -case TC_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, nsim_setup_tc_block_cb, ns); -return 0 ; -default : -return -EOPNOTSUPP ; - } -} -static int nsim_set_vf_mac (struct net_device *dev,int vf,u8 *mac) {struct netdevsim *ns =netdev_priv (dev);
@@ -226,9 +206,13 @@ static int nsim_set_vf_link_state(struct net_device *dev, int vf, int state)static int nsim_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) { +struct netdevsim *ns =netdev_priv (dev); +switch (type) {case TC_SETUP_BLOCK : -return nsim_setup_tc_block (dev, type_data); +return flow_block_cb_setup_simple (type_data,NULL , + nsim_setup_tc_block_cb, + ns, ns, true);default :return -EOPNOTSUPP ; }
include/net/flow_offload.h +27 -0
@@ -3,6 +3,7 @@#include <linux/kernel.h> #include <net/flow_dissector.h> +#include <net/sch_generic.h> struct flow_match {struct flow_dissector *dissector;
@@ -232,4 +233,30 @@ static inline void flow_stats_update(struct flow_stats *flow_stats, flow_stats->lastused = max_t(u64, flow_stats->lastused, lastused); } +enum flow_block_command { +TC_BLOCK_BIND , +TC_BLOCK_UNBIND , +}; + +enum flow_block_binder_type { +TCF_BLOCK_BINDER_TYPE_UNSPEC , +TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS , +TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS , +}; + +struct tcf_block ; +struct netlink_ext_ack ; + +struct flow_block_offload { +enum flow_block_command command; +enum flow_block_binder_type binder_type; +struct tcf_block *block; +struct list_head *driver_block_list; +struct netlink_ext_ack *extack; +}; + +int flow_block_cb_setup_simple (struct flow_block_offload *f, +struct list_head *driver_list,tc_setup_cb_t *cb, +void *cb_ident,void *cb_priv,bool ingress_only); +#endif /* _NET_FLOW_OFFLOAD_H */
include/net/pkt_cls.h +3 -17
@@ -26,11 +26,9 @@ struct tcf_walker {int register_tcf_proto_ops (struct tcf_proto_ops *ops);int unregister_tcf_proto_ops (struct tcf_proto_ops *ops); -enum tcf_block_binder_type { -TCF_BLOCK_BINDER_TYPE_UNSPEC , -TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS , -TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS , -}; +#define tc_block_offload flow_block_offload +#define tc_block_command flow_block_command +#define tcf_block_binder_type flow_block_binder_typestruct tcf_block_ext_info {enum tcf_block_binder_type binder_type;
@@ -610,18 +608,6 @@ int tc_setup_cb_call(struct tcf_block *block, enum tc_setup_type type, void *type_data, bool err_stop);unsigned int tcf_exts_num_actions (struct tcf_exts *exts); -enum tc_block_command { -TC_BLOCK_BIND , -TC_BLOCK_UNBIND , -}; - -struct tc_block_offload { -enum tc_block_command command; -enum tcf_block_binder_type binder_type; -struct tcf_block *block; -struct netlink_ext_ack *extack; -}; -struct tc_cls_common_offload {u32 chain_index;__be16 protocol;
net/core/flow_offload.c +25 -0
@@ -2,6 +2,7 @@#include <linux/kernel.h> #include <linux/slab.h> #include <net/flow_offload.h> +#include <net/pkt_cls.h> struct flow_rule *flow_rule_alloc (unsigned int num_actions) {
@@ -164,3 +165,27 @@ void flow_rule_match_enc_opts(const struct flow_rule *rule,FLOW_DISSECTOR_MATCH (rule,FLOW_DISSECTOR_KEY_ENC_OPTS , out); }EXPORT_SYMBOL (flow_rule_match_enc_opts); + +int flow_block_cb_setup_simple (struct flow_block_offload *f, +struct list_head *driver_block_list, +tc_setup_cb_t *cb,void *cb_ident,void *cb_priv, +bool ingress_only) +{ +if (ingress_only && + f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) +return -EOPNOTSUPP ; + + f->driver_block_list = driver_block_list; + +switch (f->command) { +case TC_BLOCK_BIND : +return tcf_block_cb_register (f->block, cb, cb_ident, cb_priv, + f->extack); +case TC_BLOCK_UNBIND : +tcf_block_cb_unregister (f->block, cb, cb_ident); +return 0 ; +default : +return -EOPNOTSUPP ; + } +} +EXPORT_SYMBOL (flow_block_cb_setup_simple);
Signature · 1 line
2.11.0
Re: [PATCH net-next,v3 01/11] net: flow_offload: add flow_block_cb_setup_simple()
Quoted 13 lines · Pablo Neira Ayuso
Most drivers do the same thing to set up the flow block callbacks, this patch adds a helper function to do this.
This preparation patch reduces the number of changes to adapt the existing drivers to use the flow block callback API.
This new helper function takes a flow block list per-driver, which is set to NULL until this driver list is used.
This patch also introduces the
flow_block_commandandflow_block_binder_typeenumerations, which are renamed to use FLOW_BLOCK_* in follow up patches.
Quoted 5 lines
There are three definitions (aliases) in order to reduce the number of updates in this patch, which go away once drivers are fully adapted to use this flow block API.
Signed-off-by Pablo Neira Ayuso <[email protected]>
Thanks!
Pablo Neira Ayuso
maintainerPATCH v3 2/11 net: flow_offload: rename TC_BLOCK_{UN}BIND to FLOW_BLOCK_{UN}BIND
In reply to Pablo Neira AyusoRename from TC_BLOCK_{UN}BIND to FLOW_BLOCK_{UN}BIND and remove temporary tc_block_command alias.
---
v2: move patch to the beginning of this series.
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 ++-- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 ++-- drivers/net/ethernet/mscc/ocelot_tc.c | 4 ++-- .../net/ethernet/netronome/nfp/flower/offload.c | 8 ++++---- include/net/flow_offload.h | 4 ++-- include/net/pkt_cls.h | 1 - net/core/flow_offload.c | 4 ++-- net/dsa/slave.c | 4 ++-- net/sched/cls_api.c | 22 +++++++++++----------- 9 files changed, 27 insertions(+), 28 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +2 -2
@@ -704,7 +704,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev,return -EOPNOTSUPP ;switch (f->command) { -case TC_BLOCK_BIND : +case FLOW_BLOCK_BIND : indr_priv =mlx5e_rep_indr_block_priv_lookup (rpriv, netdev);if (indr_priv)return -EEXIST ;
@@ -727,7 +727,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev, }return err; -case TC_BLOCK_UNBIND : +case FLOW_BLOCK_UNBIND : indr_priv =mlx5e_rep_indr_block_priv_lookup (rpriv, netdev);if (!indr_priv)return -ENOENT ;
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +2 -2
@@ -1679,7 +1679,7 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port, }switch (f->command) { -case TC_BLOCK_BIND : +case FLOW_BLOCK_BIND : err =tcf_block_cb_register (f->block, cb, mlxsw_sp_port, mlxsw_sp_port, f->extack);if (err)
@@ -1692,7 +1692,7 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,return err; }return 0 ; -case TC_BLOCK_UNBIND : +case FLOW_BLOCK_UNBIND :mlxsw_sp_setup_tc_block_flower_unbind (mlxsw_sp_port, f->block, ingress);tcf_block_cb_unregister (f->block, cb, mlxsw_sp_port);
drivers/net/ethernet/mscc/ocelot_tc.c +2 -2
@@ -147,14 +147,14 @@ static int ocelot_setup_tc_block(struct ocelot_port *port, }switch (f->command) { -case TC_BLOCK_BIND : +case FLOW_BLOCK_BIND : ret =tcf_block_cb_register (f->block, cb, port, port, f->extack);if (ret)return ret;return ocelot_setup_tc_block_flower_bind (port, f); -case TC_BLOCK_UNBIND : +case FLOW_BLOCK_UNBIND :ocelot_setup_tc_block_flower_unbind (port, f);tcf_block_cb_unregister (f->block, cb, port);return 0 ;
drivers/net/ethernet/netronome/nfp/flower/offload.c +4 -4
@@ -1315,11 +1315,11 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev, repr_priv->block_shared =tcf_block_shared (f->block);switch (f->command) { -case TC_BLOCK_BIND : +case FLOW_BLOCK_BIND :return tcf_block_cb_register (f->block, nfp_flower_setup_tc_block_cb, repr, repr, f->extack); -case TC_BLOCK_UNBIND : +case FLOW_BLOCK_UNBIND :tcf_block_cb_unregister (f->block, nfp_flower_setup_tc_block_cb, repr);
@@ -1395,7 +1395,7 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app,return -EOPNOTSUPP ;switch (f->command) { -case TC_BLOCK_BIND : +case FLOW_BLOCK_BIND : cb_priv =kmalloc (sizeof (*cb_priv),GFP_KERNEL );if (!cb_priv)return -ENOMEM ;
@@ -1413,7 +1413,7 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app, }return err; -case TC_BLOCK_UNBIND : +case FLOW_BLOCK_UNBIND : cb_priv =nfp_flower_indr_block_cb_priv_lookup (app, netdev);if (!cb_priv)return -ENOENT ;
include/net/flow_offload.h +2 -2
@@ -234,8 +234,8 @@ static inline void flow_stats_update(struct flow_stats *flow_stats, }enum flow_block_command { -TC_BLOCK_BIND , -TC_BLOCK_UNBIND , +FLOW_BLOCK_BIND , +FLOW_BLOCK_UNBIND , };enum flow_block_binder_type {
include/net/pkt_cls.h +0 -1
@@ -27,7 +27,6 @@ int register_tcf_proto_ops(struct tcf_proto_ops *ops);int unregister_tcf_proto_ops (struct tcf_proto_ops *ops);#define tc_block_offload flow_block_offload -#define tc_block_command flow_block_command#define tcf_block_binder_type flow_block_binder_typestruct tcf_block_ext_info {
net/core/flow_offload.c +2 -2
@@ -178,10 +178,10 @@ int flow_block_cb_setup_simple(struct flow_block_offload *f, f->driver_block_list = driver_block_list;switch (f->command) { -case TC_BLOCK_BIND : +case FLOW_BLOCK_BIND :return tcf_block_cb_register (f->block, cb, cb_ident, cb_priv, f->extack); -case TC_BLOCK_UNBIND : +case FLOW_BLOCK_UNBIND :tcf_block_cb_unregister (f->block, cb, cb_ident);return 0 ;default :
net/dsa/slave.c +2 -2
@@ -955,9 +955,9 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,return -EOPNOTSUPP ;switch (f->command) { -case TC_BLOCK_BIND : +case FLOW_BLOCK_BIND :return tcf_block_cb_register (f->block, cb, dev, dev, f->extack); -case TC_BLOCK_UNBIND : +case FLOW_BLOCK_UNBIND :tcf_block_cb_unregister (f->block, cb, dev);return 0 ;default :
net/sched/cls_api.c +11 -11
@@ -674,7 +674,7 @@ static void tc_indr_block_cb_del(struct tc_indr_block_cb *indr_block_cb)static void tc_indr_block_ing_cmd (struct tc_indr_block_dev *indr_dev,struct tc_indr_block_cb *indr_block_cb, -enum tc_block_command command) +enum flow_block_command command) {struct tc_block_offload bo = { .command = command,
@@ -705,7 +705,7 @@ int __tc_indr_block_cb_register(struct net_device *dev, void *cb_priv,if (err) goto err_dev_put; -tc_indr_block_ing_cmd (indr_dev, indr_block_cb,TC_BLOCK_BIND ); +tc_indr_block_ing_cmd (indr_dev, indr_block_cb,FLOW_BLOCK_BIND );return 0 ; err_dev_put:
@@ -742,7 +742,7 @@ void __tc_indr_block_cb_unregister(struct net_device *dev,return ;/* Send unbind message if required to free any block cbs. */ -tc_indr_block_ing_cmd (indr_dev, indr_block_cb,TC_BLOCK_UNBIND ); +tc_indr_block_ing_cmd (indr_dev, indr_block_cb,FLOW_BLOCK_UNBIND );tc_indr_block_cb_del (indr_block_cb);tc_indr_block_dev_put (indr_dev); }
@@ -759,7 +759,7 @@ EXPORT_SYMBOL_GPL(tc_indr_block_cb_unregister);static void tc_indr_block_call (struct tcf_block *block,struct net_device *dev,struct tcf_block_ext_info *ei, -enum tc_block_command command, +enum flow_block_command command,struct netlink_ext_ack *extack) {struct tc_indr_block_cb *indr_block_cb;
@@ -775,7 +775,7 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev,if (!indr_dev)return ; - indr_dev->block = command ==TC_BLOCK_BIND ? block :NULL ; + indr_dev->block = command ==FLOW_BLOCK_BIND ? block :NULL ;list_for_each_entry (indr_block_cb, &indr_dev->cb_list, list) indr_block_cb->cb(dev, indr_block_cb->cb_priv, TC_SETUP_BLOCK,
@@ -790,7 +790,7 @@ static bool tcf_block_offload_in_use(struct tcf_block *block)static int tcf_block_offload_cmd (struct tcf_block *block,struct net_device *dev,struct tcf_block_ext_info *ei, -enum tc_block_command command, +enum flow_block_command command,struct netlink_ext_ack *extack) {struct tc_block_offload bo = {};
@@ -820,20 +820,20 @@ static int tcf_block_offload_bind(struct tcf_block *block, struct Qdisc *q,return -EOPNOTSUPP ; } - err =tcf_block_offload_cmd (block, dev, ei,TC_BLOCK_BIND , extack); + err =tcf_block_offload_cmd (block, dev, ei,FLOW_BLOCK_BIND , extack);if (err == -EOPNOTSUPP ) goto no_offload_dev_inc;if (err)return err; -tc_indr_block_call (block, dev, ei,TC_BLOCK_BIND , extack); +tc_indr_block_call (block, dev, ei,FLOW_BLOCK_BIND , extack);return 0 ; no_offload_dev_inc:if (tcf_block_offload_in_use (block))return -EOPNOTSUPP ; block->nooffloaddevcnt++; -tc_indr_block_call (block, dev, ei,TC_BLOCK_BIND , extack); +tc_indr_block_call (block, dev, ei,FLOW_BLOCK_BIND , extack);return 0 ; }
@@ -843,11 +843,11 @@ static void tcf_block_offload_unbind(struct tcf_block *block, struct Qdisc *q,struct net_device *dev = q->dev_queue->dev;int err; -tc_indr_block_call (block, dev, ei,TC_BLOCK_UNBIND ,NULL ); +tc_indr_block_call (block, dev, ei,FLOW_BLOCK_UNBIND ,NULL );if (!dev->netdev_ops->ndo_setup_tc) goto no_offload_dev_dec; - err =tcf_block_offload_cmd (block, dev, ei,TC_BLOCK_UNBIND ,NULL ); + err =tcf_block_offload_cmd (block, dev, ei,FLOW_BLOCK_UNBIND ,NULL );if (err == -EOPNOTSUPP ) goto no_offload_dev_dec;return ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH v3 3/11 net: flow_offload: rename TCF_BLOCK_BINDER_TYPE_* to FLOW_BLOCK_BINDER_TYPE_*
In reply to Pablo Neira AyusoRename from TCF_BLOCK_BINDER_TYPE_* to FLOW_BLOCK_BINDER_TYPE_* and remove temporary tcf_block_binder_type alias.
---
v3: move patch to the beginning of this series.
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 ++-- drivers/net/ethernet/mscc/ocelot_flower.c | 2 +- drivers/net/ethernet/mscc/ocelot_tc.c | 4 ++-- drivers/net/ethernet/netronome/nfp/flower/offload.c | 6 +++--- include/net/flow_offload.h | 6 +++--- include/net/pkt_cls.h | 3 +-- net/core/flow_offload.c | 2 +- net/dsa/slave.c | 4 ++-- net/sched/cls_api.c | 14 +++++++------- net/sched/sch_ingress.c | 6 +++--- 11 files changed, 26 insertions(+), 27 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +1 -1
@@ -700,7 +700,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev,struct mlx5e_rep_indr_block_priv *indr_priv;int err =0 ; -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) +if (f->binder_type !=FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS )return -EOPNOTSUPP ;switch (f->command) {
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +2 -2
@@ -1668,10 +1668,10 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,bool ingress;int err; -if (f->binder_type ==TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) { +if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) { cb = mlxsw_sp_setup_tc_block_cb_matchall_ig; ingress = true; - }else if (f->binder_type ==TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) { + }else if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) { cb = mlxsw_sp_setup_tc_block_cb_matchall_eg; ingress = false; }else {
drivers/net/ethernet/mscc/ocelot_flower.c +1 -1
@@ -306,7 +306,7 @@ int ocelot_setup_tc_block_flower_bind(struct ocelot_port *port,struct tcf_block_cb *block_cb;int ret; -if (f->binder_type ==TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) +if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS )return -EOPNOTSUPP ; block_cb = tcf_block_cb_lookup(f->block,
drivers/net/ethernet/mscc/ocelot_tc.c +2 -2
@@ -137,10 +137,10 @@ static int ocelot_setup_tc_block(struct ocelot_port *port,netdev_dbg (port->dev,"tc_block command %d, binder_type %d\n" , f->command, f->binder_type); -if (f->binder_type ==TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) { +if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) { cb = ocelot_setup_tc_block_cb_ig; port->tc.block_shared =tcf_block_shared (f->block); - }else if (f->binder_type ==TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) { + }else if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) { cb = ocelot_setup_tc_block_cb_eg; }else {return -EOPNOTSUPP ;
drivers/net/ethernet/netronome/nfp/flower/offload.c +3 -3
@@ -1308,7 +1308,7 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev,struct nfp_repr *repr =netdev_priv (netdev);struct nfp_flower_repr_priv *repr_priv; -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) +if (f->binder_type !=FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS )return -EOPNOTSUPP ; repr_priv = repr->app_priv;
@@ -1389,8 +1389,8 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app,struct nfp_flower_priv *priv = app->priv;int err; -if (f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS && - !(f->binder_type ==TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS && +if (f->binder_type !=FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS && + !(f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS &&nfp_flower_internal_port_can_offload (app, netdev)))return -EOPNOTSUPP ;
include/net/flow_offload.h +3 -3
@@ -239,9 +239,9 @@ enum flow_block_command { };enum flow_block_binder_type { -TCF_BLOCK_BINDER_TYPE_UNSPEC , -TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS , -TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS , +FLOW_BLOCK_BINDER_TYPE_UNSPEC , +FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS , +FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS , };struct tcf_block ;
include/net/pkt_cls.h +1 -2
@@ -27,10 +27,9 @@ int register_tcf_proto_ops(struct tcf_proto_ops *ops);int unregister_tcf_proto_ops (struct tcf_proto_ops *ops);#define tc_block_offload flow_block_offload -#define tcf_block_binder_type flow_block_binder_typestruct tcf_block_ext_info { -enum tcf_block_binder_type binder_type; +enum flow_block_binder_type binder_type;tcf_chain_head_change_t *chain_head_change;void *chain_head_change_priv;u32 block_index;
net/core/flow_offload.c +1 -1
@@ -172,7 +172,7 @@ int flow_block_cb_setup_simple(struct flow_block_offload *f, bool ingress_only) {if (ingress_only && - f->binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) + f->binder_type !=FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS )return -EOPNOTSUPP ; f->driver_block_list = driver_block_list;
net/dsa/slave.c +2 -2
@@ -947,9 +947,9 @@ static int dsa_slave_setup_tc_block(struct net_device *dev, {tc_setup_cb_t *cb; -if (f->binder_type ==TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) +if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) cb = dsa_slave_setup_tc_block_cb_ig; -else if (f->binder_type ==TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) +else if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) cb = dsa_slave_setup_tc_block_cb_eg;else return -EOPNOTSUPP ;
net/sched/cls_api.c +7 -7
@@ -678,7 +678,7 @@ static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev, {struct tc_block_offload bo = { .command = command, - .binder_type =TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS , + .binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS , .block = indr_dev->block, };
@@ -1340,17 +1340,17 @@ static void tcf_block_release(struct Qdisc *q, struct tcf_block *block,struct tcf_block_owner_item {struct list_head list;struct Qdisc *q; -enum tcf_block_binder_type binder_type; +enum flow_block_binder_type binder_type; };static void tcf_block_owner_netif_keep_dst (struct tcf_block *block,struct Qdisc *q, -enum tcf_block_binder_type binder_type) +enum flow_block_binder_type binder_type) {if (block->keep_dst && - binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS && - binder_type !=TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) + binder_type !=FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS && + binder_type !=FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS )netif_keep_dst (qdisc_dev (q)); }
@@ -1367,7 +1367,7 @@ EXPORT_SYMBOL(tcf_block_netif_keep_dst);static int tcf_block_owner_add (struct tcf_block *block,struct Qdisc *q, -enum tcf_block_binder_type binder_type) +enum flow_block_binder_type binder_type) {struct tcf_block_owner_item *item;
@@ -1382,7 +1382,7 @@ static int tcf_block_owner_add(struct tcf_block *block,static void tcf_block_owner_del (struct tcf_block *block,struct Qdisc *q, -enum tcf_block_binder_type binder_type) +enum flow_block_binder_type binder_type) {struct tcf_block_owner_item *item;
net/sched/sch_ingress.c +3 -3
@@ -83,7 +83,7 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt,mini_qdisc_pair_init (&q->miniqp, sch, &dev->miniq_ingress); - q->block_info.binder_type =TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; + q->block_info.binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; q->block_info.chain_head_change = clsact_chain_head_change; q->block_info.chain_head_change_priv = &q->miniqp;
@@ -217,7 +217,7 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt,mini_qdisc_pair_init (&q->miniqp_ingress, sch, &dev->miniq_ingress); - q->ingress_block_info.binder_type =TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; + q->ingress_block_info.binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; q->ingress_block_info.chain_head_change = clsact_chain_head_change; q->ingress_block_info.chain_head_change_priv = &q->miniqp_ingress;
@@ -228,7 +228,7 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt,mini_qdisc_pair_init (&q->miniqp_egress, sch, &dev->miniq_egress); - q->egress_block_info.binder_type =TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS ; + q->egress_block_info.binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS ; q->egress_block_info.chain_head_change = clsact_chain_head_change; q->egress_block_info.chain_head_change_priv = &q->miniqp_egress;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH v3 4/11 net: flow_offload: add flow_block_cb_alloc() and flow_block_cb_free()
In reply to Pablo Neira AyusoAdd a new helper function to allocate flow_block_cb objects.
---
v3: instead of introducing tcf_block_cb_alloc() and tcf_block_cb_free()
to rename them later on in the series, add them upfront to flow_offload.c to reduce the size of this batch.
include/net/flow_offload.h | 14 ++++++++++++++ net/core/flow_offload.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+)
include/net/flow_offload.h +14 -0
@@ -255,6 +255,20 @@ struct flow_block_offload {struct netlink_ext_ack *extack; }; +struct flow_block_cb { +struct list_head list; +tc_setup_cb_t *cb; +void *cb_ident; +void *cb_priv; +void (*release)(void *cb_priv); +unsigned int refcnt; +}; + +struct flow_block_cb *flow_block_cb_alloc (struct net *net,tc_setup_cb_t *cb, +void *cb_ident,void *cb_priv, +void (*release)(void *cb_priv)); +void flow_block_cb_free (struct flow_block_cb *block_cb); +int flow_block_cb_setup_simple (struct flow_block_offload *f,struct list_head *driver_list,tc_setup_cb_t *cb,void *cb_ident,void *cb_priv,bool ingress_only);
net/core/flow_offload.c +28 -0
@@ -166,6 +166,34 @@ void flow_rule_match_enc_opts(const struct flow_rule *rule, }EXPORT_SYMBOL (flow_rule_match_enc_opts); +struct flow_block_cb *flow_block_cb_alloc (struct net *net,tc_setup_cb_t *cb, +void *cb_ident,void *cb_priv, +void (*release)(void *cb_priv)) +{ +struct flow_block_cb *block_cb; + + block_cb =kzalloc (sizeof (*block_cb),GFP_KERNEL ); +if (!block_cb) +return ERR_PTR (-ENOMEM ); + + block_cb->cb = cb; + block_cb->cb_ident = cb_ident; + block_cb->cb_priv = cb_priv; + block_cb->release = release; + +return block_cb; +} +EXPORT_SYMBOL (flow_block_cb_alloc); + +void flow_block_cb_free (struct flow_block_cb *block_cb) +{ +if (block_cb->release) + block_cb->release (block_cb->cb_priv); + +kfree (block_cb); +} +EXPORT_SYMBOL (flow_block_cb_free); + int flow_block_cb_setup_simple(struct flow_block_offload *f, struct list_head *driver_block_list, tc_setup_cb_t *cb, void *cb_ident, void *cb_priv,
Signature · 1 line
2.11.0
Jiri Pirko
maintainerRe: [PATCH net-next,v3 04/11] net: flow_offload: add flow_block_cb_alloc() and flow_block_cb_free()
Mon, Jul 08, 2019 at 06:06:06PM CEST, [email protected] wrote:
[...]
Quoted 1 line
+struct
flow_block_cb*flow_block_cb_alloc(struct net *net,tc_setup_cb_t*cb,
You don't use net any longer.
Quoted 2 lines
net/core/flow_offload.c +2
-0+ void *cb_ident, void *cb_priv, + void (*release)(void *cb_priv))
[...]
Pablo Neira Ayuso
maintainerPATCH v3 5/11 net: flow_offload: add list handling functions
In reply to Pablo Neira AyusoThis patch adds the list handling functions for the flow block API:
* flow_block_cb_lookup() allows drivers to look up for existing flow blocks.
* flow_block_cb_add() adds a flow block to the list to be registered by the core.
* flow_block_cb_remove() to remove a flow block from the list of existing flow blocks per driver and to request the core to unregister this.
The flow block API also annotates the netns this flow block belongs to.
---
v3: extracted from former patch "net: flow_offload: add flow_block_cb API".
include/net/flow_offload.h | 20 ++++++++++++++++++++ net/core/flow_offload.c | 18 ++++++++++++++++++ net/sched/cls_api.c | 3 +++ 3 files changed, 41 insertions(+)
include/net/flow_offload.h +20 -0
@@ -251,12 +251,16 @@ struct flow_block_offload {enum flow_block_command command;enum flow_block_binder_type binder_type;struct tcf_block *block; +struct net *net; +struct list_head cb_list;struct list_head *driver_block_list;struct netlink_ext_ack *extack; };struct flow_block_cb { +struct list_head driver_list;struct list_head list; +struct net *net;tc_setup_cb_t *cb;void *cb_ident;void *cb_priv;
@@ -269,6 +273,22 @@ struct flow_block_cb *flow_block_cb_alloc(struct net *net, tc_setup_cb_t *cb, void (*release)(void *cb_priv));void flow_block_cb_free (struct flow_block_cb *block_cb); +struct flow_block_cb *flow_block_cb_lookup (struct net *net, +struct list_head *driver_flow_block_list, +tc_setup_cb_t *cb,void *cb_ident); + +static inline void flow_block_cb_add (struct flow_block_cb *block_cb, +struct flow_block_offload *offload) +{ +list_add_tail (&block_cb->driver_list, &offload->cb_list); +} + +static inline void flow_block_cb_remove (struct flow_block_cb *block_cb, +struct flow_block_offload *offload) +{ +list_move (&block_cb->driver_list, &offload->cb_list); +} +int flow_block_cb_setup_simple (struct flow_block_offload *f,struct list_head *driver_list,tc_setup_cb_t *cb,void *cb_ident,void *cb_priv,bool ingress_only);
net/core/flow_offload.c +18 -0
@@ -176,6 +176,7 @@ struct flow_block_cb *flow_block_cb_alloc(struct net *net, tc_setup_cb_t *cb,if (!block_cb)return ERR_PTR (-ENOMEM ); + block_cb->net = net; block_cb->cb = cb; block_cb->cb_ident = cb_ident; block_cb->cb_priv = cb_priv;
@@ -194,6 +195,23 @@ void flow_block_cb_free(struct flow_block_cb *block_cb) }EXPORT_SYMBOL (flow_block_cb_free); +struct flow_block_cb *flow_block_cb_lookup (struct net *net, +struct list_head *driver_block_list, +tc_setup_cb_t *cb,void *cb_ident) +{ +struct flow_block_cb *block_cb; + +list_for_each_entry (block_cb, driver_block_list, driver_list) { +if (block_cb->net == net && + block_cb->cb == cb && + block_cb->cb_ident == cb_ident) +return block_cb; + } + +return NULL ; +} +EXPORT_SYMBOL (flow_block_cb_lookup); + int flow_block_cb_setup_simple(struct flow_block_offload *f, struct list_head *driver_block_list, tc_setup_cb_t *cb, void *cb_ident, void *cb_priv,
net/sched/cls_api.c +3 -0
@@ -679,6 +679,7 @@ static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev,struct tc_block_offload bo = { .command = command, .binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS , + .net =dev_net (indr_dev->dev), .block = indr_dev->block, };
@@ -767,6 +768,7 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev,struct tc_block_offload bo = { .command = command, .binder_type = ei->binder_type, + .net =dev_net (dev), .block = block, .extack = extack, };
@@ -795,6 +797,7 @@ static int tcf_block_offload_cmd(struct tcf_block *block, {struct tc_block_offload bo = {}; + bo.net =dev_net (dev); bo.command = command; bo.binder_type = ei->binder_type; bo.block = block;
Signature · 1 line
2.11.0
Jiri Pirko
maintainerRe: [PATCH net-next,v3 05/11] net: flow_offload: add list handling functions
Quoted 5 lines · Mon, Jul 08, 2019 at 06:06:07PM CEST, [email protected] wrote:
This patch adds the list handling functions for the flow block API:
*
flow_block_cb_lookup()allows drivers to look up for existing flow blocks.
*flow_block_cb_add()adds a flow block to the list to be registered by the core.
Per driver? You say "per driver" in the "remove" part.
Quoted 71 lines
*
flow_block_cb_remove()to remove a flow block from the list of existing flow blocks per driver and to request the core to unregister this.The flow block API also annotates the netns this flow block belongs to.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
v3: extracted from former patch "net:flow_offload: addflow_block_cbAPI".include/net/flow_offload.h | 20 ++++++++++++++++++++ net/core/flow_offload.c | 18 ++++++++++++++++++ net/sched/cls_api.c | 3 +++ 3 files changed, 41 insertions(+)include/net/flow_offload.h +20
-0@@ -251,12 +251,16 @@ struct flow_block_offload {enum flow_block_command command;enum flow_block_binder_type binder_type;struct tcf_block *block; +struct net *net; +struct list_head cb_list;struct list_head *driver_block_list;struct netlink_ext_ack *extack; };struct flow_block_cb { +struct list_head driver_list;struct list_head list; +struct net *net;tc_setup_cb_t *cb;void *cb_ident;void *cb_priv;@@ -269,6 +273,22 @@ struct flow_block_cb *flow_block_cb_alloc(struct net *net, tc_setup_cb_t *cb, void (*release)(void *cb_priv));void flow_block_cb_free (struct flow_block_cb *block_cb); +struct flow_block_cb *flow_block_cb_lookup (struct net *net, +struct list_head *driver_flow_block_list, +tc_setup_cb_t *cb,void *cb_ident); + +static inline void flow_block_cb_add (struct flow_block_cb *block_cb, +struct flow_block_offload *offload) +{ +list_add_tail (&block_cb->driver_list, &offload->cb_list); +} + +static inline void flow_block_cb_remove (struct flow_block_cb *block_cb, +struct flow_block_offload *offload) +{ +list_move (&block_cb->driver_list, &offload->cb_list); +} +int flow_block_cb_setup_simple (struct flow_block_offload *f,struct list_head *driver_list,tc_setup_cb_t *cb,void *cb_ident,void *cb_priv,bool ingress_only);net/core/flow_offload.c +1
-0@@ -176,6 +176,7 @@ struct flow_block_cb *flow_block_cb_alloc(struct net *net, tc_setup_cb_t *cb,if (!block_cb)return ERR_PTR (-ENOMEM ); + block_cb->net = net; block_cb->cb = cb; block_cb->cb_ident = cb_ident; block_cb->cb_priv = cb_priv;
net/core/flow_offload.c void flow_block_cb_free(struct flow_block_cb *block_cb) · line 199
Quoted 5 lines
net/core/flow_offload.c +2
-0@@ -194,6 +195,23 @@ void flow_block_cb_free(struct flow_block_cb *block_cb) }EXPORT_SYMBOL (flow_block_cb_free); +struct flow_block_cb *flow_block_cb_lookup(struct net *net, + struct list_head *driver_block_list,
In the header, you call this "driver_flow_block_list".
Where is this list coming from? In general, I don't think it is good to have struct list_head as an arg of exported symbol. Should be contained in some struct. Looks like this might be the "struct flow_block_offload"?
Does this have anything to do with "struct list_head *driver_block_list"? This is very confusing...
Quoted 49 lines
net/core/flow_offload.c +15
-0+ tc_setup_cb_t *cb, void *cb_ident) +{ +struct flow_block_cb *block_cb; + +list_for_each_entry (block_cb, driver_block_list, driver_list) { +if (block_cb->net == net && + block_cb->cb == cb && + block_cb->cb_ident == cb_ident) +return block_cb; + } + +return NULL ; +} +EXPORT_SYMBOL (flow_block_cb_lookup); + int flow_block_cb_setup_simple(struct flow_block_offload *f, struct list_head *driver_block_list, tc_setup_cb_t *cb, void *cb_ident, void *cb_priv,net/sched/cls_api.c +3
-0@@ -679,6 +679,7 @@ static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev,struct tc_block_offload bo = { .command = command, .binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS , + .net =dev_net (indr_dev->dev), .block = indr_dev->block, };@@ -767,6 +768,7 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev,struct tc_block_offload bo = { .command = command, .binder_type = ei->binder_type, + .net =dev_net (dev), .block = block, .extack = extack, };@@ -795,6 +797,7 @@ static int tcf_block_offload_cmd(struct tcf_block *block, {struct tc_block_offload bo = {}; + bo.net =dev_net (dev); bo.command = command; bo.binder_type = ei->binder_type; bo.block = block;Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH v3 6/11 net: flow_offload: add flow_block_cb_{priv,incref,decref}()
In reply to Pablo Neira AyusoThis patch completes the flow block API to introduce:
* flow_block_cb_priv() to accept callback private data.
* flow_block_cb_incref() to bump reference counter on this flow block.
* flow_block_cb_decref() to decrement the reference counter.
These function are taken from the existing tcf_block_cb_priv(), tcf_block_cb_incref() and tcf_block_cb_decref().
---
v3: missing in previous batch.
include/net/flow_offload.h | 4 ++++ net/core/flow_offload.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+)
include/net/flow_offload.h +4 -0
@@ -277,6 +277,10 @@ struct flow_block_cb *flow_block_cb_lookup(struct net *net,struct list_head *driver_flow_block_list, tc_setup_cb_t *cb, void *cb_ident); +void *flow_block_cb_priv (struct flow_block_cb *block_cb); +void flow_block_cb_incref (struct flow_block_cb *block_cb); +unsigned int flow_block_cb_decref (struct flow_block_cb *block_cb); +static inline void flow_block_cb_add (struct flow_block_cb *block_cb,struct flow_block_offload *offload) {
net/core/flow_offload.c +18 -0
@@ -212,6 +212,24 @@ struct flow_block_cb *flow_block_cb_lookup(struct net *net, }EXPORT_SYMBOL (flow_block_cb_lookup); +void *flow_block_cb_priv (struct flow_block_cb *block_cb) +{ +return block_cb->cb_priv; +} +EXPORT_SYMBOL (flow_block_cb_priv); + +void flow_block_cb_incref (struct flow_block_cb *block_cb) +{ + block_cb->refcnt++; +} +EXPORT_SYMBOL (flow_block_cb_incref); + +unsigned int flow_block_cb_decref (struct flow_block_cb *block_cb) +{ +return --block_cb->refcnt; +} +EXPORT_SYMBOL (flow_block_cb_decref); + int flow_block_cb_setup_simple(struct flow_block_offload *f, struct list_head *driver_block_list, tc_setup_cb_t *cb, void *cb_ident, void *cb_priv,
Signature · 1 line
2.11.0
Jiri Pirko
maintainerRe: [PATCH net-next,v3 06/11] net: flow_offload: add flow_block_cb_{priv,incref,decref}()
Quoted 3 lines · Mon, Jul 08, 2019 at 06:06:08PM CEST, [email protected] wrote:
This patch completes the flow block API to introduce:
*
flow_block_cb_priv()to accept callback private data.
"accept"? That's sounds odd to me.
Quoted 4 lines
*
flow_block_cb_incref()to bump reference counter on this flow block.
*flow_block_cb_decref()to decrement the reference counter.These function are taken from the existing
tcf_block_cb_priv(),
"functions"
Quoted 2 lines
tcf_block_cb_incref()andtcf_block_cb_decref().
[...]
Pablo Neira Ayuso
maintainerPATCH v3 7/11 net: sched: use flow block API
In reply to Pablo Neira AyusoThis patch adds tcf_block_setup() which uses the flow block API.
This infrastructure takes the flow block callbacks coming from the driver and register/unregister to/from the cls_api core.
---
v3: call tcf_block_cb_free() - Jakub Kicinski.
tcf_block_setup() already deals with unroll (see err_unroll) in case of error, so it is undoing ndo_setup_tc().
net/sched/cls_api.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-)
net/sched/cls_api.c +89 -1
@@ -672,6 +672,9 @@ static void tc_indr_block_cb_del(struct tc_indr_block_cb *indr_block_cb)kfree (indr_block_cb); } +static int tcf_block_setup (struct tcf_block *block, +struct flow_block_offload *bo); +static void tc_indr_block_ing_cmd (struct tc_indr_block_dev *indr_dev,struct tc_indr_block_cb *indr_block_cb,enum flow_block_command command)
@@ -682,12 +685,14 @@ static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev, .net = dev_net(indr_dev->dev), .block = indr_dev->block, }; +INIT_LIST_HEAD (&bo.cb_list);if (!indr_dev->block)return ; indr_block_cb->cb (indr_dev->dev, indr_block_cb->cb_priv,TC_SETUP_BLOCK , &bo); +tcf_block_setup (indr_dev->block, &bo); } int __tc_indr_block_cb_register(struct net_device *dev, void *cb_priv,
@@ -772,6 +777,7 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev, .block = block, .extack = extack, }; +INIT_LIST_HEAD (&bo.cb_list); indr_dev =tc_indr_block_dev_lookup (dev);if (!indr_dev)
@@ -782,6 +788,8 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev,list_for_each_entry (indr_block_cb, &indr_dev->cb_list, list) indr_block_cb->cb (dev, indr_block_cb->cb_priv,TC_SETUP_BLOCK , &bo); + +tcf_block_setup (block, &bo); }static bool tcf_block_offload_in_use (struct tcf_block *block)
@@ -796,13 +804,20 @@ static int tcf_block_offload_cmd(struct tcf_block *block, struct netlink_ext_ack *extack) {struct tc_block_offload bo = {}; +int err; bo.net =dev_net (dev); bo.command = command; bo.binder_type = ei->binder_type; bo.block = block; bo.extack = extack; -return dev->netdev_ops->ndo_setup_tc (dev,TC_SETUP_BLOCK , &bo); +INIT_LIST_HEAD (&bo.cb_list); + + err = dev->netdev_ops->ndo_setup_tc (dev,TC_SETUP_BLOCK , &bo); +if (err <0 ) +return err; + +return tcf_block_setup (block, &bo); } static int tcf_block_offload_bind(struct tcf_block *block, struct Qdisc *q,
@@ -1636,6 +1651,79 @@ void tcf_block_cb_unregister(struct tcf_block *block, }EXPORT_SYMBOL (tcf_block_cb_unregister); +static int tcf_block_bind (struct tcf_block *block, +struct flow_block_offload *bo) +{ +struct flow_block_cb *block_cb, *next; +int err, i =0 ; + +list_for_each_entry (block_cb, &bo->cb_list, driver_list) { + err =tcf_block_playback_offloads (block, block_cb->cb, + block_cb->cb_priv, true, +tcf_block_offload_in_use (block), + bo->extack); +if (err) + goto err_unroll; + +list_add (&block_cb->list, &block->cb_list); + i++; + } +list_splice (&bo->cb_list, bo->driver_block_list); + +return 0 ; + +err_unroll: +list_for_each_entry_safe (block_cb, next, &bo->cb_list, driver_list) { +if (i-- >0 ) { +list_del (&block_cb->list); +tcf_block_playback_offloads (block, block_cb->cb, + block_cb->cb_priv, false, +tcf_block_offload_in_use (block), +NULL ); + } +flow_block_cb_free (block_cb); + } + +return err; +} + +static void tcf_block_unbind (struct tcf_block *block, +struct flow_block_offload *bo) +{ +struct flow_block_cb *block_cb, *next; + +list_for_each_entry_safe (block_cb, next, &bo->cb_list, driver_list) { +list_del (&block_cb->driver_list); +tcf_block_playback_offloads (block, block_cb->cb, + block_cb->cb_priv, false, +tcf_block_offload_in_use (block), +NULL ); +list_del (&block_cb->list); +flow_block_cb_free (block_cb); + } +} + +static int tcf_block_setup (struct tcf_block *block, +struct flow_block_offload *bo) +{ +int err; + +switch (bo->command) { +case FLOW_BLOCK_BIND : + err =tcf_block_bind (block, bo); +break ; +case FLOW_BLOCK_UNBIND : + err =0 ; +tcf_block_unbind (block, bo); +break ; +default : +WARN_ON_ONCE (1 ); + err = -EOPNOTSUPP ; + } + +return err; +} +/* Main classifier routine: scans classifier chain attached * to this qdisc, (optionally) tests for protocol and asks * specific classifiers.
Signature · 1 line
2.11.0
Jiri Pirko
maintainerRe: [PATCH net-next,v3 07/11] net: sched: use flow block API
Quoted 6 lines · Mon, Jul 08, 2019 at 06:06:09PM CEST, [email protected] wrote:
This patch adds
tcf_block_setup()which uses the flow block API.This infrastructure takes the flow block callbacks coming from the driver and register/unregister to/from the
cls_apicore.Signed-off-by Pablo Neira Ayuso <[email protected]>
[...]
Quoted 8 lines
net/sched/cls_api.c +8
-0+static int tcf_block_bind (struct tcf_block *block, +struct flow_block_offload *bo) +{ +struct flow_block_cb *block_cb, *next; +int err, i =0 ; + +list_for_each_entry (block_cb, &bo->cb_list, driver_list) { + err = tcf_block_playback_offloads(block, block_cb->cb,
net/sched/cls_api.c void tcf_block_cb_unregister(struct tcf_block *block, · line 1671
Quoted 10 lines
net/sched/cls_api.c +10
-0+ block_cb->cb_priv, true, +tcf_block_offload_in_use (block), + bo->extack); +if (err) + goto err_unroll; + +list_add (&block_cb->list, &block->cb_list); + i++; + } +list_splice (&bo->cb_list, bo->driver_block_list);
This cl/driver_block list magic is really very hard to follow. Could you please make it more clear?
Quoted 33 lines
net/sched/cls_api.c +33
-0+ +return 0 ; + +err_unroll: +list_for_each_entry_safe (block_cb, next, &bo->cb_list, driver_list) { +if (i-- >0 ) { +list_del (&block_cb->list); +tcf_block_playback_offloads (block, block_cb->cb, + block_cb->cb_priv, false, +tcf_block_offload_in_use (block), +NULL ); + } +flow_block_cb_free (block_cb); + } + +return err; +} + +static void tcf_block_unbind (struct tcf_block *block, +struct flow_block_offload *bo) +{ +struct flow_block_cb *block_cb, *next; + +list_for_each_entry_safe (block_cb, next, &bo->cb_list, driver_list) { +list_del (&block_cb->driver_list); +tcf_block_playback_offloads (block, block_cb->cb, + block_cb->cb_priv, false, +tcf_block_offload_in_use (block), +NULL ); +list_del (&block_cb->list); +flow_block_cb_free (block_cb); + } +}
[...]
Pablo Neira Ayuso
maintainerPATCH v3 8/11 drivers: net: use flow block API
In reply to Pablo Neira AyusoThis patch updates flow_block_cb_setup_simple() to use the flow block API. Several drivers are also adjusted to use it.
This patch introduces the per-driver list of flow blocks to account for blocks that are already in use.
Remove tc_block_offload alias.
---
v3: incorrect list name variables in several drivers - Jakub Kicinski.
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 5 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 5 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 5 +- drivers/net/ethernet/intel/igb/igb_main.c | 5 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 40 +++++++--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 91 +++++++++++++--------- drivers/net/ethernet/mscc/ocelot_ace.h | 4 +- drivers/net/ethernet/mscc/ocelot_flower.c | 45 ++++++----- drivers/net/ethernet/mscc/ocelot_tc.c | 33 +++++--- drivers/net/ethernet/netronome/nfp/abm/cls.c | 7 +- drivers/net/ethernet/netronome/nfp/abm/main.h | 2 +- drivers/net/ethernet/netronome/nfp/bpf/main.c | 5 +- .../net/ethernet/netronome/nfp/flower/offload.c | 65 +++++++++++----- drivers/net/ethernet/qlogic/qede/qede_main.c | 5 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 +- drivers/net/netdevsim/netdev.c | 5 +- include/net/flow_offload.h | 3 +- include/net/pkt_cls.h | 2 - net/core/flow_offload.c | 19 ++++- net/dsa/slave.c | 22 +++++- net/sched/cls_api.c | 14 ++-- 25 files changed, 275 insertions(+), 132 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 -1
@@ -9847,6 +9847,8 @@ static int bnxt_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } +static LIST_HEAD (bnxt_block_cb_list); +static int bnxt_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) {
@@ -9854,7 +9856,8 @@ static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type,switch (type) {case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &bnxt_block_cb_list, bnxt_setup_tc_block_cb, bp, bp, true);case TC_SETUP_QDISC_MQPRIO : {
drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c +4 -1
@@ -161,6 +161,8 @@ static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type, } } +static LIST_HEAD (bnxt_vf_block_cb_list); +static int bnxt_vf_rep_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) {
@@ -168,7 +170,8 @@ static int bnxt_vf_rep_setup_tc(struct net_device *dev, enum tc_setup_type type,switch (type) {case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &bnxt_vf_block_cb_list, bnxt_vf_rep_setup_tc_block_cb, vf_rep, vf_rep, true);default :
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +4 -1
@@ -3190,6 +3190,8 @@ static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } +static LIST_HEAD (cxgb_block_cb_list); +static int cxgb_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) {
@@ -3197,7 +3199,8 @@ static int cxgb_setup_tc(struct net_device *dev, enum tc_setup_type type,switch (type) {case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &cxgb_block_cb_list, cxgb_setup_tc_block_cb, pi, dev, true);default :
drivers/net/ethernet/intel/i40e/i40e_main.c +4 -1
@@ -8177,6 +8177,8 @@ static int i40e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } +static LIST_HEAD (i40e_block_cb_list); +static int __i40e_setup_tc (struct net_device *netdev,enum tc_setup_type type,void *type_data) {
@@ -8186,7 +8188,8 @@ static int __i40e_setup_tc(struct net_device *netdev, enum tc_setup_type type,case TC_SETUP_QDISC_MQPRIO :return i40e_setup_tc (netdev, type_data);case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &i40e_block_cb_list, i40e_setup_tc_block_cb, np, np, true);default :
drivers/net/ethernet/intel/iavf/iavf_main.c +4 -1
@@ -3113,6 +3113,8 @@ static int iavf_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } +static LIST_HEAD (iavf_block_cb_list); +/** * iavf_setup_tc - configure multiple traffic classes * @netdev: network interface device structure
@@ -3133,7 +3135,8 @@ static int iavf_setup_tc(struct net_device *netdev, enum tc_setup_type type,case TC_SETUP_QDISC_MQPRIO :return __iavf_setup_tc (netdev, type_data);case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &iavf_block_cb_list, iavf_setup_tc_block_cb, adapter, adapter, true);default :
drivers/net/ethernet/intel/igb/igb_main.c +4 -1
@@ -2806,6 +2806,8 @@ static int igb_offload_txtime(struct igb_adapter *adapter,return 0 ; } +static LIST_HEAD (igb_block_cb_list); +static int igb_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) {
@@ -2815,7 +2817,8 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type,case TC_SETUP_QDISC_CBS :return igb_offload_cbs (adapter, type_data);case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &igb_block_cb_list, igb_setup_tc_block_cb, adapter, adapter, true);
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +4 -1
@@ -9614,6 +9614,8 @@ static int ixgbe_setup_tc_mqprio(struct net_device *dev,return ixgbe_setup_tc (dev, mqprio->num_tc); } +static LIST_HEAD (ixgbe_block_cb_list); +static int __ixgbe_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) {
@@ -9621,7 +9623,8 @@ static int __ixgbe_setup_tc(struct net_device *dev, enum tc_setup_type type,switch (type) {case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &ixgbe_block_cb_list, ixgbe_setup_tc_block_cb, adapter, adapter, true);case TC_SETUP_QDISC_MQPRIO :
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +4 -1
@@ -3459,6 +3459,8 @@ static int mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, }#endif +static LIST_HEAD (mlx5e_block_cb_list); +static int mlx5e_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) {
@@ -3467,7 +3469,8 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type,switch (type) {#ifdef CONFIG_MLX5_ESWITCH case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &mlx5e_block_cb_list, mlx5e_setup_tc_block_cb, priv, priv, true);#endif
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +28 -12
@@ -692,17 +692,29 @@ static int mlx5e_rep_indr_setup_block_cb(enum tc_setup_type type, } } +static void mlx5e_rep_indr_tc_block_unbind (void *cb_priv) +{ +struct mlx5e_rep_indr_block_priv *indr_priv = cb_priv; + +list_del (&indr_priv->list); +kfree (indr_priv); +} + +static LIST_HEAD (mlx5e_block_cb_list); +static int mlx5e_rep_indr_setup_tc_block (struct net_device *netdev,struct mlx5e_rep_priv *rpriv, -struct tc_block_offload *f) +struct flow_block_offload *f) {struct mlx5e_rep_indr_block_priv *indr_priv; -int err =0 ; +struct flow_block_cb *block_cb;if (f->binder_type !=FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS )return -EOPNOTSUPP ; + f->driver_block_list = &mlx5e_block_cb_list; +switch (f->command) {case FLOW_BLOCK_BIND : indr_priv =mlx5e_rep_indr_block_priv_lookup (rpriv, netdev);
@@ -718,26 +730,30 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev,list_add (&indr_priv->list, &rpriv->uplink_priv.tc_indr_block_priv_list); - err =tcf_block_cb_register (f->block, - mlx5e_rep_indr_setup_block_cb, - indr_priv, indr_priv, f->extack); -if (err) { + block_cb =flow_block_cb_alloc (f->net, + mlx5e_rep_indr_setup_block_cb, + indr_priv, indr_priv, + mlx5e_rep_indr_tc_block_unbind); +if (IS_ERR (block_cb)) {list_del (&indr_priv->list);kfree (indr_priv); +return PTR_ERR (block_cb); } +flow_block_cb_add (block_cb, f); -return err; +return 0 ;case FLOW_BLOCK_UNBIND : indr_priv =mlx5e_rep_indr_block_priv_lookup (rpriv, netdev);if (!indr_priv)return -ENOENT ; -tcf_block_cb_unregister (f->block, - mlx5e_rep_indr_setup_block_cb, - indr_priv); -list_del (&indr_priv->list); -kfree (indr_priv); + block_cb =flow_block_cb_lookup (f->net, &mlx5e_block_cb_list, + mlx5e_rep_indr_setup_block_cb, + indr_priv); +if (!block_cb) +return -ENOENT ; +flow_block_cb_remove (block_cb, f);return 0 ;default :return -EOPNOTSUPP ;
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +56 -35
159 lines not on this page · raw message
drivers/net/ethernet/mscc/ocelot_ace.h +2 -2
@@ -225,8 +225,8 @@ int ocelot_ace_init(struct ocelot *ocelot);void ocelot_ace_deinit (void );int ocelot_setup_tc_block_flower_bind (struct ocelot_port *port, -struct tc_block_offload *f); +struct flow_block_offload *f);void ocelot_setup_tc_block_flower_unbind (struct ocelot_port *port, -struct tc_block_offload *f); +struct flow_block_offload *f);#endif /* _MSCC_OCELOT_ACE_H_ */
drivers/net/ethernet/mscc/ocelot_flower.c +24 -21
80 lines not on this page · raw message
drivers/net/ethernet/mscc/ocelot_tc.c +24 -9
@@ -128,35 +128,50 @@ static int ocelot_setup_tc_block_cb_eg(enum tc_setup_type type, cb_priv, false); } +static LIST_HEAD (ocelot_block_cb_list); +static int ocelot_setup_tc_block (struct ocelot_port *port, -struct tc_block_offload *f) +struct flow_block_offload *f) { +struct flow_block_cb *block_cb;tc_setup_cb_t *cb; -int ret; +int err;netdev_dbg (port->dev,"tc_block command %d, binder_type %d\n" , f->command, f->binder_type);if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ) { cb = ocelot_setup_tc_block_cb_ig; - port->tc.block_shared =tcf_block_shared (f->block); + port->tc.block_shared = f->block_shared; }else if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS ) { cb = ocelot_setup_tc_block_cb_eg; }else {return -EOPNOTSUPP ; } + f->driver_block_list = &ocelot_block_cb_list; +switch (f->command) {case FLOW_BLOCK_BIND : - ret =tcf_block_cb_register (f->block, cb, port, - port, f->extack); -if (ret) -return ret; + block_cb =flow_block_cb_alloc (f->net, cb, port, port,NULL ); +if (IS_ERR (block_cb)) +return PTR_ERR (block_cb); -return ocelot_setup_tc_block_flower_bind (port, f); + err =ocelot_setup_tc_block_flower_bind (port, f); +if (err <0 ) { +flow_block_cb_free (block_cb); +return err; + } +flow_block_cb_add (block_cb, f); +return 0 ;case FLOW_BLOCK_UNBIND : + block_cb =flow_block_cb_lookup (f->net, &ocelot_block_cb_list, + cb, port); +if (!block_cb) +return -ENOENT ; +ocelot_setup_tc_block_flower_unbind (port, f); -tcf_block_cb_unregister (f->block, cb, port); +flow_block_cb_remove (block_cb, f);return 0 ;default :return -EOPNOTSUPP ;
drivers/net/ethernet/netronome/nfp/abm/cls.c +5 -2
@@ -262,9 +262,12 @@ static int nfp_abm_setup_tc_block_cb(enum tc_setup_type type, } } +static LIST_HEAD (nfp_abm_block_cb_list); +int nfp_abm_setup_cls_block (struct net_device *netdev,struct nfp_repr *repr, -struct tc_block_offload *f) +struct flow_block_offload *f) { -return flow_block_cb_setup_simple (f,NULL , nfp_abm_setup_tc_block_cb, +return flow_block_cb_setup_simple (f, &nfp_abm_block_cb_list, + nfp_abm_setup_tc_block_cb, repr, repr, true); }
drivers/net/ethernet/netronome/nfp/abm/main.h +1 -1
@@ -247,7 +247,7 @@ int nfp_abm_setup_tc_mq(struct net_device *netdev, struct nfp_abm_link *alink,int nfp_abm_setup_tc_gred (struct net_device *netdev,struct nfp_abm_link *alink,struct tc_gred_qopt_offload *opt);int nfp_abm_setup_cls_block (struct net_device *netdev,struct nfp_repr *repr, -struct tc_block_offload *opt); +struct flow_block_offload *opt);int nfp_abm_ctrl_read_params (struct nfp_abm_link *alink);int nfp_abm_ctrl_find_addrs (struct nfp_abm *abm);
drivers/net/ethernet/netronome/nfp/bpf/main.c +4 -1
@@ -160,6 +160,8 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type,return 0 ; } +static LIST_HEAD (nfp_bfp_block_cb_list); +static int nfp_bpf_setup_tc (struct nfp_app *app,struct net_device *netdev,enum tc_setup_type type,void *type_data) {
@@ -167,7 +169,8 @@ static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev,switch (type) {case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &nfp_bfp_block_cb_list, nfp_bpf_setup_tc_block_cb, nn, nn, true);default :
drivers/net/ethernet/netronome/nfp/flower/offload.c +45 -20
111 lines not on this page · raw message
drivers/net/ethernet/qlogic/qede/qede_main.c +4 -1
@@ -579,6 +579,8 @@ static int qede_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } +static LIST_HEAD (qede_block_cb_list); +static int qede_setup_tc_offload (struct net_device *dev,enum tc_setup_type type,void *type_data)
@@ -588,7 +590,8 @@ qede_setup_tc_offload(struct net_device *dev, enum tc_setup_type type,switch (type) {case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &qede_block_cb_list, qede_setup_tc_block_cb, edev, edev, true);case TC_SETUP_QDISC_MQPRIO :
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4 -1
@@ -3853,6 +3853,8 @@ static int stmmac_setup_tc_block_cb(enum tc_setup_type type, void *type_data,return ret; } +static LIST_HEAD (stmmac_block_cb_list); +static int stmmac_setup_tc (struct net_device *ndev,enum tc_setup_type type,void *type_data) {
@@ -3860,7 +3862,8 @@ static int stmmac_setup_tc(struct net_device *ndev, enum tc_setup_type type,switch (type) {case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &stmmac_block_cb_list, stmmac_setup_tc_block_cb, priv, priv, true);case TC_SETUP_QDISC_CBS :
drivers/net/netdevsim/netdev.c +4 -1
@@ -203,6 +203,8 @@ static int nsim_set_vf_link_state(struct net_device *dev, int vf, int state)return 0 ; } +static LIST_HEAD (nsim_block_cb_list); +static int nsim_setup_tc (struct net_device *dev,enum tc_setup_type type,void *type_data) {
@@ -210,7 +212,8 @@ nsim_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data)switch (type) {case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &nsim_block_cb_list, nsim_setup_tc_block_cb, ns, ns, true);default :
include/net/flow_offload.h +1 -2
@@ -244,13 +244,12 @@ enum flow_block_binder_type { FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS, }; -struct tcf_block ;struct netlink_ext_ack ;struct flow_block_offload {enum flow_block_command command;enum flow_block_binder_type binder_type; -struct tcf_block *block; +bool block_shared;struct net *net;struct list_head cb_list;struct list_head *driver_block_list;
include/net/pkt_cls.h +0 -2
@@ -26,8 +26,6 @@ struct tcf_walker {int register_tcf_proto_ops (struct tcf_proto_ops *ops);int unregister_tcf_proto_ops (struct tcf_proto_ops *ops); -#define tc_block_offload flow_block_offload -struct tcf_block_ext_info {enum flow_block_binder_type binder_type;tcf_chain_head_change_t *chain_head_change;
net/core/flow_offload.c +15 -4
@@ -2,7 +2,6 @@#include <linux/kernel.h> #include <linux/slab.h> #include <net/flow_offload.h> -#include <net/pkt_cls.h> struct flow_rule *flow_rule_alloc (unsigned int num_actions) {
@@ -235,6 +234,8 @@ int flow_block_cb_setup_simple(struct flow_block_offload *f, tc_setup_cb_t *cb, void *cb_ident, void *cb_priv, bool ingress_only) { +struct flow_block_cb *block_cb; +if (ingress_only && f->binder_type !=FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS )return -EOPNOTSUPP ;
@@ -243,10 +244,20 @@ int flow_block_cb_setup_simple(struct flow_block_offload *f,switch (f->command) {case FLOW_BLOCK_BIND : -return tcf_block_cb_register (f->block, cb, cb_ident, cb_priv, - f->extack); + block_cb =flow_block_cb_alloc (f->net, cb, cb_ident, + cb_priv,NULL ); +if (IS_ERR (block_cb)) +return PTR_ERR (block_cb); + +flow_block_cb_add (block_cb, f); +return 0 ;case FLOW_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, cb, cb_ident); + block_cb =flow_block_cb_lookup (f->net, driver_block_list, + cb, cb_ident); +if (!block_cb) +return -ENOENT ; + +flow_block_cb_remove (block_cb, f);return 0 ;default :return -EOPNOTSUPP ;
net/dsa/slave.c +19 -3
@@ -942,9 +942,12 @@ static int dsa_slave_setup_tc_block_cb_eg(enum tc_setup_type type,return dsa_slave_setup_tc_block_cb (type, type_data, cb_priv, false); } +static LIST_HEAD (dsa_slave_block_cb_list); +static int dsa_slave_setup_tc_block (struct net_device *dev, -struct tc_block_offload *f) +struct flow_block_offload *f) { +struct flow_block_cb *block_cb;tc_setup_cb_t *cb;if (f->binder_type ==FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS )
@@ -954,11 +957,24 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,else return -EOPNOTSUPP ; + f->driver_block_list = &dsa_slave_block_cb_list; +switch (f->command) {case FLOW_BLOCK_BIND : -return tcf_block_cb_register (f->block, cb, dev, dev, f->extack); + block_cb =flow_block_cb_alloc (f->net, cb, dev, dev,NULL ); +if (IS_ERR (block_cb)) +return PTR_ERR (block_cb); + +flow_block_cb_add (block_cb, f); +return 0 ;case FLOW_BLOCK_UNBIND : -tcf_block_cb_unregister (f->block, cb, dev); + block_cb =flow_block_cb_lookup (f->net, + &dsa_slave_block_cb_list, + cb, dev); +if (!block_cb) +return -ENOENT ; + +flow_block_cb_remove (block_cb, f);return 0 ;default :return -EOPNOTSUPP ;
net/sched/cls_api.c +7 -7
@@ -679,11 +679,11 @@ static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev,struct tc_indr_block_cb *indr_block_cb, enum flow_block_command command) { - struct tc_block_offload bo = { + struct flow_block_offload bo = { .command = command, .binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS , .net =dev_net (indr_dev->dev), - .block = indr_dev->block, + .block_shared =tcf_block_shared (indr_dev->block), };INIT_LIST_HEAD (&bo.cb_list);
@@ -770,11 +770,11 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev, {struct tc_indr_block_cb *indr_block_cb;struct tc_indr_block_dev *indr_dev; -struct tc_block_offload bo = { +struct flow_block_offload bo = { .command = command, .binder_type = ei->binder_type, .net =dev_net (dev), - .block = block, + .block_shared =tcf_block_shared (block), .extack = extack, };INIT_LIST_HEAD (&bo.cb_list);
@@ -803,13 +803,13 @@ static int tcf_block_offload_cmd(struct tcf_block *block,enum flow_block_command command, struct netlink_ext_ack *extack) { - struct tc_block_offload bo = {}; + struct flow_block_offload bo = {};int err; bo.net =dev_net (dev); bo.command = command; bo.binder_type = ei->binder_type; - bo.block = block; + bo.block_shared =tcf_block_shared (block); bo.extack = extack;INIT_LIST_HEAD (&bo.cb_list);
@@ -3246,7 +3246,7 @@ EXPORT_SYMBOL(tcf_exts_dump_stats);int tc_setup_cb_call (struct tcf_block *block,enum tc_setup_type type,void *type_data,bool err_stop) { -struct tcf_block_cb *block_cb; +struct flow_block_cb *block_cb;int ok_count =0 ;int err;
Signature · 1 line
2.11.0
Re: [PATCH net-next,v3 08/11] drivers: net: use flow block API
drivers/net/ethernet/netronome/nfp/bpf/main.c static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type, · line 163
Quoted 9 lines · Pablo Neira Ayuso
drivers/net/ethernet/netronome/nfp/bpf/main.c +1
-0@@ -160,6 +160,8 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type,return 0 ; } +static LIST_HEAD (nfp_bfp_block_cb_list);
This still says bfp.
Quoted 14 lines
drivers/net/ethernet/netronome/nfp/bpf/main.c +3
-1+static int nfp_bpf_setup_tc (struct nfp_app *app,struct net_device *netdev,enum tc_setup_type type,void *type_data) {@@ -167,7 +169,8 @@ static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev,switch (type) {case TC_SETUP_BLOCK : -return flow_block_cb_setup_simple (type_data,NULL , +return flow_block_cb_setup_simple (type_data, + &nfp_bfp_block_cb_list, nfp_bpf_setup_tc_block_cb, nn, nn, true);default :
Pablo Neira Ayuso
maintainerPATCH v3 9/11 net: sched: remove tcf block API
In reply to Pablo Neira AyusoUnused, now replaced by flow block API.
---
v3: remove tcf_block_cb_priv(), tcf_block_cb_lookup(), tcf_block_cb_incref()
tcf_block_cb_decref() too.
Formely known as "net: sched: remove tcf_block_cb_{register,unregister}()"
include/net/pkt_cls.h | 69 ------------------------------------ net/sched/cls_api.c | 98 --------------------------------------------------- 2 files changed, 167 deletions(-)
include/net/pkt_cls.h +0 -69
@@ -66,22 +66,6 @@ static inline struct Qdisc *tcf_block_q(struct tcf_block *block)return block->q; } -void *tcf_block_cb_priv (struct tcf_block_cb *block_cb); -struct tcf_block_cb *tcf_block_cb_lookup (struct tcf_block *block, -tc_setup_cb_t *cb,void *cb_ident); -void tcf_block_cb_incref (struct tcf_block_cb *block_cb); -unsigned int tcf_block_cb_decref (struct tcf_block_cb *block_cb); -struct tcf_block_cb *__tcf_block_cb_register (struct tcf_block *block, -tc_setup_cb_t *cb,void *cb_ident, -void *cb_priv, -struct netlink_ext_ack *extack); -int tcf_block_cb_register (struct tcf_block *block, -tc_setup_cb_t *cb,void *cb_ident, -void *cb_priv,struct netlink_ext_ack *extack); -void __tcf_block_cb_unregister (struct tcf_block *block, -struct tcf_block_cb *block_cb); -void tcf_block_cb_unregister (struct tcf_block *block, -tc_setup_cb_t *cb,void *cb_ident);int __tc_indr_block_cb_register (struct net_device *dev,void *cb_priv,tc_indr_block_bind_cb_t *cb,void *cb_ident); int tc_indr_block_cb_register(struct net_device *dev, void *cb_priv,
@@ -145,59 +129,6 @@ void tc_setup_cb_block_unregister(struct tcf_block *block, tc_setup_cb_t *cb, }static inline -void *tcf_block_cb_priv (struct tcf_block_cb *block_cb) -{ -return NULL ; -} - -static inline -struct tcf_block_cb *tcf_block_cb_lookup (struct tcf_block *block, -tc_setup_cb_t *cb,void *cb_ident) -{ -return NULL ; -} - -static inline -void tcf_block_cb_incref (struct tcf_block_cb *block_cb) -{ -} - -static inline -unsigned int tcf_block_cb_decref (struct tcf_block_cb *block_cb) -{ -return 0 ; -} - -static inline -struct tcf_block_cb *__tcf_block_cb_register (struct tcf_block *block, -tc_setup_cb_t *cb,void *cb_ident, -void *cb_priv, -struct netlink_ext_ack *extack) -{ -return NULL ; -} - -static inline -int tcf_block_cb_register (struct tcf_block *block, -tc_setup_cb_t *cb,void *cb_ident, -void *cb_priv,struct netlink_ext_ack *extack) -{ -return 0 ; -} - -static inline -void __tcf_block_cb_unregister (struct tcf_block *block, -struct tcf_block_cb *block_cb) -{ -} - -static inline -void tcf_block_cb_unregister (struct tcf_block *block, -tc_setup_cb_t *cb,void *cb_ident) -{ -} - -static inline int __tc_indr_block_cb_register (struct net_device *dev,void *cb_priv,tc_indr_block_bind_cb_t *cb,void *cb_ident) {
net/sched/cls_api.c +0 -98
110 lines not on this page · raw message
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH v3 10/11 net: flow_offload: add flow_block_cb_is_busy() and use it
In reply to Pablo Neira AyusoThis patch adds a function to check if flow block callback is already in use. Call this new function from flow_block_cb_setup_simple() and from drivers.
---
v3: formerly known as "net: flow_offload: don't allow subsystem to reuse blocks"
add flow_block_cb_is_busy() helper. Call it per driver to make it easier to remove this whenever the first driver client support for multiple subsystem offloads.
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 ++++ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 ++++ drivers/net/ethernet/mscc/ocelot_tc.c | 3 +++ drivers/net/ethernet/netronome/nfp/flower/offload.c | 4 ++++ include/net/flow_offload.h | 3 +++ net/core/flow_offload.c | 18 ++++++++++++++++++ net/dsa/slave.c | 3 +++ 7 files changed, 39 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +4 -0
@@ -721,6 +721,10 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev,if (indr_priv)return -EEXIST ; +if (flow_block_cb_is_busy (mlx5e_rep_indr_setup_block_cb, + indr_priv, &mlx5e_block_cb_list)) +return -EBUSY ; + indr_priv =kmalloc (sizeof (*indr_priv),GFP_KERNEL );if (!indr_priv)return -ENOMEM ;
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +4 -0
@@ -1696,6 +1696,10 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,switch (f->command) {case FLOW_BLOCK_BIND : +if (flow_block_cb_is_busy (cb, mlxsw_sp_port, + &mlxsw_sp_block_cb_list)) +return -EBUSY ; + block_cb =flow_block_cb_alloc (f->net, cb, mlxsw_sp_port, mlxsw_sp_port,NULL );if (IS_ERR (block_cb))
drivers/net/ethernet/mscc/ocelot_tc.c +3 -0
@@ -153,6 +153,9 @@ static int ocelot_setup_tc_block(struct ocelot_port *port,switch (f->command) {case FLOW_BLOCK_BIND : +if (flow_block_cb_is_busy (cb, port, &ocelot_block_cb_list)) +return -EBUSY ; + block_cb =flow_block_cb_alloc (f->net, cb, port, port,NULL );if (IS_ERR (block_cb))return PTR_ERR (block_cb);
drivers/net/ethernet/netronome/nfp/flower/offload.c +4 -0
@@ -1320,6 +1320,10 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev,switch (f->command) {case FLOW_BLOCK_BIND : +if (flow_block_cb_is_busy (nfp_flower_setup_tc_block_cb, repr, + &nfp_block_cb_list)) +return -EBUSY ; + block_cb =flow_block_cb_alloc (f->net, nfp_flower_setup_tc_block_cb, repr, repr,NULL );
include/net/flow_offload.h +3 -0
@@ -292,6 +292,9 @@ static inline void flow_block_cb_remove(struct flow_block_cb *block_cb,list_move (&block_cb->driver_list, &offload->cb_list); } +bool flow_block_cb_is_busy (tc_setup_cb_t *cb,void *cb_ident, +struct list_head *driver_block_list); +int flow_block_cb_setup_simple (struct flow_block_offload *f,struct list_head *driver_list,tc_setup_cb_t *cb,void *cb_ident,void *cb_priv,bool ingress_only);
net/core/flow_offload.c +18 -0
@@ -229,6 +229,21 @@ unsigned int flow_block_cb_decref(struct flow_block_cb *block_cb) }EXPORT_SYMBOL (flow_block_cb_decref); +bool flow_block_cb_is_busy (tc_setup_cb_t *cb,void *cb_ident, +struct list_head *driver_block_list) +{ +struct flow_block_cb *block_cb; + +list_for_each_entry (block_cb, driver_block_list, driver_list) { +if (block_cb->cb == cb && + block_cb->cb_ident == cb_ident) +return true; + } + +return false; +} +EXPORT_SYMBOL (flow_block_cb_is_busy); + int flow_block_cb_setup_simple(struct flow_block_offload *f, struct list_head *driver_block_list, tc_setup_cb_t *cb, void *cb_ident, void *cb_priv,
@@ -244,6 +259,9 @@ int flow_block_cb_setup_simple(struct flow_block_offload *f,switch (f->command) {case FLOW_BLOCK_BIND : +if (flow_block_cb_is_busy (cb, cb_ident, driver_block_list)) +return -EBUSY ; + block_cb =flow_block_cb_alloc (f->net, cb, cb_ident, cb_priv,NULL );if (IS_ERR (block_cb))
net/dsa/slave.c +3 -0
@@ -961,6 +961,9 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,switch (f->command) {case FLOW_BLOCK_BIND : +if (flow_block_cb_is_busy (cb, dev, &dsa_slave_block_cb_list)) +return -EBUSY ; + block_cb =flow_block_cb_alloc (f->net, cb, dev, dev,NULL );if (IS_ERR (block_cb))return PTR_ERR (block_cb);
Signature · 1 line
2.11.0
Jiri Pirko
maintainerRe: [PATCH net-next,v3 10/11] net: flow_offload: add flow_block_cb_is_busy() and use it
Quoted 25 lines · Mon, Jul 08, 2019 at 06:06:12PM CEST, [email protected] wrote:
This patch adds a function to check if flow block callback is already in use. Call this new function from
flow_block_cb_setup_simple()and from drivers.Signed-off-by Pablo Neira Ayuso <[email protected]>---
v3: formerly known as "net:flow_offload: don't allow subsystem to reuse blocks"
addflow_block_cb_is_busy()helper. Call it per driver to make it easier to remove this whenever the first driver client support for multiple subsystem offloads.drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 ++++ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 ++++ drivers/net/ethernet/mscc/ocelot_tc.c | 3 +++ drivers/net/ethernet/netronome/nfp/flower/offload.c | 4 ++++ include/net/flow_offload.h | 3 +++ net/core/flow_offload.c | 18 ++++++++++++++++++ net/dsa/slave.c | 3 +++ 7 files changed, 39 insertions(+)drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +0
-0
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c mlx5e_rep_indr_setup_tc_block(struct net_device *netdev, · line 725
Quoted 5 lines
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +2
-0@@ -721,6 +721,10 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev,if (indr_priv)return -EEXIST ; +if (flow_block_cb_is_busy (mlx5e_rep_indr_setup_block_cb, + indr_priv, &mlx5e_block_cb_list))
As I already asked for in another patch in this set, it would be really much much better to have some wrapping struct instead of plain list head here.
[...]
Jiri Pirko
maintainerRe: [PATCH net-next,v3 10/11] net: flow_offload: add flow_block_cb_is_busy() and use it
In reply to Pablo Neira AyusoMon, Jul 08, 2019 at 06:06:12PM CEST, [email protected] wrote:
[...]
Quoted 1 line
+bool flow_block_cb_is_busy(tc_setup_cb_t *cb, void
*cb_ident,
There should be another patch before this one renaming tc_setup_cb_t and ndo_setup_tc. This is not TC specific anymore now, it might confuse the reader.
[...]
Pablo Neira Ayuso
maintainerPATCH v3 11/11 netfilter: nf_tables: add hardware offload support
In reply to Pablo Neira AyusoThis patch adds hardware offload support for nftables through the existing netdev_ops->ndo_setup_tc() interface, the TC_SETUP_CLSFLOWER classifier and the flow rule API. This hardware offload support is available for the NFPROTO_NETDEV family and the ingress hook.
Each nftables expression has a new ->offload interface, that is used to populate the flow rule object that is attached to the transaction object.
There is a new per-table NFT_TABLE_F_HW flag, that is set on to offload an entire table, including all of its chains.
This patch supports for basic metadata (layer 3 and 4 protocol numbers), 5-tuple payload matching and the accept/drop actions; this also includes basechain hardware offload only.
---
v3: no changes.
include/net/netfilter/nf_tables.h | 13 ++ include/net/netfilter/nf_tables_offload.h | 76 +++++++++ include/uapi/linux/netfilter/nf_tables.h | 2 + net/netfilter/Makefile | 2 +- net/netfilter/nf_tables_api.c | 22 ++- net/netfilter/nf_tables_offload.c | 261 ++++++++++++++++++++++++++++++ net/netfilter/nft_cmp.c | 53 ++++++ net/netfilter/nft_immediate.c | 31 ++++ net/netfilter/nft_meta.c | 27 ++++ net/netfilter/nft_payload.c | 187 +++++++++++++++++++++ 10 files changed, 671 insertions(+), 3 deletions(-) create mode 100644 include/net/netfilter/nf_tables_offload.h create mode 100644 net/netfilter/nf_tables_offload.c
include/net/netfilter/nf_tables.h +13 -0
@@ -161,6 +161,7 @@ struct nft_ctx {const struct nlattr *const *nla;u32 portid;u32 seq; +u16 flags;u8 family;u8 level;bool report;
@@ -735,6 +736,9 @@ enum nft_trans_phase { NFT_TRANS_RELEASE }; +struct nft_flow_rule ; +struct nft_offload_ctx ; +/** * struct nft_expr_ops - nf_tables expression operations *
@@ -777,6 +781,10 @@ struct nft_expr_ops { const struct nft_data **data);bool (*gc)(struct net *net,const struct nft_expr *expr); +int (*offload)(struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr); +u32 offload_flags;const struct nft_expr_type *type;void *data; };
@@ -942,6 +950,7 @@ struct nft_stats {* @stats: per-cpu chain stats * @chain: the chain * @dev_name: device name that this base chain is attached to (if any) +* @cb_list: list of flow block callbacks (for hardware offload) */ struct nft_base_chain {struct nf_hook_ops ops;
@@ -951,6 +960,7 @@ struct nft_base_chain {struct nft_stats __percpu *stats;struct nft_chain chain;char dev_name[IFNAMSIZ ]; +struct list_head cb_list; };static inline struct nft_base_chain *nft_base_chain (const struct nft_chain *chain)
@@ -1322,11 +1332,14 @@ struct nft_trans {struct nft_trans_rule {struct nft_rule *rule; +struct nft_flow_rule *flow;u32 rule_id; };#define nft_trans_rule (trans) \ (((struct nft_trans_rule *)trans->data)->rule) +#define nft_trans_flow_rule (trans) \ + (((struct nft_trans_rule *)trans->data)->flow)#define nft_trans_rule_id (trans) \ (((struct nft_trans_rule *)trans->data)->rule_id)
include/net/netfilter/nf_tables_offload.h new file +76 -0
76 lines not on this page · raw message
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -158,9 +158,11 @@ enum nft_hook_attributes {* enum nft_table_flags - nf_tables table flags * * @NFT_TABLE_F_DORMANT: this table is not active +* @NFT_TABLE_F_HW_OFFLOAD: enable hardware offload */ enum nft_table_flags {NFT_TABLE_F_DORMANT =0x1 , +NFT_TABLE_F_HW_OFFLOAD =0x2 , };/**
net/netfilter/Makefile +1 -1
@@ -78,7 +78,7 @@ nf_tables-objs := nf_tables_core.o nf_tables_api.o nft_chain_filter.o \ nf_tables_trace.o nft_immediate.o nft_cmp.o nft_range.o \ nft_bitwise.o nft_byteorder.o nft_payload.o nft_lookup.o \ nft_dynset.o nft_meta.o nft_rt.o nft_exthdr.o \ - nft_chain_route.o + nft_chain_route.o nf_tables_offload.o nf_tables_set-objs := nf_tables_set_core.o \ nft_set_hash.o nft_set_bitmap.o nft_set_rbtree.o
net/netfilter/nf_tables_api.c +20 -2
@@ -18,6 +18,7 @@#include <net/netfilter/nf_flow_table.h> #include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_offload.h> #include <net/net_namespace.h> #include <net/sock.h>
@@ -97,6 +98,7 @@ static void nft_ctx_init(struct nft_ctx *ctx, ctx->nla = nla; ctx->portid =NETLINK_CB (skb).portid; ctx->report =nlmsg_report (nlh); + ctx->flags = nlh->nlmsg_flags; ctx->seq = nlh->nlmsg_seq; }
@@ -896,7 +898,7 @@ static int nf_tables_newtable(struct net *net, struct sock *nlsk,if (nla[NFTA_TABLE_FLAGS ]) { flags =ntohl (nla_get_be32 (nla[NFTA_TABLE_FLAGS ])); -if (flags & ~NFT_TABLE_F_DORMANT ) +if (flags & ~(NFT_TABLE_F_DORMANT |NFT_TABLE_F_HW_OFFLOAD ))return -EINVAL ; }
@@ -1659,6 +1661,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, chain->flags |=NFT_BASE_CHAIN ; basechain->policy =NF_ACCEPT ; +INIT_LIST_HEAD (&basechain->cb_list); }else { chain =kzalloc (sizeof (*chain),GFP_KERNEL );if (chain ==NULL )
@@ -2638,6 +2641,7 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,u8 genmask =nft_genmask_next (net);struct nft_expr_info *info =NULL ;int family = nfmsg->nfgen_family; +struct nft_flow_rule *flow;struct nft_table *table;struct nft_chain *chain;struct nft_rule *rule, *old_rule =NULL ;
@@ -2784,7 +2788,8 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,list_add_tail_rcu (&rule->list, &old_rule->list); }else { -if (nft_trans_rule_add (&ctx,NFT_MSG_NEWRULE , rule) ==NULL ) { + trans =nft_trans_rule_add (&ctx,NFT_MSG_NEWRULE , rule); +if (!trans) { err = -ENOMEM ; goto err2; }
@@ -2807,6 +2812,14 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,if (net->nft.validate_state ==NFT_VALIDATE_DO )return nft_table_validate (net, table); +if (table->flags &NFT_TABLE_F_HW_OFFLOAD ) { + flow =nft_flow_rule_create (rule); +if (IS_ERR (flow)) +return PTR_ERR (flow); + +nft_trans_flow_rule (trans) = flow; + } +return 0 ; err2:nf_tables_rule_release (&ctx, rule);
@@ -6604,6 +6617,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)struct nft_trans_elem *te;struct nft_chain *chain;struct nft_table *table; +int err;if (list_empty (&net->nft.commit_list)) {mutex_unlock (&net->nft.commit_mutex);
@@ -6614,6 +6628,10 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)if (nf_tables_validate (net) <0 )return -EAGAIN ; + err =nft_flow_rule_offload_commit (net); +if (err <0 ) +return err; +/* 1. Allocate space for next generation rules_gen_X[] */ list_for_each_entry_safe (trans, next, &net->nft.commit_list, list) {int ret;
net/netfilter/nf_tables_offload.c new file +261 -0
261 lines not on this page · raw message
net/netfilter/nft_cmp.c +53 -0
83 lines not on this page · raw message
net/netfilter/nft_immediate.c +31 -0
@@ -13,6 +13,7 @@#include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_offload.h> void nft_immediate_eval(const struct nft_expr *expr, struct nft_regs *regs,
@@ -124,6 +125,34 @@ static int nft_immediate_validate(const struct nft_ctx *ctx,return 0 ; } +static int nft_immediate_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr) +{ +const struct nft_immediate_expr *priv =nft_expr_priv (expr); +struct flow_action_entry *entry; +const struct nft_data *data; + +if (priv->dreg !=NFT_REG_VERDICT ) +return -EOPNOTSUPP ; + + entry = &flow->rule->action.entries[ctx->num_actions++]; + + data = &priv->data; +switch (data->verdict.code) { +case NF_ACCEPT : + entry->id =FLOW_ACTION_ACCEPT ; +break ; +case NF_DROP : + entry->id =FLOW_ACTION_DROP ; +break ; +default : +return -EOPNOTSUPP ; + } + +return 0 ; +} +static const struct nft_expr_ops nft_imm_ops = { .type = &nft_imm_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_immediate_expr )),
@@ -133,6 +162,8 @@ static const struct nft_expr_ops nft_imm_ops = { .deactivate = nft_immediate_deactivate, .dump = nft_immediate_dump, .validate = nft_immediate_validate, + .offload = nft_immediate_offload, + .offload_flags = NFT_OFFLOAD_F_ACTION, };struct nft_expr_type nft_imm_type__read_mostly = {
net/netfilter/nft_meta.c +27 -0
@@ -21,6 +21,7 @@#include <net/tcp_states.h> /* for TCP_TIME_WAIT */ #include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> +#include <net/netfilter/nf_tables_offload.h> #include <uapi/linux/netfilter_bridge.h> /* NF_BR_PRE_ROUTING */
@@ -515,6 +516,31 @@ static void nft_meta_set_destroy(const struct nft_ctx *ctx,static_branch_dec (&nft_trace_enabled); } +static int nft_meta_get_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr) +{ +const struct nft_meta *priv =nft_expr_priv (expr); +struct nft_offload_reg *reg = &ctx->regs[priv->dreg]; + +switch (priv->key) { +case NFT_META_PROTOCOL : +NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_BASIC , basic, n_proto, +sizeof (__u16), reg); +nft_offload_set_dependency (ctx,NFT_OFFLOAD_DEP_NETWORK ); +break ; +case NFT_META_L4PROTO : +NFT_OFFLOAD_MATCH (FLOW_DISSECTOR_KEY_BASIC , basic, ip_proto, +sizeof (__u8), reg); +nft_offload_set_dependency (ctx,NFT_OFFLOAD_DEP_TRANSPORT ); +break ; +default : +return -EOPNOTSUPP ; + } + +return 0 ; +} +static const struct nft_expr_ops nft_meta_get_ops = { .type = &nft_meta_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_meta )),
@@ -522,6 +548,7 @@ static const struct nft_expr_ops nft_meta_get_ops = { .init = nft_meta_get_init, .dump = nft_meta_get_dump, .validate = nft_meta_get_validate, + .offload = nft_meta_get_offload, };static const struct nft_expr_ops nft_meta_set_ops = {
net/netfilter/nft_payload.c +187 -0
215 lines not on this page · raw message
Signature · 1 line
2.11.0
Re: [PATCH net-next,v3 11/11] netfilter: nf_tables: add hardware offload support
Quoted 9 lines · Pablo Neira Ayuso
This patch adds hardware offload support for nftables through the existing
netdev_ops->ndo_setup_tc()interface, theTC_SETUP_CLSFLOWERclassifier and the flow rule API. This hardware offload support is available for theNFPROTO_NETDEVfamily and the ingress hook.Each nftables expression has a new ->offload interface, that is used to populate the flow rule object that is attached to the transaction object.
Quoted 8 lines
There is a new per-table
NFT_TABLE_F_HWflag, that is set on to offload an entire table, including all of its chains.This patch supports for basic metadata (layer 3 and 4 protocol numbers), 5-tuple payload matching and the accept/drop actions; this also includes basechain hardware offload only.
Signed-off-by Pablo Neira Ayuso <[email protected]>
Any particular reason to not fence this off with a device feature (ethtool -k)? Then you wouldn't need that per-driver list abomination until drivers start advertising it.. IDK if we want the per-device offload enable flags or not in general, it seems like a good idea in general for admin to be able to disable offload per device 🤷
Quoted 16 lines
net/netfilter/nf_tables_offload.c new file +16
-0+static int nft_flow_offload_rule (struct nft_trans *trans, +enum tc_fl_command command) +{ +struct nft_flow_rule *flow =nft_trans_flow_rule (trans); +struct nft_rule *rule =nft_trans_rule (trans); +struct tc_cls_flower_offload cls_flower = {}; +struct nft_base_chain *basechain; +struct netlink_ext_ack extack; +__be16 proto =ETH_P_ALL ; + +if (!nft_is_base_chain (trans->ctx.chain)) +return -EOPNOTSUPP ; + + basechain =nft_base_chain (trans->ctx.chain); + +if (flow)
net/netfilter/nf_tables_offload.c line 152
Quoted 10 lines
net/netfilter/nf_tables_offload.c new file +10
-0+ proto = flow->proto; + +nft_flow_offload_common_init (&cls_flower.common, proto, &extack); + cls_flower.command = command; + cls_flower.cookie = (unsigned long ) rule; +if (flow) + cls_flower.rule = flow->rule; + +return nft_setup_cb_call (basechain,TC_SETUP_CLSFLOWER , &cls_flower); +}
Are we 100% okay with using TC cls_flower structures and defines in nft code?
Jiri Pirko
maintainerRe: [PATCH net-next,v3 11/11] netfilter: nf_tables: add hardware offload support
Quoted 46 lines · Tue, Jul 09, 2019 at 03:44:37AM CEST, [email protected] wrote:
Quoted 9 lines · Pablo Neira Ayuso
This patch adds hardware offload support for nftables through the existing
netdev_ops->ndo_setup_tc()interface, theTC_SETUP_CLSFLOWERclassifier and the flow rule API. This hardware offload support is available for theNFPROTO_NETDEVfamily and the ingress hook.Each nftables expression has a new ->offload interface, that is used to populate the flow rule object that is attached to the transaction object.
Quoted 8 lines
There is a new per-table
NFT_TABLE_F_HWflag, that is set on to offload an entire table, including all of its chains.This patch supports for basic metadata (layer 3 and 4 protocol numbers), 5-tuple payload matching and the accept/drop actions; this also includes basechain hardware offload only.
Signed-off-by Pablo Neira Ayuso <[email protected]>Any particular reason to not fence this off with a device feature (ethtool -k)? Then you wouldn't need that per-driver list abomination until drivers start advertising it.. IDK if we want the per-device offload enable flags or not in general, it seems like a good idea in general for admin to be able to disable offload per device 🤷
Quoted 21 lines
net/netfilter/nf_tables_offload.c new file +21
-0+static int nft_flow_offload_rule (struct nft_trans *trans, +enum tc_fl_command command) +{ +struct nft_flow_rule *flow =nft_trans_flow_rule (trans); +struct nft_rule *rule =nft_trans_rule (trans); +struct tc_cls_flower_offload cls_flower = {}; +struct nft_base_chain *basechain; +struct netlink_ext_ack extack; +__be16 proto =ETH_P_ALL ; + +if (!nft_is_base_chain (trans->ctx.chain)) +return -EOPNOTSUPP ; + + basechain =nft_base_chain (trans->ctx.chain); + +if (flow) + proto = flow->proto; + +nft_flow_offload_common_init (&cls_flower.common, proto, &extack); + cls_flower.command = command; + cls_flower.cookie = (unsigned long ) rule;
Quoted 8 lines
net/netfilter/nf_tables_offload.c line 152
Quoted 5 lines
net/netfilter/nf_tables_offload.c new file +5
-0+if (flow) + cls_flower.rule = flow->rule; + +return nft_setup_cb_call (basechain,TC_SETUP_CLSFLOWER , &cls_flower); +}Are we 100% okay with using TC
cls_flowerstructures and defines in nft code?
Yeah, your right. Should be renamed and moved to "flow offload" as well.
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Mon, 8 Jul 2019 18:06:02 +0200
Quoted 1 line
This patchset adds support for Netfilter hardware offloads.
Pablo if you can address Jiri's feedback fully and repost this by Tuesday (PST timezone) I will allow it into this merge window.
Thank you.