@@ -90,13 +90,14 @@ static void stats_read(struct flow_stats *stats,
struct ovs_flow_stats *ovs_stats,
unsigned long *used, __be16 *tcp_flags)
{
- spin_lock(&stats->lock);
+ unsigned long flags;
+ spin_lock_irqsave(&stats->lock, flags);
if (time_after(stats->used, *used))
*used = stats->used;
*tcp_flags |= stats->tcp_flags;
ovs_stats->n_packets += stats->packet_count;
ovs_stats->n_bytes += stats->byte_count;
- spin_unlock(&stats->lock);
+ spin_unlock_irqrestore(&stats->lock, flags);
}
void ovs_flow_stats_get(struct sw_flow *flow, struct ovs_flow_stats *ovs_stats,
@@ -130,12 +131,13 @@ void ovs_flow_stats_get(struct sw_flow *flow, struct ovs_flow_stats *ovs_stats,
static void stats_reset(struct flow_stats *stats)
{
- spin_lock(&stats->lock);
+ unsigned long flags;
+ spin_lock_irqsave(&stats->lock, flags);
stats->used = 0;
stats->packet_count = 0;
stats->byte_count = 0;
stats->tcp_flags = 0;
- spin_unlock(&stats->lock);
+ spin_unlock_irqrestore(&stats->lock, flags);
}
void ovs_flow_stats_clear(struct sw_flow *flow)
The megaflow feature introduced per-CPU stats, and the new code did some refactoring as well [1]. However the new functions doesn't disable bottom halves when locking the stat, and as they can be called from userspace context, they can be interrupted by netif_receive_skb. [1] e298e50570: openvswitch: Per cpu flow stats. Signed-off-by: Zoltan Kiss <zoltan.kiss@citrix.com> --- net/openvswitch/flow.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html