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

Commit b89d06ce authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'use-tc_cls_can_offload_and_chain0-throughout-the-drivers' 



Jakub Kicinski says:

====================
use tc_cls_can_offload_and_chain0() throughout the drivers

This set makes all drivers use a new tc_cls_can_offload_and_chain0()
helper which will set extack in case TC hw offload flag is disabled.

I chose to keep the new helper which also looks at the chain but
renamed it more appropriately.  The rationale being that most drivers
don't accept chains other than 0 and since we have to pass extack
to the helper we can as well pass the entire struct tc_cls_common_offload
and perform the most common checks.

This code makes the assumption that type_data in the callback can
be interpreted as struct tc_cls_common_offload, i.e. the real offload
structure has common part as the first member.  This allows us to
make the check once for all classifier types if driver supports
more than one.

v1:
 - drop the type validation in nfp and netdevsim.
v2:
 - reorder checks in patch 1;
 - split other changes from patch 1;
 - add the i40e patch in;
 - add one more test case - for chain 0 extack.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fdd6d771 baf6a07e

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

+2 −1
Original line number Diff line number Diff line
@@ -7778,7 +7778,8 @@ static int bnxt_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
{

	struct bnxt *bp = cb_priv;



	if (!bnxt_tc_flower_enabled(bp) || !tc_can_offload(bp->dev))

	if (!bnxt_tc_flower_enabled(bp) ||

	    !tc_cls_can_offload_and_chain0(bp->dev, type_data))

		return -EOPNOTSUPP;



	switch (type) {

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

+0 −3
Original line number Diff line number Diff line
@@ -1474,9 +1474,6 @@ int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid, 
{

	int rc = 0;



	if (cls_flower->common.chain_index)

		return -EOPNOTSUPP;



	switch (cls_flower->command) {

	case TC_CLSFLOWER_REPLACE:

		rc = bnxt_tc_add_flow(bp, src_fid, cls_flower);

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

+2 −1
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type, 
	struct bnxt *bp = vf_rep->bp;

	int vf_fid = bp->pf.vf[vf_rep->vf_idx].fw_fid;



	if (!bnxt_tc_flower_enabled(vf_rep->bp) || !tc_can_offload(bp->dev))

	if (!bnxt_tc_flower_enabled(vf_rep->bp) ||

	    !tc_cls_can_offload_and_chain0(bp->dev, type_data))

		return -EOPNOTSUPP;



	switch (type) {

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+1 −7
Original line number Diff line number Diff line
@@ -2928,9 +2928,6 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate) 
static int cxgb_setup_tc_flower(struct net_device *dev,

				struct tc_cls_flower_offload *cls_flower)

{

	if (cls_flower->common.chain_index)

		return -EOPNOTSUPP;



	switch (cls_flower->command) {

	case TC_CLSFLOWER_REPLACE:

		return cxgb4_tc_flower_replace(dev, cls_flower);
@@ -2946,9 +2943,6 @@ static int cxgb_setup_tc_flower(struct net_device *dev, 
static int cxgb_setup_tc_cls_u32(struct net_device *dev,

				 struct tc_cls_u32_offload *cls_u32)

{

	if (cls_u32->common.chain_index)

		return -EOPNOTSUPP;



	switch (cls_u32->command) {

	case TC_CLSU32_NEW_KNODE:

	case TC_CLSU32_REPLACE_KNODE:
@@ -2974,7 +2968,7 @@ static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
		return -EINVAL;

	}



	if (!tc_can_offload(dev))

	if (!tc_cls_can_offload_and_chain0(dev, type_data))

		return -EOPNOTSUPP;



	switch (type) {

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −5
Original line number Diff line number Diff line
@@ -7437,11 +7437,6 @@ static int i40e_setup_tc_cls_flower(struct i40e_netdev_priv *np, 
{

	struct i40e_vsi *vsi = np->vsi;



	if (!tc_can_offload(vsi->netdev))

		return -EOPNOTSUPP;

	if (cls_flower->common.chain_index)

		return -EOPNOTSUPP;



	switch (cls_flower->command) {

	case TC_CLSFLOWER_REPLACE:

		return i40e_configure_clsflower(vsi, cls_flower);
@@ -7459,6 +7454,9 @@ static int i40e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
{

	struct i40e_netdev_priv *np = cb_priv;



	if (!tc_cls_can_offload_and_chain0(np->vsi->netdev, type_data))

		return -EOPNOTSUPP;



	switch (type) {

	case TC_SETUP_CLSFLOWER:

		return i40e_setup_tc_cls_flower(np, type_data);