From patchwork Tue Feb 19 16:22:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10820139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 240C5922 for ; Tue, 19 Feb 2019 16:23:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1021F2CC0B for ; Tue, 19 Feb 2019 16:23:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 016302CC0F; Tue, 19 Feb 2019 16:23:12 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 A380E2CC0B for ; Tue, 19 Feb 2019 16:23:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725991AbfBSQXL (ORCPT ); Tue, 19 Feb 2019 11:23:11 -0500 Received: from mail-it1-f196.google.com ([209.85.166.196]:37730 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726342AbfBSQXL (ORCPT ); Tue, 19 Feb 2019 11:23:11 -0500 Received: by mail-it1-f196.google.com with SMTP id z124so7593444itc.2 for ; Tue, 19 Feb 2019 08:23:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=oIzVSIi6+b8+6GYlIs63aoI4uIzn/vPHe/BBtI19YpU=; b=tvN2P5+r+TaB5Jsjd82FmmJG7ctRQdQZQVnavRCmJkRl9UYNuHYD72fz32Y6rElPwW uATVp/KlFCEpgByzevgOFLE0ZOasfecYnaeGU2tyuhkkmIyOPBw7gEFi4wZ6Cim+PzsR zy9awrl6yIuVG1DHuU8eJaYLGgnys4ovew0siqEv20t2ECut4yPfjYcv0lXx7Gy5KAkP CKX8VK83xZoFTAatzy0bKJbUEDP7l27qWuXomzQULTcakuD2LvmXOAlBe7lbJuRiFBrm 1PP/WUGAnGwkPCCoB4XT42vgqruP/ZIni0PX+SSqYHKh/W9bK5wAPSOQAUsp9AtEpNiB P7OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=oIzVSIi6+b8+6GYlIs63aoI4uIzn/vPHe/BBtI19YpU=; b=Qnx/gELEdMZPAS0k89DsOZRtpr9gk5lxS0IZCGQZzkdoJHH5ZCzE/g3ZCv3wKVsWer H0slSj922R3nfkIMqAG3TPUj5oP7PRFWFhvw/ltid0d7c4fTPjf4q8Um4Teov+9PsJjX xmz9erjYB5HglvJo+FCdWg0fQzQVztAR7XEBeCdMmxFFpS6CH78U+rkVVJhaWB8FCO61 4/W3T1PCNAEOvWTtZErlC0+M1yc1w71SrXdchzrK2N5LjUSuDsOOY7Z2ffvtsp9A1tID uIMkfGLzYBHgdNd1uw/QB8k6zIxS2vPRYVxhrAI8jz3q3WpOi1Zpw0tYZ/N2c75kIl9j ERpA== X-Gm-Message-State: AHQUAuZPB4AikhVnfVnDD3SxIob/wiu3m7o27EauFmaJB++tkuxn64hx IdONWB4Ml6yNigT2BWx49mYatKc= X-Google-Smtp-Source: AHgI3IZMUm45Pv1Zf8XzLkWvyfxQMDuBBnbdXrsNicDNDL5A8dktWMN3/DCHgdgElUpaZ8Mf8lWHsQ== X-Received: by 2002:a6b:dc01:: with SMTP id s1mr17211417ioc.253.1550593390512; Tue, 19 Feb 2019 08:23:10 -0800 (PST) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id o9sm882683itb.23.2019.02.19.08.23.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Feb 2019 08:23:09 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 1/3] SUNRPC: Don't suppress socket errors when a message read completes Date: Tue, 19 Feb 2019 11:22:00 -0500 Message-Id: <20190219162202.68013-1-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 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 If the message read completes, but the socket returned an error condition, we should ensure to propagate that error. Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index d663f75a6536..52c98dc480ec 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -498,11 +498,9 @@ xs_read_stream_request(struct sock_xprt *transport, struct msghdr *msg, &read); transport->recv.offset += read; transport->recv.copied += read; - if (transport->recv.offset == transport->recv.len) { - if (xs_read_stream_request_done(transport)) - msg->msg_flags |= MSG_EOR; - return read; - } + if (transport->recv.offset == transport->recv.len && + xs_read_stream_request_done(transport)) + msg->msg_flags |= MSG_EOR; switch (ret) { default: From patchwork Tue Feb 19 16:22:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10820141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 03A541805 for ; Tue, 19 Feb 2019 16:23:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E64C72CC0B for ; Tue, 19 Feb 2019 16:23:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA5E72CC0F; Tue, 19 Feb 2019 16:23:13 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 7B1FF2CC0B for ; Tue, 19 Feb 2019 16:23:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729018AbfBSQXM (ORCPT ); Tue, 19 Feb 2019 11:23:12 -0500 Received: from mail-it1-f194.google.com ([209.85.166.194]:53455 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726342AbfBSQXM (ORCPT ); Tue, 19 Feb 2019 11:23:12 -0500 Received: by mail-it1-f194.google.com with SMTP id x131so7391045itc.3 for ; Tue, 19 Feb 2019 08:23:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=72oU/TkKqTiqq7cVg+AUBpRPupcx4Rw4nRfDtgXws1E=; b=KzIzV8CofJsX43OrvRk9/tCsZ4zIf3mzWEBr6t+ViaaRNbQgFfPrx6AdhcO8SldpaD BWItGrJhCLlMObH+QxWrsJAGk8/7eDiZOvEP5t/ebdeaK60tVnsG1PXW8JM7JqnrjDbu KcXoSb1/WjLqBDrD2h3ha+lI7wmdcCeDE8ta/tNMfyIJDDP+XrjvNyi6gC06s/eNB0oP FW77nR9uwkeSbHUh4q19K9zmBcDGtGEIBcj0QO/4cHxQ1H9kZiIunslWPCcwwUY5Lknc mHMl8V7gZdCpHuIIVgyVBBH1veXRl9WvUClLAlhZ7qxxyX5GruXqMgF+DrBjPsCYnqoj 3u+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=72oU/TkKqTiqq7cVg+AUBpRPupcx4Rw4nRfDtgXws1E=; b=dB8ZoJBNjXysaiyO6a4Pdqw8bIKSfacmXzCr41vUSErZCgvCqrO8cD1O2x5VAxVu5j AmNywuE7qqGimAvSa46aRGuLina65OsIQvDSDY/jYxTMdc+DxFCirhBDnWorNKe/rZ18 F+SVIcSgZHDHCHYSTBDiN0WeiUSu7xOGHjMCpvg+/7pbecuyNX9Wve6ILnxsYdLLoEeT A7qbLHNKCREKV4iIPJpz7sElcFezTwiTpiGcifOmZLMczqP3pDDYdwBzwUs5KAPw0eXc BaVepWE2JWz6GYFhro9RB4Lt2RL5TOTUaw6CDK5cJP/livRZvV92NFWc9dk4M0kDnhwy 2CXQ== X-Gm-Message-State: AHQUAuYaxUC4CRCSCoRRwBDTz2rxDGwzxZ451QabSVFO0tTNApbuLVIg d1RPB1JWysAt0XzNAXs7JpupuiU= X-Google-Smtp-Source: AHgI3IYO3zB5Oh2t2ovxYExdets846mHeSWyRTFSIU0+b6Vg5/xqvHujoH3316unLZ4ceD9W4jQ1Zw== X-Received: by 2002:a02:9d07:: with SMTP id n7mr14822856jak.36.1550593391308; Tue, 19 Feb 2019 08:23:11 -0800 (PST) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id o9sm882683itb.23.2019.02.19.08.23.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Feb 2019 08:23:10 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 2/3] SUNRPC: Handle zero length fragments correctly Date: Tue, 19 Feb 2019 11:22:01 -0500 Message-Id: <20190219162202.68013-2-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190219162202.68013-1-trond.myklebust@hammerspace.com> References: <20190219162202.68013-1-trond.myklebust@hammerspace.com> 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 A zero length fragment is really a bug, but let's ensure we don't go nuts when one turns up. Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 52c98dc480ec..89bcab53848a 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -405,8 +405,8 @@ xs_read_xdr_buf(struct socket *sock, struct msghdr *msg, int flags, size_t want, seek_init = seek, offset = 0; ssize_t ret; - if (seek < buf->head[0].iov_len) { - want = min_t(size_t, count, buf->head[0].iov_len); + want = min_t(size_t, count, buf->head[0].iov_len); + if (seek < want) { ret = xs_read_kvec(sock, msg, flags, &buf->head[0], want, seek); if (ret <= 0) goto sock_err; @@ -417,8 +417,8 @@ xs_read_xdr_buf(struct socket *sock, struct msghdr *msg, int flags, goto out; seek = 0; } else { - seek -= buf->head[0].iov_len; - offset += buf->head[0].iov_len; + seek -= want; + offset += want; } want = xs_alloc_sparse_pages(buf, @@ -443,8 +443,8 @@ xs_read_xdr_buf(struct socket *sock, struct msghdr *msg, int flags, offset += want; } - if (seek < buf->tail[0].iov_len) { - want = min_t(size_t, count - offset, buf->tail[0].iov_len); + want = min_t(size_t, count - offset, buf->tail[0].iov_len); + if (seek < want) { ret = xs_read_kvec(sock, msg, flags, &buf->tail[0], want, seek); if (ret <= 0) goto sock_err; @@ -454,7 +454,7 @@ xs_read_xdr_buf(struct socket *sock, struct msghdr *msg, int flags, if (ret != want) goto out; } else - offset += buf->tail[0].iov_len; + offset = seek_init; ret = -EMSGSIZE; out: *read = offset - seek_init; @@ -482,6 +482,14 @@ xs_read_stream_request_done(struct sock_xprt *transport) return transport->recv.fraghdr & cpu_to_be32(RPC_LAST_STREAM_FRAGMENT); } +static void +xs_read_stream_check_eor(struct sock_xprt *transport, + struct msghdr *msg) +{ + if (xs_read_stream_request_done(transport)) + msg->msg_flags |= MSG_EOR; +} + static ssize_t xs_read_stream_request(struct sock_xprt *transport, struct msghdr *msg, int flags, struct rpc_rqst *req) @@ -493,14 +501,18 @@ xs_read_stream_request(struct sock_xprt *transport, struct msghdr *msg, xs_read_header(transport, buf); want = transport->recv.len - transport->recv.offset; + if (want == 0) { + xs_read_stream_check_eor(transport, msg); + return 0; + } + ret = xs_read_xdr_buf(transport->sock, msg, flags, buf, transport->recv.copied + want, transport->recv.copied, &read); transport->recv.offset += read; transport->recv.copied += read; - if (transport->recv.offset == transport->recv.len && - xs_read_stream_request_done(transport)) - msg->msg_flags |= MSG_EOR; + if (transport->recv.offset == transport->recv.len) + xs_read_stream_check_eor(transport, msg); switch (ret) { default: From patchwork Tue Feb 19 16:22:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10820143 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 89B8B180E for ; Tue, 19 Feb 2019 16:23:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7805B2CC0B for ; Tue, 19 Feb 2019 16:23:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C3612CC0F; Tue, 19 Feb 2019 16:23:14 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 23B692CC0B for ; Tue, 19 Feb 2019 16:23:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726342AbfBSQXN (ORCPT ); Tue, 19 Feb 2019 11:23:13 -0500 Received: from mail-it1-f194.google.com ([209.85.166.194]:54450 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728216AbfBSQXN (ORCPT ); Tue, 19 Feb 2019 11:23:13 -0500 Received: by mail-it1-f194.google.com with SMTP id f10so7373192ita.4 for ; Tue, 19 Feb 2019 08:23:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jT74WFfrDl/+VabIgj0qfMzVGMbohB+BWe9aCCdqkGw=; b=H46O0eTg1r26hB/ZZesRqfRx4kcri6r2pamAKrc82lma3EXS1fsW9VdK4a1EibQ2kt lCAbJ1N0GUu5iFTSoIghnfAgkeGXR3f7Tv9oGgupvB2oUg8Fsv9eF8e6VVSA9ldkcoEs NMxhIbStZ+zMb9POJ7Z461oqYFZrmDMGAtCZxh7M6XLZYzbiJx99hSHwuEYAXZ/OBY/k jf4K9RjO1AzHQnZiQ0Mu9YusmjRKsHP4VVJt1Fx5JwfgPjHuJpFG3m8TC/equ1jxrAXR ATixfULH25TCINXyqTsTRwCxc6ohivAj3DyqqS4TErmqHCY/22C0h2yN45xtvSwEdWEQ GadA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jT74WFfrDl/+VabIgj0qfMzVGMbohB+BWe9aCCdqkGw=; b=F6T28H+0BgWtksIWNhAfvrsZ5dDQi5vQ46RO022OChnJjl8RdLTVqKub+70yhYXd6H S7sZPXSREPZKdIbnpB4Jzut3HS/TTbm3qA3OIkaeid9fDKFiTZRphDXJGOl4Utm33Meq iDQIfcne8YoNiNMELFWsb/epSb+7qQI3fXmUBRv82cxpj3r9OQpo7FuunnX+AZ1TI0vJ 8iuY7RAmGF+V30uNlb2uVbiW6FmtPaMb9ChZScAfHDvhgYtc7hXa8ErplecdtQumbHc6 m/vCDnDJgbYEhoGupqPFqAd7l7qvxK93rUJjDC1Kf5eiqzO6hrH/s1TGCzu8UWrqcF7m FpTA== X-Gm-Message-State: AHQUAua+9EJl4KCMrIUA2khvHSZx/DGzyCiSSAeCLbr9KNDOHCsdrZhh XFHif/oVyyh+z/xS/GiHx56D7ZE= X-Google-Smtp-Source: AHgI3IYACqAY8MAve28SmEIU4aRYj01BxmKjoel/h0b5oQKnLMKsjCxoGmU4WpZ+PbuoKMevqA6vSg== X-Received: by 2002:a02:c60b:: with SMTP id i11mr16091337jan.118.1550593392048; Tue, 19 Feb 2019 08:23:12 -0800 (PST) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id o9sm882683itb.23.2019.02.19.08.23.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Feb 2019 08:23:11 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 3/3] SUNRPC: Initiate a connection close on an ESHUTDOWN error in stream receive Date: Tue, 19 Feb 2019 11:22:02 -0500 Message-Id: <20190219162202.68013-3-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190219162202.68013-2-trond.myklebust@hammerspace.com> References: <20190219162202.68013-1-trond.myklebust@hammerspace.com> <20190219162202.68013-2-trond.myklebust@hammerspace.com> 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 If the client stream receive code receives an ESHUTDOWN error either because the server closed the connection, or because it sent a callback which cannot be processed, then we should shut down the connection. Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 89bcab53848a..618e9c255a9f 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -694,7 +694,10 @@ static void xs_stream_data_receive(struct sock_xprt *transport) read += ret; cond_resched(); } - xs_poll_check_readable(transport); + if (ret == -ESHUTDOWN) + kernel_sock_shutdown(transport->sock, SHUT_RDWR); + else + xs_poll_check_readable(transport); out: mutex_unlock(&transport->recv_mutex); trace_xs_stream_read_data(&transport->xprt, ret, read);