From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36B1BC43381 for ; Fri, 29 Mar 2019 16:15:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05C5D218A3 for ; Fri, 29 Mar 2019 16:15:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="zWOUKifR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729652AbfC2QPh (ORCPT ); Fri, 29 Mar 2019 12:15:37 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:50567 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729584AbfC2QPh (ORCPT ); Fri, 29 Mar 2019 12:15:37 -0400 Received: by mail-it1-f194.google.com with SMTP id m137so4611026ita.0 for ; Fri, 29 Mar 2019 09:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=33CxlXQHXC0S6M1Uolu/19/3Ah7FDE+HyfACUH2HypU=; b=zWOUKifRuq6P8xB/UQHw4IcqIBl8TGZWNSQspjG7UXFAorSLBj9U4yP0173xjK64UT otIq83PhZlKOv2iFAckaiMTdrUgjkEIlX9xwNYl+ACeamXDGfMGX3uxtwSRblX9iXkXu lnTahK2C3uQg6g19WtfMWKCQAG0YA/cx0QiiJSRxW3Ejglk+wZTCf14XyB4BnG8CswAM paZwvgzOYjmaiEHIK01VcUcvBuKls5S8XAIergYBfAtcTKHJpSgeoZNU2TGM5ImFVi0v w94ZPf12WihqoFennzhsGivEgrYXfbHfVZa95K6r8nYPE2NUsCbFwOiGqzuxALHZp5u4 nY2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=33CxlXQHXC0S6M1Uolu/19/3Ah7FDE+HyfACUH2HypU=; b=pcVjpVcT0dJTRUvkD1SKDpeKNNs0DXvTcBMJs3luUB+/g3kwcukU/272o4N3owJKv8 QmAYeBoh90fvg2i6oSk1ZhGDWmzLJCKH4cKyMSagFaRU8aBJAHZrtnvvA7poH3tamWI0 ulnzTtviN2io4FG3pmHunWcNEYt7GFIieBPit1zt2QJyZrH70fBlBRoNx7zCukuZQbXT pyXvssXPfg2UWPOiqW1JlelqYT1bqTOWWAF0AmzDueOen8YYlMJJf9sSMGmSG2AuTyv+ D9g+QarVI7AgxqfaaaHHPHSJlwuR0TX6uo9Yx+G1lSTvdxMzEueDRTB1bgrwrRMAWokj WWMA== X-Gm-Message-State: APjAAAVwq1ACNXLsqB4XTp321yYljR74gy9xfFjkfmycLQXw/Ir5t5JP JZO1Lb0bDwaAIIyX67ujRK9ivg== X-Google-Smtp-Source: APXvYqy131RiI5afWzKJi0E6wSTIfRafb7CgdWXhPzy5IcWahZwUpe/hYUQ2ASYpUrMCZq+lzRateg== X-Received: by 2002:a02:b008:: with SMTP id p8mr35973604jah.90.1553876135956; Fri, 29 Mar 2019 09:15:35 -0700 (PDT) Received: from [192.168.1.158] ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id p18sm1224758itp.10.2019.03.29.09.15.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 09:15:34 -0700 (PDT) Subject: Re: [PATCH] block/bfq: fix ifdef for CONFIG_BFQ_GROUP_IOSCHED=y To: =?UTF-8?Q?Holger_Hoffst=c3=a4tte?= , Konstantin Khlebnikov , linux-block@vger.kernel.org, Paolo Valente , linux-kernel@vger.kernel.org References: <155386807826.3190.16175453392005064129.stgit@buzz> <5234a971-2b6a-47b1-0071-8f3bd07d9fc3@kernel.dk> From: Jens Axboe Message-ID: <6be15f08-dbb4-6b43-3d95-44044f1acdbc@kernel.dk> Date: Fri, 29 Mar 2019 10:15:33 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On 3/29/19 10:12 AM, Holger Hoffstätte wrote: > On 3/29/19 4:58 PM, Jens Axboe wrote: >> On 3/29/19 9:56 AM, Holger Hoffstätte wrote: >>> On 3/29/19 3:01 PM, Konstantin Khlebnikov wrote: >>>> Replace BFQ_GROUP_IOSCHED_ENABLED with CONFIG_BFQ_GROUP_IOSCHED. >>>> Code under these ifdefs never worked, something might be broken. >>>> >>>> Fixes: 0471559c2fbd ("block, bfq: add/remove entity weights correctly") >>>> Fixes: 73d58118498b ("block, bfq: consider also ioprio classes in symmetry detection") >>>> Signed-off-by: Konstantin Khlebnikov >>>> --- >>>> block/bfq-iosched.c | 2 +- >>>> block/bfq-wf2q.c | 2 +- >>>> 2 files changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c >>>> index 4c592496a16a..fac188dd78fa 100644 >>>> --- a/block/bfq-iosched.c >>>> +++ b/block/bfq-iosched.c >>>> @@ -674,7 +674,7 @@ static bool bfq_symmetric_scenario(struct bfq_data *bfqd) >>>> * at least two nodes. >>>> */ >>>> return !(varied_queue_weights || multiple_classes_busy >>>> -#ifdef BFQ_GROUP_IOSCHED_ENABLED >>>> +#ifdef CONFIG_BFQ_GROUP_IOSCHED >>>> || bfqd->num_groups_with_pending_reqs > 0 >>>> #endif >>>> ); >>>> diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c >>>> index 63311d1ff1ed..a11bef75483d 100644 >>>> --- a/block/bfq-wf2q.c >>>> +++ b/block/bfq-wf2q.c >>>> @@ -1012,7 +1012,7 @@ static void __bfq_activate_entity(struct bfq_entity *entity, >>>> entity->on_st = true; >>>> } >>>> >>>> -#ifdef BFQ_GROUP_IOSCHED_ENABLED >>>> +#ifdef CONFIG_BFQ_GROUP_IOSCHED >>>> if (!bfq_entity_to_bfqq(entity)) { /* bfq_group */ >>>> struct bfq_group *bfqg = >>>> container_of(entity, struct bfq_group, entity); >>>> >>>> >>> >>> Good catch! I run without group scheduling and therefore didn't notice these >>> stray defines earlier. For 5.1 it should merge cleanly; adding this on top of >>> the pending 5.2 BFQ patches required a small context fixup in hunk #1 due to >>> "block, bfq: do not idle for lowest-weight queues". >> >> I'm hesitant to apply this, since the group scheduling stuff has obviously never >> been tested. > > This is simply a regression in 5.1 caused by 73d58118498b - nothing else, > and as such this fix needs to go into 5.1 as well. I'm sure Paolo will agree. > What you so ominously call "the group scheduling stuff" has been there and > shipping in mainline since day 1 of the BFQ merge, and it works fine in 5.0. If that's the case (I didn't check how far back it went), then yes, it should of course go into 5.1. The ominous nature of my reply I'll chalk up to your interpretation -- Jens Axboe