From patchwork Thu Jan 10 03:12:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauricio Faria de Oliveira X-Patchwork-Id: 1022680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ZrgG4vCXz9sDL; Thu, 10 Jan 2019 14:13:46 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ghQmr-00074W-9M; Thu, 10 Jan 2019 03:13:41 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1ghQmW-0006qH-2I for kernel-team@lists.ubuntu.com; Thu, 10 Jan 2019 03:13:20 +0000 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ghQmV-0000Xk-Hi for kernel-team@lists.ubuntu.com; Thu, 10 Jan 2019 03:13:19 +0000 Received: by mail-qk1-f197.google.com with SMTP id 80so8231324qkd.0 for ; Wed, 09 Jan 2019 19:13:19 -0800 (PST) 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; bh=DAR3Z03n4vyGun0aP1A+CWv+kc0rgmXE7S4uM3wm5ZM=; b=F2Z9d9VDJa9l0FE1EfLcStRXfMM9wcyeVCCcs1X06NOYwA6KeOqSq0CYCEZRqUEf/V lOq07PhNMzKIKUtED0e2zCEtgXOmGurfciDbnjwJJ9jYJS7f8N0MkQ62qWWJI7dbxr+u qyM/Y0nhZXfWBG8vjFOmJ1G6EyQnG9otksA3f/qmOQW4kZ8LWg3QkB3Qa/GAZ2LuFZqe nYY5jkYwdAUvNI4neipDELN20idCnpGjDwwYK1LQ+t3WKG3ZnMtKJ79BQOP3N5GWpcEQ bV13e6n0gj17buNgwtUifqBKb32voS9IslwXBtj5ERXA9PWAg6iu5yruUrEvXMNYqdKp wT7g== X-Gm-Message-State: AJcUukeNi4Z8Q3oGwzPm25t2yVe/MKUY0IfcRkv3LygHCkXV/cKeAN5E 37XXl6jW9O0c9QqZEReRie8n+VNUPpCWqF6+Hi35meYpHBlYTCGhJ1C7i26/n/VXoSQf8VbPkNf upkaMEWnnDC74enfCiRgS5NR0OHcD/wvaXo9XJHOHFQ== X-Received: by 2002:aed:37e7:: with SMTP id j94mr8226578qtb.282.1547089998584; Wed, 09 Jan 2019 19:13:18 -0800 (PST) X-Google-Smtp-Source: ALg8bN6pOTt0f5yfUxwwZbYt5tzye7GWHwodzggyX97PxLlbChw2qZdR5TZ6vQ3k81rK/Vdkwc3uOg== X-Received: by 2002:aed:37e7:: with SMTP id j94mr8226568qtb.282.1547089998412; Wed, 09 Jan 2019 19:13:18 -0800 (PST) Received: from localhost.localdomain ([177.181.227.0]) by smtp.gmail.com with ESMTPSA id s9sm43971956qta.35.2019.01.09.19.13.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jan 2019 19:13:18 -0800 (PST) From: Mauricio Faria de Oliveira To: kernel-team@lists.ubuntu.com Subject: [SRU B][PATCH 09/13] blk-wbt: use wq_has_sleeper() for wq active check Date: Thu, 10 Jan 2019 01:12:15 -0200 Message-Id: <20190110031219.30676-10-mfo@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110031219.30676-1-mfo@canonical.com> References: <20190110031219.30676-1-mfo@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jens Axboe BugLink: https://bugs.launchpad.net/bugs/1810998 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(). Tested-by: Anchal Agarwal Signed-off-by: Jens Axboe (cherry picked from commit b78820937b4762b7d30b807d7156bec1d89e4dd3) Signed-off-by: Mauricio Faria de Oliveira --- 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 d6a85e2a07c9..5f975288e9fb 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -116,7 +116,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); } } @@ -157,7 +157,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) @@ -485,8 +485,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);