Message ID | 20180917130335.112832-13-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 AA77215A6 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 17 Sep 2018 13:04:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FB21299A8 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 17 Sep 2018 13:04:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9250329B38; Mon, 17 Sep 2018 13:04: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 45B10299A8 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 17 Sep 2018 13:04:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728172AbeIQSb1 (ORCPT <rfc822;patchwork-linux-nfs@patchwork.kernel.org>); Mon, 17 Sep 2018 14:31:27 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:45077 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728095AbeIQSb0 (ORCPT <rfc822;linux-nfs@vger.kernel.org>); Mon, 17 Sep 2018 14:31:26 -0400 Received: by mail-qt0-f194.google.com with SMTP id g44-v6so15093728qtb.12 for <linux-nfs@vger.kernel.org>; Mon, 17 Sep 2018 06:04:11 -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=b5ww9FryMiLnvnIVC/RTei7bVfnKBJkCsqMbJKxIksY=; b=WSzrGeqKNnq3znygdKa466WC8Bw0DSvusnR4E7686D1IjNsknAV0tpoHaI4rRC2wiG FU5Bw9W5GPpN3bF27z+/VtBtV/1FiNo4bp+yGX99sHy2odv5tockvwwadlQBWa0P/syD DrLWbTUejX2R9uV/mkh1ENCCBgVrB7fHEYTAwpcApBI77PSet+AOswXVxPFU2O1cZrv8 l6bfsZfv5pwyymVu8BLnZMekAEMRR5R3+DQLh4DIcAbF8BaFMHmFNXHx0CfkSypE9vFw nLeHnqE4394rRfXni3qeF1q+MYoOcNaKc0l8gqoYDWlq6kmlquNVNAjemgv7GRPRAPWG /iYg== 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=b5ww9FryMiLnvnIVC/RTei7bVfnKBJkCsqMbJKxIksY=; b=h/3oo51dL3g/9cC0qdCLGivDfVIzSXkgxmmJJiDF3U6tHIXFyqNFYvhYwoH+HB0J2t +sKHqax1kUaEPQ+kpvHhYuVjyc5tnxg/zsDs5n/cOKrEcdM81alMD/oCldRjSghuD+06 /rNLUm3e71zhzkTmYGoMqbBGxi06gK9WpqmyY5MHR+h4mjO7/rLsbqvXA5N+rOS6ZF7F 2N3tuIoYs9GVzJWs8m1fudZ7lCRU04VVyBbI/on9AcRN/3DlUzUK9x+DplRVt+SYjetB Y7RfFduGudA7NhKAiI0ZPiYwPCD+8Oo8LTepuM6pkTVSCK50AGh6B6rREzff4BqmwkGo zexw== X-Gm-Message-State: APzg51BjXCnzWEt5nYn2kJkF7nsXgkDldLWtVkFWDY1IAr1YZWuFMfBe 5kyEl6dvIMmLosGicl/VlZ3FlihB0g== X-Google-Smtp-Source: ANB0VdZ5737JtyzzUaunAIAvjxfbECHhN9DLo3X2tOREn+t94eAnfh+Jf4/AiMWVLWHRzW9HGM7khg== X-Received: by 2002:a0c:88d7:: with SMTP id 23-v6mr17884960qvo.51.1537189450962; Mon, 17 Sep 2018 06:04:10 -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.09 for <linux-nfs@vger.kernel.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 06:04:09 -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 12/44] SUNRPC: Test whether the task is queued before grabbing the queue spinlocks Date: Mon, 17 Sep 2018 09:03:03 -0400 Message-Id: <20180917130335.112832-13-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917130335.112832-12-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> 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/sched.c b/net/sunrpc/sched.c index dec01bd1b71c..9a8ec012b449 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -479,6 +479,8 @@ void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq, struct rpc_wait_queue *queue, struct rpc_task *task) { + if (!RPC_IS_QUEUED(task)) + return; spin_lock_bh(&queue->lock); rpc_wake_up_task_on_wq_queue_locked(wq, queue, task); spin_unlock_bh(&queue->lock); @@ -489,6 +491,8 @@ void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq, */ void rpc_wake_up_queued_task(struct rpc_wait_queue *queue, struct rpc_task *task) { + if (!RPC_IS_QUEUED(task)) + return; spin_lock_bh(&queue->lock); rpc_wake_up_task_queue_locked(queue, task); spin_unlock_bh(&queue->lock);
When asked to wake up an RPC task, it makes sense to test whether or not the task is still queued. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> --- net/sunrpc/sched.c | 4 ++++ 1 file changed, 4 insertions(+)