iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mscc-skb-lists'

Browse Source 
Yangbo Lu says:

====================
net: mscc: ocelot: fix potential issues accessing skbs list

Fix two prtential issues accessing skbs list.
- Break the matching loop when find the matching skb to avoid
  consuming more skbs incorrectly. The timestamp ID is only
  from 0 to 3 while the FIFO supports 128 timestamps at most.
- Convert to use skb queue instead of the list of skbs to provide
  protect with lock.

Changes for v2:
	- Split into two patches.
	- Converted to use skb queue.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2019-11-27 10:53:37 -08:00
commit a02e3991af
2 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/net/ethernet/mscc/ocelot.c
View File

@ -583,18 +583,10 @@ int ocelot_port_add_txtstamp_skb(struct ocelot_port *ocelot_port,
if (ocelot->ptp && shinfo->tx_flags & SKBTX_HW_TSTAMP && if (ocelot->ptp && shinfo->tx_flags & SKBTX_HW_TSTAMP &&
ocelot_port->ptp_cmd == IFH_REW_OP_TWO_STEP_PTP) { ocelot_port->ptp_cmd == IFH_REW_OP_TWO_STEP_PTP) {
struct ocelot_skb *oskb =
kzalloc(sizeof(struct ocelot_skb), GFP_ATOMIC);
if (unlikely(!oskb))
return -ENOMEM;
shinfo->tx_flags |= SKBTX_IN_PROGRESS; shinfo->tx_flags |= SKBTX_IN_PROGRESS;
/* Store timestamp ID in cb[0] of sk_buff */
oskb->skb = skb; skb->cb[0] = ocelot_port->ts_id % 4;
oskb->id = ocelot_port->ts_id % 4; skb_queue_tail(&ocelot_port->tx_skbs, skb);
list_add_tail(&oskb->head, &ocelot_port->skbs);
return 0; return 0;
} }
return -ENODATA; return -ENODATA;
@ -704,12 +696,11 @@ void ocelot_get_txtstamp(struct ocelot *ocelot)
int budget = OCELOT_PTP_QUEUE_SZ; int budget = OCELOT_PTP_QUEUE_SZ;
while (budget--) { while (budget--) {
struct sk_buff *skb, *skb_tmp, *skb_match = NULL;
struct skb_shared_hwtstamps shhwtstamps; struct skb_shared_hwtstamps shhwtstamps;
struct list_head *pos, *tmp;
struct sk_buff *skb = NULL;
struct ocelot_skb *entry;
struct ocelot_port *port; struct ocelot_port *port;
struct timespec64 ts; struct timespec64 ts;
unsigned long flags;
u32 val, id, txport; u32 val, id, txport;
val = ocelot_read(ocelot, SYS_PTP_STATUS); val = ocelot_read(ocelot, SYS_PTP_STATUS);
@ -727,21 +718,22 @@ void ocelot_get_txtstamp(struct ocelot *ocelot)
/* Retrieve its associated skb */ /* Retrieve its associated skb */
port = ocelot->ports[txport]; port = ocelot->ports[txport];
list_for_each_safe(pos, tmp, &port->skbs) { spin_lock_irqsave(&port->tx_skbs.lock, flags);
entry = list_entry(pos, struct ocelot_skb, head);
if (entry->id != id) skb_queue_walk_safe(&port->tx_skbs, skb, skb_tmp) {
if (skb->cb[0] != id)
continue; continue;
__skb_unlink(skb, &port->tx_skbs);
skb = entry->skb; skb_match = skb;
break;
list_del(pos);
kfree(entry);
} }
spin_unlock_irqrestore(&port->tx_skbs.lock, flags);
/* Next ts */ /* Next ts */
ocelot_write(ocelot, SYS_PTP_NXT_PTP_NXT, SYS_PTP_NXT); ocelot_write(ocelot, SYS_PTP_NXT_PTP_NXT, SYS_PTP_NXT);
if (unlikely(!skb)) if (unlikely(!skb_match))
continue; continue;
/* Get the h/w timestamp */ /* Get the h/w timestamp */
@ -750,9 +742,9 @@ void ocelot_get_txtstamp(struct ocelot *ocelot)
/* Set the timestamp into the skb */ /* Set the timestamp into the skb */
memset(&shhwtstamps, 0, sizeof(shhwtstamps)); memset(&shhwtstamps, 0, sizeof(shhwtstamps));
shhwtstamps.hwtstamp = ktime_set(ts.tv_sec, ts.tv_nsec); shhwtstamps.hwtstamp = ktime_set(ts.tv_sec, ts.tv_nsec);
skb_tstamp_tx(skb, &shhwtstamps); skb_tstamp_tx(skb_match, &shhwtstamps);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb_match);
} }
} }
EXPORT_SYMBOL(ocelot_get_txtstamp); EXPORT_SYMBOL(ocelot_get_txtstamp);
@ -2205,7 +2197,7 @@ void ocelot_init_port(struct ocelot *ocelot, int port)
{ {
struct ocelot_port *ocelot_port = ocelot->ports[port]; struct ocelot_port *ocelot_port = ocelot->ports[port];
INIT_LIST_HEAD(&ocelot_port->skbs); skb_queue_head_init(&ocelot_port->tx_skbs);
/* Basic L2 initialization */ /* Basic L2 initialization */
@ -2490,9 +2482,7 @@ EXPORT_SYMBOL(ocelot_init);
void ocelot_deinit(struct ocelot *ocelot) void ocelot_deinit(struct ocelot *ocelot)
{ {
struct list_head *pos, *tmp;
struct ocelot_port *port; struct ocelot_port *port;
struct ocelot_skb *entry;
int i; int i;
cancel_delayed_work(&ocelot->stats_work); cancel_delayed_work(&ocelot->stats_work);
@ -2502,14 +2492,7 @@ void ocelot_deinit(struct ocelot *ocelot)
for (i = 0; i < ocelot->num_phys_ports; i++) { for (i = 0; i < ocelot->num_phys_ports; i++) {
port = ocelot->ports[i]; port = ocelot->ports[i];
skb_queue_purge(&port->tx_skbs);
list_for_each_safe(pos, tmp, &port->skbs) {
entry = list_entry(pos, struct ocelot_skb, head);
list_del(pos);
dev_kfree_skb_any(entry->skb);
kfree(entry);
}
} }
} }
EXPORT_SYMBOL(ocelot_deinit); EXPORT_SYMBOL(ocelot_deinit);

9
include/soc/mscc/ocelot.h
View File

@ -406,13 +406,6 @@ struct ocelot_ops {
int (*reset)(struct ocelot *ocelot); int (*reset)(struct ocelot *ocelot);
}; };
struct ocelot_skb {
struct list_head head;
struct sk_buff *skb;
u8 id;
};
struct ocelot_port { struct ocelot_port {
struct ocelot *ocelot; struct ocelot *ocelot;
@ -425,7 +418,7 @@ struct ocelot_port {
u16 vid; u16 vid;
u8 ptp_cmd; u8 ptp_cmd;
struct list_head skbs; struct sk_buff_head tx_skbs;
u8 ts_id; u8 ts_id;
}; };