Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e95bc26 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

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.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2bb295f3

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+5 −21
Original line number Diff line number Diff line
@@ -9907,32 +9907,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -3113,35 +3113,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
@@ -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;

	}