From mboxrd@z Thu Jan 1 00:00:00 1970 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 9826DC04FE4 for ; Wed, 20 Sep 2023 18:59:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A78856B0194; Wed, 20 Sep 2023 14:59:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A011C6B0196; Wed, 20 Sep 2023 14:59:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87AD56B0197; Wed, 20 Sep 2023 14:59:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 74AC86B0194 for ; Wed, 20 Sep 2023 14:59:27 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3980C40770 for ; Wed, 20 Sep 2023 18:59:27 +0000 (UTC) X-FDA: 81257889174.01.EBEC3B4 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by imf17.hostedemail.com (Postfix) with ESMTP id 29E5740020 for ; Wed, 20 Sep 2023 18:59:23 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=devkernel.io header.s=fm3 header.b="TkEy/w0E"; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=BnXfMTOS; dmarc=none; spf=pass (imf17.hostedemail.com: domain of shr@devkernel.io designates 66.111.4.27 as permitted sender) smtp.mailfrom=shr@devkernel.io ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695236364; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=t4Kp9fLt8bqhZ5C1c0iLXPtn7Zyyv0RxVkTe9WghAqI=; b=kWKXn8hT5h1LvRWBE/MzBvRQgVM9AuBrWjvdEx7x2AFQ9xyBL1LK6lgmFpmXMCAkohxoDO 5G+WWqZbeWrscYca5hVbJr5Q7G/9IZCOh5vwK0a5D5wjmXiTrp6A2hBraYtV2ksu/u0VOa yzMD8Cn34mhoE286XY0dY4sMe28Uf6k= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=devkernel.io header.s=fm3 header.b="TkEy/w0E"; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=BnXfMTOS; dmarc=none; spf=pass (imf17.hostedemail.com: domain of shr@devkernel.io designates 66.111.4.27 as permitted sender) smtp.mailfrom=shr@devkernel.io ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695236364; a=rsa-sha256; cv=none; b=S2Ujuet7XHCakcv7mRZY6HhLEo2MiLSzZc9Kued4eZA/lnAoPXeHo6nMCv3Ga/dWYINK0M VlAPhua23kpOBLcJBRbsYhWgS6GsnLNW1So2KxmDOyIwsvQ2SId4D/cO6ayW/jgVHlMhQu nj0bjrMvZpERbd2k5tJ+EG/o2SggnRg= Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 75C9A5C012A; Wed, 20 Sep 2023 14:59:23 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 20 Sep 2023 14:59:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=devkernel.io; h= cc:cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1695236363; x=1695322763; bh=t4 Kp9fLt8bqhZ5C1c0iLXPtn7Zyyv0RxVkTe9WghAqI=; b=TkEy/w0ELZo7Ts6DPH J/A3DNMUiSFBbNvlHGDpEbQT4vX0NWaauoea1txWsnxUvz9yQFk0z57awJGyYLV5 3hnE80afN3X9cNNdPggYK1wTw3Es3y5c9Wh6cppa92es7YRvN/5OdlTMvuZQoQ16 DDWyCIIBczpvEms3KhyeekdUZs3vM5G/c9NHnWpCdUGf3tSovz0b04N7U1mlv3hL DRuwrQuYQiC6EAhPTE7eZzsOAEW0Q4CM0fcBzn2NMUdhnGvDHh2YuAgmDhKTFiS2 vBbSWjkqtUWJ0BmwSGNC1Sm/A8nAGJ5mJFDzb3JZGtjIffozyg7KIYtbwZyx0RTu L+iA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1695236363; x=1695322763; bh=t4Kp9fLt8bqhZ 5C1c0iLXPtn7Zyyv0RxVkTe9WghAqI=; b=BnXfMTOSi8a+AM/3jDAuEON7D5sOq SDimlGw4ZLAM20NIrNs2PYkBiVzMcEq2UEyMGbIp5Yow8rnsdJ/mr9730SimOF5z PT8/LupdGemc2dzWo4lCcblhVWheQSO0BgV3VYfhc3Zz8QOFg4FMUoIkP7ABGn1Z jWbIIfDq51tSNCsSPPl+tgK0KUvNJkCu0cO96CPJme7na5sGO1Nw8x0saLzDsUP7 uH8NRApyVyHbobokZMQGUkSuTd0uYIZqF9eYCcYi4yk8FzQVezXhWzZz+Y1N7WXX EU6EGd5E5nHm62Z6LbExzQUcFScpiMBdPWz4Y3HkGkgM5ovBwU3cyeFew== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudekfedgudeffecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpehffgfhvfevufffjgfkgggtsehttdertddtredtnecuhfhrohhmpefuthgv fhgrnhcutfhovghstghhuceoshhhrhesuggvvhhkvghrnhgvlhdrihhoqeenucggtffrrg htthgvrhhnpeevlefggffhheduiedtheejveehtdfhtedvhfeludetvdegieekgeeggfdu geeutdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hshhhrseguvghvkhgvrhhnvghlrdhioh X-ME-Proxy: Feedback-ID: i84614614:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 20 Sep 2023 14:59:22 -0400 (EDT) References: <20230919205158.1897353-1-shr@devkernel.io> <20230919205158.1897353-3-shr@devkernel.io> User-agent: mu4e 1.10.1; emacs 28.2.50 From: Stefan Roesch To: David Hildenbrand Cc: kernel-team@fb.com, akpm@linux-foundation.org, hannes@cmpxchg.org, riel@surriel.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v1 2/2] mm/ksm: Test case for prctl fork/exec workflow Date: Wed, 20 Sep 2023 11:57:27 -0700 In-reply-to: Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 29E5740020 X-Stat-Signature: 9monxttnyozo45cwzmjyyhw8w9hbaq7w X-Rspam-User: X-HE-Tag: 1695236363-408041 X-HE-Meta: U2FsdGVkX19nDfup+ybhuz7VSpWbfyolVIZitdk45ktqQzEwXvIYlhOUbf5++uYPVdkaYUtFQ0aTcDIk2fQ+fahZXIdLzel4Y/Z8jkBXm+SAjPGC8di0JGqlUM/C6STcZop5BZ9gX1tyOBqRgqGqtYeliS8pQ22ocNriT6CkVm1JMHosgpapnexlj9P/78OU6JpYmCWD1x8DQspZSH/xgDIiPpuyW0agWgwKktfZcX7ZpI9MwA5wgLmOurTxgW+TdMg42XjRmUwkQ/mbIdeGCefsIdbf24atRDA11/161dzyaUbqXvPjOaiA6shzMKYCaYXpm4WKRkSvVc2PVMeVBXPSZrTAzZyvQ/z5B3fgxEv0b/K/2/ln1nHPXs5snkGx7TtSQ6I8zFljF90RKnmfAg5JWVaLSHwzmOpa8Sk89VKi42ejWru8bTMOmOKPazjN1S/oNx4O6NvsU6bWZfpkOIqy9JUrlCKdHMVyORjNWv/DJo5Fr2W0+AvrGaiC1M+0xGQL3JZInXJ7tZ2IHO5cx67RF/vy4GMV9r+EdlL9LntyB3/yxPdRc58JCHiDvijyyVUoF5Y0FAHUHntswfsuRowhGklEJHvu9kN6bQ5U3yDEoYEAhW7UinDpDj3wvQChXcOxXu+4aIK9vFpsHjc2E3yCNJqGX06mdnL2tqbiU5/l8SG4t5T/KXoKOk2ZXvxwfXaq1pw0USNTCh+4yxEwmUXAVdTyFhmsGQbRJJStoma0Ei4qsRTPPKj8NgpaGicdzQ8k5Fe7+IxGNbxL7hA8tJHRPDk7EsWT43dGgVUKOfPfk4A55hSxzVGZ+K0TwGRJ7lV9ck3/lzCWfHh2uEO3GCVUvCc0w7Vt5bW6cH7/3ljz9QBzcv1JiO4n6SHis417ekasavwsXbrJ0Qtjjcqfud/Ej1dt3DEEY8LJdLHwWV5jfxi/sQhdTLnGleCo2ZUdPkssIXjDkXPTyKsQ6KI FZp+tOpg 3yrs/KB8T3qROj0QkcJL06dfMWqG42pzZDj+irbopE6FlQCOIi4TZEpwDySrw6tVFzwiEPVx+rnrCvv6fMqQ5qm84GoBvq5MJZXP2PJYRaBUrPz2Y7EsjXfMDGqbXs2UXzyHvrVCu5rLnjsUq4sM7yV/scTcJXIyKG7N6vse6CPgtDLx4NtIWtQxMHjl5AGa7shW1hBhznrsVJg7Uo3z9yHIrij4rGhhHfYAL 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: David Hildenbrand writes: > On 19.09.23 22:51, Stefan Roesch wrote: >> This adds a new test case to the ksm functional tests to make sure that >> the KSM setting is inherited by the child process when doing a >> fork/exec. >> Signed-off-by: Stefan Roesch >> --- >> tools/testing/selftests/mm/Makefile | 2 + >> .../selftests/mm/ksm_fork_exec_child.c | 9 ++++ >> .../selftests/mm/ksm_functional_tests.c | 50 ++++++++++++++++++- >> 3 files changed, 60 insertions(+), 1 deletion(-) >> create mode 100644 tools/testing/selftests/mm/ksm_fork_exec_child.c >> diff --git a/tools/testing/selftests/mm/Makefile >> b/tools/testing/selftests/mm/Makefile >> index 6a9fc5693145..9ab6aa402544 100644 >> --- a/tools/testing/selftests/mm/Makefile >> +++ b/tools/testing/selftests/mm/Makefile >> @@ -73,6 +73,8 @@ ifneq ($(ARCH),arm64) >> TEST_GEN_PROGS += soft-dirty >> endif >> +TEST_GEN_PROGS += ksm_fork_exec_child > > It's not a test itself, so it shouldn't be run when running all tests. See > below. > >> + >> ifeq ($(ARCH),x86_64) >> CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_32bit_program.c -m32) >> CAN_BUILD_X86_64 := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_64bit_program.c) >> diff --git a/tools/testing/selftests/mm/ksm_fork_exec_child.c b/tools/testing/selftests/mm/ksm_fork_exec_child.c >> new file mode 100644 >> index 000000000000..298439f0d55f >> --- /dev/null >> +++ b/tools/testing/selftests/mm/ksm_fork_exec_child.c >> @@ -0,0 +1,9 @@ >> +#include >> +#include >> + >> +int main() >> +{ >> + /* Test if KSM is enabled for the process. */ >> + int ksm = prctl(68, 0, 0, 0, 0); > > Can we use the define from a header? (PR_SET_MEMORY_MERGE) > I changed it. > I was wondering if we could simply exec() ourself (same binary), but pass a > special cmdline argument. Then you don't have to build a separate binary. > I'm execing the same executable with an additional parameter. > Just special-case in main() on that argument and perform this check. > I added a check in main and invoke a new function for the child. >> + exit(ksm == 1 ? 0 : 1); >> +} >> diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c >> index 901e950f9138..4dc0bb522c07 100644 >> --- a/tools/testing/selftests/mm/ksm_functional_tests.c >> +++ b/tools/testing/selftests/mm/ksm_functional_tests.c >> @@ -479,6 +479,53 @@ static void test_prctl_fork(void) >> ksft_test_result_pass("PR_SET_MEMORY_MERGE value is inherited\n"); >> } >> +static void test_prctl_fork_exec(void) >> +{ >> + int ret, status; >> + pid_t child_pid; >> + >> + ksft_print_msg("[RUN] %s\n", __func__); >> + >> + ret = prctl(PR_SET_MEMORY_MERGE, 1, 0, 0, 0); >> + if (ret < 0 && errno == EINVAL) { >> + ksft_test_result_skip("PR_SET_MEMORY_MERGE not supported\n"); >> + return; >> + } else if (ret) { >> + ksft_test_result_fail("PR_SET_MEMORY_MERGE=1 failed\n"); >> + return; >> + } >> + >> + child_pid = fork(); >> + if (child_pid == -1) { >> + ksft_test_result_skip("fork() failed\n"); >> + return; >> + } else if (child_pid == 0) { >> + char *filename = "./ksm_fork_exec_child"; >> + char *argv_for_program[] = { filename, NULL }; >> + >> + execv(filename, argv_for_program);; > > s/;;/;/ > Fixed. > Add a return; so you can simplify the code below (no need for the "else") > Done. >> + } else { >> + if (waitpid(child_pid, &status, 0) > 0) { >> + if (WIFEXITED(status)) { >> + status = WEXITSTATUS(status); >> + if (status) { >> + ksft_test_result_fail("KSM not enabled\n"); >> + return; >> + } >> + >> + } else { >> + ksft_test_result_fail("program didn't terminate normally\n"); >> + return; >> + } >> + } else { >> + ksft_test_result_fail("waitpid() failed\n"); >> + return; >> + } >> + } >> + >> + ksft_test_result_pass("PR_SET_MEMORY_MERGE value is inherited\n"); > > It's probably the cleanest to disable PR_SET_MEMORY_MERGE again when returning > form this function, so the other tests have a clean slate. In the next version it is disabled at the end.