Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp142257pxf; Thu, 25 Mar 2021 00:02:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUJxU6QdAfUJo88mEB5HvqUji3NTi041iisidVugW5YSNKVpwWu3p4Jq9rWSgbFQqs1TE7 X-Received: by 2002:a17:907:7699:: with SMTP id jv25mr7479221ejc.363.1616655771365; Thu, 25 Mar 2021 00:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616655771; cv=none; d=google.com; s=arc-20160816; b=KjKfIEC9MVWziYMAe0TDFBhjzIycT7tpuRkLtg8Hpq2NUzmeVuai6X+c6OXEEKq0dL PCyG7QsrO1ZfkGrVjXW4JQKEOFz2dhkv/wiq5bopyeQR0n/fIIleYXxH23TZVLWg4vOz xm6MUJH/sJhm23UZvHhUfJDhV/Vjn70Bhx9/YlHr/o9UXqWhVF8+TcqqKQKIyY2Fvc12 6YKRweFYUIJy/fJBmEppLypqzcG+mx843fDKe974DqZhw026CdH8o6tSAZWfX80Id9I+ EYFWxrzi9GYd319LRG5RMR0BonylnHpmBYAGgaJx0we2LY4N5D+UKunARufZd78M2qE4 sJGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ZZvw7/YnAvbuz3MYm/09eOTBXS+Szbh8Xu21JXaDC18=; b=UgKWMAQtk1BKUSEYtCrWT78ZrnXmP8kdIIB4pi7u/m6v+cHdCWcZDkflVEPfufqqTJ gmVslrbIfYtNFp2Q+XLPE6M6wFCdL8wyyDKUylFwnF4qj/BJim2odn32MnO297Jh2VDN Ruzx0Oa3ydH+YV/QzYxlavrIoLYYwp/j25ESbiCZQOJIzEAttWrbqfWQvS7Amvw6aYV4 n7pNwzh25PubmDofLcfLU85i9IEguAdtBjI/YMbogO8vqMpRlDLVm6SaG0Vdv+KhE6is j0ToNffuxsQfL7ZNrX88NbUD39DwzawkkqMQ8VodcIEcxGAzQAsgxOAYx5VGGEGx3LzO h4Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=A5MwuGnB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j2si3473051ejv.381.2021.03.25.00.02.28; Thu, 25 Mar 2021 00:02:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=A5MwuGnB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230203AbhCYG7D (ORCPT + 99 others); Thu, 25 Mar 2021 02:59:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229957AbhCYG6X (ORCPT ); Thu, 25 Mar 2021 02:58:23 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2C18C06174A; Wed, 24 Mar 2021 23:58:22 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id v2so832818pgk.11; Wed, 24 Mar 2021 23:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=ZZvw7/YnAvbuz3MYm/09eOTBXS+Szbh8Xu21JXaDC18=; b=A5MwuGnBLXyxo1pNxzLhQUC1BCejhCEC8eQEep08Z+a+m2RfBsIU+6isYbN7js2fpI jjkbVmee3EPb+2fDE30FjVmQc7QtHnOLSzFfaObbLfd9T8zni8h2cDnaBBP38ue13hHk HR4cNYODcN4OIrVlkNLHh2J5QZjZ+C/qhcS8v5PdccuELOCUhqJ7jnFnKm5JmwL2FmPE J+bwS8yOkJv+vk8NCWANCP3/fDkf+GCEHbhYSxD9bsoc8Yk7QgaNZA5zVEsudsJVoxPJ 4VjLXwuA7INBQdt0tA+RxEroUa9tPBGhx5rUhreTd5MHorZLxDHpWAAyX0W+aN473Zt3 PM3g== 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:in-reply-to:references; bh=ZZvw7/YnAvbuz3MYm/09eOTBXS+Szbh8Xu21JXaDC18=; b=IF8/YXQ4Jirtsd7Ox0GCYVG9AxtDlOa7+Kd0GKKFYtf/1umsbo/hhAD5CFzQO1r9mA DTN+rDYyEaXh05amX7sIFTqPJ+Ly4caLNfzI1ManG3K22vZoslnqoBKAw3LlLNz3CIGq +5vdXvqhp38Y1KYr/kJ++dwzOI0xz1hu7wSldkbavOBIQbDEd1XdSSrtoJVPSz2YKOmc Lw+40imXs68bvYGURaohja+f3SZf0sFmPCXxBEsQ/vXq8cAMVh1hR5cbq1+ijcRwNaoZ OTPe0UEBckF0EwWcGuu71cPAnAWFFGiu83W4Rv1y8RXTCqoRUwcYcXK2B/+rFVceMG6F SSOA== X-Gm-Message-State: AOAM532eAtn4/mIwf1tntSQ9WxjBrAlEJMTFTxNVbyjNSgQv/FUroNAy sKENtDMUjonbnGv13KK0+uA= X-Received: by 2002:a05:6a00:8c7:b029:20f:1cf4:d02 with SMTP id s7-20020a056a0008c7b029020f1cf40d02mr6628093pfu.49.1616655502496; Wed, 24 Mar 2021 23:58:22 -0700 (PDT) Received: from VM-0-3-centos.localdomain ([101.32.213.191]) by smtp.gmail.com with ESMTPSA id x19sm4470202pfc.152.2021.03.24.23.58.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Mar 2021 23:58:22 -0700 (PDT) From: brookxu To: paolo.valente@linaro.org, axboe@kernel.dk, tj@kernel.org Cc: linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 12/14] bfq: disable merging between different groups under better_fairness Date: Thu, 25 Mar 2021 14:57:56 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chunguang Xu In order to better guarantee the Qos for each group, we do not allow queues of different groups to be merged. Signed-off-by: Chunguang Xu --- block/bfq-iosched.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 5aa9c2c..f4a99f9 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2665,6 +2665,9 @@ static bool bfq_may_be_close_cooperator(struct bfq_queue *bfqq, if (!bfq_bfqq_sync(bfqq) || !bfq_bfqq_sync(new_bfqq)) return false; + if (!bfq_bfqq_may_inject(bfqq, new_bfqq)) + return false; + return true; } -- 1.8.3.1