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

Commit d6787147 authored by Pieter Jansen van Vuuren's avatar Pieter Jansen van Vuuren Committed by David S. Miller
Browse files

net/sched: remove block pointer from common offload structure 



Based on feedback from Jiri avoid carrying a pointer to the tcf_block
structure in the tc_cls_common_offload structure. Instead store
a flag in driver private data which indicates if offloads apply
to a shared block at block binding time.

Suggested-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarPieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2e7ae67b

drivers/net/ethernet/netronome/nfp/flower/main.h

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ struct nfp_fl_qos { 
 * @lag_port_flags:	Extended port flags to record lag state of repr

 * @mac_offloaded:	Flag indicating a MAC address is offloaded for repr

 * @offloaded_mac_addr:	MAC address that has been offloaded for repr

 * @block_shared:	Flag indicating if offload applies to shared blocks

 * @mac_list:		List entry of reprs that share the same offloaded MAC

 * @qos_table:		Stored info on filters implementing qos

 */
@@ -223,6 +224,7 @@ struct nfp_flower_repr_priv { 
	unsigned long lag_port_flags;

	bool mac_offloaded;

	u8 offloaded_mac_addr[ETH_ALEN];

	bool block_shared;

	struct list_head mac_list;

	struct nfp_fl_qos qos_table;

};

drivers/net/ethernet/netronome/nfp/flower/offload.c

+4 −0
Original line number Diff line number Diff line
@@ -1197,10 +1197,14 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev, 
				     struct tc_block_offload *f)

{

	struct nfp_repr *repr = netdev_priv(netdev);

	struct nfp_flower_repr_priv *repr_priv;



	if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

		return -EOPNOTSUPP;



	repr_priv = repr->app_priv;

	repr_priv->block_shared = tcf_block_shared(f->block);



	switch (f->command) {

	case TC_BLOCK_BIND:

		return tcf_block_cb_register(f->block,

drivers/net/ethernet/netronome/nfp/flower/qos_conf.c

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,9 @@ nfp_flower_install_rate_limiter(struct nfp_app *app, struct net_device *netdev, 
		return -EOPNOTSUPP;

	}

	repr = netdev_priv(netdev);

	repr_priv = repr->app_priv;



	if (tcf_block_shared(flow->common.block)) {

	if (repr_priv->block_shared) {

		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload not supported on shared blocks");

		return -EOPNOTSUPP;

	}
@@ -123,7 +124,6 @@ nfp_flower_install_rate_limiter(struct nfp_app *app, struct net_device *netdev, 
	config->cir = cpu_to_be32(rate);

	nfp_ctrl_tx(repr->app->ctrl, skb);



	repr_priv = repr->app_priv;

	repr_priv->qos_table.netdev_port_id = netdev_port_id;

	fl_priv->qos_rate_limiters++;

	if (fl_priv->qos_rate_limiters == 1)

include/net/pkt_cls.h

+0 −3
Original line number Diff line number Diff line
@@ -629,7 +629,6 @@ struct tc_cls_common_offload { 
	u32 chain_index;

	__be16 protocol;

	u32 prio;

	struct tcf_block *block;

	struct netlink_ext_ack *extack;

};
@@ -731,13 +730,11 @@ static inline bool tc_in_hw(u32 flags) 
static inline void

tc_cls_common_offload_init(struct tc_cls_common_offload *cls_common,

			   const struct tcf_proto *tp, u32 flags,

			   struct tcf_block *block,

			   struct netlink_ext_ack *extack)

{

	cls_common->chain_index = tp->chain->index;

	cls_common->protocol = tp->protocol;

	cls_common->prio = tp->prio;

	cls_common->block = block;

	if (tc_skip_sw(flags) || flags & TCA_CLS_FLAGS_VERBOSE)

		cls_common->extack = extack;

}

net/sched/cls_bpf.c

+3 −5
Original line number Diff line number Diff line
@@ -157,8 +157,7 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog, 
	skip_sw = prog && tc_skip_sw(prog->gen_flags);

	obj = prog ?: oldprog;



	tc_cls_common_offload_init(&cls_bpf.common, tp, obj->gen_flags, block,

				   extack);

	tc_cls_common_offload_init(&cls_bpf.common, tp, obj->gen_flags, extack);

	cls_bpf.command = TC_CLSBPF_OFFLOAD;

	cls_bpf.exts = &obj->exts;

	cls_bpf.prog = prog ? prog->filter : NULL;
@@ -227,8 +226,7 @@ static void cls_bpf_offload_update_stats(struct tcf_proto *tp, 
	struct tcf_block *block = tp->chain->block;

	struct tc_cls_bpf_offload cls_bpf = {};



	tc_cls_common_offload_init(&cls_bpf.common, tp, prog->gen_flags, block,

				   NULL);

	tc_cls_common_offload_init(&cls_bpf.common, tp, prog->gen_flags, NULL);

	cls_bpf.command = TC_CLSBPF_STATS;

	cls_bpf.exts = &prog->exts;

	cls_bpf.prog = prog->filter;
@@ -670,7 +668,7 @@ static int cls_bpf_reoffload(struct tcf_proto *tp, bool add, tc_setup_cb_t *cb, 
			continue;



		tc_cls_common_offload_init(&cls_bpf.common, tp, prog->gen_flags,

					   block, extack);

					   extack);

		cls_bpf.command = TC_CLSBPF_OFFLOAD;

		cls_bpf.exts = &prog->exts;

		cls_bpf.prog = add ? prog->filter : NULL;