From patchwork Fri Aug 19 19:19:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Rasmussen X-Patchwork-Id: 12949113 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9A91C32771 for ; Fri, 19 Aug 2022 19:20:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351334AbiHSTUO (ORCPT ); Fri, 19 Aug 2022 15:20:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349802AbiHSTTs (ORCPT ); Fri, 19 Aug 2022 15:19:48 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C0011141BE for ; Fri, 19 Aug 2022 12:19:33 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-33352499223so90810327b3.8 for ; Fri, 19 Aug 2022 12:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc; bh=7jW9JSFdBkYgLRSlwkmM/JIttkYceIPDZWewEa3r/u8=; b=oR+QcvLsAx7r4XQNN3cL0Twl29NyDz8147I+ryzAyb527+xnsfUFeLqIySHJ854uy6 ifH5GSNUxqLNTHZJIeGfD/3JXqZN8VpCi9HVpQ2fhFh+7fp1MKED4pUCnMP9FHX7Fco3 zkuh6QuX8n2LVfXK3Vb6ZiWkTTAFWETBsHj5R2e5uxY6TwbeZ67/O8q9UxiBX1GMQEM1 bt/E54Z4WsqFvIW9H+kN6PCddfpJYitM9/XHsCODdiIMc7pIbiT2CkjRGpPhQ7DJCqWi htrgbPkPU8Kj5Q1ngR1iVrLmBHp+vZguUJ3nXGw2WVxx9hf+vPmWnueCPSxgycGDaVbS jlqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc; bh=7jW9JSFdBkYgLRSlwkmM/JIttkYceIPDZWewEa3r/u8=; b=Ns2PBxLQ+QapTpuZzEvr9uvexzNvFDywp+vWRhQyBCTj+2yB9lg0WKmBC2vnQUDy7D GEtMJLgVN2rq7CdkOq/la1SzPj9fpudRkGtMoDapvwo/go1WNAjHEMiRoNXAfrGVJT5d sQvO77xpNSlqenIJdMzJV3uV2fY2ZIpA2uh3HRXypMvULyuwnmlNct22WSpCNrZ1hRJl NcBlPur41poXm8iCcgXl5MjL7IH1caN8hqSlrlA5TWzUHnfCl7qcrC6Sy37C9Bu+zAIf dJausE3oTXSU//58v8pFPQnyt+xR61wdL6+0K7HcMjPwfrHPjtnGwuyPcuKCOHyYQ0dD cQfQ== X-Gm-Message-State: ACgBeo3GxcRPWej+jnWmGHl75qp/qd7L0S5aAcECgOb0UO4zmTX0K0/L 1/F6+ZyS3yB9WsfXnXShKXfQVxahSlzgc4zk3F1R X-Google-Smtp-Source: AA6agR4VD42sceVnWm58Z+eDpzGYApQVQC8yQTgPQxRlFe0oL38C+92/Nyrf7mt8jHbHD4sASoH0kBeSt4AWuHk9DBj1 X-Received: from ajr0.svl.corp.google.com ([2620:15c:2d4:203:676:8328:93fe:a318]) (user=axelrasmussen job=sendgmr) by 2002:a05:6902:154d:b0:67b:7908:9660 with SMTP id r13-20020a056902154d00b0067b79089660mr8579721ybu.607.1660936772678; Fri, 19 Aug 2022 12:19:32 -0700 (PDT) Date: Fri, 19 Aug 2022 12:19:28 -0700 Message-Id: <20220819191929.480108-1-axelrasmussen@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog Subject: [PATCH v2 1/2] selftests/vm: fix inability to build any vm tests From: Axel Rasmussen To: Andrew Morton , Guillaume Tucker , " =?utf-8?b?SsOpcsO0bWUg?= =?utf-8?b?R2xpc3Nl?= " , John Hubbard , Shuah Khan Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Axel Rasmussen Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org When we stopped using KSFT_KHDR_INSTALL, a side effect is we also changed the value of `top_srcdir`. This can be seen by looking at the code removed by commit 49de12ba06ef ("selftests: drop KSFT_KHDR_INSTALL make target"). (Note though that this commit didn't break this, technically the one before it did since that's the one that stopped KSFT_KHDR_INSTALL from being used, even though the code was still there.) Previously lib.mk reconfigured `top_srcdir` when KSFT_KHDR_INSTALL was being used. Now, that's no longer the case. As a result, the path to gup_test.h in vm/Makefile was wrong, and since it's a dependency of all of the vm binaries none of them could be built. Instead, we'd get an "error" like: make[1]: *** No rule to make target '/[...]/tools/testing/selftests/vm/compaction_test', needed by 'all'. Stop. So, modify lib.mk so it once again sets top_srcdir to the root of the kernel tree. Fixes: f2745dc0ba3d ("selftests: stop using KSFT_KHDR_INSTALL") Signed-off-by: Axel Rasmussen Reviewed-by: John Hubbard --- tools/testing/selftests/lib.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 947fc72413e9..d44c72b3abe3 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -40,6 +40,7 @@ ifeq (0,$(MAKELEVEL)) endif endif selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST)))) +top_srcdir = $(selfdir)/../../.. # The following are built by lib.mk common compile rules. # TEST_CUSTOM_PROGS should be used by tests that require From patchwork Fri Aug 19 19:19:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Rasmussen X-Patchwork-Id: 12949114 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32F01C32773 for ; Fri, 19 Aug 2022 19:20:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350668AbiHSTUQ (ORCPT ); Fri, 19 Aug 2022 15:20:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351339AbiHSTTt (ORCPT ); Fri, 19 Aug 2022 15:19:49 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 973DD4F67B for ; Fri, 19 Aug 2022 12:19:35 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-334ab1f0247so90471037b3.7 for ; Fri, 19 Aug 2022 12:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc; bh=FN3l7Edmt0N8hD2i6jpuTBKf9D3zI43oI6ElWLITPto=; b=Bw9oxVuL1mAMELgMlLatOutDlRfcfibuHS7Gw4khLfV8nWDrryFaFTnzdZn3sfxren 0NqPTWft+mcVVbDVIVZq19iU1Ahayk8YBEPxIyyLuh5E23B78obW2Yxv1OB+To4Aasta fCVHg5lzI4hthdRL/CdRCNSdTLkr3SOmoDGHwv2gZiYyiUXLyWnsNfFPdyCrBXioTAe3 0CUTZBzcknar9aL2UbV9WEw8MHWjNXWfuu4roNfPfS/o0Di0da3tEV8oEFRiPUxM4jAm zz+rDt9NdjR3WyAqSpMGQ6gxSKLVUvyIa/1BvU8bp1vsx2sEGvCPUwvpLGkDDVC8X6VT BHOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc; bh=FN3l7Edmt0N8hD2i6jpuTBKf9D3zI43oI6ElWLITPto=; b=mszOtwxIFrAyqy2BfXo6KnpgYYcXetu26axXKdjxzmCPhPdAOlKMkmdJrUEzGDXgp8 EtsPePVIFIQFhSqWdNxhf4RLI8PueLR/y2J6LimBL2WklgiYlHFvknx9CiebL27bIwMV 2/6Qpaapc+4sxmCQaqaQVni2zBCehgS7JNucA2W4UBwsK1qU+n55rvAodZ8nCzbKUHgL teSIA/ZSeGm5uYMnnIGdp7As1d2xKt1EznShaBkcmfMRBmtbqiOaVr8BbAw0CvD+Dpdb jS9gMBvE1J7eG1s3UCyHfkoSd8fi5jmHu32w40aa1BiT2FnQB96cEUGT4EJqxIsG1SCN 5jnA== X-Gm-Message-State: ACgBeo1C6OKf3NIB/WOJE8xiBv6z5hJb2iuWUk9a0Tu39lm0TapWXbrM iJ+sKPEBNW9Lf1h3qHQFX9m/2JVJFrWHuCLk0Syx X-Google-Smtp-Source: AA6agR6pQKrmoSd2Cuf9uYE0qJgeOlGD73u5ApSsOVKBUEzalfKaGHLjncY5Vt7iMPjrqZKhAvEfz7m2wAkDHWBAAYrt X-Received: from ajr0.svl.corp.google.com ([2620:15c:2d4:203:676:8328:93fe:a318]) (user=axelrasmussen job=sendgmr) by 2002:a05:6902:10c:b0:671:68b7:ab41 with SMTP id o12-20020a056902010c00b0067168b7ab41mr8569977ybh.608.1660936774945; Fri, 19 Aug 2022 12:19:34 -0700 (PDT) Date: Fri, 19 Aug 2022 12:19:29 -0700 In-Reply-To: <20220819191929.480108-1-axelrasmussen@google.com> Message-Id: <20220819191929.480108-2-axelrasmussen@google.com> Mime-Version: 1.0 References: <20220819191929.480108-1-axelrasmussen@google.com> X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog Subject: [PATCH v2 2/2] selftests/vm: use top_srcdir instead of recomputing relative paths From: Axel Rasmussen To: Andrew Morton , Guillaume Tucker , " =?utf-8?b?SsOpcsO0bWUg?= =?utf-8?b?R2xpc3Nl?= " , John Hubbard , Shuah Khan Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Axel Rasmussen Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org In various places both in t/t/s/v/Makefile as well as some of the test sources, we were referring to headers or directories using some fairly long relative paths. Since we have a working top_srcdir variable though, which refers to the root of the kernel tree, we can clean up all of these "up and over" relative paths, just relying on the single variable instead. Signed-off-by: Axel Rasmussen Reviewed-by: John Hubbard --- tools/testing/selftests/vm/Makefile | 2 +- tools/testing/selftests/vm/gup_test.c | 2 +- tools/testing/selftests/vm/hmm-tests.c | 4 ++-- tools/testing/selftests/vm/ksm_tests.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index d9fa6a9ea584..d516b8c38eed 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -25,7 +25,7 @@ MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/p # LDLIBS. MAKEFLAGS += --no-builtin-rules -CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES) +CFLAGS = -Wall -I $(top_srcdir) -I $(top_srcdir)/usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES) LDLIBS = -lrt -lpthread TEST_GEN_FILES = compaction_test TEST_GEN_FILES += gup_test diff --git a/tools/testing/selftests/vm/gup_test.c b/tools/testing/selftests/vm/gup_test.c index a309876d832f..e43879291dac 100644 --- a/tools/testing/selftests/vm/gup_test.c +++ b/tools/testing/selftests/vm/gup_test.c @@ -10,7 +10,7 @@ #include #include #include -#include "../../../../mm/gup_test.h" +#include #include "../kselftest.h" #include "util.h" diff --git a/tools/testing/selftests/vm/hmm-tests.c b/tools/testing/selftests/vm/hmm-tests.c index 529f53b40296..98b949c279be 100644 --- a/tools/testing/selftests/vm/hmm-tests.c +++ b/tools/testing/selftests/vm/hmm-tests.c @@ -35,8 +35,8 @@ * This is a private UAPI to the kernel test module so it isn't exported * in the usual include/uapi/... directory. */ -#include "../../../../lib/test_hmm_uapi.h" -#include "../../../../mm/gup_test.h" +#include +#include struct hmm_buffer { void *ptr; diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c index f5e4e0bbd081..0d85be2350fa 100644 --- a/tools/testing/selftests/vm/ksm_tests.c +++ b/tools/testing/selftests/vm/ksm_tests.c @@ -11,7 +11,7 @@ #include #include "../kselftest.h" -#include "../../../../include/vdso/time64.h" +#include #include "util.h" #define KSM_SYSFS_PATH "/sys/kernel/mm/ksm/"