From patchwork Tue Aug 21 15:05:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10571895 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 19FCF112E for ; Tue, 21 Aug 2018 15:05:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2F062852C for ; Tue, 21 Aug 2018 15:05:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E77F82A2DC; Tue, 21 Aug 2018 15:05:24 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 91A812852C for ; Tue, 21 Aug 2018 15:05:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727111AbeHUSZz (ORCPT ); Tue, 21 Aug 2018 14:25:55 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:50628 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726743AbeHUSZz (ORCPT ); Tue, 21 Aug 2018 14:25:55 -0400 Received: by mail-it0-f65.google.com with SMTP id j81-v6so4584357ite.0 for ; Tue, 21 Aug 2018 08:05:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R6iqzjyZzFDGceiLQrktaR2JrQ4OT6zRwmykn6uzCS0=; b=GE0lTZD+itEm9lNjLpYB6vry5y1Ch3tYEonaT9cZ6ly4S196CtETsvF41461BJo4dV /U2DYhdSgRESXoxf4DzjhsglHSAqT/+pMSThp6vhZ41ETx3P+PraPX6RxM4SSY9ZQAlP EivMbbXiaF/3+1Ip07vmBB6/ynBNLxd52JSyQIjuCfpOZW+yj33CbUG4QAmXxCZgdBwU 35otwD6pQY06MBY5dDJRQ+PNaWhtix9XV93P5rjuzDFBAVv5bYM59x8TzqpPibgUrHVZ PUnrwSoALTjRvzcNmswDrSEhz7uzadHJPAkqffYvJhZ/YDd6TE5/yLvpdiPnmcyg4iUx DpLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R6iqzjyZzFDGceiLQrktaR2JrQ4OT6zRwmykn6uzCS0=; b=aE3oiQGLlywf2m5XP18pdhUavLIojoqGgT0iOxqEy+L689SiDkLdyivndeEgOdZ9SH AcJbL9+wGjNHaKeskusIaYq4JzI1y0zsacOzhRh0kB3AfKg8s6WbKUT1ekL+AYfhChNg Rz4qrKjWg7lvSLTtEr0EsMu06l3CuTOhz5/FmE3MDSc/+wQGzqPAZPSspq44w9M4lZS7 U8O2ClLN92cGiliMQsXD0CjZNceBxn9fR3bdZtQQ/pIj/fzj/HXy85hLU3qRF7V5UJO0 qGytmYVvCf7jeEWEQNU0vJYP1NqaMaf+TwtDX6JRosisCK9okVfqkpH2U4gD6BDXfXcv E/Dw== X-Gm-Message-State: AOUpUlGoW7kn1cIwbCYvXhzqwmAjlQCxS8c7q4W85NWR5Sm/xyGGfxnq jQUq7laJeWvjF+imDX0dwKd88k/vEIM= X-Google-Smtp-Source: AA+uWPyiXo33kuZ4Wgy4N/z34RF2f5HG7UCDFoTSHfgDv8E1GjNDakBHUFhG54xngy2Hqpo8YMLKOA== X-Received: by 2002:a02:b18d:: with SMTP id t13-v6mr4816493jah.64.1534863922424; Tue, 21 Aug 2018 08:05:22 -0700 (PDT) Received: from x1.thefacebook.com ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id k5-v6sm2956501ioj.59.2018.08.21.08.05.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 08:05:21 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 1/3] blk-wbt: move disable check into get_limit() Date: Tue, 21 Aug 2018 09:05:15 -0600 Message-Id: <20180821150517.19744-2-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180821150517.19744-1-axboe@kernel.dk> References: <20180821150517.19744-1-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Check it in one place, instead of in multiple places. Signed-off-by: Jens Axboe --- block/blk-wbt.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index bb93c7c2b182..1dd7edce7a99 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -449,6 +449,13 @@ static inline unsigned int get_limit(struct rq_wb *rwb, unsigned long rw) { unsigned int limit; + /* + * If we got disabled, just return UINT_MAX. This ensures that + * we'll properly inc a new IO, and dec+wakeup at the end. + */ + if (!rwb_enabled(rwb)) + return UINT_MAX; + if ((rw & REQ_OP_MASK) == REQ_OP_DISCARD) return rwb->wb_background; @@ -486,16 +493,6 @@ static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct, struct rq_wait *rqw = get_rq_wait(rwb, wb_acct); DECLARE_WAITQUEUE(wait, current); - /* - * inc it here even if disabled, since we'll dec it at completion. - * this only happens if the task was sleeping in __wbt_wait(), - * and someone turned it off at the same time. - */ - if (!rwb_enabled(rwb)) { - atomic_inc(&rqw->inflight); - return; - } - if (!waitqueue_active(&rqw->wait) && rq_wait_inc_below(rqw, get_limit(rwb, rw))) return; @@ -504,11 +501,6 @@ static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct, do { set_current_state(TASK_UNINTERRUPTIBLE); - if (!rwb_enabled(rwb)) { - atomic_inc(&rqw->inflight); - break; - } - if (rq_wait_inc_below(rqw, get_limit(rwb, rw))) break; From patchwork Tue Aug 21 15:05:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10571897 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 42FD513B6 for ; Tue, 21 Aug 2018 15:05:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F6992852C for ; Tue, 21 Aug 2018 15:05:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2370B2A2DC; Tue, 21 Aug 2018 15:05:27 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 1679D2852C for ; Tue, 21 Aug 2018 15:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727246AbeHUSZ4 (ORCPT ); Tue, 21 Aug 2018 14:25:56 -0400 Received: from mail-it0-f48.google.com ([209.85.214.48]:55950 "EHLO mail-it0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726743AbeHUSZ4 (ORCPT ); Tue, 21 Aug 2018 14:25:56 -0400 Received: by mail-it0-f48.google.com with SMTP id d10-v6so4538070itj.5 for ; Tue, 21 Aug 2018 08:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K4ruTra9jKw0XyqA894F3hS5WCu+xHDxgYSgUGp7Qec=; b=LoA9EtTB/AR1jvI7nsBNtDgjsyPZ+tcgQQk/ojmePP8JtyLi9mQR3C6gUlhxE0OwO+ 7AVGZfbNgGnPRPcJrUhGz4YfcZPHABEQcSrZ2hpnKJC5w2TzrQQuyqnvZFeq7okcXHoY ufyGnKwYpQljheBQeWUPlb/eHZFb2nscYh6i4U+2HBXCD4omCmpUMFkHHpKSFG7ir/nJ RiSJdfw1zEH3jBbx7BQ7VYxlxs5+37qWV4HCi4eWvSZDXuLa91ro6TWLCOxF7iJsuHuH m2i1JhIamLBV8UfPXCzG86/gP0JRBh6DTHeUSSJGEjAPX3qwH8BvBWeJmIGYJfhDkgtU jJKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=K4ruTra9jKw0XyqA894F3hS5WCu+xHDxgYSgUGp7Qec=; b=bH/dQ5+NM78Yd3Y4VmPUZgSdoGDZExdXCIfoYSc0mJOAkHtMFz7qYVsx66B/firx5h dNk1Jmk/PMk9NAs7pYzIYFv09t3IgvOIOeB9mwRnXmdiwQYlhTccvCY/mTag6BXxHXzI Qs9lLRsywvcG4EsmsrqujjjXg0NQgIMwrb5ufnrHGKOROmj25+ZXUGWQhHvaIaGyQe+F kxA+IgnolxNWaRfm52CJkDIyl+ioi+RJIsyjkJ00Cy1K1sJ2ls9NqtZipkgH9GvmFTJr 6b4pzkky09sTGrxfZaDWkIA/Vjaam+R7D5gqSS+8Mur5a4cCPFWimlTIJU1vrEND0FgK wEKg== X-Gm-Message-State: APzg51Az1op36RAhnyQYhgrGJTbIF/SjdNkHt67drt425rr9IqtErd/S 6vg4zWHa5rdl93cPe78gfKZy0OmdsJ4= X-Google-Smtp-Source: ANB0VdZ/xgIBNEU0I3zEszivXmGFBowFyeJQ2wHUElcRy/UXwTOs+erC25fWxCpZ8LKb6fu8U/0Y0A== X-Received: by 2002:a02:742e:: with SMTP id o46-v6mr2807083jac.139.1534863924411; Tue, 21 Aug 2018 08:05:24 -0700 (PDT) Received: from x1.thefacebook.com ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id k5-v6sm2956501ioj.59.2018.08.21.08.05.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 08:05:23 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 2/3] blk-wbt: use wq_has_sleeper() for wq active check Date: Tue, 21 Aug 2018 09:05:16 -0600 Message-Id: <20180821150517.19744-3-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180821150517.19744-1-axboe@kernel.dk> References: <20180821150517.19744-1-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We need the memory barrier before checking the list head, use the appropriate helper for this. The matching queue side memory barrier is provided by set_current_state(). Signed-off-by: Jens Axboe --- block/blk-wbt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 1dd7edce7a99..853e22492f4e 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -118,7 +118,7 @@ static void rwb_wake_all(struct rq_wb *rwb) for (i = 0; i < WBT_NUM_RWQ; i++) { struct rq_wait *rqw = &rwb->rq_wait[i]; - if (waitqueue_active(&rqw->wait)) + if (wq_has_sleeper(&rqw->wait)) wake_up_all(&rqw->wait); } } @@ -162,7 +162,7 @@ static void __wbt_done(struct rq_qos *rqos, enum wbt_flags wb_acct) if (inflight && inflight >= limit) return; - if (waitqueue_active(&rqw->wait)) { + if (wq_has_sleeper(&rqw->wait)) { int diff = limit - inflight; if (!inflight || diff >= rwb->wb_background / 2) @@ -493,8 +493,8 @@ static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct, struct rq_wait *rqw = get_rq_wait(rwb, wb_acct); DECLARE_WAITQUEUE(wait, current); - if (!waitqueue_active(&rqw->wait) - && rq_wait_inc_below(rqw, get_limit(rwb, rw))) + if (!wq_has_sleeper(&rqw->wait) && + rq_wait_inc_below(rqw, get_limit(rwb, rw))) return; add_wait_queue_exclusive(&rqw->wait, &wait); From patchwork Tue Aug 21 15:05:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10571899 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 6985313B6 for ; Tue, 21 Aug 2018 15:05:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54C2E2852C for ; Tue, 21 Aug 2018 15:05:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48D4B2A2DC; Tue, 21 Aug 2018 15:05:28 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 EBF462852C for ; Tue, 21 Aug 2018 15:05:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727485AbeHUSZ6 (ORCPT ); Tue, 21 Aug 2018 14:25:58 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:34423 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726743AbeHUSZ6 (ORCPT ); Tue, 21 Aug 2018 14:25:58 -0400 Received: by mail-it0-f65.google.com with SMTP id x79-v6so2379722ita.1 for ; Tue, 21 Aug 2018 08:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ff4uGbwoRh9YZjq7M6XEBoJOkyKOvrSuJZsRGM3ejF4=; b=z+8zLw/r+81skDNBEmCpYIeJTrjrtdXSkzSf4pubG3NnjCIkSYuis9+uuv3eMXt+Ee rMyloPEOg5HRjH4w5ZlVN5cK9a6UWkKi288g7nxBkbQkrGZ+Qk7j/y3gG8XJaKuYkqZ4 gRrKCHF003Vt1nIkKvFHRoRSPpOfVC6ZdmZiZYW2N1c87oTFpuL02qvlKRIhzOozE55t 4P+mVc1AlfXVLAy88bz5o0J3lJ5U/nkIx61yuhu4AW2YSZsu6PUfsHci3kQMB8nT6MiO xKxFQgmAoiof+bx+5nHyxXNS/DB6vSxiHC/0JgO3VOVsyX2f4eNFpMuuiDTSW4+RpDan daXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ff4uGbwoRh9YZjq7M6XEBoJOkyKOvrSuJZsRGM3ejF4=; b=ntRcm7fPFYYzz5GcVpoC849dxlz6SlSsbP4X+yKnMiM/JJgHrXAa8WrrpLmyWZ4HkP t0QhUnEwLJL/HQS7ksesDLAShVgcGQWo/UaUk89asiLmVoTmShf+wD0gdsHfl/D8qLuj dILJFMT8++8uyMTV4yBvoc0xHZ+Tgv5n0/o4Y6pwX/VbX1R5SZNrdeh1iecZLA+ec4u1 oKvvwoRwaZHs0s4H2AkzBr4hWcYGAFJjXI8MpEgpoSZMkZ8l6j3JQC6vlxh2y9jNZte1 05xOqSwxEl4ilQ44SO9CvPzAJ2G8jQ5NrkcEYRROwCFJftNSlv2O4GQyKxrWvx+b4amP VpAQ== X-Gm-Message-State: APzg51DrRN4fRDyPbSaTBSj6zu0dpmeWkjiMp86bQutlg4TztW9xj/1C fT6OatfB7K09NFaWjWxS2nGCgOnUqvk= X-Google-Smtp-Source: ANB0VdaZPPbT123h5rCRuteapGO9OBfvON0GDcx7hvi/6eT6GvoFOxoOe8ioy6juy2ODpvRggSIZkw== X-Received: by 2002:a24:8782:: with SMTP id f124-v6mr3418909ite.87.1534863926093; Tue, 21 Aug 2018 08:05:26 -0700 (PDT) Received: from x1.thefacebook.com ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id k5-v6sm2956501ioj.59.2018.08.21.08.05.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 08:05:24 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 3/3] blk-wbt: fix has-sleeper queueing check Date: Tue, 21 Aug 2018 09:05:17 -0600 Message-Id: <20180821150517.19744-4-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180821150517.19744-1-axboe@kernel.dk> References: <20180821150517.19744-1-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We need to do this inside the loop as well, or we can allow new IO to supersede previous IO. Signed-off-by: Jens Axboe --- block/blk-wbt.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 853e22492f4e..c9358f1981fb 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -492,16 +492,17 @@ static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct, { struct rq_wait *rqw = get_rq_wait(rwb, wb_acct); DECLARE_WAITQUEUE(wait, current); + bool has_sleeper; - if (!wq_has_sleeper(&rqw->wait) && - rq_wait_inc_below(rqw, get_limit(rwb, rw))) + has_sleeper = wq_has_sleeper(&rqw->wait); + if (!has_sleeper && rq_wait_inc_below(rqw, get_limit(rwb, rw))) return; add_wait_queue_exclusive(&rqw->wait, &wait); do { set_current_state(TASK_UNINTERRUPTIBLE); - if (rq_wait_inc_below(rqw, get_limit(rwb, rw))) + if (!has_sleeper && rq_wait_inc_below(rqw, get_limit(rwb, rw))) break; if (lock) { @@ -510,6 +511,7 @@ static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct, spin_lock_irq(lock); } else io_schedule(); + has_sleeper = false; } while (1); __set_current_state(TASK_RUNNING);