From patchwork Tue Sep 13 14:52:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9329263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0B37760231 for ; Tue, 13 Sep 2016 14:53:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F13C929521 for ; Tue, 13 Sep 2016 14:53:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3E2F29520; Tue, 13 Sep 2016 14:53:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF3BE2951A for ; Tue, 13 Sep 2016 14:53:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753562AbcIMOxD (ORCPT ); Tue, 13 Sep 2016 10:53:03 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:35897 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758839AbcIMOxB (ORCPT ); Tue, 13 Sep 2016 10:53:01 -0400 Received: by mail-it0-f68.google.com with SMTP id n143so1445797ita.3; Tue, 13 Sep 2016 07:53:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=wDfNVPUUN6yVFnBFuWMhzumBAB05DjYHUKOzAiJTOQI=; b=Jkn5e2pjIGBKoQwsl2G4OZeB8Mj+MUk2ur8EUyU4VEuXDFDnQ05fXF7ymboKSFCC2q aB3FCtGbsU3QgERkdVhDvPX4oUHfwV98vdVME1c2Sr9xMdG09x0s9V+MEYohFGrkdbHo 3+Yy7S4MYBCe+ECY5+xhF73ZtnwTTW0shjL1IZka16zjQke1aXqXYtNCZ+fY6saSg6tY U/Bvj2ukW8BMk2x6BKUXHe4sZCRO/PzEFVykk2nI1OsJfVvqp5I+eM/QP/SVU3MRozQw tKRcPOGnKBKuP7afdm5aXR3jXXBCymoQtawlTnyMFhCBxslT+mLsbWNQR9MsCUJYV5NS Fokw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=wDfNVPUUN6yVFnBFuWMhzumBAB05DjYHUKOzAiJTOQI=; b=Vgr0yX/mm3TQLX4FxHMzRmP5UowGjHhz5+6zyV+7NeQ01twqSbJ/ZcgO2uZbqG0o8s OD1Rp08LuxGnaGF7KegFMaAoFpg4PTdYILIIcBCVmXlwhk7Iz3ZUe6AiDzy2kHwihkAJ HoGV84ZiM2LiBhO5FsdpjNdepg3hRmgrWdILwZ4qCf/G5UHuzUGE8UZKsnh/Yfk5yWmb yEIork9NlzQV2U8XgzCh+ZzAEl8d6NvxrmZp8B4j3CqlUag0k8y5N8CLyJ6tptFtbUSh 3daxxqy5nw2MSPiq3HXUMZTPMJzzGrIE+kGC8LMCfAGQAJw59aBHxLTXpSAGHOeJMdog mq8g== X-Gm-Message-State: AE9vXwNEZkt5dZqjKrjGb12PipAX5hW8CQXFO/FQYGrfNMOksxbNvgwzdtY6tRt0Y5vOsg== X-Received: by 10.107.132.157 with SMTP id o29mr2522652ioi.109.1473778380412; Tue, 13 Sep 2016 07:53:00 -0700 (PDT) Received: from klimt.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:6aa0]) by smtp.gmail.com with ESMTPSA id d15sm3494620ioj.19.2016.09.13.07.52.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Sep 2016 07:53:00 -0700 (PDT) Subject: [PATCH v3 3/6] svcrdma: Skip put_page() when send_reply() fails From: Chuck Lever To: bfields@fieldses.org Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 13 Sep 2016 10:52:59 -0400 Message-ID: <20160913145259.5733.47591.stgit@klimt.1015granger.net> In-Reply-To: <20160913144246.5733.66229.stgit@klimt.1015granger.net> References: <20160913144246.5733.66229.stgit@klimt.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Message from syslogd@klimt at Aug 18 17:00:37 ... kernel:page:ffffea0020639b00 count:0 mapcount:0 mapping: (null) index:0x0 Aug 18 17:00:37 klimt kernel: flags: 0x2fffff80000000() Aug 18 17:00:37 klimt kernel: page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0) Aug 18 17:00:37 klimt kernel: kernel BUG at /home/cel/src/linux/linux-2.6/include/linux/mm.h:445! Aug 18 17:00:37 klimt kernel: RIP: 0010:[] svc_rdma_sendto+0x641/0x820 [rpcrdma] send_reply() assigns its page argument as the first page of ctxt. On error, send_reply() already invokes svc_rdma_put_context(ctxt, 1); which does a put_page() on that very page. No need to do that again as svc_rdma_sendto exits. Fixes: 3e1eeb980822 ("svcrdma: Close connection when a send error occurs") Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 +- 1 file changed, 1 insertion(+), 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/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index e5b49e6..3b95b19 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c @@ -621,7 +621,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp) ret = send_reply(rdma, rqstp, res_page, rdma_resp, vec, inline_bytes); if (ret < 0) - goto err1; + goto err0; svc_rdma_put_req_map(rdma, vec); dprintk("svcrdma: send_reply returns %d\n", ret);