From patchwork Mon Feb 9 17:18:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 5802421 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8D208BF90F for ; Mon, 9 Feb 2015 17:19:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3DA520121 for ; Mon, 9 Feb 2015 17:19:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC9062012D for ; Mon, 9 Feb 2015 17:19:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933169AbbBIRTH (ORCPT ); Mon, 9 Feb 2015 12:19:07 -0500 Received: from mail-ig0-f171.google.com ([209.85.213.171]:39470 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933602AbbBIRTE (ORCPT ); Mon, 9 Feb 2015 12:19:04 -0500 Received: by mail-ig0-f171.google.com with SMTP id h15so17798461igd.4 for ; Mon, 09 Feb 2015 09:19:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=uBBCrh1ZAijaKNigFyyiBziH91qbd66mKPH/JH+cfUg=; b=JpWHVjNsaVKZ02nI1gfOmINNEynK8kpe17bK7XAMgu1ltIFHMla4hQocQhco0pHPgC fd7Zc2R+qRCCKUt+R3qNnVWGitfsYPEh1jbUPlqU2N7XBFIB9b6Sglq1ZQjE4pKT1puz FJv+ewtY+wA4sNR823X/xE16kfJdq3e4gwGkacmxZ2keClWEbgAoG2+O/Eq141dyiSwz oG0tDYaK+C01qk8/JAkP6QrUjqsi42+wLs5nVrBpjY85uOUQEwlMmj53tSivYzc5qAef BBUbDVJi5D3b1l/hAk6XAE4PlgHNkBC1WclysWzOMQism4RXZIsde9jXmk0FflZDCri7 ZMbQ== X-Gm-Message-State: ALoCoQmrDkJyD3/NPGwDKuyMMzpQqNExYbLJ0oFjq+52xhv3Ey7YVer4kfK6QzfdRFuQ1sj4MoOw X-Received: by 10.43.140.68 with SMTP id iz4mr21873194icc.77.1423502343600; Mon, 09 Feb 2015 09:19:03 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-68-40-185-14.hsd1.mi.comcast.net. [68.40.185.14]) by mx.google.com with ESMTPSA id z9sm5927486igw.21.2015.02.09.09.19.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Feb 2015 09:19:03 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 13/14] SUNRPC: Handle connection reset more efficiently. Date: Mon, 9 Feb 2015 12:18:43 -0500 Message-Id: <1423502324-25981-14-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1423502324-25981-13-git-send-email-trond.myklebust@primarydata.com> References: <1423502324-25981-1-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-2-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-3-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-4-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-5-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-6-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-7-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-8-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-9-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-10-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-11-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-12-git-send-email-trond.myklebust@primarydata.com> <1423502324-25981-13-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the connection reset is due to an active call on our side, then the state change is sometimes not reported. Catch those instances using xs_error_report() instead. Also remove the xs_tcp_shutdown() call in xs_tcp_send_request() as the change in behaviour makes it redundant. Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index c72b13e2bdf5..540d542d85e5 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -718,7 +718,6 @@ static int xs_tcp_send_request(struct rpc_task *task) dprintk("RPC: sendmsg returned unrecognized error %d\n", -status); case -ECONNRESET: - xs_tcp_shutdown(xprt); case -ECONNREFUSED: case -ENOTCONN: case -EADDRINUSE: @@ -774,6 +773,21 @@ static void xs_restore_old_callbacks(struct sock_xprt *transport, struct sock *s sk->sk_error_report = transport->old_error_report; } +static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt) +{ + smp_mb__before_atomic(); + clear_bit(XPRT_CLOSE_WAIT, &xprt->state); + clear_bit(XPRT_CLOSING, &xprt->state); + smp_mb__after_atomic(); +} + +static void xs_sock_mark_closed(struct rpc_xprt *xprt) +{ + xs_sock_reset_connection_flags(xprt); + /* Mark transport as closed and wake up all pending tasks */ + xprt_disconnect_done(xprt); +} + /** * xs_error_report - callback to handle TCP socket state errors * @sk: socket @@ -793,6 +807,9 @@ static void xs_error_report(struct sock *sk) err = -sk->sk_err; if (err == 0) goto out; + /* Is this a reset event? */ + if (sk->sk_state == TCP_CLOSE) + xs_sock_mark_closed(xprt); dprintk("RPC: xs_error_report client %p, error=%d...\n", xprt, -err); trace_rpc_socket_error(xprt, sk->sk_socket, err); @@ -801,14 +818,6 @@ static void xs_error_report(struct sock *sk) read_unlock_bh(&sk->sk_callback_lock); } -static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt) -{ - smp_mb__before_atomic(); - clear_bit(XPRT_CLOSE_WAIT, &xprt->state); - clear_bit(XPRT_CLOSING, &xprt->state); - smp_mb__after_atomic(); -} - static void xs_reset_transport(struct sock_xprt *transport) { struct socket *sock = transport->sock; @@ -1421,13 +1430,6 @@ out: read_unlock_bh(&sk->sk_callback_lock); } -static void xs_sock_mark_closed(struct rpc_xprt *xprt) -{ - xs_sock_reset_connection_flags(xprt); - /* Mark transport as closed and wake up all pending tasks */ - xprt_disconnect_done(xprt); -} - /** * xs_tcp_state_change - callback to handle TCP socket state changes * @sk: socket whose state has changed