From patchwork Mon Apr 1 13:29:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1072781 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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44XtV90v82z9sRJ; Tue, 2 Apr 2019 00:29:21 +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 1hAwzz-00065j-5W; Mon, 01 Apr 2019 13:29:15 +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 1hAwzw-00064b-Ce for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:12 +0000 Received: from mail-ed1-f69.google.com ([209.85.208.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hAwzv-0003kh-5R for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:11 +0000 Received: by mail-ed1-f69.google.com with SMTP id p5so4380597edh.2 for ; Mon, 01 Apr 2019 06:29:11 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DanMsla+QEQTXWD602uCXpX8VCFRW5AruhOA6pAl88g=; b=ggHbmg0Qwh3Koe2mTHltgnCL7SzUSpw5V9Y/Gph9P9Lxr4fHSo2E66YbRvk5SCQqn3 bubz0/2zT7jpkHpn5UP7hFFLCvDrROBw9tyrhp/V3Zd0VbgpGGZ4nvLQQBH3/UkDVIQ4 VuPSgeXEI2LWnOX7jCVEL5fFy5lqLMkhT3mxPNjdH+mzuJtrfyKdKBzRRkwZ1csz6Od9 g+k8//2pkprrWpR+baPowKp7Tz0RcswSglsZCgX7BmBw2TXtRIT+TEWsL898zC9F8q1H rgeuNi6Fx/XBtrxxW9/bL+xGgbGGr54iTkial3ppNg1XOGlHW35OmAcKNWUxTqSddWfT CDOg== X-Gm-Message-State: APjAAAXuED5/B/kGcX80JYS/RjI8ICBI4zSN38jY1+etvE5zWB8+XeQe NCpZVXt8kgSIqWcBa7VwWqEngIpAMBh58htJBHTUVyRahMf1EGAWMLh2xT3r0LelZwHmaxr7PFv 6aL2s/PImaXt5X7P93ackmqIq2NbhaBbljxlUqT4m+A== X-Received: by 2002:a50:86a7:: with SMTP id r36mr42273945eda.259.1554125350625; Mon, 01 Apr 2019 06:29:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqy9lrLiWXDxffM2nDwSka5MLSjeRxfxZ97xHT54jb0H/Jo3RgyvPHscLLGfjaQQbdefVTLV4w== X-Received: by 2002:a50:86a7:: with SMTP id r36mr42273935eda.259.1554125350479; Mon, 01 Apr 2019 06:29:10 -0700 (PDT) Received: from gollum.fritz.box ([81.221.192.120]) by smtp.gmail.com with ESMTPSA id d37sm3231146ede.79.2019.04.01.06.29.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 06:29:09 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][PATCH 1/4] UBUNTU: SAUCE: cpu/hotplug: Fix Documentation/kernel-parameters.txt Date: Mon, 1 Apr 2019 15:29:04 +0200 Message-Id: <20190401132907.24823-2-juergh@canonical.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190401132907.24823-1-juergh@canonical.com> References: <20190401132907.24823-1-juergh@canonical.com> MIME-Version: 1.0 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1820872 Add 'nosmt' which was omitted in the original backport. Fixes: df8ddbcb30b2 ("cpu/hotplug: Provide knobs to control SMT") Signed-off-by: Juerg Haefliger --- Documentation/kernel-parameters.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index e4ed78be15f8..14bd3bcf0707 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2544,7 +2544,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. nohugeiomap [KNL,x86] Disable kernel huge I/O mappings. - [KNL,x86] Disable symmetric multithreading (SMT). + nosmt [KNL,x86] Disable symmetric multithreading (SMT). nosmt=force: Force disable SMT, cannot be undone via the sysfs control file. From patchwork Mon Apr 1 13:29:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1072779 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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44XtV85RM2z9sR0; Tue, 2 Apr 2019 00:29:20 +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 1hAwzx-00065A-W3; Mon, 01 Apr 2019 13:29:14 +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 1hAwzw-00064j-TD for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:12 +0000 Received: from mail-ed1-f69.google.com ([209.85.208.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hAwzw-0003kt-LH for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:12 +0000 Received: by mail-ed1-f69.google.com with SMTP id 41so4413790edr.19 for ; Mon, 01 Apr 2019 06:29:12 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TNpeBOB9GjK8L3LNZZUkTXADqj2XSYL42cQD607Pxe8=; b=jWh1gV4lqskMHbSOJFYW3MXc+KpxoVhVPrPMyRqMe/7pPuVps+TdgpFYcnQAcy05QZ J+FjdaF1drhf+YdrwNh2NcZL3240mtAT8AL+4qsRktL4fYH4e2GfIt38/1cz87aC7zNN bTvh8bPY2slCgaO8p/dXXMK+XecNMCQ7BaMYEq92+RzIKCZYxdpT3DXI/5VcTNzAL7Vd S/hV/0vZeGYOQkRG+AtQmll2TSuyh32bOpyD+/5riDtKfiSRvSeXMRXtYVtblAw8IIJI 1kNVgqNPWyr8B8ClAED05s31frM7Ojt2f0qm9G+saGgOdzRa+3oJcxDPMc8pkNopahL7 6bFA== X-Gm-Message-State: APjAAAVwrp1yLEt8PsShvfh/1kQv/RJh5gVhCQ65L6C3bESGdHF+2uyw 0ZlhN3JX416/Rd4csfL5NGwMBtWgJBrceFYX9VhpBcrUNQiSnhDeTOCox9hl5O1OLMPkCAJwFSK YCBF1PXnuHoq4OTuIPChrl2btr6vvMo/edmvnUn5ckQ== X-Received: by 2002:a17:906:194c:: with SMTP id b12mr26523951eje.228.1554125351769; Mon, 01 Apr 2019 06:29:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqxl93rRjLGhCivgy5ly+ozzYXYEIFKCe+WlWnEB/9A6Pe+eSSuzeWrr4NkhXlkK9LnY3ThIpg== X-Received: by 2002:a17:906:194c:: with SMTP id b12mr26523944eje.228.1554125351615; Mon, 01 Apr 2019 06:29:11 -0700 (PDT) Received: from gollum.fritz.box ([81.221.192.120]) by smtp.gmail.com with ESMTPSA id d37sm3231146ede.79.2019.04.01.06.29.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 06:29:10 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][PATCH 2/4] UBUNTU: SAUCE: Fix typo in Documentation/kernel-parameters.txt Date: Mon, 1 Apr 2019 15:29:05 +0200 Message-Id: <20190401132907.24823-3-juergh@canonical.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190401132907.24823-1-juergh@canonical.com> References: <20190401132907.24823-1-juergh@canonical.com> MIME-Version: 1.0 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1820872 Fixes: bb807b8430bc ("UBUNTU: SAUCE: x86/bugs: Provide boot parameters for the spec_store_bypass_disable mitigation") Signed-off-by: Juerg Haefliger --- Documentation/kernel-parameters.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 14bd3bcf0707..1ad86a8d68b8 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3727,7 +3727,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. spec_store_bypass_disable= [HW] Control Speculative Store Bypass (SSB) Disable mitigation - (Seculative Store Bypass vulnerability) + (Speculative Store Bypass vulnerability) Certain CPUs are vulnerable to an exploit against a a common industry wide performance optimization known From patchwork Mon Apr 1 13:29:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1072780 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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44XtV86rfJz9sR7; Tue, 2 Apr 2019 00:29:20 +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 1hAwzz-00065w-BO; Mon, 01 Apr 2019 13:29:15 +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 1hAwzx-000654-Q7 for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:13 +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 1hAwzx-0003kx-Ij for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:13 +0000 Received: by mail-ed1-f70.google.com with SMTP id m32so4421942edd.9 for ; Mon, 01 Apr 2019 06:29:13 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vP/TVvrnaYOMsYbzg5atlegwvF8odrRdUsQJYkVhodI=; b=W3xF0o+B0rPlulYP1BwT4zWkb4xZHTE0ny+tA9qpUmQ8VUpyI141irrm+O4cJJXPsf J6FISQyeusbl8HdxYJOhiX0k7CdfwtkOHSQ/r4O8mMbU+P7VGg4GKHxAd/yRsWNwNaIQ EwoPGg/1/8EdOWUNhvT063CCzTnyWVm/+FYpnF7UQ8oF+jqo/oUt9lMZUUDrXCgwzmtn GIm+feNOMPfJOzvRGJNXGpkFFBPIGotXCqeW8iQJXjcgUZuUzAiTnXTfj44EtnWZKCDO KoCENbZzMoPe9zOYHXBW/leVC3jRgwKMsaaG8701mqJmaaIXJDRDrPgNHgPVOwPH3PY6 GX3Q== X-Gm-Message-State: APjAAAXX3UyC2QTKHkxNZ53o5d8esVssu0uT8JJQSQ21MLhBhkOO7V9S L97+fXUV+VhyVxUvvyHnRvicWIVVvJK9P2gJsrKLn5VORInF6ycXRd+lhJXqqdhU+QEC0U+74s9 0hb7Wc6N9hF0K9ljcRmByod90o2z26KeyLMxA5wwDvg== X-Received: by 2002:a50:cac1:: with SMTP id f1mr17544338edi.74.1554125353103; Mon, 01 Apr 2019 06:29:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqy0PblEGV6Ip/rSNxWUC/bty60uSzy4qL6lKuH3OrYsh5KWD3zR3o+Uet9qhI3TCj9wYNoIBA== X-Received: by 2002:a50:cac1:: with SMTP id f1mr17544326edi.74.1554125352931; Mon, 01 Apr 2019 06:29:12 -0700 (PDT) Received: from gollum.fritz.box ([81.221.192.120]) by smtp.gmail.com with ESMTPSA id d37sm3231146ede.79.2019.04.01.06.29.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 06:29:11 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][PATCH 3/4] UBUNTU: SAUCE: x86: Move hunks and sync to upstream stable 4.9 Date: Mon, 1 Apr 2019 15:29:06 +0200 Message-Id: <20190401132907.24823-4-juergh@canonical.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190401132907.24823-1-juergh@canonical.com> References: <20190401132907.24823-1-juergh@canonical.com> MIME-Version: 1.0 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1820872 Trivial changes to reduce the delta between Xenial 4.4 and upstream stable 4.9 so that future cherry-picking results in fewer conflicts. Signed-off-by: Juerg Haefliger --- arch/x86/include/asm/nospec-branch.h | 7 ++++--- arch/x86/kernel/cpu/amd.c | 4 +--- arch/x86/kernel/cpu/bugs.c | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index a6120d43caa7..46eb80b1b57b 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -202,9 +202,6 @@ enum spectre_v2_mitigation { SPECTRE_V2_IBRS_ENHANCED, }; -/* The Intel SPEC CTRL MSR base value cache */ -extern u64 x86_spec_ctrl_base; - /* The Speculative Store Bypass disable variants */ enum ssb_mitigation { SPEC_STORE_BYPASS_NONE, @@ -256,6 +253,9 @@ static inline void indirect_branch_prediction_barrier(void) X86_FEATURE_USE_IBPB); } +/* The Intel SPEC CTRL MSR base value cache */ +extern u64 x86_spec_ctrl_base; + /* * With retpoline, we must use IBRS to restrict branch prediction * before calling into firmware. @@ -265,6 +265,7 @@ static inline void indirect_branch_prediction_barrier(void) #define firmware_restrict_branch_speculation_start() \ do { \ u64 val = x86_spec_ctrl_base | SPEC_CTRL_IBRS; \ + \ preempt_disable(); \ alternative_msr_write(MSR_IA32_SPEC_CTRL, val, \ X86_FEATURE_USE_IBRS_FW); \ diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 081732f8a598..b3f68f9500cc 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -296,10 +296,8 @@ static int nearby_node(int apicid) static void amd_get_topology_early(struct cpuinfo_x86 *c) { -#ifdef CONFIG_SMP - if (boot_cpu_has(X86_FEATURE_TOPOEXT)) + if (cpu_has(c, X86_FEATURE_TOPOEXT)) smp_num_siblings = ((cpuid_ebx(0x8000001e) >> 8) & 0x3) + 1; -#endif } /* diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 63d5b84e680b..4759c11b2380 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -396,7 +396,7 @@ retpoline_auto: if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) { retpoline_amd: if (!boot_cpu_has(X86_FEATURE_LFENCE_RDTSC)) { - pr_err("Spectre mitigation: LFENCE not serializing. Switching to generic retpoline\n"); + pr_err("Spectre mitigation: LFENCE not serializing, switching to generic retpoline\n"); goto retpoline_generic; } mode = retp_compiler() ? SPECTRE_V2_RETPOLINE_AMD : @@ -860,7 +860,6 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr case X86_BUG_SPECTRE_V1: return sprintf(buf, "Mitigation: __user pointer sanitization\n"); - break; case X86_BUG_SPECTRE_V2: return sprintf(buf, "%s%s%s%s%s\n", spectre_v2_strings[spectre_v2_enabled], From patchwork Mon Apr 1 13:29:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1072782 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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44XtVB47SJz9sNg; Tue, 2 Apr 2019 00:29:22 +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 1hAx01-00067n-Lu; Mon, 01 Apr 2019 13:29:17 +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 1hAwzz-00065c-0E for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:15 +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 1hAwzy-0003l8-Ny for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:14 +0000 Received: by mail-ed1-f70.google.com with SMTP id 41so4413857edr.19 for ; Mon, 01 Apr 2019 06:29:14 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+dRkiD2PpwWI2PsF5Nd/X9/1XSj395Tge4UNg7GiZ1Q=; b=UoJ70gQSmuDKZ/wiSyypVMMZ7rU/ik6m9hk2BOqu6FFLzS6PkQYAQZdnoYGla3AkQC c5WdP3MF3IsALinAEBPTylpKZ5JlTf3QqT+LYfqKCGN1iq0Jx5XmcO1+qZQnJLA2hSDd LlEiImMTGAHpSvOIAJ9+iBUjZDFI4tv1KQuaExFvl25JVMRwpsHzQ0397mBGw3wo5bIo FwvOAdqxae6CfzDj6kGM8FcbAi6WxOz1mYbSZmQie3st/PztLcPNX5rMH8RiUDBoYmA0 MzmjMkqH7o93+oBwSCUjcHYx9Pb+qviW7OdrhjPCsipYMY9dBH8heMEzc+VeFLlqwcJ5 NAjg== X-Gm-Message-State: APjAAAUljMWQ1wclac3dm3st2ZBWkK3yWabQWTMkcC7qz2vgkj+6ij5F kbQ2AOdpGnVHheiSTW9LKi2SanLyXCmHB1+GIb7mjEwChtaP5bBissSQiJ3gq7LqovHB2payeW8 UCBUrw/KkvnBWLRT0pHHHkwVMY2FOWJ6B07QPKiQLCg== X-Received: by 2002:a50:95fa:: with SMTP id x55mr40347232eda.49.1554125354257; Mon, 01 Apr 2019 06:29:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvtMSzR5hmsx6MuU6RI8afnsnq/2kUMvSEek/4ugJt/5OW8yscJpiIkL5DBAVDUnl+us2R0A== X-Received: by 2002:a50:95fa:: with SMTP id x55mr40347220eda.49.1554125354077; Mon, 01 Apr 2019 06:29:14 -0700 (PDT) Received: from gollum.fritz.box ([81.221.192.120]) by smtp.gmail.com with ESMTPSA id d37sm3231146ede.79.2019.04.01.06.29.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 06:29:13 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][PATCH 4/4] Revert "module: Add retpoline tag to VERMAGIC" Date: Mon, 1 Apr 2019 15:29:07 +0200 Message-Id: <20190401132907.24823-5-juergh@canonical.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190401132907.24823-1-juergh@canonical.com> References: <20190401132907.24823-1-juergh@canonical.com> MIME-Version: 1.0 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Greg Kroah-Hartman BugLink: https://bugs.launchpad.net/bugs/1820872 This reverts commit 6cfb521ac0d5b97470883ff9b7facae264b7ab12. Turns out distros do not want to make retpoline as part of their "ABI", so this patch should not have been merged. Sorry Andi, this was my fault, I suggested it when your original patch was the "correct" way of doing this instead. Reported-by: Jiri Kosina Fixes: 6cfb521ac0d5 ("module: Add retpoline tag to VERMAGIC") Acked-by: Andi Kleen Cc: Thomas Gleixner Cc: David Woodhouse Cc: rusty@rustcorp.com.au Cc: arjan.van.de.ven@intel.com Cc: jeyu@kernel.org Cc: stable Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds (backported from commit 5132ede0fe8092b043dae09a7cc32b8ae7272baa) [juergh: Adjusted context.] Signed-off-by: Juerg Haefliger --- include/linux/vermagic.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h index a3d04934aa96..6f8fbcf10dfb 100644 --- a/include/linux/vermagic.h +++ b/include/linux/vermagic.h @@ -24,16 +24,10 @@ #ifndef MODULE_ARCH_VERMAGIC #define MODULE_ARCH_VERMAGIC "" #endif -#ifdef RETPOLINE -#define MODULE_VERMAGIC_RETPOLINE "retpoline " -#else -#define MODULE_VERMAGIC_RETPOLINE "" -#endif #define VERMAGIC_STRING \ UTS_RELEASE " " \ MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \ MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \ - MODULE_ARCH_VERMAGIC \ - MODULE_VERMAGIC_RETPOLINE + MODULE_ARCH_VERMAGIC