From patchwork Mon May 6 11:58:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 13655356 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91EEEC10F16 for ; Mon, 6 May 2024 11:58:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CFD616B007B; Mon, 6 May 2024 07:58:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CAD2E6B0082; Mon, 6 May 2024 07:58:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9BDA6B0083; Mon, 6 May 2024 07:58:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 9C0A16B007B for ; Mon, 6 May 2024 07:58:51 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 17D2B14068B for ; Mon, 6 May 2024 11:58:51 +0000 (UTC) X-FDA: 82087824462.04.2CFCD79 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by imf18.hostedemail.com (Postfix) with ESMTP id E4B361C0004 for ; Mon, 6 May 2024 11:58:47 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=ellerman.id.au header.s=201909 header.b=ovDRCObK; dmarc=none; spf=pass (imf18.hostedemail.com: domain of michael@ellerman.id.au designates 150.107.74.76 as permitted sender) smtp.mailfrom=michael@ellerman.id.au ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714996728; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=jX/mUszE+S1VDJa81j1IS6jhEDVmJabjLYtSxdg26Xs=; b=M3bj56IVLl1lcaLZ45zlj0TC1zB58sqcp8xxjYTJEjpL/20prWeVSNzmfgY0C5PgycDiab I6UB4JB8trcKh/2zVrcIjzMpvvS8kZSWhtzDSGLQvoca9KqCvj19llP0MZ0snFqqAC8Vpv iNHIfT+0lVUH+PQd0XXJrZf0R8RMmuo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714996728; a=rsa-sha256; cv=none; b=YrauAhDk7Ws9B4aI3izQKFA/Io37iDxDSlIrPfJ4DXxoWZhw6SrqOkXlOuDZWvoli/cSOB mLN0C20ZtBhfeybMXl0u6BKzhanfaENHJyZMoMlYmRLTDM+jKBhheRxnLrKAmwafpFj0WI 0syeCM6JwOqbXUhRlGYXCA697ANjcaE= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=ellerman.id.au header.s=201909 header.b=ovDRCObK; dmarc=none; spf=pass (imf18.hostedemail.com: domain of michael@ellerman.id.au designates 150.107.74.76 as permitted sender) smtp.mailfrom=michael@ellerman.id.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1714996724; bh=jX/mUszE+S1VDJa81j1IS6jhEDVmJabjLYtSxdg26Xs=; h=From:To:Cc:Subject:Date:From; b=ovDRCObKSqHo0kyqfy86RBUTQxmTVAylxZXmr7EHGt6/BNqosEaLk8ddTDV2gM0P1 vzXprSZpq3YYqbMjobcjPFfimAAv6uzQ2bfBR2t8Q/FAZ6wh2ewPLft4PabLSyZ4jg UCQ4rFVc7RxrbDDewspYdX6sco6vEI8lNe0N3NrRii4BwKUYlFPovT7HcooAYVFS5+ ei0QTifk6ykOlDzAmj7IpuFj93F2VfU1HBF7H8g89WVl42E/76ZNd5cvdeUPeDV6YD IbTgR+RFlr2VThHcptPYgDTPAz1y8AtAbncHsPG/s+fEKwhG6gSCS0O4zgDFHxafC3 441QJzFarMTmQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4VY0LD1Py9z4wnv; Mon, 6 May 2024 21:58:44 +1000 (AEST) From: Michael Ellerman To: Cc: , broonie@kernel.org, Subject: [PATCH] selftests/mm: Fix powerpc ARCH check Date: Mon, 6 May 2024 21:58:25 +1000 Message-ID: <20240506115825.66415-1-mpe@ellerman.id.au> X-Mailer: git-send-email 2.45.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: E4B361C0004 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: rjcddk5ugk9gfqj1e8abdxxoqwfpi6ji X-HE-Tag: 1714996727-789508 X-HE-Meta: U2FsdGVkX19H0cRPHYxGDMWDxsNhxRdQY9Hdmpau/LRbGfxpt6m73kYno+4DeCtGqGX/ofRHGBaT/LwbGmrRiMwzBjHBsYB1cFigmV1MTaZJrPpxrZrMzRszNqrIeelqcj1U6VYTZE0jL9u2/0lSG68ob+xGBu3Xm1O+8UKKzukO9Z/BGM8vxYHeEP7SWXNdp9ro4axHiv5Wnh7510psIfmCEG/UNaraUxjHkkNMs8d7DYSqFKOyiIou/Jjs7L6BrEG3o6VvH8Ug3rwy12piYgLa8ABqa6nlPB+xPo+mvYczHX3ABeFX9vlglYDc806Yj75ZZcCwNpK3pk+HvmyafDxn+muHQeYD6EJlON2WHBSXNg+6CL9Jkl8s43Ex/LitiY1525f9uRGUWDKPGwO7S1UuHldoli0IysTq8r97YhYQQSAZV2Y9pGE5ekzAdjvcNRz0oWngb2vLQLiomkkMfZIR4M9AqJZCnxpBirfVW5fJNz4oAIz18q30Y3aF9cKisoNBCBAXkerGZshqT1PY5hhzzHcAFcNCP+mtwJgECYfjK1oM0IzscDSP3TSAKUrpn3w7nDvyUqSoWeBS6fX/4ds0vc5bNh0u5vXVPfTC989hFfZJCN/BoJyB2IndGfcwL4O8cqNYpl+tSFXcePnBJnPbWDoRaI5GxY4yWPR5u0D9wcLrcvipRzSigVIHoozslC1u1AfhfhCv/ogkehJGr4+hPVjpI5k3S3OTSK1jufueEpuWF3P57YKh3T4FHY1PTKpi5DoZerj4Petqr5w9670QFAfiEVZmkg434Ivs0td+FfaptjXug/vkrQnJGMRdNYkUumagQReOOHhIlBW2q2CcuboyIypH6M+3IMfDFQ3ACFn+hObNrg5uDOiUzUocbplIz88BqacbyGQ1nD32AkoEqfUgu852lqoJv6EC7GmVpWpAcg9ftfyP7sVLbSXR6YchsJizg2f+uDImejg GiDv/qBT BfXCwL1s6IFz9GoHKUsQ+uml2bTN4LPs2iMXtgk2XrnhXkB0qgIOs49Ha1I4XdD94Cn0QZAt/tldAeO5YAvgpHVmyexmFEmhbi/5N5bNRpobZBl2UgEYVzBXyQbf4WHg9IQucABmUEHqU3JQI+su87/BKRrz0WhDJKV7aTkn+aN2adxT63jwQZFdAZb01M/ghconyFhT8xQfyw0kyf8VXsW1G5eTc6AmAJXLPdYfxxaJCO7sMMiScFAzCvjSJKK0gzD0kthobtUdJmhRWsbifnOYiVMI7j8zINNOnCgrqqX32vheIl8/oapymFP9FTnXGIUy23Q5YHeelh1mmzmmM5H1LqOnT5PlcMoo9QeVsmTzJtqhIgd9fEX7LwQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In commit 0518dbe97fe6 ("selftests/mm: fix cross compilation with LLVM") the logic to detect the machine architecture in the Makefile was changed to use ARCH, and only fallback to uname -m if ARCH is unset. However the tests of ARCH were not updated to account for the fact that ARCH is "powerpc" for powerpc builds, not "ppc64". Fix it by changing the checks to look for "powerpc", and change the uname -m logic to convert "ppc64.*" into "powerpc". With that fixed the following tests now build for powerpc again: * protection_keys * va_high_addr_switch * virtual_address_range * write_to_hugetlbfs Fixes: 0518dbe97fe6 ("selftests/mm: fix cross compilation with LLVM") Cc: stable@vger.kernel.org # v6.4+ Signed-off-by: Michael Ellerman --- tools/testing/selftests/mm/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index eb5f39a2668b..410495e0a611 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -12,7 +12,7 @@ uname_M := $(shell uname -m 2>/dev/null || echo not) else uname_M := $(shell echo $(CROSS_COMPILE) | grep -o '^[a-z0-9]\+') endif -ARCH ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/ppc64/') +ARCH ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/powerpc/') endif # Without this, failed build products remain, with up-to-date timestamps, @@ -98,13 +98,13 @@ TEST_GEN_FILES += $(BINARIES_64) endif else -ifneq (,$(findstring $(ARCH),ppc64)) +ifneq (,$(findstring $(ARCH),powerpc)) TEST_GEN_FILES += protection_keys endif endif -ifneq (,$(filter $(ARCH),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sparc64 x86_64)) +ifneq (,$(filter $(ARCH),arm64 ia64 mips64 parisc64 powerpc riscv64 s390x sparc64 x86_64)) TEST_GEN_FILES += va_high_addr_switch TEST_GEN_FILES += virtual_address_range TEST_GEN_FILES += write_to_hugetlbfs