From patchwork Thu Jul 30 09:03:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 11692545 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1105B6C1 for ; Thu, 30 Jul 2020 09:03:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EDCDB2075F for ; Thu, 30 Jul 2020 09:03:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bytedance-com.20150623.gappssmtp.com header.i=@bytedance-com.20150623.gappssmtp.com header.b="gO3m2cAB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728928AbgG3JDh (ORCPT ); Thu, 30 Jul 2020 05:03:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728693AbgG3JDd (ORCPT ); Thu, 30 Jul 2020 05:03:33 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D07B1C061794 for ; Thu, 30 Jul 2020 02:03:33 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id g19so894264plq.0 for ; Thu, 30 Jul 2020 02:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QaFCt3p70PhPdpfYX4VplxwSDGJOv+7O6cVdHFqJo+8=; b=gO3m2cABUKQ0JZFSXpIPxZZMapd15KMvmgHC+Z9d/KpK1KfPTw8SF/N8TYQIgfOPRH I8T1RLTezCgNI8h5pAqaHcDCPnzM2S2k4GdHYDabcm82ZK9UvHYtfS3WD5wK20kpyQxy xurQQ0N/RnZgPdODXJRshuRxeT9dDsW81XxM772UhSTAgAHchnSzqVkkP9BO/IfDk8mL sNvABzgewox5KDCrR/IEjETXHP+Y1tZ8k/ouGj/W6Lle8R8Ih+LTaVeaM/YHj+w/mKR2 50FqsrGJclCoHecx1ZQ/TLYTh7JgfPkkTsh0RW7In8Nje65jCjyZlrQ7XkBGxrYJeSYl qY9g== 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:mime-version :content-transfer-encoding; bh=QaFCt3p70PhPdpfYX4VplxwSDGJOv+7O6cVdHFqJo+8=; b=bLTzu3Va9kMktEH4KPqXpydRbZp7392DPXJ0F2Z3iaHM4/sIQbsoHcJZRap4dXjMSt QPEqrI9Rj4/sXo1PcuCOxaALbpUaba752PPd+Y4F5SoSyo5YVaRMMpFf4tj+CZtxMog0 BU8E7Cx03xYVR3QoKQ6Kt+OdJhUEUuYQDzTh7owffp9X+ZCOw8BAEQ6vlaIYhyCCkLoe bc0wxQn9Ny/uQbGnXc3/YvkaQwDaXZibKgWU91F/82wGxx3h9lGsWELeDrZdGOwjgjS3 B79dpGiBxcRW0C6VMjhdasavEWiZWlRihXyMXpXZcGHFOWFWkhp3DYWcxEkKXhoRpVfc D1rA== X-Gm-Message-State: AOAM530mdfr0SKMIaGKvnmssEqbgQct72sFPHXuliur9ML4LsPIXee13 H4EQL7zFc5R8avVfRpyM/my33w== X-Google-Smtp-Source: ABdhPJyKgxSZ6enRMtBSL39zsPd1k2zp+c5GqSn6zYTw17+/9PB2UapxZRNc1CS/IFHGPSkmJuJcTg== X-Received: by 2002:a17:90a:1fca:: with SMTP id z10mr140054pjz.209.1596099813408; Thu, 30 Jul 2020 02:03:33 -0700 (PDT) Received: from C02CV1DAMD6P.bytedance.net ([103.136.220.73]) by smtp.gmail.com with ESMTPSA id b185sm5217080pfg.71.2020.07.30.02.03.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jul 2020 02:03:33 -0700 (PDT) From: Chengming Zhou To: tj@kernel.org, axboe@kernel.dk, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: zhouchengming@bytedance.com Subject: [PATCH] iocost: Fix check condition of iocg abs_vdebt Date: Thu, 30 Jul 2020 17:03:21 +0800 Message-Id: <20200730090321.38781-1-zhouchengming@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org We shouldn't skip iocg when its abs_vdebt is not zero. Fixes: 0b80f9866e6b ("iocost: protect iocg->abs_vdebt with iocg->waitq.lock") Signed-off-by: Chengming Zhou --- block/blk-iocost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 8ac4aad66ebc..86ba6fd254e1 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -1370,7 +1370,7 @@ static void ioc_timer_fn(struct timer_list *timer) * should have woken up in the last period and expire idle iocgs. */ list_for_each_entry_safe(iocg, tiocg, &ioc->active_iocgs, active_list) { - if (!waitqueue_active(&iocg->waitq) && iocg->abs_vdebt && + if (!waitqueue_active(&iocg->waitq) && !iocg->abs_vdebt && !iocg_is_idle(iocg)) continue;