Message ID | 20180917130335.112832-29-trond.myklebust@hammerspace.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-nfs-owner@kernel.org> 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 066A015A6 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 17 Sep 2018 13:04:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0DA029B38 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 17 Sep 2018 13:04:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E552D29B71; Mon, 17 Sep 2018 13:04:33 +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 2500729B63 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 17 Sep 2018 13:04:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728301AbeIQSbp (ORCPT <rfc822;patchwork-linux-nfs@patchwork.kernel.org>); Mon, 17 Sep 2018 14:31:45 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:45120 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728299AbeIQSbp (ORCPT <rfc822;linux-nfs@vger.kernel.org>); Mon, 17 Sep 2018 14:31:45 -0400 Received: by mail-qt0-f194.google.com with SMTP id g44-v6so15094867qtb.12 for <linux-nfs@vger.kernel.org>; Mon, 17 Sep 2018 06:04:30 -0700 (PDT) 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=FvEyIW0WhqeS6Cm18ArwW9BZ/v2ns6LZUKJLy3Ix3MY=; b=gilm+9cKUIcj6H8GGuWnicgewSRcWSRJSTx/PruypVajvYOdpz94sO5mhA+6A2Umbn k2rxVPCOR1iaHqwhJzCLRKr/+pymcrqGd/XKANjiqWkTGoOuN3H1j4JPEBWaz3zsc0Wc /fZpMWM1FH7RmI4sKR/br0s+4pij3RgZ6bnRzAX5dTotSqCySVCZyVoO/+E1G7aGIOUI 3Y7b5m2bGAN/XIt70ibardW5v0pLyBNpRZMsL4MlGXmwo2BSqPanCUsJETeI13xNk0c3 7fTw9cY+QyZCK1tCJI9jSvLtgZ79IVp5N6ds2W6yWnjw7iKcn48SiwOVk6fchA136Q/i 4W6Q== 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=FvEyIW0WhqeS6Cm18ArwW9BZ/v2ns6LZUKJLy3Ix3MY=; b=sPpNZkK2TzeSViIrkhL9bvTX+KLGfM/aAphDeuvAV3/DbSV0MseUlA0X5OSNV7rdnP 3wpnvTJ4kn8e1lI3y0oQBNXymufy3VO59C61xABhkBywqItQyBSzqZObrV/skIbmAvYF wGoBNQyPHH2yGqEETGcpdF7ekhVqneSj1EbQpI0bVeGpe/V3MnFQLMs1qEWLlMu/JNtX 2S7AxQp7c6p0+SkrRxLcSANmGaWvvSbgAqm81dPBaedIhRs6Qfx4TmGbr8+JGH17a7Zs xp3W8QR27Al55exXpqFMuWlt6lCYQ8PCtJrFPOBh4+LyUb7WfjkB/YAQgLJn6GNz3Ew2 6pEA== X-Gm-Message-State: APzg51Amk8pG93Tc1XgQXYrS1eiVk0jYjK7mK+nkLts9mwIn3DBYyCdw 3yzUtv3Od2lc0YUEk5Zij2+t2nMvjg== X-Google-Smtp-Source: ANB0VdZeh4/wGXPriLqbnzkHHOdDXoP+4ZmYn5jLyl/HTpjHb7XvtYBC0cW8uEGIuo9JSGYumGKufA== X-Received: by 2002:aed:2c27:: with SMTP id f36-v6mr18011562qtd.229.1537189470018; Mon, 17 Sep 2018 06:04:30 -0700 (PDT) Received: from leira.trondhjem.org.localdomain ([66.187.232.65]) by smtp.gmail.com with ESMTPSA id q1-v6sm10499607qkl.31.2018.09.17.06.04.29 for <linux-nfs@vger.kernel.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 06:04:29 -0700 (PDT) From: Trond Myklebust <trondmy@gmail.com> X-Google-Original-From: Trond Myklebust <trond.myklebust@hammerspace.com> To: linux-nfs@vger.kernel.org Subject: [PATCH v3 28/44] SUNRPC: Enqueue swapper tagged RPCs at the head of the transmit queue Date: Mon, 17 Sep 2018 09:03:19 -0400 Message-Id: <20180917130335.112832-29-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917130335.112832-28-trond.myklebust@hammerspace.com> References: <20180917130335.112832-1-trond.myklebust@hammerspace.com> <20180917130335.112832-2-trond.myklebust@hammerspace.com> <20180917130335.112832-3-trond.myklebust@hammerspace.com> <20180917130335.112832-4-trond.myklebust@hammerspace.com> <20180917130335.112832-5-trond.myklebust@hammerspace.com> <20180917130335.112832-6-trond.myklebust@hammerspace.com> <20180917130335.112832-7-trond.myklebust@hammerspace.com> <20180917130335.112832-8-trond.myklebust@hammerspace.com> <20180917130335.112832-9-trond.myklebust@hammerspace.com> <20180917130335.112832-10-trond.myklebust@hammerspace.com> <20180917130335.112832-11-trond.myklebust@hammerspace.com> <20180917130335.112832-12-trond.myklebust@hammerspace.com> <20180917130335.112832-13-trond.myklebust@hammerspace.com> <20180917130335.112832-14-trond.myklebust@hammerspace.com> <20180917130335.112832-15-trond.myklebust@hammerspace.com> <20180917130335.112832-16-trond.myklebust@hammerspace.com> <20180917130335.112832-17-trond.myklebust@hammerspace.com> <20180917130335.112832-18-trond.myklebust@hammerspace.com> <20180917130335.112832-19-trond.myklebust@hammerspace.com> <20180917130335.112832-20-trond.myklebust@hammerspace.com> <20180917130335.112832-21-trond.myklebust@hammerspace.com> <20180917130335.112832-22-trond.myklebust@hammerspace.com> <20180917130335.112832-23-trond.myklebust@hammerspace.com> <20180917130335.112832-24-trond.myklebust@hammerspace.com> <20180917130335.112832-25-trond.myklebust@hammerspace.com> <20180917130335.112832-26-trond.myklebust@hammerspace.com> <20180917130335.112832-27-trond.myklebust@hammerspace.com> <20180917130335.112832-28-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: <linux-nfs.vger.kernel.org> X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Convert RPC client transmission to a queued model
|
expand
|
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index e07a54fbe1e7..68974966b2e4 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1111,6 +1111,17 @@ xprt_request_enqueue_transmit(struct rpc_task *task) INIT_LIST_HEAD(&req->rq_xmit2); goto out; } + } else if (RPC_IS_SWAPPER(task)) { + list_for_each_entry(pos, &xprt->xmit_queue, rq_xmit) { + if (pos->rq_cong || pos->rq_bytes_sent) + continue; + if (RPC_IS_SWAPPER(pos->rq_task)) + continue; + /* Note: req is added _before_ pos */ + list_add_tail(&req->rq_xmit, &pos->rq_xmit); + INIT_LIST_HEAD(&req->rq_xmit2); + goto out; + } } else { list_for_each_entry(pos, &xprt->xmit_queue, rq_xmit) { if (pos->rq_task->tk_owner != task->tk_owner)
Avoid memory starvation by giving RPCs that are tagged with the RPC_TASK_SWAPPER flag the highest priority. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> --- net/sunrpc/xprt.c | 11 +++++++++++ 1 file changed, 11 insertions(+)