From patchwork Wed Aug 22 06:40:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 960797 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 41wHx51mRPz9s4c; Wed, 22 Aug 2018 16:40:41 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fsMoj-0006xK-Ru; Wed, 22 Aug 2018 06:40:33 +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 1fsMoh-0006vL-3L for kernel-team@lists.ubuntu.com; Wed, 22 Aug 2018 06:40:31 +0000 Received: from mail-ed1-f70.google.com ([209.85.208.70]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fsMog-0004F8-Qh for kernel-team@lists.ubuntu.com; Wed, 22 Aug 2018 06:40:30 +0000 Received: by mail-ed1-f70.google.com with SMTP id v26-v6so497010eds.9 for ; Tue, 21 Aug 2018 23:40:30 -0700 (PDT) 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; bh=yOnh9i0kWHZSVdXyOru2XDjy2fGTH2aacrNy9XbH1Sk=; b=CEI7yT1XobRQzySYJz721r3KlQ62NRbEdNA6nkFdlkY2ECjd9hsWMZihS7eStfTei2 nsb/hFwZJYGLdIaokgivAtrHG2kHcw3u7Bd7ozxdbdTviebz6QLit8mT1akFumSjJ7Ao WLm/7FqoJj8QkEVPRcKoY/lQee3O1CYeVwfXVTqRlxNryhQnVwC6AwXlEcQJG63hpxdC C4D+PN1sWv6vFo6S4/qohSFkXQ17vQ6QzCJiPUWeA+5oW9PFd7QrdpyCQrZ8uiIQg/kT H2fIVMMoHi+bZRrjK5t2CdUIAqyJUvsV/TUAn72N+5w6LQ51ALLQ2EtxM5WoI1yPSj40 +WNg== X-Gm-Message-State: AOUpUlEIpHUfx/5OT4uHcoVWJEllYdsjs+QjeLacqBRAKkgGDiYONUzf HDAPTKw4p153BvR1SIoERDmy6TNTecRLSytnAnO3xLb28m4FEaY1EDIDX7sgGLEsxVgvfRkjL3n 70CnwnT2W70UZihrgWEmHF9ntF646ctAaJpFROhkC0g== X-Received: by 2002:a50:f10d:: with SMTP id w13-v6mr16966399edl.0.1534920030397; Tue, 21 Aug 2018 23:40:30 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyncMkcgpNF+4tns/YPyZCUYbEnm57Cs0ipnHa3sOtCU7eQ+OWf4AP+xmwtiUTfX/J13SdU7A== X-Received: by 2002:a50:f10d:: with SMTP id w13-v6mr16966386edl.0.1534920030249; Tue, 21 Aug 2018 23:40:30 -0700 (PDT) Received: from localhost.localdomain ([81.221.205.149]) by smtp.gmail.com with ESMTPSA id j23-v6sm529350edh.29.2018.08.21.23.40.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 23:40:29 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Trusty][PATCH 6/7] Revert "UBUNTU: [Config] disable NUMA_BALANCING" Date: Wed, 22 Aug 2018 08:40:20 +0200 Message-Id: <20180822064021.17216-7-juergh@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180822064021.17216-1-juergh@canonical.com> References: <20180822064021.17216-1-juergh@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: , Cc: juergh@canonical.com MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This reverts commit c68375ad13b90e33dcf9d5008957ecd0e9d2c331. We can reenable NUMA balancing again, now that _PAGE_NUMA is no longer aliased to _PAGE_PROTNONE which was causing issues with the PTE offset inversion introduced by the L1TF patches. CVE-2018-3620 CVE-2018-3646 Signed-off-by: Juerg Haefliger --- debian.master/config/config.common.ubuntu | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index aa9d16a0d011..3689f20ba78f 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -334,6 +334,7 @@ CONFIG_ARCH_TEGRA_124_SOC=y CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_ARCH_TEGRA_3x_SOC=y # CONFIG_ARCH_U8500 is not set +CONFIG_ARCH_USES_NUMA_PROT_NONE=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y @@ -4599,7 +4600,8 @@ CONFIG_NTB_NETDEV=m # CONFIG_NTFS_DEBUG is not set CONFIG_NTFS_FS=m # CONFIG_NTFS_RW is not set -# CONFIG_NUMA_BALANCING is not set +CONFIG_NUMA_BALANCING=y +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y # CONFIG_NUMA_EMU is not set CONFIG_NVEC_PAZ00=m CONFIG_NVEC_POWER=m