From patchwork Wed Aug 28 22:55:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 172499 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1395979ily; Wed, 28 Aug 2019 15:56:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5GDYfUedV4Gq5Paginsw2BVIOCW+gxEVfIHRxbk7bvGEvL/ujWhkia7SzaFWb/d+BkTRg X-Received: by 2002:a17:902:b704:: with SMTP id d4mr6941008pls.261.1567032989032; Wed, 28 Aug 2019 15:56:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567032989; cv=none; d=google.com; s=arc-20160816; b=tixBbCgRXCq69anxlpKQqJjyA0ZRxD0UiYsTOGFcpSSMQOCJxmFBLfXIJ4gtGbik7h 1dQ1ihec7EXOgzpVixAVCwQLoxMJZRZPMBq2ZpqYdRwzkywkNU4+tEgexKV3VAiSmOHT PgmiiwewfYtrOLjZRsITHdcHnpF8mfnmqRKtYcVfLnDcf/hw0n0R4kvuWcTlg9wFdT9U 10AKtpieXkHIde7WDO35z3qCVRoBiCSEHFvyeJTh3xHEF8fK5QZgtVlCUj/WjY7BBJhN F25tMrtLdFmJAAKi2wP/iB7TNzp7NtmlbsDuzxLNlwXUG9TltHHf9iwTtVjQd+TGwlVR Nm5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=tRdkLp5blIPkAjhL3VcWLqU9CGzkwns+t7XttYIchcI=; b=ny4GSUNtKSfkadji1DgXoV1sXaVB9nde8iJQJe4qbwAvHjRNc3WfbiDmWIeV26jH5y XU6vqc3koGNW4vJtz08gZ76LB395S+iReyJAh6yaXm0+wmidUhX1Is3lWDqW1I1GoXn/ f4dP8gBFHH9m1ZpW8cJ/R+bta6aKzNn9yI++x+pNZpvmalHOXJ9qRh3urm8JjYNXt+dG /vRoDhIcxuR/2ZwBJjUSW6P7LnMdeEk6qtvuXajuFig0MiNmLMnKUK9ln2vjbkajADRb hhRc/UXTxckYPm613KeYNnQ26nYdNkMFuFeuKBTU5Z/8qq/+T/vFf+V+fukdQjuA+/7y Fdew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=CMVAnmm+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 29si360394pgk.306.2019.08.28.15.56.28; Wed, 28 Aug 2019 15:56:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=CMVAnmm+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727492AbfH1W41 (ORCPT + 28 others); Wed, 28 Aug 2019 18:56:27 -0400 Received: from mail-pl1-f202.google.com ([209.85.214.202]:53794 "EHLO mail-pl1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727432AbfH1W4Z (ORCPT ); Wed, 28 Aug 2019 18:56:25 -0400 Received: by mail-pl1-f202.google.com with SMTP id y22so801511plr.20 for ; Wed, 28 Aug 2019 15:56:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=tRdkLp5blIPkAjhL3VcWLqU9CGzkwns+t7XttYIchcI=; b=CMVAnmm+YWw/BIadUY7YkC8sx7aCqztSp28UEVdIAoBP/Db56oZcYwzwqO2lnEiwxy HeMLtZhGYyQIkv8VzXp/1ZoAc0KOiEx25s63pADHK/NT70OynSBYThUHxroz2TMm1IpL 4OlZhZdHoED0+GrWWY9KfbkPon3aclDJJa4vn6vu4wuP7Q6YFcILIJ4JkxR6PJHmKuwW 66wIkcJmowDYRiYd4A8lM+pQRGPmeKsp2m9hUm07nv0DKitnTk2ic9IyXNfR4sdS9c0v UibkgV0Ij7jXR0sDh9icT4PqjlrjUFopN82MmtPfRSnV9hQ+95iec5iGoo3PJyKVAa1w mW3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=tRdkLp5blIPkAjhL3VcWLqU9CGzkwns+t7XttYIchcI=; b=epLGLxsyDB+YkgSAw5UkwlWQpU13Rud74o19oRyE8Oyui5fXKF0ozaJcTLIHP94DXh S2OfccajetRpQ+swdagTniFESj75Zj1XjsdSeJSbsU4Tsmk8+vxz4xjfESIf3cNKMFod qJxU5KR5gzM3B4+807QT1Vva0lio9xrpaLcokRQL5EvtM/w2HMhDNqkUydWWz1Ehd0ef cql9nP/x8K2lONghM7HMinvnHx1ePjFcMM8iR3Zdw0QxLF4VMAN6gEZ0ixn6o5mg/akf TJKoqSoLS7ryubk6KSsMkwp4Oj00rYwmANM3nBcvFoJ4CzVsrlERR2f9fn04NmS2hon2 LySQ== X-Gm-Message-State: APjAAAWDGTc8U6AwTysGLtbOH5JGl5muebKmNl7xFAGQW6u0tX9L3RLr ShVn7eCkfEkvIvzKXKRAvTOGq9vZYWh5NfXMx3Q= X-Received: by 2002:a65:638c:: with SMTP id h12mr5450926pgv.436.1567032983334; Wed, 28 Aug 2019 15:56:23 -0700 (PDT) Date: Wed, 28 Aug 2019 15:55:31 -0700 In-Reply-To: <20190828225535.49592-1-ndesaulniers@google.com> Message-Id: <20190828225535.49592-11-ndesaulniers@google.com> Mime-Version: 1.0 References: <20190828225535.49592-1-ndesaulniers@google.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog Subject: [PATCH v3 10/14] x86: prefer __section from compiler_attributes.h From: Nick Desaulniers To: miguel.ojeda.sandonis@gmail.com Cc: sedat.dilek@gmail.com, will@kernel.org, jpoimboe@redhat.com, naveen.n.rao@linux.vnet.ibm.com, davem@davemloft.net, paul.burton@mips.com, clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org, Nick Desaulniers Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org GCC unescapes escaped string section names while Clang does not. Because __section uses the `#` stringification operator for the section name, it doesn't need to be escaped. Instead, we should: 1. Prefer __section(.section_name_no_quotes). 2. Only use __attribute__((__section__(".section"))) when creating the section name via C preprocessor (see the definition of __define_initcall in arch/um/include/shared/init.h). This antipattern was found with: $ grep -e __section\(\" -e __section__\(\" -r See the discussions in: Link: https://bugs.llvm.org/show_bug.cgi?id=42950 Link: https://marc.info/?l=linux-netdev&m=156412960619946&w=2 Link: https://github.com/ClangBuiltLinux/linux/issues/619 Reported-by: Sedat Dilek Suggested-by: Josh Poimboeuf Tested-by: Sedat Dilek Signed-off-by: Nick Desaulniers --- arch/x86/include/asm/cache.h | 2 +- arch/x86/include/asm/intel-mid.h | 2 +- arch/x86/include/asm/iommu_table.h | 5 ++--- arch/x86/include/asm/irqflags.h | 2 +- arch/x86/include/asm/mem_encrypt.h | 2 +- arch/x86/kernel/cpu/cpu.h | 3 +-- 6 files changed, 7 insertions(+), 9 deletions(-) -- 2.23.0.187.g17f5b7556c-goog diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h index abe08690a887..bb9f4bf4ec02 100644 --- a/arch/x86/include/asm/cache.h +++ b/arch/x86/include/asm/cache.h @@ -8,7 +8,7 @@ #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) -#define __read_mostly __attribute__((__section__(".data..read_mostly"))) +#define __read_mostly __section(.data..read_mostly) #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT) diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h index 8e5af119dc2d..f51f04aefe1b 100644 --- a/arch/x86/include/asm/intel-mid.h +++ b/arch/x86/include/asm/intel-mid.h @@ -43,7 +43,7 @@ struct devs_id { #define sfi_device(i) \ static const struct devs_id *const __intel_mid_sfi_##i##_dev __used \ - __attribute__((__section__(".x86_intel_mid_dev.init"))) = &i + __section(.x86_intel_mid_dev.init) = &i /** * struct mid_sd_board_info - template for SD device creation diff --git a/arch/x86/include/asm/iommu_table.h b/arch/x86/include/asm/iommu_table.h index 1fb3fd1a83c2..7d190710eb92 100644 --- a/arch/x86/include/asm/iommu_table.h +++ b/arch/x86/include/asm/iommu_table.h @@ -50,9 +50,8 @@ struct iommu_table_entry { #define __IOMMU_INIT(_detect, _depend, _early_init, _late_init, _finish)\ static const struct iommu_table_entry \ - __iommu_entry_##_detect __used \ - __attribute__ ((unused, __section__(".iommu_table"), \ - aligned((sizeof(void *))))) \ + __iommu_entry_##_detect __used __section(.iommu_table) \ + __aligned((sizeof(void *))) \ = {_detect, _depend, _early_init, _late_init, \ _finish ? IOMMU_FINISH_IF_DETECTED : 0} /* diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h index 8a0e56e1dcc9..68db90bca813 100644 --- a/arch/x86/include/asm/irqflags.h +++ b/arch/x86/include/asm/irqflags.h @@ -9,7 +9,7 @@ #include /* Provide __cpuidle; we can't safely include */ -#define __cpuidle __attribute__((__section__(".cpuidle.text"))) +#define __cpuidle __section(.cpuidle.text) /* * Interrupt control: diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h index 0c196c47d621..db2cd3709148 100644 --- a/arch/x86/include/asm/mem_encrypt.h +++ b/arch/x86/include/asm/mem_encrypt.h @@ -50,7 +50,7 @@ void __init mem_encrypt_free_decrypted_mem(void); bool sme_active(void); bool sev_active(void); -#define __bss_decrypted __attribute__((__section__(".bss..decrypted"))) +#define __bss_decrypted __section(.bss..decrypted) #else /* !CONFIG_AMD_MEM_ENCRYPT */ diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index c0e2407abdd6..7ff9dc41a603 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h @@ -38,8 +38,7 @@ struct _tlb_table { #define cpu_dev_register(cpu_devX) \ static const struct cpu_dev *const __cpu_dev_##cpu_devX __used \ - __attribute__((__section__(".x86_cpu_dev.init"))) = \ - &cpu_devX; + __section(.x86_cpu_dev.init) = &cpu_devX; extern const struct cpu_dev *const __x86_cpu_dev_start[], *const __x86_cpu_dev_end[];