| Message ID | 20220211065220.88196-1-tonylu@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2e13bde1315373cf7e9fb7dc4330d0d2a6bd5417 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net/smc: Add comment for smc_tx_pending | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 11 Feb 2022 14:52:21 +0800 you wrote: > The previous patch introduces a lock-free version of smc_tx_work() to > solve unnecessary lock contention, which is expected to be held lock. > So this adds comment to remind people to keep an eye out for locks. > > Suggested-by: Stefan Raspl <raspl@linux.ibm.com> > Signed-off-by: Tony Lu <tonylu@linux.alibaba.com> > > [...] Here is the summary with links: - [net-next] net/smc: Add comment for smc_tx_pending https://git.kernel.org/netdev/net-next/c/2e13bde13153 You are awesome, thank you!
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c index a96ce162825e..5df3940d4543 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -611,6 +611,10 @@ int smc_tx_sndbuf_nonempty(struct smc_connection *conn) return rc; } +/* Wakeup sndbuf consumers from process context + * since there is more data to transmit. The caller + * must hold sock lock. + */ void smc_tx_pending(struct smc_connection *conn) { struct smc_sock *smc = container_of(conn, struct smc_sock, conn); @@ -626,7 +630,8 @@ void smc_tx_pending(struct smc_connection *conn) } /* Wakeup sndbuf consumers from process context - * since there is more data to transmit + * since there is more data to transmit in locked + * sock. */ void smc_tx_work(struct work_struct *work) {
The previous patch introduces a lock-free version of smc_tx_work() to solve unnecessary lock contention, which is expected to be held lock. So this adds comment to remind people to keep an eye out for locks. Suggested-by: Stefan Raspl <raspl@linux.ibm.com> Signed-off-by: Tony Lu <tonylu@linux.alibaba.com> --- net/smc/smc_tx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)