From patchwork Mon Feb 4 01:47:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1035670 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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43t9Zx3MZSz9sLw; Mon, 4 Feb 2019 12:48:08 +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 1gqTMf-0006vk-7Z; Mon, 04 Feb 2019 01:48:01 +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 1gqTMd-0006vU-Or for kernel-team@lists.ubuntu.com; Mon, 04 Feb 2019 01:47:59 +0000 Received: from mail-qt1-f200.google.com ([209.85.160.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gqTMd-0005f3-FA for kernel-team@lists.ubuntu.com; Mon, 04 Feb 2019 01:47:59 +0000 Received: by mail-qt1-f200.google.com with SMTP id p24so17272418qtl.2 for ; Sun, 03 Feb 2019 17:47:59 -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=j6qmOu/0H3ANCUz0g5fjHj+dBuriWM9vZu7Bxw2+cM8=; b=PAF3uMO6wvt62J3s2bqMUs9LKWzBhHH7fwv3NFT3bZNfXG5bB0UcSl12xvOYUal1+o bycghidCFagps8pCoY7QlJlNAlyN8V2al9DDiK1VsAyrsohY0BFfWY0itN8rIcvcT9Zb 51MreNjmP49kOYEdQgYZRg7lnCqtlMZ0DIE5QCo34GaxUOIGIj8XqnAOlkeOeuduMU0x 19/+WjsXkqXPF+YXegYODFhu6kWpgSUT4lL1byHbdx4xCJd383BP+IC6b5OpdY9PJKLQ lyA+IgHrtWkC72ajjo7SkEO/2retgRkUxXdxDPiA9rEG5lv6ep/Q5IOOaxJ1Nk9cBDNb qaUg== X-Gm-Message-State: AHQUAubE8/lv4Pj5jpUtMeFfBDc+9VR7DSYu9vQeU3U2L6vuvsmA+Ou1 aqGq/PxYj/mWP/iDotvCFAxq+VBLnJfs6/8nzKgwADVXNUY9oDnOZSqmbqZgbkYLNo6UvlVlZu1 93ZtqFG8NYu7SwDtlnBqx6g7F9HLElnJbx9Zuai8T X-Received: by 2002:a05:620a:15b4:: with SMTP id f20mr10068638qkk.331.1549244878199; Sun, 03 Feb 2019 17:47:58 -0800 (PST) X-Google-Smtp-Source: AHgI3IYnMLMbgFqQjAFI1hy7/MFNgDOhnWej2iOqsV3idf80aBK56v6I7LSmhWL+563MyrfSHhG4Gw== X-Received: by 2002:a05:620a:15b4:: with SMTP id f20mr10068630qkk.331.1549244877904; Sun, 03 Feb 2019 17:47:57 -0800 (PST) Received: from gallifrey.lan ([189.61.208.219]) by smtp.gmail.com with ESMTPSA id x5sm13229946qtc.43.2019.02.03.17.47.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Feb 2019 17:47:57 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic/linux-azure][PATCH 1/1] UBUNTU: [Config] linux-azure: Enable all IO schedulers as modules Date: Sun, 3 Feb 2019 23:47:49 -0200 Message-Id: <20190204014750.16124-2-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190204014750.16124-1-marcelo.cerri@canonical.com> References: <20190204014750.16124-1-marcelo.cerri@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" BugLink: http://bugs.launchpad.net/bugs/1813211 Build all missing IO schedulers as modules and keep them in the main modules package. Signed-off-by: Marcelo Henrique Cerri --- debian.azure/config/annotations | 26 ++++++++++++++------- debian.azure/config/config.common.ubuntu | 5 ++-- debian.azure/control.d/azure.inclusion-list | 5 ++++ 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 532083c33877..053ec8b17ac1 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -8629,15 +8629,23 @@ CONFIG_BLK_SED_OPAL policy<{'amd64': 'y', 'arm64': ' CONFIG_BLK_DEV_THROTTLING note # Menu: Enable the block layer >> IO Schedulers -CONFIG_IOSCHED_DEADLINE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_IOSCHED_CFQ policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_CFQ_GROUP_IOSCHED policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_MQ_IOSCHED_DEADLINE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> -CONFIG_MQ_IOSCHED_KYBER policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> -CONFIG_IOSCHED_BFQ policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> -CONFIG_BFQ_GROUP_IOSCHED policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -# -CONFIG_MQ_IOSCHED_DEADLINE flag +CONFIG_IOSCHED_NOOP policy<{'amd64': 'y'}> +CONFIG_IOSCHED_DEADLINE policy<{'amd64': 'm'}> +CONFIG_IOSCHED_CFQ policy<{'amd64': 'm'}> +CONFIG_CFQ_GROUP_IOSCHED policy<{'amd64': 'y'}> +CONFIG_MQ_IOSCHED_DEADLINE policy<{'amd64': 'm'}> +CONFIG_MQ_IOSCHED_KYBER policy<{'amd64': 'm'}> +CONFIG_IOSCHED_BFQ policy<{'amd64': 'm'}> +CONFIG_BFQ_GROUP_IOSCHED policy<{'amd64': 'y'}> +# +CONFIG_IOSCHED_NOOP mark note +CONFIG_IOSCHED_DEADLINE mark note +CONFIG_IOSCHED_CFQ mark note +CONFIG_CFQ_GROUP_IOSCHED mark note +CONFIG_MQ_IOSCHED_DEADLINE mark note +CONFIG_MQ_IOSCHED_KYBER mark note +CONFIG_IOSCHED_BFQ mark note +CONFIG_BFQ_GROUP_IOSCHED mark note # Menu: Enable the block layer >> IO Schedulers >> Default I/O scheduler CONFIG_DEFAULT_DEADLINE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 77d1e179609e..e07cb60e62a4 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -604,6 +604,7 @@ CONFIG_CFG80211_DEFAULT_PS=y CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y CONFIG_CFG80211_WEXT=y +CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_CFS_BANDWIDTH=y CONFIG_CGROUPS=y CONFIG_CGROUP_BPF=y @@ -2094,8 +2095,8 @@ CONFIG_IOMMU_IOVA=y # CONFIG_IOMMU_STRESS is not set CONFIG_IOMMU_SUPPORT=y CONFIG_IOSCHED_BFQ=m -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_IOSCHED_CFQ=m +CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_NOOP=y CONFIG_IOSF_MBI=y CONFIG_IOSF_MBI_DEBUG=y diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list index f98ef5e2999f..02cea0af622b 100644 --- a/debian.azure/control.d/azure.inclusion-list +++ b/debian.azure/control.d/azure.inclusion-list @@ -7,6 +7,11 @@ arch/powerpc/platforms/powernv/opal-prd.ko arch/s390/* arch/x86/kvm/kvm-amd.ko arch/x86/kvm/kvm-intel.ko +block/bfq.ko +block/cfq-iosched.ko +block/deadline-iosched.ko +block/kyber-iosched.ko +block/mq-deadline.ko crypto/* drivers/acpi/* drivers/ata/acard-ahci.ko