From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6324FC43387 for ; Wed, 26 Dec 2018 22:58:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EF942070B for ; Wed, 26 Dec 2018 22:58:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545865098; bh=cgRaQDezgxyggRZb2be2bGN1295kG+KCiQ5vXQxiH7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sIcwkgOyfBmv2eygtyXG44MFXNtYruxaiCokyByqmNncM6lKd6szBsA2mV2ha6Hp3 JEbPbiivfFl13tsx5SS9Jxab4+LY3HzEPF1TT6NadMw9uwIR9dWTXrbKXCLl6XDGXb IuGMld3TKrJtnwy9OLNklZx1agF3XgwCJm9PZ0LI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730469AbeLZW5c (ORCPT ); Wed, 26 Dec 2018 17:57:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:58524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729393AbeLZW5a (ORCPT ); Wed, 26 Dec 2018 17:57:30 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 19972214D8; Wed, 26 Dec 2018 22:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545865049; bh=cgRaQDezgxyggRZb2be2bGN1295kG+KCiQ5vXQxiH7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IIqGN2pjUsEeIzzxMjZOAE9yAhzNukCEBNbikI6/FgFY39HFLfD541VrNwz84lWpN 52UCb7A4NAN/8NKWoR1imGsDzw1PH0GV2d/5Vi308QTdXZoN6UNv3iaDRRCEYFK/bi Sj/5pQ5xckBjhir/uErtOMH3C45STQUZfd0OtBVM= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 15/21] SUNRPC: Fix a race with XPRT_CONNECTING Date: Wed, 26 Dec 2018 17:54:53 -0500 Message-Id: <20181226225501.151365-15-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181226225501.151365-1-sashal@kernel.org> References: <20181226225501.151365-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust [ Upstream commit cf76785d30712d90185455e752337acdb53d2a5d ] Ensure that we clear XPRT_CONNECTING before releasing the XPRT_LOCK so that we don't have races between the (asynchronous) socket setup code and tasks in xprt_connect(). Signed-off-by: Trond Myklebust Tested-by: Chuck Lever Signed-off-by: Sasha Levin --- net/sunrpc/xprtsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index c9c0976d3bbb..5047c20f4306 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2200,8 +2200,8 @@ static void xs_udp_setup_socket(struct work_struct *work) trace_rpc_socket_connect(xprt, sock, 0); status = 0; out: - xprt_unlock_connect(xprt, transport); xprt_clear_connecting(xprt); + xprt_unlock_connect(xprt, transport); xprt_wake_pending_tasks(xprt, status); } @@ -2374,8 +2374,8 @@ static void xs_tcp_setup_socket(struct work_struct *work) } status = -EAGAIN; out: - xprt_unlock_connect(xprt, transport); xprt_clear_connecting(xprt); + xprt_unlock_connect(xprt, transport); xprt_wake_pending_tasks(xprt, status); } -- 2.19.1