From patchwork Tue Oct 12 23:46:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 12554067 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B35F6C433EF for ; Tue, 12 Oct 2021 23:48:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8423360E74 for ; Tue, 12 Oct 2021 23:48:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8423360E74 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=9S1/gy6gLc/4sR66X3mQuJZz0scdvnH+xL6cB7BKckE=; b=cyW2/AyTPbPCwtM2W+EQZk56MH dC80+mW6VbsoDavHORcIMAlOaWwUmQKCQ8o9L9EOnHjk2LY1beOWak6D7nWdP7+QV9vuLwsqKFKj6 u4fcpJrrx+K1+Xp9mB6T0j2w0kpjv2y6tH2vsYj+b43ZK5A3qptkizF7j9Ntioa5yv4ItQU9MYFKo fN7MXZ0+5fVmn2pPwTKq84RqMPBmyZFiH+7swfVnHvzWBznkp5BH2W4wgRaBq4HbUlJ7kGmgl3waT jsULcrZ3mtjAOvfgM5yLtBCxYpvv28tE0ki6dhYWBAVYquh96kXDkulXGKELBtkvaJUx3xdIHYHeu JHUChYqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maRTu-00ECXJ-Tj; Tue, 12 Oct 2021 23:46:51 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maRTe-00ECT1-GE for linux-arm-kernel@lists.infradead.org; Tue, 12 Oct 2021 23:46:35 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id x16-20020a25b910000000b005b6b7f2f91cso1273906ybj.1 for ; Tue, 12 Oct 2021 16:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=453jnyDh5+St7IVUodDCbgLxZ13MiKlNZ2J3hqUdcvM=; b=GiQnyCyCbpwY9yiy0ekI90qBi524flhldE7LmLeUFKKWm8lctHKu1bsmytldY+TUxY WMA98mLcf0kJRjamikFx99dWxHiXdDQLUsWaBbPirwJP5+eAXKVU6FDo57sKENYlyzdO 31bd6OFulXpLt3bpfK93NK4yL0spwCACKTB+vrKQ7GCPXzLILOSFqFt9AeYBJ3ciZwlv YXwZM2deyztIXu8I1fxaflF94jcNJufrpRf4U9azIBZ2hfFutsdTt1NAvQ48d9Dg3wcF sT+Wl1DFt+Wlq7oF10x8A5XCORu2v+sT0dd7XEmbKggavRr1+GKEW5K5OKOGZYlPpuhb 7kNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=453jnyDh5+St7IVUodDCbgLxZ13MiKlNZ2J3hqUdcvM=; b=MpeHy3JL95uBg9EKteB6SOKU18W5RnYpOqpYoFxdoYgYasBKUyJ9XyOf4bfB+6mWFQ 3EJhOcmMOrw5ksHwu8HNRBUyeW3/G/5ertPUFuSrhKO/6GtNV73RaPOrpFiokclRogsX OZh6lClYylmaFoSAsIFWR3y9Rjtd/RVwntZgSMYBTL+ArufdWyQ9/uoPO3XGXaVs9KW5 D2PccvpHHLvappHWwQquvrZpK1TsiOLwXsti3QKzjQAP/i1mh8zJi1UASQ0jndA9WopQ Pg69k/dOcJ3kGM3qWJg2TD6QJLmTOomVAESw08MMxa89MI9Or7thyOu64USvbGm2jQJ6 iTGA== X-Gm-Message-State: AOAM530eYdMs2rOdJ5RGuHpQaCpUQTQIuFNc7VTY30XBW2P1B17+FjSa kdPp5rThpn3IIKIqmVGQQqyATr+AI9YgRv2KctE= X-Google-Smtp-Source: ABdhPJzDpvjNkv+aSz66oQo+gO0Q3iFyt0KqnBrqcpv1ZIS3EYj2e1x+fBZ2NNF1cqaK6s2XL2w7RMeIIcdjpCl0gRg= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:9b44:962:5897:17c0]) (user=ndesaulniers job=sendgmr) by 2002:a25:5ed6:: with SMTP id s205mr34338891ybb.31.1634082392753; Tue, 12 Oct 2021 16:46:32 -0700 (PDT) Date: Tue, 12 Oct 2021 16:46:04 -0700 In-Reply-To: <20211012234606.91717-1-ndesaulniers@google.com> Message-Id: <20211012234606.91717-2-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211012234606.91717-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=lvO/pmg+aaCb6dPhyGC1GyOCvPueDrrc8Zeso5CaGKE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1634082366; l=2752; s=20211004; h=from:subject; bh=F9HRxccJOmwhcZZiuHrzsbCihhzYYcSweRituqKRuSc=; b=eZ+y9VuclQWGHxZZCUU0M238NP4YS16hxLmrZFuG4syjxneIbvLJ1p9XCrFVIvsJox33KLDaEcmw cJtLdaZODfd7SymUzuS2rZgM0tbdGiSw/dZCb+obsqKfSgQzt0Es X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH 1/3] arm64: vdso32: drop the test for dmb ishld From: Nick Desaulniers To: Catalin Marinas , Will Deacon Cc: llvm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vincenzo Frascino , Nick Desaulniers , Christian Biesinger , Simon Marchi X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211012_164634_566159_373579DB X-CRM114-Status: GOOD ( 13.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Binutils added support for this instruction in commit e797f7e0b2bedc9328d4a9a0ebc63ca7a2dbbebc which shipped in 2.34 (just missing the 2.33 release) but was cherry-picked into 2.33 in commit 27a50d6755bae906bc73b4ec1a8b448467f0bea1. Thanks to Christian and Simon for helping me with the patch archaeology. According to Documentation/process/changes.rst, the minimum supported version of binutils is 2.33. Since all supported versions of GAS support this instruction, drop the assembler invocation, preprocessor flags/guards, and the cross assembler macro that's now unused. This also avoids a recursive self reference in a follow up cleanup patch. Cc: Christian Biesinger Cc: Simon Marchi Signed-off-by: Nick Desaulniers --- arch/arm64/include/asm/vdso/compat_barrier.h | 2 +- arch/arm64/kernel/vdso32/Makefile | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/vdso/compat_barrier.h b/arch/arm64/include/asm/vdso/compat_barrier.h index 3fd8fd6d8fc2..fb60a88b5ed4 100644 --- a/arch/arm64/include/asm/vdso/compat_barrier.h +++ b/arch/arm64/include/asm/vdso/compat_barrier.h @@ -20,7 +20,7 @@ #define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory") -#if __LINUX_ARM_ARCH__ >= 8 && defined(CONFIG_AS_DMB_ISHLD) +#if __LINUX_ARM_ARCH__ >= 8 #define aarch32_smp_mb() dmb(ish) #define aarch32_smp_rmb() dmb(ishld) #define aarch32_smp_wmb() dmb(ishst) diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 3dba0c4f8f42..89299a26638b 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -29,8 +29,6 @@ cc32-option = $(call try-run,\ $(CC_COMPAT) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2)) cc32-disable-warning = $(call try-run,\ $(CC_COMPAT) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1))) -cc32-as-instr = $(call try-run,\ - printf "%b\n" "$(1)" | $(CC_COMPAT) $(VDSO_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3)) # We cannot use the global flags to compile the vDSO files, the main reason # being that the 32-bit compiler may be older than the main (64-bit) compiler @@ -113,12 +111,6 @@ endif VDSO_AFLAGS := $(VDSO_CAFLAGS) VDSO_AFLAGS += -D__ASSEMBLY__ -# Check for binutils support for dmb ishld -dmbinstr := $(call cc32-as-instr,dmb ishld,-DCONFIG_AS_DMB_ISHLD=1) - -VDSO_CFLAGS += $(dmbinstr) -VDSO_AFLAGS += $(dmbinstr) - # From arm vDSO Makefile VDSO_LDFLAGS += -Bsymbolic --no-undefined -soname=linux-vdso.so.1 VDSO_LDFLAGS += -z max-page-size=4096 -z common-page-size=4096 From patchwork Tue Oct 12 23:46:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 12554069 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCA93C433EF for ; Tue, 12 Oct 2021 23:49:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE616610CB for ; Tue, 12 Oct 2021 23:49:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AE616610CB Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=BSs74MF2B66Nms7mJ2Fk8LjxZ+uPGmbUgJSpnu8lqLs=; b=cnA/cDr8adHVkDMazLHSiQmNE5 VKxSUeNGVTXkophIuMAdNPLXkfV3fHzDMfZTl3PxaNSabhpDsQvqaMtOs8a0CmN2D/ZLpHGZ05kTr JXn8mV59ZDyKp3gaNpa/v77Eie+yhy9eBf00YmHZSoBL/ZScNd8eYWTXwL4l8vAN0z9gnI0rQOQl2 85YqRof/gkO7cu6u1Xo2iXrQqo/8GNPi87rQIlmaQriCljyoCb01e6ff5gMC8HLayy89i16DmRTWe xt/2njiwK7nRd3OWUhKF8i6UVFpHnFhqXgyqJ0/UIumBM95W9hxWqrVfVqkd4r1zzpj6Mj4CkCV/p dfaFs55A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maRU8-00ECb6-N5; Tue, 12 Oct 2021 23:47:04 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maRTq-00ECWL-A5 for linux-arm-kernel@lists.infradead.org; Tue, 12 Oct 2021 23:46:47 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id i83-20020a252256000000b005b67a878f56so1175925ybi.17 for ; Tue, 12 Oct 2021 16:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=hfiy0QufwKlZXZoYyiK7jO6+5BlktvV9a4QK+YsxTx0=; b=P5Kv4XRzDuovgemzwzFDEbF2CapwNumuLtyGpo9nYCVcOcDOuFAm04NHV6EDPcNKoE kfQkzVrspYepYC/bjDdzPpXeHWd+OUcwCvxz1yWEVlGzC7u6FO8EXGPZ07b+1gSPti6L bcbg9qEl/VPw1CPZhDvmecfDFtpKKhYlHQrioZ1LyewqEnvWUU8agYqExzKmmGHasVdm vNfR3xCfSaQ6b4abY9o9hY1cDY+DMHeVGcd94ZbVzqoYEG9dMlO89lWGsnKZ3e2LE8Oq 0yCs8X3+V5I8JK1t+GFhB2HzftTVf5g83fSzGlcYPbJZencfTlXjEmMFyCty+OCTJ7Ls QCbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=hfiy0QufwKlZXZoYyiK7jO6+5BlktvV9a4QK+YsxTx0=; b=fDPMh+xH2zzkyH94pVR8ln52VMshR5qgnj8V2SrF+dL0r+IF6hME6BYZJP7/CE0+Yr 5TLVKBKW0K3hvp3+ui1UuXQlGrlzvi4pNZMRoosfpqPshoaqGBIVpQ1Cj4LuMKjSNrFv 7ATVWrQGbaI67kQJkNbMQODFfW+jyP26hiy2UugxWGOy1nhM6cOKbD/DglIsNpKqGXJi JwP0SzsYVgxbgKmRWcN3vd4dvUgG/ZoPiDSDOe61N3CHRXVth9LxaWMwNIUFzppTJMl7 x+PgPpi/ADug/3y3+h5LB9MuecnlTVxe1ssOGchKaimG+2Yw+lhRkvgClCQhMJFHxzYf PD+g== X-Gm-Message-State: AOAM532HmYPS68VBF338Wt0Eg4mLkU6SCHL7oY7JZSOsbdHlrS0BRCSY yob7Gn/1Okb8Ly2CMcS9jdCgsxHkmwJjprPbrOs= X-Google-Smtp-Source: ABdhPJzqJ+E+oSOLkej8TGqrH10ec7ZUj9JYPKz4YsOMxhOsBrZihoow2n6bwIjVHLjng8ovw3DFgWfRX8Hoos5I++M= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:9b44:962:5897:17c0]) (user=ndesaulniers job=sendgmr) by 2002:a25:2202:: with SMTP id i2mr31320160ybi.223.1634082404879; Tue, 12 Oct 2021 16:46:44 -0700 (PDT) Date: Tue, 12 Oct 2021 16:46:05 -0700 In-Reply-To: <20211012234606.91717-1-ndesaulniers@google.com> Message-Id: <20211012234606.91717-3-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211012234606.91717-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=lvO/pmg+aaCb6dPhyGC1GyOCvPueDrrc8Zeso5CaGKE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1634082366; l=2372; s=20211004; h=from:subject; bh=hiyKEKl9KNUln0vdBegNdaMtjSqTKA9iKbxjt+QhW7o=; b=7aj4L6HQ17bDqsHnReZofAfQuwPdPnNcErtr1xRO8mhYy74vVRcWes0SugNBY5Cix+5yQo5urUvo 1y5nRpMbAhoSK7FxdeCTIF3kLFjP7t8xQzU1pkdXmgLfMtYazSW1 X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH 2/3] arm64: vdso32: lazily invoke COMPAT_CC From: Nick Desaulniers To: Catalin Marinas , Will Deacon Cc: llvm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vincenzo Frascino , Nick Desaulniers , Masahiro Yamada , Lucas Henneman X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211012_164646_375445_FC5DBE1B X-CRM114-Status: GOOD ( 13.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When running the following command without arm-linux-gnueabi-gcc in one's $PATH, the following warning is observed: $ ARCH=arm64 CROSS_COMPILE_COMPAT=arm-linux-gnueabi- make -j72 LLVM=1 mrproper make[1]: arm-linux-gnueabi-gcc: No such file or directory This is because KCONFIG is not run for mrproper, so CONFIG_CC_IS_CLANG is not set, and we end up eagerly evaluating various variables that try to invoke CC_COMPAT. This is a similar problem to what was observed in commit 3ec8a5b33dea ("kbuild: do not export LDFLAGS_vmlinux") Cc: Masahiro Yamada Reported-by: Lucas Henneman Signed-off-by: Nick Desaulniers --- arch/arm64/kernel/vdso32/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 89299a26638b..d24b12318f4c 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -38,12 +38,12 @@ cc32-disable-warning = $(call try-run,\ # As a result we set our own flags here. # KBUILD_CPPFLAGS and NOSTDINC_FLAGS from top-level Makefile -VDSO_CPPFLAGS := -DBUILD_VDSO -D__KERNEL__ -nostdinc -isystem $(shell $(CC_COMPAT) -print-file-name=include) +VDSO_CPPFLAGS = -DBUILD_VDSO -D__KERNEL__ -nostdinc -isystem $(shell $(CC_COMPAT) -print-file-name=include) VDSO_CPPFLAGS += $(LINUXINCLUDE) # Common C and assembly flags # From top-level Makefile -VDSO_CAFLAGS := $(VDSO_CPPFLAGS) +VDSO_CAFLAGS = $(VDSO_CPPFLAGS) ifneq ($(shell $(CC_COMPAT) --version 2>&1 | head -n 1 | grep clang),) VDSO_CAFLAGS += --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%)) endif @@ -73,7 +73,7 @@ VDSO_CAFLAGS += -DDISABLE_BRANCH_PROFILING VDSO_CAFLAGS += $(call cc32-option,-march=armv8-a -D__LINUX_ARM_ARCH__=8,\ -march=armv7-a -D__LINUX_ARM_ARCH__=7) -VDSO_CFLAGS := $(VDSO_CAFLAGS) +VDSO_CFLAGS = $(VDSO_CAFLAGS) VDSO_CFLAGS += -DENABLE_COMPAT_VDSO=1 # KBUILD_CFLAGS from top-level Makefile VDSO_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ @@ -108,7 +108,7 @@ else VDSO_CFLAGS += -marm endif -VDSO_AFLAGS := $(VDSO_CAFLAGS) +VDSO_AFLAGS = $(VDSO_CAFLAGS) VDSO_AFLAGS += -D__ASSEMBLY__ # From arm vDSO Makefile From patchwork Tue Oct 12 23:46:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 12554071 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6151BC433EF for ; Tue, 12 Oct 2021 23:49:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A4CE60E74 for ; Tue, 12 Oct 2021 23:49:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1A4CE60E74 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=TvWmV7WS/ADadJo2x6vWB8tmiopTE4GDra2GBtd10To=; b=VHgQapw3QeVjeEO6KflZLM6+8Z YFInSY6IbCjpHW72jA71gwfR6PZRxTfvBw++e9gs0D9uLuxfodpiFoTw320VwT/UGsMaYb64H564+ pxTooD48YCxJdQgbEEqvOx7BQ1jJj+ATp8oJUtxINWY4YjXAfMUioZ+jBLKagnZx459/DD8fQqQSw nqelBZI5k4lmZ4DCkyPhRpi75x/e1XQwrs4MZzN/Qvv/YbxZa4NthbglVRoIUTNqn86Jf6xVHtfKN FOll1zBojzFkQuUGZRMUSXopGSFcx+s7UEz5BIMwYeLDeobBwWlaUL4Fk7l0s7ht9Ga21bZnJCYcd 89oJFDJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maRUM-00ECff-FH; Tue, 12 Oct 2021 23:47:18 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maRTy-00ECXr-E1 for linux-arm-kernel@lists.infradead.org; Tue, 12 Oct 2021 23:46:55 +0000 Received: by mail-yb1-xb49.google.com with SMTP id h185-20020a256cc2000000b005bdce4db0easo1197486ybc.12 for ; Tue, 12 Oct 2021 16:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=3talEs2itJqGmarZ00bRlZ+EZGYrtuuD53DfIvzQNtg=; b=qzdeDSvgzhMcWtYkdUSFa0ZuPywUNS8d6Iq0opEXqOeXrVaoiG5JxPJ0TJQiRZh0LG WrVHXzHG2RJrNxv+YjLx4cto+c5SmzGQ2/z0zUULMIT7Ylb7pXOl297B1+MWZ4URm6S3 K90m3PbtV9kWTxRgSNz3PeKremWzBOf0Cox3VCPKFO56xhD3za4t6+XsqAI+rP2pGL1W cTfACzuqg94r2cGOPU8l0OIdCsWVRzb7nWFXAEYC/pjCatjBxM87j3vg47R/3uW0gnuW mMjxF9pyyNF+/pFKR62WKfH+q/OPZAGXiRJrN508Uimg4ecnjxAB+2n+VMbix2baq+nU YzeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=3talEs2itJqGmarZ00bRlZ+EZGYrtuuD53DfIvzQNtg=; b=uRXcEhAR2GbUN4/ylFSbIaJrMYvlRM9DvgunGuVhZnen+xEgBOL7lvy4xgrPjfVLf2 FeZlvJImLJ5mE9ZgFY7g4R3MlZTs/OMAs6JXIryaxHciMIhIqcRbZGCNB7wa1A27fz4+ LuqSPuX+ryIGOqWLgYZPfxmHUI9QGInm6SX5SxFVgQbtvSs27uutu/cBgpw84HeAVZvX Q6PrbuaqmPWUGcRSjO4EroF2n/ny92ELyMIAo4J869rFhUc58zU59uM2bzNP4ljOSpuT j0wMAa0TX0jekFrxeHEVS3navWG5qmelIvZPQC7ydrSegiJyMw4EzYgL/DCwxQEyYO5e dMug== X-Gm-Message-State: AOAM530ocWpgKcUk8XHIMPFh/7S5Y78NOkh7XNVZCYiBuyp47Xk8khah KZGGkXGVBJLb8+RQqmWSbI79ba79pU9drbiU7e4= X-Google-Smtp-Source: ABdhPJzIFutXhB9fFNe6qJTxVeF1qwVsjQr5R4imjUV0XUci065GZ+CKOL8HJ4Lt4zkEXo2DTCrWFbyf95vjjodTJI0= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:9b44:962:5897:17c0]) (user=ndesaulniers job=sendgmr) by 2002:a25:81c5:: with SMTP id n5mr31228924ybm.276.1634082411872; Tue, 12 Oct 2021 16:46:51 -0700 (PDT) Date: Tue, 12 Oct 2021 16:46:06 -0700 In-Reply-To: <20211012234606.91717-1-ndesaulniers@google.com> Message-Id: <20211012234606.91717-4-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211012234606.91717-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=lvO/pmg+aaCb6dPhyGC1GyOCvPueDrrc8Zeso5CaGKE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1634082366; l=2773; s=20211004; h=from:subject; bh=KivxBEiz8kY/YG1A752ABLoGXTndClfSbCaLd5U6VRE=; b=o6J8KwlbYffgoHGg/p2CFoh1PIdXMYZrdEsa/Db69BI0eYl2197Z05hXHSNfvgmMqr/qea2Oqv2M U0DjCIgcDQNjSaSxOvufMKH6LrB5PlivtBlBsJEAz4gLGwPgsM2T X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH 3/3] arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd From: Nick Desaulniers To: Catalin Marinas , Will Deacon Cc: llvm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vincenzo Frascino , Nick Desaulniers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211012_164654_520506_AD041E2B X-CRM114-Status: GOOD ( 10.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Similar to commit 231ad7f409f1 ("Makefile: infer --target from ARCH for CC=clang") There really is no point in setting --target based on $CROSS_COMPILE_COMPAT for clang when the integrated assembler is being used. Allows COMPAT_VDSO to be selected without setting $CROSS_COMPILE_COMPAT when using clang and lld together. Before: $ ARCH=arm64 CROSS_COMPILE_COMPAT=arm-linux-gnueabi- make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config CONFIG_COMPAT_VDSO=y $ ARCH=arm64 make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config $ After: $ ARCH=arm64 CROSS_COMPILE_COMPAT=arm-linux-gnueabi- make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config CONFIG_COMPAT_VDSO=y $ ARCH=arm64 make -j72 LLVM=1 defconfig $ grep CONFIG_COMPAT_VDSO .config CONFIG_COMPAT_VDSO=y Signed-off-by: Nick Desaulniers Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor --- arch/arm64/Kconfig | 3 ++- arch/arm64/kernel/vdso32/Makefile | 17 +++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 5c7ae4c3954b..7b28dad2fb80 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1264,7 +1264,8 @@ config KUSER_HELPERS config COMPAT_VDSO bool "Enable vDSO for 32-bit applications" - depends on !CPU_BIG_ENDIAN && "$(CROSS_COMPILE_COMPAT)" != "" + depends on !CPU_BIG_ENDIAN + depends on CC_IS_CLANG && LD_IS_LLD || "$(CROSS_COMPILE_COMPAT)" != "" select GENERIC_COMPAT_VDSO default y help diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index d24b12318f4c..376261d3791f 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -10,18 +10,15 @@ include $(srctree)/lib/vdso/Makefile # Same as cc-*option, but using CC_COMPAT instead of CC ifeq ($(CONFIG_CC_IS_CLANG), y) -CC_COMPAT_CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%)) - CC_COMPAT ?= $(CC) -CC_COMPAT += $(CC_COMPAT_CLANG_FLAGS) - -ifneq ($(LLVM),) -LD_COMPAT ?= $(LD) +CC_COMPAT += --target=arm-linux-gnueabi else -LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld +CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc endif + +ifeq ($(CONFIG_LD_IS_LLD), y) +LD_COMPAT ?= $(LD) else -CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld endif @@ -44,10 +41,6 @@ VDSO_CPPFLAGS += $(LINUXINCLUDE) # Common C and assembly flags # From top-level Makefile VDSO_CAFLAGS = $(VDSO_CPPFLAGS) -ifneq ($(shell $(CC_COMPAT) --version 2>&1 | head -n 1 | grep clang),) -VDSO_CAFLAGS += --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%)) -endif - VDSO_CAFLAGS += $(call cc32-option,-fno-PIE) ifdef CONFIG_DEBUG_INFO VDSO_CAFLAGS += -g