From patchwork Fri Feb 13 18:08:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 5826711 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 BED49BF440 for ; Fri, 13 Feb 2015 18:08:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EAD98200E0 for ; Fri, 13 Feb 2015 18:08:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01E0320265 for ; Fri, 13 Feb 2015 18:08:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751839AbbBMSI3 (ORCPT ); Fri, 13 Feb 2015 13:08:29 -0500 Received: from mail-ig0-f175.google.com ([209.85.213.175]:41442 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751409AbbBMSI2 (ORCPT ); Fri, 13 Feb 2015 13:08:28 -0500 Received: by mail-ig0-f175.google.com with SMTP id hn18so12189546igb.2 for ; Fri, 13 Feb 2015 10:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; bh=fvzI2UwQbu+Xj4GLOC9OtmoLYCq1EY2vx61YzyVStME=; b=f+VujBTTdZqwRSj7Qqaw2REql8nTFjOGgh2E8EE57w8rAorTlJTTeyW7d4JQoAXsvE kZw73AU/zZoVYCmzCzFD7FcigNOXJvhLg1wwS18GmLwgEeEBDDLB7Ng/5EjXknNsJwEC wl2/RWlxp+KKelzBBaY7ZukeB6db+ZvndRFncYiKrUKicHbdltdNM45ZM437oBisDCL8 6woKZV1/I/yqSfRlSIkBfGPaVaCIkUqWDzDZXPg4UVvXfAu6cePkoGPRj2QCnaNXojPt EQsfw9UwUy4yw3Laxn+vDF6VfZuyrIhRE5UbE5H+K+4m5BwHZNomkc97z5xWim072Wh3 xVXw== X-Received: by 10.107.12.13 with SMTP id w13mr13332009ioi.28.1423850907639; Fri, 13 Feb 2015 10:08:27 -0800 (PST) Received: from manet.1015granger.net ([2604:8800:100:81fc:82ee:73ff:fe43:d64f]) by mx.google.com with ESMTPSA id d6sm1372848iod.11.2015.02.13.10.08.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Feb 2015 10:08:26 -0800 (PST) Subject: [PATCH] SUNRPC: Always manipulate rpc_rqst::rq_bc_pa_list under xprt->bc_pa_lock From: Chuck Lever To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org Date: Fri, 13 Feb 2015 13:08:25 -0500 Message-ID: <20150213180513.10705.1546.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-3-g7d0f MIME-Version: 1.0 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,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 Other code that accesses rq_bc_pa_list holds xprt->bc_pa_lock. xprt_complete_bc_request() should do the same. Fixes: 2ea24497a1b3 ("SUNRPC: RPC callbacks may be split . . .") Signed-off-by: Chuck Lever --- How about this (compile-tested only)? net/sunrpc/backchannel_rqst.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c index 651f49a..9dd0ea8d 100644 --- a/net/sunrpc/backchannel_rqst.c +++ b/net/sunrpc/backchannel_rqst.c @@ -309,12 +309,15 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied) struct rpc_xprt *xprt = req->rq_xprt; struct svc_serv *bc_serv = xprt->bc_serv; + spin_lock(&xprt->bc_pa_lock); + list_del(&req->rq_bc_pa_list); + spin_unlock(&xprt->bc_pa_lock); + req->rq_private_buf.len = copied; set_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state); dprintk("RPC: add callback request to list\n"); spin_lock(&bc_serv->sv_cb_lock); - list_del(&req->rq_bc_pa_list); list_add(&req->rq_bc_list, &bc_serv->sv_cb_list); wake_up(&bc_serv->sv_cb_waitq); spin_unlock(&bc_serv->sv_cb_lock);