From patchwork Tue Apr 18 15:28:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13215829 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 A87EFC77B75 for ; Tue, 18 Apr 2023 15:29:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A74858E0001; Tue, 18 Apr 2023 11:29:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D5B2900002; Tue, 18 Apr 2023 11:29:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D8CF8E0005; Tue, 18 Apr 2023 11:29:07 -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 6BC0A8E0001 for ; Tue, 18 Apr 2023 11:29:07 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 01422160342 for ; Tue, 18 Apr 2023 15:29:06 +0000 (UTC) X-FDA: 80694895134.07.F819DA0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 302641A0022 for ; Tue, 18 Apr 2023 15:29:05 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bmfoqXYv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681831745; 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:in-reply-to:references:references:dkim-signature; bh=O7hwLzEYfyCC+1HV0+CQuKr6XrxBkPdmXIv3+pwAsAU=; b=yZtopHsJsmaL6cwAEoBKOx0oL/eY2dZgcVcvo03puYSELZdVzuEY7gH+fmzW0KLox6+uwd aSovz3yeepePfeNFTfpdBMVRPMP4VptriD4dtJDFVk0f0E3TipzHw1xWzt8gbSRCoO+6dS CQ6M+aqKGTwt5/aRGZvJZDtnhLhjNIg= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bmfoqXYv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681831745; a=rsa-sha256; cv=none; b=rMUxCpxBbeExr55Tv1xV1ftCF1vRnVvuLa0mi1+X8sQEYTolD282TfJH7m4tLRyrhavyr1 j4nJ/1L4gtsKqhYvXTtzQ87K5Iet/9VivZPVYOXgtvOAY5O8x/FAIYi3BMWc+vfI/NgX87 7HEu6US8H/zpGRoUUE/6muSqwoK/q68= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681831744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O7hwLzEYfyCC+1HV0+CQuKr6XrxBkPdmXIv3+pwAsAU=; b=bmfoqXYvEjJIxh9L2VOAgzyxW6hxU1TVQEii7fKesGNn04IKohG0D51mitHh4XoyMpvVNG dMloIUPNiWlTzyb14lzh6OjvhpEUE8rU8n71TdfgDBBUJnwhBKh3DHUChk1ii7zUu9aCZT 4RiNPu6hRGq9t3fzWT+/LpOAcH23SAw= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-283-tx5a0GuAONunj9TrLi1nxQ-1; Tue, 18 Apr 2023 11:29:01 -0400 X-MC-Unique: tx5a0GuAONunj9TrLi1nxQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 048921C0A58F; Tue, 18 Apr 2023 15:29:00 +0000 (UTC) Received: from t480s.redhat.com (unknown [10.39.194.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id B148314152F6; Tue, 18 Apr 2023 15:28:57 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-s390@vger.kernel.org, linux-kselftest@vger.kernel.org, David Hildenbrand , Andrew Morton , Stefan Roesch , Rik van Riel , Johannes Weiner , Michal Hocko , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Heiko Carstens , Vasily Gorbik , Sven Schnelle , Shuah Khan Subject: [PATCH v1 2/3] selftests/ksm: ksm_functional_tests: add prctl unmerge test Date: Tue, 18 Apr 2023 17:28:48 +0200 Message-Id: <20230418152849.505124-3-david@redhat.com> In-Reply-To: <20230418152849.505124-1-david@redhat.com> References: <20230418051342.1919757-1-shr@devkernel.io> <20230418152849.505124-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Rspamd-Queue-Id: 302641A0022 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 35cmd41uxyq6rag6dkg8nerzok3skkjg X-HE-Tag: 1681831745-171818 X-HE-Meta: U2FsdGVkX19D7n8KFYA5vwRXSr0olLbKKO+x2Zg82gP6yiRRmfIngCo412ky8gDD/yWCRTcRJ8qACHDk3Yjj0X4J64DIbqwdXBhS0heGgn+ruM7KANseLIhZ1HuDT7vcWn05l0f2WXCHQlijlshf/T9YSA4nmAyvFuhsdphLr5pb3fRuH5fVIfSuorsQEEaDht47SGtFRBL4UTI16BnAsVToyGPNzzfyYfLJ0qzazz+vgV94XnCnqjimebpnLEVv4J0G/zw86OARbu6yzfg81W7q5SX+BPux+ePg+4egMFaBuwWYx+3nc+jopAAUyflz1hs2LscN1YnsbdvP6dxKGJU6ei7NlKQCbNyjWknUjOBzy6/5pIRQFSzt0hd1/R9n02KkvrMZLpxK7lqtfaF2MQd4UEkh4s18zF/pU34ViHTxIOaRjjs3YIxcf/zk+lBjMeCRfrPxpUtzZU6t6DgnQm5+Oi1a2CMaJoD3C5fyBG9YqFlFi/aTsgDZR5N0PDB62WH5OQ4Elw39WQnnEKhUf5ztQ2CcjZ7dCk3gA9+S7I8oJnkS//jY7gTCrhosDrHgFtgTxYnnWAvOsbHqaFbz2VcvtTsxzfm5x++eFS+iCr9FkZ9OWYXp4By6Y040s0fcrU/E33AWCuM2rGe+h7SaCS+oDdk60AypTLL+imTNqLPM0b+mKNpVXuncBRk8sES6n8yQAtXfY+Elh9IIU218vCHTzLAfcogdwiPzX9wVzWSLFei8FS2ld9Yg+WKTNq+0YF5gW+x2EGt0tepVgqzzDEhr6hrJ4S5+SDc6+1cB7Bygkm86NQoKZYyxMKuV0riv9Qj3yJnU1z85evJxcJJIdVhHWi6pS9tjdfRTvHday1hoob4228RCN8xpwHf/DmBj9WFJEp4Y5hfUz9FA4Y7eZGQ1g8fjfh/Fr8ltbgHj9whcaGEoZu+GgJOxMayY2v8i8L6SajHWHsKnT9+AVuN YyozyfTm nq2GME2x2mZfk7RGvlGiNniHaf2ObEDIkFtV5YbD7GefTyOItZ1jX1vJXoVEypkhnYsjHCI7YMRMDM0eS523gpHPZQmSe/duLUZMRfjhgvmaM9T/xW7aSj4m1FZRAxYL2esIKFVXco/5Md1f99QzC+e307ce3YaH2rfT7v0jmp/I6uvw96CkglA10urmkJXv7KeirGbGQ7dZseylPwccC6UiRMuM1pyQgFWdj5KQ8BpVc4Ro= 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: Let's test whether setting PR_SET_MEMORY_MERGE to 0 after setting it to 1 will unmerge pages, similar to how setting MADV_UNMERGEABLE after setting MADV_MERGEABLE would. Signed-off-by: David Hildenbrand Acked-by: Stefan Roesch --- .../selftests/mm/ksm_functional_tests.c | 46 ++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c index 7bc9fc17c9f0..26853badae70 100644 --- a/tools/testing/selftests/mm/ksm_functional_tests.c +++ b/tools/testing/selftests/mm/ksm_functional_tests.c @@ -91,9 +91,10 @@ static int ksm_merge(void) return 0; } -static char *mmap_and_merge_range(char val, unsigned long size) +static char *mmap_and_merge_range(char val, unsigned long size, bool use_prctl) { char *map; + int ret; map = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0); @@ -110,7 +111,17 @@ static char *mmap_and_merge_range(char val, unsigned long size) /* Make sure each page contains the same values to merge them. */ memset(map, val, size); - if (madvise(map, size, MADV_MERGEABLE)) { + + if (use_prctl) { + 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"); + goto unmap; + } else if (ret) { + ksft_test_result_fail("PR_SET_MEMORY_MERGE=1 failed\n"); + goto unmap; + } + } else if (madvise(map, size, MADV_MERGEABLE)) { ksft_test_result_fail("MADV_MERGEABLE failed\n"); goto unmap; } @@ -133,7 +144,7 @@ static void test_unmerge(void) ksft_print_msg("[RUN] %s\n", __func__); - map = mmap_and_merge_range(0xcf, size); + map = mmap_and_merge_range(0xcf, size, false); if (map == MAP_FAILED) return; @@ -155,7 +166,7 @@ static void test_unmerge_discarded(void) ksft_print_msg("[RUN] %s\n", __func__); - map = mmap_and_merge_range(0xcf, size); + map = mmap_and_merge_range(0xcf, size, false); if (map == MAP_FAILED) return; @@ -187,7 +198,7 @@ static void test_unmerge_uffd_wp(void) ksft_print_msg("[RUN] %s\n", __func__); - map = mmap_and_merge_range(0xcf, size); + map = mmap_and_merge_range(0xcf, size, false); if (map == MAP_FAILED) return; @@ -323,9 +334,31 @@ static void test_prctl_fork(void) ksft_test_result_pass("PR_SET_MEMORY_MERGE value is inherited\n"); } +static void test_prctl_unmerge(void) +{ + const unsigned int size = 2 * MiB; + char *map; + + ksft_print_msg("[RUN] %s\n", __func__); + + map = mmap_and_merge_range(0xcf, size, true); + if (map == MAP_FAILED) + return; + + if (prctl(PR_SET_MEMORY_MERGE, 0, 0, 0, 0)) { + ksft_test_result_fail("PR_SET_MEMORY_MERGE=0 failed\n"); + goto unmap; + } + + ksft_test_result(!range_maps_duplicates(map, size), + "Pages were unmerged\n"); +unmap: + munmap(map, size); +} + int main(int argc, char **argv) { - unsigned int tests = 4; + unsigned int tests = 5; int err; #ifdef __NR_userfaultfd @@ -355,6 +388,7 @@ int main(int argc, char **argv) test_prctl(); test_prctl_fork(); + test_prctl_unmerge(); err = ksft_get_fail_cnt(); if (err)