From patchwork Tue Oct 19 22:36:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 12571263 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 57825C433F5 for ; Tue, 19 Oct 2021 22:38:32 +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 26D5B610E5 for ; Tue, 19 Oct 2021 22:38:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 26D5B610E5 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=9NXYVfc4R1wpoR+sB7elDINq7NZ2ceckDjcu0MKdwzU=; b=Q0tBIP52HYyc7yoXcfNnWn1GLM tUZ8Mmdg+KW9zEsEBltfFKopU2Y3C4qqki9eXIkDnDOjsvc2qqWarlTkqpLx3peWLkoJMUHXH7x3n 1ZAet5UEan3wRPzTPIJPNE2DlbVa78p+fk/0s25rkusl1qw3d1FaeN93GB/Ii0gDZYiMHua6HdKvf h6oqUPHByF08HsHSydXAJQToCXt54ZjVLK762oE1sPmLIvOC8rk+94DWCxxxYyIz9sVgGhjCx2Q/8 MpSBGYyyv20VLePbzve89bbVsttVp/SZkNtMU2r6Xmtrol0MCWK8aBNThVcG1AoOY2mJRfxxWfjug T+8RxX0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxjH-002rJt-NL; Tue, 19 Oct 2021 22:37:07 +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 1mcxj5-002rHf-Hz for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 22:36:56 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id v203-20020a25c5d4000000b005bb21580411so26982994ybe.19 for ; Tue, 19 Oct 2021 15:36:54 -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=VaDhNNXFhhUWTkgSjDPcE9jIHDvc0J7EwPhGj9hqbDg=; b=U4r59HjWNUbmVDmiOoXYYqpVZHqKp4+rLZ02pdOyHxb2EHjipt3QcanrHfMBoa3rT5 46DcFKiJRxQZrRbEhBFYXiTFuko4pQ5C5tx7WmOh3ox8ce6rI9/4yFHS+m/HOWpKlIrw 7Z9onRNpOALMCnrVgSQ2ak3GUAPD/Rab/YKMyZJp8Fs+FnjqNiJ0TzTZcGl3K7WUvHUK vt8BxxNp4U19TJKZLBQgLCVUJHQAAn8GY5FXIlcasCpw6bD30t9rhDA5EDyoCjKH/eGL Cc/kBpiOTrJCT8bKggekiJ28PoyiEuvGfzlC3I/YJVcxIRRBp9whVGiMU2mocdYsgib0 h6pA== 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=VaDhNNXFhhUWTkgSjDPcE9jIHDvc0J7EwPhGj9hqbDg=; b=uWaIZzZhhdpjZUzX2Bw4FvBWn7j25kiUTzhFMgwUTYlp6KVzCRwhdYFEYoiANyUQrj D4BWtzspWGdravZdRw9ZGKvuFQo8x2ffeY2exyWog32qBuqr9kNDUjyVoWE2m6GPZ4zY /C1Pc+pORRbDijQUdny6+58BV50FxFK9KpLtCCNUqdOK3ZnaGM/eQUwReqmR4q5YPMQR rFqYj2EBAOfNFTPYzzWOaZgsXOkfEG4DyYWd0wWiJU9jEiI6McEubEZujxiRJ8BMVxRJ WT68y0oQDoN6uKp1rXLgZnLEHFYCDzHhZ4Xt/6nS9BpD0YjyA5tTUTzbgxCHihwZQFrv V4CA== X-Gm-Message-State: AOAM531lxo+ZmTcctOHrX4aQZy9sGS56AnOaEfUepugbA1xOf0OQyxF4 Vsy2yq2K87M+Inrh58P1ZjBpPsqGEkcMXAiAG1s= X-Google-Smtp-Source: ABdhPJyQWgh+9TAh7Tj9W4TPJjcbAfo42Zp7ylgyKKOUAS7vlg0nA6CmHikYeHsN7iDfd3+1B8gmJF9NLBykmaqmjNI= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:de0:247b:5157:7c15]) (user=ndesaulniers job=sendgmr) by 2002:a25:b887:: with SMTP id w7mr6602581ybj.52.1634683014157; Tue, 19 Oct 2021 15:36:54 -0700 (PDT) Date: Tue, 19 Oct 2021 15:36:43 -0700 In-Reply-To: <20211019223646.1146945-1-ndesaulniers@google.com> Message-Id: <20211019223646.1146945-2-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211019223646.1146945-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=1634683006; l=2834; s=20211004; h=from:subject; bh=31zZKmnHrPsMeReQcK7MwmH2ZeeaRVf9+ZMpH9/QAhA=; b=g12/8wiwE9txkit7fKe98XPB6Jo5bZ5mba6BV0kO9dbn65pXWfDpCYkXcn2/HlAcmBW//4ogjGTH n0jVXAvFAXMo22BQYw6Wtm/FKDQlrvXziKgG73UymQWiS1njdv50 X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 1/4] 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 , Nathan Chancellor , Nick Desaulniers , Christian Biesinger , Simon Marchi X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_153655_619236_FBB60A4B X-CRM114-Status: GOOD ( 13.45 ) 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.24 (just missing the 2.33 release) but was cherry-picked into 2.23 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.23. 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 Reviewed-by: Nathan Chancellor Reviewed-by: Vincenzo Frascino --- Changes v1 -> v2: * Fix typos (2.33 -> 2.23, 2.34 -> 2.24) as per Christian. 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 19 22:36:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 12571265 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 5F2B9C433EF for ; Tue, 19 Oct 2021 22:38: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 25AA9610E5 for ; Tue, 19 Oct 2021 22:38:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 25AA9610E5 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=wMHzs1i4X/FUdS0zln65c9hO691w7vKo+WxZrTpxb+E=; b=RdEObqAWNbuZRRAY+AFcUfWU0y vQc0ncDhfmvQU5stM3S526IGO+z7l9YSRpHJMNdfbJZd2XbCH26vQ0uSgCJMBPWJpOOAAwA+FiDUY h+vIyzIUGBgcwkCyu5Z4AC7kYDCu4cWJdMNxPBs5lGPpB9vFLL6JjByOldVh5V9qmXA0EUvAQNsiG X94HipqaacoBNt7icSQURxaVN91zekwsDdYtYjMjUzMQr+0GugRz5lULLJqbskuKY+mWi1Oxjggv9 32bRSZbS5eZqME75Cs4rTJuguLpcF/6hQYMrlcvdp1fA3GOsWdV8ecFuKvPJSrIlnwn4WEhricYUt uwApiYGg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxjS-002rMe-P1; Tue, 19 Oct 2021 22:37:18 +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 1mcxj7-002rI2-Tg for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 22:36:59 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id j193-20020a2523ca000000b005b789d71d9aso27112615ybj.21 for ; Tue, 19 Oct 2021 15:36:57 -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=a45Ln1D7ZtUe/1bUcSj9pWfb4TeXSMsuqA08OUNsoW4=; b=C/DPg6WFYTFDt0YKudnJRZv5vE52p5pGFx+/sMVLqwD0LssuUyyGBJ3fde+wDbZRPZ xwTLlo3xgrX02h+KdBL5fgDs68VKSfWKbonXwRKp75pJaE2Fs2/dSZJXUYdWsYtWrovR JTkfgi9YKuZoSXnu/vpN2yBzHd40RVKM6ALN9x/YJLtuSdyOhc1nYR6yGsOcz1NoRoOt lIQoRmr/3YOoZ5dHhQY6BdxkWA9V7HFgvB2hu1IUhzs6BP/L/hbwOXETYV7KP03vjNBP WTaktCWsUCD36jEu2nbiNsN9UwCHj51jMSsbf0/5Jyc1wHcYpH+KSCe9FlPsJSA84vwW LfUw== 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=a45Ln1D7ZtUe/1bUcSj9pWfb4TeXSMsuqA08OUNsoW4=; b=iPW92BUFAasAM0ZJAPZLGH7+49IZecNJdB1JvIvTt9mqT+zqulAsPvRcaReaoTp+lg /EI8hdfc/nkElNGS/TDghlFFYmzWZ/od4MV3TAtjO8cNqjgDV/k/M6aflFzXDCqY/VkQ VsR9BoBa8zzAtPWU7atDW5BY+Ex+p6jRVqQgMqs+QqACwLhVzUCY6PEvXV4c+6l/hXdm FVPpBs9jo7Al44WdZ/eiHjaiXVBF6Xe0GFKIaihoyAXgjqaQnUVP8u++CiVyhRGPJ4f9 jpdEocsC+CQKNYdfrFtRu05TsFc5t1uKWT3lvAQqOi0grR5KWV7Ea42JsnvjwgUWsCSD o/Rg== X-Gm-Message-State: AOAM5305S+UeaIE9b5bJK4BUuOdntjQPy6yfzZwqijFgKj7huRf4kjYj 4lG0V/wCWhhI2NSmtIeVyLcSPkyjqELvRPRPiC4= X-Google-Smtp-Source: ABdhPJyXa/oHkLzXSjbRGWB4SvAFLikU2/e7o0757AHdoqspRbjhCNfLFsD1Qx0hu2ir4MF3GcgZRiwsvvvOQHF6YTE= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:de0:247b:5157:7c15]) (user=ndesaulniers job=sendgmr) by 2002:a25:1c86:: with SMTP id c128mr39976792ybc.83.1634683016574; Tue, 19 Oct 2021 15:36:56 -0700 (PDT) Date: Tue, 19 Oct 2021 15:36:44 -0700 In-Reply-To: <20211019223646.1146945-1-ndesaulniers@google.com> Message-Id: <20211019223646.1146945-3-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211019223646.1146945-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=1634683006; l=2182; s=20211004; h=from:subject; bh=jpMXqOpkcp5RnayWtEE83+1uBxJkTa7ynpwJrViYoAw=; b=qajt0gNdxEY2kp9cPSmK3GU6yiC5ml6CaoZHQWk8SysT+y/gX1h8ncSkCbc3LnKtUjBh+GDKxiPX QOoEOn45D9GObiCd0QkxIAnJhaSyyD8a/SFgguZpKzwFLe3+hHnS X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 2/4] arm64: vdso32: drop test for -march=armv8-a 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 , Nathan Chancellor , Nick Desaulniers , Arnd Bergmann X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_153657_993639_7C37D7B0 X-CRM114-Status: GOOD ( 12.03 ) 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 As Arnd points out: gcc-4.8 already supported -march=armv8, and we require gcc-5.1 now, so both this #if/#else construct and the corresponding "cc32-option,-march=armv8-a" check should be obsolete now. Link: https://lore.kernel.org/lkml/CAK8P3a3UBEJ0Py2ycz=rHfgog8g3mCOeQOwO0Gmp-iz6Uxkapg@mail.gmail.com/ Suggested-by: Arnd Bergmann Signed-off-by: Nick Desaulniers Reviewed-by: Nathan Chancellor Reviewed-by: Vincenzo Frascino --- arch/arm64/include/asm/vdso/compat_barrier.h | 7 ------- arch/arm64/kernel/vdso32/Makefile | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/vdso/compat_barrier.h b/arch/arm64/include/asm/vdso/compat_barrier.h index fb60a88b5ed4..3ac35f4a667c 100644 --- a/arch/arm64/include/asm/vdso/compat_barrier.h +++ b/arch/arm64/include/asm/vdso/compat_barrier.h @@ -20,16 +20,9 @@ #define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory") -#if __LINUX_ARM_ARCH__ >= 8 #define aarch32_smp_mb() dmb(ish) #define aarch32_smp_rmb() dmb(ishld) #define aarch32_smp_wmb() dmb(ishst) -#else -#define aarch32_smp_mb() dmb(ish) -#define aarch32_smp_rmb() aarch32_smp_mb() -#define aarch32_smp_wmb() dmb(ishst) -#endif - #undef smp_mb #undef smp_rmb diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 89299a26638b..1407516e041e 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -65,13 +65,7 @@ endif # From arm vDSO Makefile VDSO_CAFLAGS += -fPIC -fno-builtin -fno-stack-protector VDSO_CAFLAGS += -DDISABLE_BRANCH_PROFILING - - -# Try to compile for ARMv8. If the compiler is too old and doesn't support it, -# fall back to v7. There is no easy way to check for what architecture the code -# is being compiled, so define a macro specifying that (see arch/arm/Makefile). -VDSO_CAFLAGS += $(call cc32-option,-march=armv8-a -D__LINUX_ARM_ARCH__=8,\ - -march=armv7-a -D__LINUX_ARM_ARCH__=7) +VDSO_CAFLAGS += -march=armv8-a VDSO_CFLAGS := $(VDSO_CAFLAGS) VDSO_CFLAGS += -DENABLE_COMPAT_VDSO=1 From patchwork Tue Oct 19 22:36:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 12571269 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 C6204C433EF for ; Tue, 19 Oct 2021 22:39:00 +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 86BD061154 for ; Tue, 19 Oct 2021 22:39:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 86BD061154 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=9qvO1ctXFG/HMvoMnXxtQ5Yn2J3lMvObj6esZtPHfDA=; b=2bgh9yTy+l0bteanhvmr0N5Miw tzKjtWgqFeQ6ubWLXSePe3BY5I3JyecigZoDopLIYrF4VYxWS/boFMDYaMF3bMDt44Avwsk6QCXK0 T+q+lKMtvikmMsr0gW6DHIPWjCgLj+74bPjP+wCxTj33btkIt/J/ZcatoEUYvPQ5lkSLG8vGuIGxE Hz614wl/7rbeoC5bfEqRgWJzt6NSV5CFgMA7w68bTo6hSZjv1EjyK4cvCemYKT4MkMfPwODissLft tktvtHRExnqosjVgFAJvY9fiWOotzlTvpri7sxQrsku+e58MY0UOHb/pAiJl5AcqZGKMFTB7juBla ZKIp2tEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxjg-002rPz-A2; Tue, 19 Oct 2021 22:37:32 +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 1mcxjA-002rIS-GH for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 22:37:01 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id w201-20020a25dfd2000000b005be4c3971cdso9298386ybg.13 for ; Tue, 19 Oct 2021 15:36:59 -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=VYYzFbtg9v9uYxEoyPeKXiW1szMtPubg10b/PAxgSlo=; b=P/eAIE9t9qFsmOQDu4H456xxeFJ3Vkto2vyDtoqZjgvzOwZNlvZmPpM0Sh6JTLHncz CYalQVIr7MNV7ME6aicxY56kbBmtCNpLBLqSU7bDdG5t8Hh/K8cOgjDjLa41cS2Nucj/ VTDTqMNWqbGlcGGUE0BfMB4kouEsOqF8BBpEAQKCMY8BnYZe86RWewujSOxolKk1vX/g UD2EJFVstgRFE/b1PYK68bSUvE7gZJCtpg+wanBc5kQTxv3bNIDNrIdpL7kJLBud7dGE 6Dpq9f63a0mnKkV8d4VCuApFnjrG43JmEhp4N66+GrL+D1ASWMIm+c6sFd9hgWsEb/TH olMA== 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=VYYzFbtg9v9uYxEoyPeKXiW1szMtPubg10b/PAxgSlo=; b=l14UxnZ4+YlgHj9J6ELHvXQgz698loXAWxtD4zpXGDFvozKkbwnot8jCBJi1fpBY3Z wPhM03zGtu+2oizgwgzm+Ugoy36jl/bLmR4seTAk1pyw+PRz0SSlhy01roVghNkIRVJb EQBcAga8KuZITxsdOAOaAI0GIwrGrHCoM2NHB+LvXVMjf+iVo+lCfpUqIjnREmAVf4L+ Z/vvRUnHSFrX4AjFA3yC1yG3jELz8XWphvKA928HXkHdhjS8KTSUwVv699/yuBloBBLB vOm8IrDZIxvb9+hkndzUbNhPQvZpfILv+1wO+pk9o3cIyDbUcEzwT2d8zM1+xJPdPcNS /BdA== X-Gm-Message-State: AOAM5336J07uDZBuDPTd5OwjaVzy0vsjo43EccZnDh+w28j0uWokKUm6 ENfmOSr6WYFgGjG63mICcZxYZkR90nuQzaxTI4M= X-Google-Smtp-Source: ABdhPJwkCVKrRS6V2GiMRNX/DRIW3FAv4Tj5QWfrAeg45eqOecBgUJGLb6kiJ7Qveek+Eh5VMcpw/nfY1YtIB0nY/YM= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:de0:247b:5157:7c15]) (user=ndesaulniers job=sendgmr) by 2002:a25:bd7:: with SMTP id 206mr41112924ybl.408.1634683018922; Tue, 19 Oct 2021 15:36:58 -0700 (PDT) Date: Tue, 19 Oct 2021 15:36:45 -0700 In-Reply-To: <20211019223646.1146945-1-ndesaulniers@google.com> Message-Id: <20211019223646.1146945-4-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211019223646.1146945-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=1634683006; l=1704; s=20211004; h=from:subject; bh=74hCoLStsXal7EECTyeA4v4ANHbGr/aLrzSq59yc++w=; b=NMtRKTwXJOcg7HCEHcr4qlyA51nWYLdppfUbMlsepaH/P2iZVOh62wivzOpTO7DmNm1ywvKsULyi 90vwOhN3CX+banOlQxJJQe/9xRZvNfnyvhmezJeuqNJ3aHFhGagP X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 3/4] arm64: vdso32: suppress error message for 'make mrproper' 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 , Nathan Chancellor , Nick Desaulniers , Lucas Henneman , Masahiro Yamada X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_153700_567862_2B2A5544 X-CRM114-Status: GOOD ( 13.55 ) 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 dc960bfeedb0 ("h8300: suppress error messages for 'make clean'") Reported-by: Lucas Henneman Suggested-by: Masahiro Yamada Signed-off-by: Nick Desaulniers Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Reviewed-by: Vincenzo Frascino --- Changes v1 -> v2: * Change to suppressing via redirecting stderr to /dev/null, as per Masahiro. * Add Masahiro's SB tag. * Cite dc960bfeedb0. arch/arm64/kernel/vdso32/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 1407516e041e..e478cebb9891 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -38,7 +38,8 @@ 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 +VDSO_CPPFLAGS += -isystem $(shell $(CC_COMPAT) -print-file-name=include 2>/dev/null) VDSO_CPPFLAGS += $(LINUXINCLUDE) # Common C and assembly flags From patchwork Tue Oct 19 22:36:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 12571271 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 38EE0C433F5 for ; Tue, 19 Oct 2021 22:39:11 +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 0691161154 for ; Tue, 19 Oct 2021 22:39:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0691161154 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=XItQLRutlKOI7sofqOTi+32XEkokmPgwmhjaeSlWI1c=; b=fHvvpJfGWUI5mJmomq6anoyxz7 nzmFeNkku9INiu1fySabAUzBfqbNuZRMRxnBYncOuWvbp/ZvcfDP0SAJ9dZ5EhBiFQLAerEirMPCL J5xHXy1c5BuQKtTyP/YvDWJrWXiKrCVmzixf0e6AHTZ6ZkA0zCpAwX9IiPs2CwvFgzFaCuirBWHlo anCvqUH/GihSnCrMgYS7eNbJpSdrz2wW0cuBwGVJe/gUA3wanhVQhokQjz3BNG8IoZGAKc76mnfoA PCvYrO2MimUxTGk0TD0a4S3OsXJWVmTuBnWRhqRIwcXGXIgh/fRKy5Ss3ZxwC73jd5G1gDDMmNRCx /A0TUh9g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxju-002rVF-V1; Tue, 19 Oct 2021 22:37:47 +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 1mcxjC-002rIv-NM for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 22:37:04 +0000 Received: by mail-yb1-xb49.google.com with SMTP id y18-20020a25a092000000b005bddb39f160so25722302ybh.10 for ; Tue, 19 Oct 2021 15:37:01 -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=ieJkUq9AzcpIj4LQBtK/SuYHkz864IVu4L+C9FeReNk=; b=ERko7aMyEefMKRlvV+YD2HoE6JCeR02DxC3cDmrCS0O1UiBj+RN2tSODvIWcna78Cw EJR33ISjdTzmwBPptFpZbGhcPvP4wQ/wlvy/jh/F5JfsfiG7Nwaoy7dsONTwHvPP7YJo wqdihZee+7b7qp3N9lLeJUXPikSzPfCkK3O3jppmlVpy+p4/D5m9KVmWBTdOjIttqqBb XNcKhpveeawTx3cJCTsN50vbXBF+S91p2IOyqhdMBcjThvW8iAGo6nckvEmibPnHUbzb tMG1bFm6Th+iIzS+zYG23S7K9UTJDw4wBFJ8/VIMGzm8Y4T/9FiaFppZ3vbDfkAsU2cG cE4Q== 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=ieJkUq9AzcpIj4LQBtK/SuYHkz864IVu4L+C9FeReNk=; b=ibK7JtlKOgBfBP/1T6zj+1gIjfANCeVpakDNfe9is6bRQNIX5Pk9Thv8FNlO4D9wFI B8CPl+DEaM0Vxh80ULEQ/wwf1KAePsJP1rFc9FOhBdgidWVmLfGW9HT0GgFhFQ13Pybv xMkajvom7PL+GZxLQ8nXJzmXRKymgCS543xJx5LfjYZ66Z7RGBt8sFWCOIDTdvMAelXI OAZYMRcDOv2q7ygg/RX3fwq7NAwCQysIM/272saC1OysBwGPLBWHdthi51LS0oWPOgC8 YptVVlPX8j+114wcHQ4fAdC+/NrR5Fx16TcYF2/tKMJmRhlwVclcsMOcvnYA/AWjdUSn 3paQ== X-Gm-Message-State: AOAM532+Wg6JdWuxORea6KiQXbLhu46XCBy6XoNxyX4K+grCVnVHz6eQ l3UDlaIY9exS6TX5ggeJsiztj+va3XXW44+eXK4= X-Google-Smtp-Source: ABdhPJw8tBLJuOZSF61b7iRwYY/fKQtMy2X99637/nO9cOgSqDLJbdat9U2v0D48/Z7up8cj+LueXImtfbNoMWSaySs= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:de0:247b:5157:7c15]) (user=ndesaulniers job=sendgmr) by 2002:a25:1a46:: with SMTP id a67mr42666171yba.21.1634683021220; Tue, 19 Oct 2021 15:37:01 -0700 (PDT) Date: Tue, 19 Oct 2021 15:36:46 -0700 In-Reply-To: <20211019223646.1146945-1-ndesaulniers@google.com> Message-Id: <20211019223646.1146945-5-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211019223646.1146945-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=1634683006; l=3156; s=20211004; h=from:subject; bh=bnFBQ6SFPtVAkwcilKxCNvOoVbtexwjszCO7lK1gTak=; b=WK0kuoDuvYBKOWtOBxZiPPiBoN9HIqJyfM6EDsHV+1PUewJNi21HNTTWWfH7V5NZcKxfR4UBSAPi L3H7+RH4BlB/mChnNglFhRxhTz73LV4hNQDAa3YHRyCtVpW1JNKe X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 4/4] 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 , Nathan Chancellor , Nick Desaulniers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_153702_791985_1C2CE0F9 X-CRM114-Status: GOOD ( 10.85 ) 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, since commit ef94340583ee ("arm64: vdso32: drop -no-integrated-as flag"). 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 Reviewed-by: Nathan Chancellor Suggested-by: Nathan Chancellor Tested-by: Nathan Chancellor Signed-off-by: Nick Desaulniers Reviewed-by: Vincenzo Frascino --- Changes v1 -> v2: * Cite ef94340583ee as per Nathan. * Add parens to Kconfig expression as per Nathan. * Pick up Nathan's RB, TB, and SB tags. 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..f0f2c95aa4c8 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 e478cebb9891..c8fec493a450 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 @@ -45,10 +42,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