From patchwork Wed Nov 12 23:04:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 5292471 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ACE7F9F440 for ; Wed, 12 Nov 2014 23:04:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE96020176 for ; Wed, 12 Nov 2014 23:04:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9550020172 for ; Wed, 12 Nov 2014 23:04:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752352AbaKLXEM (ORCPT ); Wed, 12 Nov 2014 18:04:12 -0500 Received: from mail-ig0-f170.google.com ([209.85.213.170]:50993 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752195AbaKLXEM (ORCPT ); Wed, 12 Nov 2014 18:04:12 -0500 Received: by mail-ig0-f170.google.com with SMTP id a13so162447igq.1 for ; Wed, 12 Nov 2014 15:04:11 -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:cc:subject:date:message-id; bh=WzBVAk8COp7niQ/jm9Jnf5JPCyqrbaYjPTnvIPSt1mM=; b=Q/9yPQq55IGTD5fLz4SO5wiWgEz0wKmZtwpdfRJGv+VsULxWeZAGcoPDP33pphwYg0 e6J2ioZzRNuxZ9akx8qtw95NOPh/5ZgT43j/3SRKNY6+TVAWvRPzLLsdlb1+EBRryGTi ZTBC2NaxcTSrLyQLSEOkaftkubmjjaGO7KZmhirA7cuCJghXd7EWba1O4qG40uFzyBYi e/r2KESiRwfDGWaYOf4Iqvdxq6WGYAcUSCyI1uqsR/lYTGGGiJWrwg2G2pRKNqPlzyhD 5f50yEl67xT+pgz5rr4jzLYkfAlI8kG429VIKBdfmmbzMky407zO8XK9stTsncakSxld e0Hg== X-Gm-Message-State: ALoCoQmo8/NxgpGLmSeSm7E4GoM35BcGmEfxDClfnWn+P04pNXNqCREi7032LbMICe47K1IY6fBJ X-Received: by 10.107.168.15 with SMTP id r15mr5781503ioe.66.1415833451146; Wed, 12 Nov 2014 15:04:11 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-73-190-61-247.hsd1.mi.comcast.net. [73.190.61.247]) by mx.google.com with ESMTPSA id 124sm7820711ioe.12.2014.11.12.15.04.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Nov 2014 15:04:10 -0800 (PST) From: Trond Myklebust To: Bruce Fields Cc: linux-nfs@vger.kernel.org Subject: [PATCH] SUNRPC: Fix locking around callback channel reply receive Date: Wed, 12 Nov 2014 18:04:04 -0500 Message-Id: <1415833444-48129-1-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.3 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Both xprt_lookup_rqst() and xprt_complete_rqst() require that you take the transport lock in order to avoid races with xprt_transmit(). Signed-off-by: Trond Myklebust Cc: Bruce Fields Reviewed-by: Jeff Layton --- net/sunrpc/svcsock.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 3f959c681885..f9c052d508f0 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1019,17 +1019,12 @@ static int receive_cb_reply(struct svc_sock *svsk, struct svc_rqst *rqstp) xid = *p++; calldir = *p; - if (bc_xprt) - req = xprt_lookup_rqst(bc_xprt, xid); - - if (!req) { - printk(KERN_NOTICE - "%s: Got unrecognized reply: " - "calldir 0x%x xpt_bc_xprt %p xid %08x\n", - __func__, ntohl(calldir), - bc_xprt, ntohl(xid)); + if (!bc_xprt) return -EAGAIN; - } + spin_lock_bh(&bc_xprt->transport_lock); + req = xprt_lookup_rqst(bc_xprt, xid); + if (!req) + goto unlock_notfound; memcpy(&req->rq_private_buf, &req->rq_rcv_buf, sizeof(struct xdr_buf)); /* @@ -1040,11 +1035,21 @@ static int receive_cb_reply(struct svc_sock *svsk, struct svc_rqst *rqstp) dst = &req->rq_private_buf.head[0]; src = &rqstp->rq_arg.head[0]; if (dst->iov_len < src->iov_len) - return -EAGAIN; /* whatever; just giving up. */ + goto unlock_eagain; /* whatever; just giving up. */ memcpy(dst->iov_base, src->iov_base, src->iov_len); xprt_complete_rqst(req->rq_task, rqstp->rq_arg.len); rqstp->rq_arg.len = 0; + spin_unlock_bh(&bc_xprt->transport_lock); return 0; +unlock_notfound: + printk(KERN_NOTICE + "%s: Got unrecognized reply: " + "calldir 0x%x xpt_bc_xprt %p xid %08x\n", + __func__, ntohl(calldir), + bc_xprt, ntohl(xid)); +unlock_eagain: + spin_unlock_bh(&bc_xprt->transport_lock); + return -EAGAIN; } static int copy_pages_to_kvecs(struct kvec *vec, struct page **pages, int len)