diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-08-23 11:55:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-23 16:23:12 -0700 |
| commit | cff6a334e63420e95ec40dc7fcdc0b8258615760 (patch) | |
| tree | 0c63de6d61d8228c38e6ada5d7c7d131eaf10aff | |
| parent | 3c90a941eda4836b0492b7f44e596a2700c1d0d6 (diff) | |
| download | linux-rpi-cff6a334e63420e95ec40dc7fcdc0b8258615760.tar.gz linux-rpi-cff6a334e63420e95ec40dc7fcdc0b8258615760.tar.bz2 linux-rpi-cff6a334e63420e95ec40dc7fcdc0b8258615760.zip | |
strparser: Queue work when being unpaused
When the upper layer unpauses a stream parser connection we need to
queue rx_work to make sure no events are missed.
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/strparser.h | 5 | ||||
| -rw-r--r-- | net/strparser/strparser.c | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/net/strparser.h b/include/net/strparser.h index fdb3d6746cc4..91fa0b958426 100644 --- a/include/net/strparser.h +++ b/include/net/strparser.h @@ -88,10 +88,7 @@ static inline void strp_pause(struct strparser *strp) } /* May be called without holding lock for attached socket */ -static inline void strp_unpause(struct strparser *strp) -{ - strp->rx_paused = 0; -} +void strp_unpause(struct strparser *strp); static inline void save_strp_stats(struct strparser *strp, struct strp_aggr_stats *agg_stats) diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index 68334b56db1e..4ecfc10cbe6d 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -445,6 +445,17 @@ int strp_init(struct strparser *strp, struct sock *csk, } EXPORT_SYMBOL_GPL(strp_init); +void strp_unpause(struct strparser *strp) +{ + strp->rx_paused = 0; + + /* Sync setting rx_paused with RX work */ + smp_mb(); + + queue_work(strp_wq, &strp->rx_work); +} +EXPORT_SYMBOL_GPL(strp_unpause); + /* strp must already be stopped so that strp_tcp_recv will no longer be called. * Note that strp_done is not called with the lower socket held. */ |