From patchwork Mon Jan 15 04:05:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10162971 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 C2E9760467 for ; Mon, 15 Jan 2018 04:05:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8D6D28712 for ; Mon, 15 Jan 2018 04:05:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 948F428A05; Mon, 15 Jan 2018 04:05:22 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 725F72888F for ; Mon, 15 Jan 2018 04:05:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752150AbeAOEFQ (ORCPT ); Sun, 14 Jan 2018 23:05:16 -0500 Received: from mail-io0-f193.google.com ([209.85.223.193]:36038 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752490AbeAOEFP (ORCPT ); Sun, 14 Jan 2018 23:05:15 -0500 Received: by mail-io0-f193.google.com with SMTP id l17so1859189ioc.3 for ; Sun, 14 Jan 2018 20:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VP4L68WyZrJ3StB9P/26Of1PgMgO/dpd6Eb5gBzt/I4=; b=MSV5EEsF5LTNASEehw5oOwgpUX0T2TW82W44oUKr5FPOcosyivAfzkwXr/oxlcry7o k0O7dX/ONSAI4CSX8ZiiRas0AJ7aNnfPQqCPgJbNPPExKl3hfG2lNViJAPg9Li0/uJ/d jGVZaL4l5S9ke6EgvphF47MLa+1JffeM9UauSACeN6ebcrPuZLgtF3rUlQx0s4/mUYvq U8+U496b1kt0+V9yqdYyYblYTbVq201/cVyqNqwkqOPOojjFM3KlFbj1Atrvfq7njPbs TWgqycbqXhZLljV4TFg2/BFrWMXosaid5fhoBCI9t7UWqb8N5qYt8NKsKs4krXNLyxKv iG/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VP4L68WyZrJ3StB9P/26Of1PgMgO/dpd6Eb5gBzt/I4=; b=Nrj5dkylf0o86iIegnaGMJ5YGVJ3zqfXe17hP+hCsJsyN+AJ+vtEktvkYk07Z8iAL7 Mj9TWfOHJ5tSRXPJhIl9JL9uss7JOxxrff+R+OEANDIEJz3/WxNgPuayJko8DSNs/9qU xahYeRweD/KvlEpEePC5yAWV8TW0dldChTGXA2k7izzH91X3nVip9VDkTvlRxDpSysxb CBcAmsdEHdB2QeOSJJFTMag92RIqAkmTjZUHOvoECCmQ/wgZiDT8hwOlaIyVfI6nvcox hv758oqflVxjT8CmmjZ2+XJDhtHvPN26cCVLLKK+P2YIE9luPBBu7GInV+PGVZbBHbgS rCgw== X-Gm-Message-State: AKwxytfFuPbT5LqhKD6UJ/ygmcMOROKLLj+oF2W00DlEnYCwYaV4Bcz0 /lXWqwcVaxtRv9wM3Oa+fh/1TKI= X-Google-Smtp-Source: ACJfBotsvfiNIAQioBbv/V6hutjXD+OcnHr/dryuUaVhFCa4zYC7kjQ5subF1sUk6Ef1zkpi7BLBaw== X-Received: by 10.107.79.19 with SMTP id d19mr223975iob.270.1515989114234; Sun, 14 Jan 2018 20:05:14 -0800 (PST) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id g9sm15233541ioi.81.2018.01.14.20.05.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Jan 2018 20:05:13 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] SUNRPC: Add explicit rescheduling points in the receive path Date: Sun, 14 Jan 2018 23:05:08 -0500 Message-Id: <20180115040508.100921-2-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180115040508.100921-1-trond.myklebust@primarydata.com> References: <20180115040508.100921-1-trond.myklebust@primarydata.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 When reading the reply from the server, insert an explicit cond_resched() to avoid starving higher priority tasks. Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 620be573d78b..18803021f242 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1005,6 +1005,7 @@ static void xs_local_data_receive(struct sock_xprt *transport) struct sock *sk; int err; +restart: mutex_lock(&transport->recv_mutex); sk = transport->inet; if (sk == NULL) @@ -1018,6 +1019,11 @@ static void xs_local_data_receive(struct sock_xprt *transport) } if (!test_and_clear_bit(XPRT_SOCK_DATA_READY, &transport->sock_state)) break; + if (need_resched()) { + mutex_unlock(&transport->recv_mutex); + cond_resched(); + goto restart; + } } out: mutex_unlock(&transport->recv_mutex); @@ -1096,6 +1102,7 @@ static void xs_udp_data_receive(struct sock_xprt *transport) struct sock *sk; int err; +restart: mutex_lock(&transport->recv_mutex); sk = transport->inet; if (sk == NULL) @@ -1109,6 +1116,11 @@ static void xs_udp_data_receive(struct sock_xprt *transport) } if (!test_and_clear_bit(XPRT_SOCK_DATA_READY, &transport->sock_state)) break; + if (need_resched()) { + mutex_unlock(&transport->recv_mutex); + cond_resched(); + goto restart; + } } out: mutex_unlock(&transport->recv_mutex); @@ -1528,16 +1540,16 @@ static void xs_tcp_data_receive(struct sock_xprt *transport) .arg.data = xprt, }; unsigned long total = 0; - int loop; int read = 0; +restart: mutex_lock(&transport->recv_mutex); sk = transport->inet; if (sk == NULL) goto out; /* We use rd_desc to pass struct xprt to xs_tcp_data_recv */ - for (loop = 0; loop < 64; loop++) { + for (;;) { rd_desc.count = RPC_TCP_READ_CHUNK_SZ; lock_sock(sk); read = tcp_read_sock(sk, &rd_desc, xs_tcp_data_recv); @@ -1548,6 +1560,11 @@ static void xs_tcp_data_receive(struct sock_xprt *transport) } release_sock(sk); total += read; + if (need_resched()) { + mutex_unlock(&transport->recv_mutex); + cond_resched(); + goto restart; + } } if (test_bit(XPRT_SOCK_DATA_READY, &transport->sock_state)) queue_work(xprtiod_workqueue, &transport->recv_worker);