Skip to content

Commit 061d631

Browse files
IoanaCiorneidavem330
IoanaCiornei
authored and
davem330
committed
dpaa2-eth: add support for devlink parser error drop traps
Add support for the new group of devlink traps - PARSER_ERROR_DROPS. This consists of registering the array of parser error drops supported, controlling their action through the .trap_group_action_set() callback and reporting an erroneous skb received on the error queue appropriately. DPAA2 devices do not support controlling the action of independent parser error traps, thus the .trap_action_set() callback just returns an EOPNOTSUPP while .trap_group_action_set() actually notifies the hardware what it should do with a frame marked as having a header error. Signed-off-by: Ioana Ciornei <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ceeb03a commit 061d631

File tree

3 files changed

+385
-1
lines changed

3 files changed

+385
-1
lines changed

‎drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c

Lines changed: 219 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,33 @@
33
/* Copyright 2020 NXP
44
*/
55

6+
#define DPAA2_ETH_TRAP_DROP(_id, _group_id) \
7+
DEVLINK_TRAP_GENERIC(DROP, DROP, _id, \
8+
DEVLINK_TRAP_GROUP_GENERIC_ID_##_group_id, 0)
9+
10+
static const struct devlink_trap_group dpaa2_eth_trap_groups_arr[] = {
11+
DEVLINK_TRAP_GROUP_GENERIC(PARSER_ERROR_DROPS, 0),
12+
};
13+
14+
static const struct devlink_trap dpaa2_eth_traps_arr[] = {
15+
DPAA2_ETH_TRAP_DROP(VXLAN_PARSING, PARSER_ERROR_DROPS),
16+
DPAA2_ETH_TRAP_DROP(LLC_SNAP_PARSING, PARSER_ERROR_DROPS),
17+
DPAA2_ETH_TRAP_DROP(VLAN_PARSING, PARSER_ERROR_DROPS),
18+
DPAA2_ETH_TRAP_DROP(PPPOE_PPP_PARSING, PARSER_ERROR_DROPS),
19+
DPAA2_ETH_TRAP_DROP(MPLS_PARSING, PARSER_ERROR_DROPS),
20+
DPAA2_ETH_TRAP_DROP(ARP_PARSING, PARSER_ERROR_DROPS),
21+
DPAA2_ETH_TRAP_DROP(IP_1_PARSING, PARSER_ERROR_DROPS),
22+
DPAA2_ETH_TRAP_DROP(IP_N_PARSING, PARSER_ERROR_DROPS),
23+
DPAA2_ETH_TRAP_DROP(GRE_PARSING, PARSER_ERROR_DROPS),
24+
DPAA2_ETH_TRAP_DROP(UDP_PARSING, PARSER_ERROR_DROPS),
25+
DPAA2_ETH_TRAP_DROP(TCP_PARSING, PARSER_ERROR_DROPS),
26+
DPAA2_ETH_TRAP_DROP(IPSEC_PARSING, PARSER_ERROR_DROPS),
27+
DPAA2_ETH_TRAP_DROP(SCTP_PARSING, PARSER_ERROR_DROPS),
28+
DPAA2_ETH_TRAP_DROP(DCCP_PARSING, PARSER_ERROR_DROPS),
29+
DPAA2_ETH_TRAP_DROP(GTP_PARSING, PARSER_ERROR_DROPS),
30+
DPAA2_ETH_TRAP_DROP(ESP_PARSING, PARSER_ERROR_DROPS),
31+
};
32+
633
static int dpaa2_eth_dl_info_get(struct devlink *devlink,
734
struct devlink_info_req *req,
835
struct netlink_ext_ack *extack)
@@ -24,8 +51,142 @@ static int dpaa2_eth_dl_info_get(struct devlink *devlink,
2451
return 0;
2552
}
2653

54+
static struct dpaa2_eth_trap_item *
55+
dpaa2_eth_dl_trap_item_lookup(struct dpaa2_eth_priv *priv, u16 trap_id)
56+
{
57+
struct dpaa2_eth_trap_data *dpaa2_eth_trap_data = priv->trap_data;
58+
int i;
59+
60+
for (i = 0; i < ARRAY_SIZE(dpaa2_eth_traps_arr); i++) {
61+
if (dpaa2_eth_traps_arr[i].id == trap_id)
62+
return &dpaa2_eth_trap_data->trap_items_arr[i];
63+
}
64+
65+
return NULL;
66+
}
67+
68+
struct dpaa2_eth_trap_item *dpaa2_eth_dl_get_trap(struct dpaa2_eth_priv *priv,
69+
struct dpaa2_fapr *fapr)
70+
{
71+
struct dpaa2_faf_error_bit {
72+
int position;
73+
enum devlink_trap_generic_id trap_id;
74+
} faf_bits[] = {
75+
{ .position = 5, .trap_id = DEVLINK_TRAP_GENERIC_ID_VXLAN_PARSING },
76+
{ .position = 20, .trap_id = DEVLINK_TRAP_GENERIC_ID_LLC_SNAP_PARSING },
77+
{ .position = 24, .trap_id = DEVLINK_TRAP_GENERIC_ID_VLAN_PARSING },
78+
{ .position = 26, .trap_id = DEVLINK_TRAP_GENERIC_ID_PPPOE_PPP_PARSING },
79+
{ .position = 29, .trap_id = DEVLINK_TRAP_GENERIC_ID_MPLS_PARSING },
80+
{ .position = 31, .trap_id = DEVLINK_TRAP_GENERIC_ID_ARP_PARSING },
81+
{ .position = 52, .trap_id = DEVLINK_TRAP_GENERIC_ID_IP_1_PARSING },
82+
{ .position = 61, .trap_id = DEVLINK_TRAP_GENERIC_ID_IP_N_PARSING },
83+
{ .position = 67, .trap_id = DEVLINK_TRAP_GENERIC_ID_GRE_PARSING },
84+
{ .position = 71, .trap_id = DEVLINK_TRAP_GENERIC_ID_UDP_PARSING },
85+
{ .position = 76, .trap_id = DEVLINK_TRAP_GENERIC_ID_TCP_PARSING },
86+
{ .position = 80, .trap_id = DEVLINK_TRAP_GENERIC_ID_IPSEC_PARSING },
87+
{ .position = 82, .trap_id = DEVLINK_TRAP_GENERIC_ID_SCTP_PARSING },
88+
{ .position = 84, .trap_id = DEVLINK_TRAP_GENERIC_ID_DCCP_PARSING },
89+
{ .position = 88, .trap_id = DEVLINK_TRAP_GENERIC_ID_GTP_PARSING },
90+
{ .position = 90, .trap_id = DEVLINK_TRAP_GENERIC_ID_ESP_PARSING },
91+
};
92+
u64 faf_word;
93+
u64 mask;
94+
int i;
95+
96+
for (i = 0; i < ARRAY_SIZE(faf_bits); i++) {
97+
if (faf_bits[i].position < 32) {
98+
/* Low part of FAF.
99+
* position ranges from 31 to 0, mask from 0 to 31.
100+
*/
101+
mask = 1ull << (31 - faf_bits[i].position);
102+
faf_word = __le32_to_cpu(fapr->faf_lo);
103+
} else {
104+
/* High part of FAF.
105+
* position ranges from 95 to 32, mask from 0 to 63.
106+
*/
107+
mask = 1ull << (63 - (faf_bits[i].position - 32));
108+
faf_word = __le64_to_cpu(fapr->faf_hi);
109+
}
110+
if (faf_word & mask)
111+
return dpaa2_eth_dl_trap_item_lookup(priv, faf_bits[i].trap_id);
112+
}
113+
return NULL;
114+
}
115+
116+
static int dpaa2_eth_dl_trap_init(struct devlink *devlink,
117+
const struct devlink_trap *trap,
118+
void *trap_ctx)
119+
{
120+
struct dpaa2_eth_devlink_priv *dl_priv = devlink_priv(devlink);
121+
struct dpaa2_eth_priv *priv = dl_priv->dpaa2_priv;
122+
struct dpaa2_eth_trap_item *dpaa2_eth_trap_item;
123+
124+
dpaa2_eth_trap_item = dpaa2_eth_dl_trap_item_lookup(priv, trap->id);
125+
if (WARN_ON(!dpaa2_eth_trap_item))
126+
return -ENOENT;
127+
128+
dpaa2_eth_trap_item->trap_ctx = trap_ctx;
129+
130+
return 0;
131+
}
132+
133+
static int dpaa2_eth_dl_trap_action_set(struct devlink *devlink,
134+
const struct devlink_trap *trap,
135+
enum devlink_trap_action action,
136+
struct netlink_ext_ack *extack)
137+
{
138+
/* No support for changing the action of an independent packet trap,
139+
* only per trap group - parser error drops
140+
*/
141+
NL_SET_ERR_MSG_MOD(extack,
142+
"Cannot change trap action independently of group");
143+
return -EOPNOTSUPP;
144+
}
145+
146+
static int dpaa2_eth_dl_trap_group_action_set(struct devlink *devlink,
147+
const struct devlink_trap_group *group,
148+
enum devlink_trap_action action,
149+
struct netlink_ext_ack *extack)
150+
{
151+
struct dpaa2_eth_devlink_priv *dl_priv = devlink_priv(devlink);
152+
struct dpaa2_eth_priv *priv = dl_priv->dpaa2_priv;
153+
struct net_device *net_dev = priv->net_dev;
154+
struct device *dev = net_dev->dev.parent;
155+
struct dpni_error_cfg err_cfg = {0};
156+
int err;
157+
158+
if (group->id != DEVLINK_TRAP_GROUP_GENERIC_ID_PARSER_ERROR_DROPS)
159+
return -EOPNOTSUPP;
160+
161+
/* Configure handling of frames marked as errors from the parser */
162+
err_cfg.errors = DPAA2_FAS_RX_ERR_MASK;
163+
err_cfg.set_frame_annotation = 1;
164+
165+
switch (action) {
166+
case DEVLINK_TRAP_ACTION_DROP:
167+
err_cfg.error_action = DPNI_ERROR_ACTION_DISCARD;
168+
break;
169+
case DEVLINK_TRAP_ACTION_TRAP:
170+
err_cfg.error_action = DPNI_ERROR_ACTION_SEND_TO_ERROR_QUEUE;
171+
break;
172+
default:
173+
return -EOPNOTSUPP;
174+
}
175+
176+
err = dpni_set_errors_behavior(priv->mc_io, 0, priv->mc_token, &err_cfg);
177+
if (err) {
178+
dev_err(dev, "dpni_set_errors_behavior failed\n");
179+
return err;
180+
}
181+
182+
return 0;
183+
}
184+
27185
static const struct devlink_ops dpaa2_eth_devlink_ops = {
28186
.info_get = dpaa2_eth_dl_info_get,
187+
.trap_init = dpaa2_eth_dl_trap_init,
188+
.trap_action_set = dpaa2_eth_dl_trap_action_set,
189+
.trap_group_action_set = dpaa2_eth_dl_trap_group_action_set,
29190
};
30191

31192
int dpaa2_eth_dl_register(struct dpaa2_eth_priv *priv)
@@ -88,3 +249,61 @@ void dpaa2_eth_dl_port_del(struct dpaa2_eth_priv *priv)
88249
devlink_port_type_clear(devlink_port);
89250
devlink_port_unregister(devlink_port);
90251
}
252+
253+
int dpaa2_eth_dl_traps_register(struct dpaa2_eth_priv *priv)
254+
{
255+
struct dpaa2_eth_trap_data *dpaa2_eth_trap_data;
256+
struct net_device *net_dev = priv->net_dev;
257+
struct device *dev = net_dev->dev.parent;
258+
int err;
259+
260+
dpaa2_eth_trap_data = kzalloc(sizeof(*dpaa2_eth_trap_data), GFP_KERNEL);
261+
if (!dpaa2_eth_trap_data)
262+
return -ENOMEM;
263+
priv->trap_data = dpaa2_eth_trap_data;
264+
265+
dpaa2_eth_trap_data->trap_items_arr = kcalloc(ARRAY_SIZE(dpaa2_eth_traps_arr),
266+
sizeof(struct dpaa2_eth_trap_item),
267+
GFP_KERNEL);
268+
if (!dpaa2_eth_trap_data->trap_items_arr) {
269+
err = -ENOMEM;
270+
goto trap_data_free;
271+
}
272+
273+
err = devlink_trap_groups_register(priv->devlink, dpaa2_eth_trap_groups_arr,
274+
ARRAY_SIZE(dpaa2_eth_trap_groups_arr));
275+
if (err) {
276+
dev_err(dev, "devlink_trap_groups_register() = %d\n", err);
277+
goto trap_items_arr_free;
278+
}
279+
280+
err = devlink_traps_register(priv->devlink, dpaa2_eth_traps_arr,
281+
ARRAY_SIZE(dpaa2_eth_traps_arr), priv);
282+
if (err) {
283+
dev_err(dev, "devlink_traps_register() = %d\n", err);
284+
goto trap_groups_unregiser;
285+
}
286+
287+
return 0;
288+
289+
trap_groups_unregiser:
290+
devlink_trap_groups_unregister(priv->devlink, dpaa2_eth_trap_groups_arr,
291+
ARRAY_SIZE(dpaa2_eth_trap_groups_arr));
292+
trap_items_arr_free:
293+
kfree(dpaa2_eth_trap_data->trap_items_arr);
294+
trap_data_free:
295+
kfree(dpaa2_eth_trap_data);
296+
priv->trap_data = NULL;
297+
298+
return err;
299+
}
300+
301+
void dpaa2_eth_dl_traps_unregister(struct dpaa2_eth_priv *priv)
302+
{
303+
devlink_traps_unregister(priv->devlink, dpaa2_eth_traps_arr,
304+
ARRAY_SIZE(dpaa2_eth_traps_arr));
305+
devlink_trap_groups_unregister(priv->devlink, dpaa2_eth_trap_groups_arr,
306+
ARRAY_SIZE(dpaa2_eth_trap_groups_arr));
307+
kfree(priv->trap_data->trap_items_arr);
308+
kfree(priv->trap_data);
309+
}

‎drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,58 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,
509509
percpu_stats->rx_dropped++;
510510
}
511511

512+
/* Processing of Rx frames received on the error FQ
513+
* We check and print the error bits and then free the frame
514+
*/
515+
static void dpaa2_eth_rx_err(struct dpaa2_eth_priv *priv,
516+
struct dpaa2_eth_channel *ch,
517+
const struct dpaa2_fd *fd,
518+
struct dpaa2_eth_fq *fq __always_unused)
519+
{
520+
struct device *dev = priv->net_dev->dev.parent;
521+
dma_addr_t addr = dpaa2_fd_get_addr(fd);
522+
u8 fd_format = dpaa2_fd_get_format(fd);
523+
struct rtnl_link_stats64 *percpu_stats;
524+
struct dpaa2_eth_trap_item *trap_item;
525+
struct dpaa2_fapr *fapr;
526+
struct sk_buff *skb;
527+
void *buf_data;
528+
void *vaddr;
529+
530+
vaddr = dpaa2_iova_to_virt(priv->iommu_domain, addr);
531+
dma_sync_single_for_cpu(dev, addr, priv->rx_buf_size,
532+
DMA_BIDIRECTIONAL);
533+
534+
buf_data = vaddr + dpaa2_fd_get_offset(fd);
535+
536+
if (fd_format == dpaa2_fd_single) {
537+
dma_unmap_page(dev, addr, priv->rx_buf_size,
538+
DMA_BIDIRECTIONAL);
539+
skb = dpaa2_eth_build_linear_skb(ch, fd, vaddr);
540+
} else if (fd_format == dpaa2_fd_sg) {
541+
dma_unmap_page(dev, addr, priv->rx_buf_size,
542+
DMA_BIDIRECTIONAL);
543+
skb = dpaa2_eth_build_frag_skb(priv, ch, buf_data);
544+
free_pages((unsigned long)vaddr, 0);
545+
} else {
546+
/* We don't support any other format */
547+
dpaa2_eth_free_rx_fd(priv, fd, vaddr);
548+
goto err_frame_format;
549+
}
550+
551+
fapr = dpaa2_get_fapr(vaddr, false);
552+
trap_item = dpaa2_eth_dl_get_trap(priv, fapr);
553+
if (trap_item)
554+
devlink_trap_report(priv->devlink, skb, trap_item->trap_ctx,
555+
&priv->devlink_port, NULL);
556+
consume_skb(skb);
557+
558+
err_frame_format:
559+
percpu_stats = this_cpu_ptr(priv->percpu_stats);
560+
percpu_stats->rx_errors++;
561+
ch->buf_count--;
562+
}
563+
512564
/* Consume all frames pull-dequeued into the store. This is the simplest way to
513565
* make sure we don't accidentally issue another volatile dequeue which would
514566
* overwrite (leak) frames already in the store.
@@ -2723,6 +2775,7 @@ static void dpaa2_eth_set_fq_affinity(struct dpaa2_eth_priv *priv)
27232775
fq = &priv->fq[i];
27242776
switch (fq->type) {
27252777
case DPAA2_RX_FQ:
2778+
case DPAA2_RX_ERR_FQ:
27262779
fq->target_cpu = rx_cpu;
27272780
rx_cpu = cpumask_next(rx_cpu, &priv->dpio_cpumask);
27282781
if (rx_cpu >= nr_cpu_ids)
@@ -2766,6 +2819,10 @@ static void dpaa2_eth_setup_fqs(struct dpaa2_eth_priv *priv)
27662819
}
27672820
}
27682821

2822+
/* We have exactly one Rx error queue per DPNI */
2823+
priv->fq[priv->num_fqs].type = DPAA2_RX_ERR_FQ;
2824+
priv->fq[priv->num_fqs++].consume = dpaa2_eth_rx_err;
2825+
27692826
/* For each FQ, decide on which core to process incoming frames */
27702827
dpaa2_eth_set_fq_affinity(priv);
27712828
}
@@ -3341,6 +3398,38 @@ static int dpaa2_eth_setup_tx_flow(struct dpaa2_eth_priv *priv,
33413398
return 0;
33423399
}
33433400

3401+
static int setup_rx_err_flow(struct dpaa2_eth_priv *priv,
3402+
struct dpaa2_eth_fq *fq)
3403+
{
3404+
struct device *dev = priv->net_dev->dev.parent;
3405+
struct dpni_queue q = { { 0 } };
3406+
struct dpni_queue_id qid;
3407+
u8 q_opt = DPNI_QUEUE_OPT_USER_CTX | DPNI_QUEUE_OPT_DEST;
3408+
int err;
3409+
3410+
err = dpni_get_queue(priv->mc_io, 0, priv->mc_token,
3411+
DPNI_QUEUE_RX_ERR, 0, 0, &q, &qid);
3412+
if (err) {
3413+
dev_err(dev, "dpni_get_queue() failed (%d)\n", err);
3414+
return err;
3415+
}
3416+
3417+
fq->fqid = qid.fqid;
3418+
3419+
q.destination.id = fq->channel->dpcon_id;
3420+
q.destination.type = DPNI_DEST_DPCON;
3421+
q.destination.priority = 1;
3422+
q.user_context = (u64)(uintptr_t)fq;
3423+
err = dpni_set_queue(priv->mc_io, 0, priv->mc_token,
3424+
DPNI_QUEUE_RX_ERR, 0, 0, q_opt, &q);
3425+
if (err) {
3426+
dev_err(dev, "dpni_set_queue() failed (%d)\n", err);
3427+
return err;
3428+
}
3429+
3430+
return 0;
3431+
}
3432+
33443433
/* Supported header fields for Rx hash distribution key */
33453434
static const struct dpaa2_eth_dist_fields dist_fields[] = {
33463435
{
@@ -3739,6 +3828,9 @@ static int dpaa2_eth_bind_dpni(struct dpaa2_eth_priv *priv)
37393828
case DPAA2_TX_CONF_FQ:
37403829
err = dpaa2_eth_setup_tx_flow(priv, &priv->fq[i]);
37413830
break;
3831+
case DPAA2_RX_ERR_FQ:
3832+
err = setup_rx_err_flow(priv, &priv->fq[i]);
3833+
break;
37423834
default:
37433835
dev_err(dev, "Invalid FQ type %d\n", priv->fq[i].type);
37443836
return -EINVAL;
@@ -4227,6 +4319,10 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)
42274319
if (err)
42284320
goto err_dl_register;
42294321

4322+
err = dpaa2_eth_dl_traps_register(priv);
4323+
if (err)
4324+
goto err_dl_trap_register;
4325+
42304326
err = dpaa2_eth_dl_port_add(priv);
42314327
if (err)
42324328
goto err_dl_port_add;
@@ -4247,6 +4343,8 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)
42474343
err_netdev_reg:
42484344
dpaa2_eth_dl_port_del(priv);
42494345
err_dl_port_add:
4346+
dpaa2_eth_dl_traps_unregister(priv);
4347+
err_dl_trap_register:
42504348
dpaa2_eth_dl_unregister(priv);
42514349
err_dl_register:
42524350
dpaa2_eth_disconnect_mac(priv);
@@ -4304,6 +4402,7 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)
43044402
unregister_netdev(net_dev);
43054403

43064404
dpaa2_eth_dl_port_del(priv);
4405+
dpaa2_eth_dl_traps_unregister(priv);
43074406
dpaa2_eth_dl_unregister(priv);
43084407

43094408
if (priv->do_link_poll)

0 commit comments

Comments
 (0)