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=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 9328FC10F05 for ; Fri, 29 Mar 2019 15:56:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E8B8206BA for ; Fri, 29 Mar 2019 15:56:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729583AbfC2P41 (ORCPT ); Fri, 29 Mar 2019 11:56:27 -0400 Received: from mail02.iobjects.de ([188.40.134.68]:45912 "EHLO mail02.iobjects.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728839AbfC2P40 (ORCPT ); Fri, 29 Mar 2019 11:56:26 -0400 Received: from tux.wizards.de (pD9EBF050.dip0.t-ipconnect.de [217.235.240.80]) by mail02.iobjects.de (Postfix) with ESMTPSA id 8A9FC4164673; Fri, 29 Mar 2019 16:56:24 +0100 (CET) Received: from [192.168.100.223] (ragnarok.applied-asynchrony.com [192.168.100.223]) by tux.wizards.de (Postfix) with ESMTP id 36F2CF01604; Fri, 29 Mar 2019 16:56:24 +0100 (CET) Subject: Re: [PATCH] block/bfq: fix ifdef for CONFIG_BFQ_GROUP_IOSCHED=y To: Konstantin Khlebnikov , linux-block@vger.kernel.org, Jens Axboe , Paolo Valente , linux-kernel@vger.kernel.org References: <155386807826.3190.16175453392005064129.stgit@buzz> From: =?UTF-8?Q?Holger_Hoffst=c3=a4tte?= Organization: Applied Asynchrony, Inc. Message-ID: Date: Fri, 29 Mar 2019 16:56:24 +0100 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: <155386807826.3190.16175453392005064129.stgit@buzz> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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". Reviewed-by: Holger Hoffstätte cheers, Holger