From: Chuck Lever <chuck.lever@oracle.com>
To: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Cc: Chien Yen <chien.yen@oracle.com>,
davem@davemloft.net, rds-devel@oss.oracle.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] rds: rds_cong_queue_updates needs to defer the congestion update transmission
Date: Tue, 10 Feb 2015 11:50:39 -0500 [thread overview]
Message-ID: <E0CB7D17-5ACB-4860-847E-BB0C01CBB65A@oracle.com> (raw)
In-Reply-To: <20150210142214.GO337@oracle.com>
On Feb 10, 2015, at 9:22 AM, Sowmini Varadhan <sowmini.varadhan@oracle.com> wrote:
>
> This patch fixes a sock_lock deadlock in the rds_cong_queue_update path.
Note that the deadlock appears to exist only with TCP transports.
> We cannot inline the call to rds_send_xmit from rds_cong_queue_update
> because
> (a) we are already holding the sock_lock in the recv path, and
> will deadlock when tcp_setsockopt/tcp_sendmsg try to get the sock
> lock
> (b) cong_queue_update does an irqsave on the rds_cong_lock, and this
> will trigger warnings (for a good reason) from functions called
> out of sock_lock.
>
> Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
> ---
> net/rds/cong.c | 16 +++++++++++++++-
> 1 files changed, 15 insertions(+), 1 deletions(-)
>
> diff --git a/net/rds/cong.c b/net/rds/cong.c
> index e5b65ac..765d18f 100644
> --- a/net/rds/cong.c
> +++ b/net/rds/cong.c
> @@ -221,7 +221,21 @@ void rds_cong_queue_updates(struct rds_cong_map *map)
> list_for_each_entry(conn, &map->m_conn_list, c_map_item) {
> if (!test_and_set_bit(0, &conn->c_map_queued)) {
> rds_stats_inc(s_cong_update_queued);
> - rds_send_xmit(conn);
> + /* We cannot inline the call to rds_send_xmit() here
> + * for two reasons:
> + * 1. When we get here from the receive path, we
> + * are already holding the sock_lock (held by
> + * tcp_v4_rcv()). So inlining calls to
> + * tcp_setsockopt and/or tcp_sendmsg will deadlock
> + * when it tries to get the sock_lock())
> + * 2. Interrupts are masked so that we can mark the
> + * the port congested from both send and recv paths.
> + * (See comment around declaration of rds_cong_lock).
> + * An attempt to get the sock_lock() here will
> + * therefore trigger warnings.
> + * Defer the xmit to rds_send_worker() instead.
> + */
> + queue_delayed_work(rds_wq, &conn->c_send_w, 0);
> }
> }
>
> --
> 1.7.1
>
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
next prev parent reply other threads:[~2015-02-10 16:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-10 14:22 [PATCH] rds: rds_cong_queue_updates needs to defer the congestion update transmission Sowmini Varadhan
2015-02-10 16:50 ` Chuck Lever [this message]
2015-02-10 16:56 ` Sowmini Varadhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E0CB7D17-5ACB-4860-847E-BB0C01CBB65A@oracle.com \
--to=chuck.lever@oracle.com \
--cc=chien.yen@oracle.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rds-devel@oss.oracle.com \
--cc=sowmini.varadhan@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).