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 6D16BC7EE26 for ; Tue, 23 May 2023 10:15:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC63D900002; Tue, 23 May 2023 06:15:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C4F6E6B0075; Tue, 23 May 2023 06:15:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC994900002; Tue, 23 May 2023 06:15:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 95DA46B0074 for ; Tue, 23 May 2023 06:15:10 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 437EE40724 for ; Tue, 23 May 2023 10:15:10 +0000 (UTC) X-FDA: 80821111980.18.4409E01 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 784C840011 for ; Tue, 23 May 2023 10:15:07 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S6EdV6xJ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf27.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=1684836907; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ND/ou30ORoYCnfj9Kyfqf3MTIMtAMJBB+4GB/lYgQKU=; b=3iQLlJ5QVObn9tfXdaBkrvx09xzzABKHOHu2FzqxN21minVzh+cUYkG5mTA5kE5NZafQ5M oPG39HhKOaW0kzTqQiWkpY8s6s+y310LjcXfdvhU37NTGCKHUes9k1qj9Id6z/pgjgvUEj g4fT4EfUbktQ357vZjCWVWYd5fr9kyI= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S6EdV6xJ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf27.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=1684836907; a=rsa-sha256; cv=none; b=Wvu05eRDujHY0es6ODusySbi05F0Q4iczP3dAD21GhGfJLJpu7sgVY1aSYtX4UJWohLdMc FSfHL7qEjg3qxGV8M4uew7601KzSjXxw5x7tJfulbA1WoyPtErF5WBhQoAZAHJ3uISwH4L icdurukQeWAjMcOFS+jP7D4RAOa4e38= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684836906; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ND/ou30ORoYCnfj9Kyfqf3MTIMtAMJBB+4GB/lYgQKU=; b=S6EdV6xJ9Gynvw57NVXWS/+Qxi4XtWFDvRqWP2Njwuz0kTM1FxpgJbkFcHcif84fw6wW6C cJXB9bsvxs9Luyr0xVsoWs5ZVq+c+aKXyeitnJPP2Ps4ki0fTNfV7+8SDdkSNFDwcvaZgD Q18WWsnWXeGh4cHiaME3BJwnDKpFLOI= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-xJohUlIZM1iI-qawAfMy9Q-1; Tue, 23 May 2023 06:15:05 -0400 X-MC-Unique: xJohUlIZM1iI-qawAfMy9Q-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f6089a9689so8232335e9.1 for ; Tue, 23 May 2023 03:15:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684836904; x=1687428904; h=content-transfer-encoding:in-reply-to:subject:organization:from :references:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ND/ou30ORoYCnfj9Kyfqf3MTIMtAMJBB+4GB/lYgQKU=; b=PpLXXzMdt/8vGhB9Mf47TwuwRM4kJT/pP+i+wtEF6W8Hf4q4BI64Ap4C376PaD7yTa gm5jrV+kXuRAaOr5Dn7V+BCbZ0VX79WOK9eQsLtt4t19HkhkH5c57N7NvFQ860qAZify NYfxlxqw3eQfqTvPx3yRVvivQmrPgBr9ksOjH+4L2tlbQldsDafI/w7TAtPTnKPN1VU3 bGBOIUsw+QSIwZy6O6MZl2rbY3Hs79+zyKZzYkKlwT1dk9+fVfKeOEuc5QZyRFzc6gYm EIHf4N2ZtNTN0edPz+2U7aJIRV655uk88ZLoeVulUKWFzdiO+Tvm8CxrqLX44BPiUfbe nwuQ== X-Gm-Message-State: AC+VfDwxbzamWEMGLRQUFhS0FGPp1MeyYrazqC4YkgkziYZrbCcOwuat KqK/LQRyuGIYnIY21lMeIYgG3KsIT85glqDzCQ3CURgLxt5J5zIWKLpSWzJAZ7OncfcwygNdRHO +y2k35eqUbiM= X-Received: by 2002:a5d:6509:0:b0:309:3db8:51e6 with SMTP id x9-20020a5d6509000000b003093db851e6mr9859189wru.35.1684836904071; Tue, 23 May 2023 03:15:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ycDNXEE29gfxeRpK0bpjNrv1eub8emKCQxHXG/xj0UVG7NHbcGQGOldzjjRYRaTNPSsgWeA== X-Received: by 2002:a5d:6509:0:b0:309:3db8:51e6 with SMTP id x9-20020a5d6509000000b003093db851e6mr9859162wru.35.1684836903680; Tue, 23 May 2023 03:15:03 -0700 (PDT) Received: from ?IPV6:2003:cb:c74c:b400:5c8b:a0b2:f57e:e1cd? (p200300cbc74cb4005c8ba0b2f57ee1cd.dip0.t-ipconnect.de. [2003:cb:c74c:b400:5c8b:a0b2:f57e:e1cd]) by smtp.gmail.com with ESMTPSA id s4-20020a5d4244000000b00307bc4e39e5sm10489729wrr.117.2023.05.23.03.15.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 May 2023 03:15:03 -0700 (PDT) Message-ID: Date: Tue, 23 May 2023 12:15:02 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 To: Yang Yang , akpm@linux-foundation.org Cc: imbrenda@linux.ibm.com, jiang.xuexin@zte.com.cn, linux-kernel@vger.kernel.org, linux-mm@kvack.org, ran.xiaokai@zte.com.cn, xu.xin.sc@gmail.com, xu.xin16@zte.com.cn References: <202305221842587200002@zte.com.cn> <20230522105433.4277-1-yang.yang29@zte.com.cn> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH v8 6/6] selftest: add a testcase of ksm zero pages In-Reply-To: <20230522105433.4277-1-yang.yang29@zte.com.cn> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 784C840011 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: jnwtckpq4fm55xge6w3h1y5wxe9reu4w X-HE-Tag: 1684836907-58066 X-HE-Meta: U2FsdGVkX1+3frm2//AoOBCHUc+aWR+0ygTmIPt9/tR/kYjDI3OOAQWhIEd6cxEhnYCtbu5ft3ULZDDmpFu6iTC/INZBWLRkMCQkhA/pYZ/1PfRY9CzpMb1e0WU/guGZgwtMTS18AzrQ+al18jkQUJvpA0dijM+0zbLI6lFKKvBWpaQsqCAK2rdbtQVOEyhXM/Xq5cuBJiml0RBQ21i9bydUuw+of14HCKuQvmXGXryFUSd5qPItavDXGVQ1O/+aqJP6QhHkI/+8F16Dx2UIUDL+d3wbUmsDRf300cfTzHkJe6fFeg8OgIDMuytS0BabiUcvORCOUVPsm1GgwqJ8q27PW/7gi1HXxw8CncZJ7X9Rl0owSU7+3hGhRROmkkkkbKYoFOgwop8GnB/g+RLQdDHbYxVgZoHs4yFzEB+JpFeiiN/ofoicDKlfiNnrzCsQ//EBSAnAMwQcAKGeVLXG7AxzmjSsDQFP/0ruQNrgohIIK62y+aHz9vdv++HHUPib8iOJ5Q38kkTBf+jOpJUsRYPXbw9xpweG+tvElKGUmfPZphq4ia65dj+gp2WVTDkLMUE2mOJzY7weVDE7maWotvetanPv+8bM6loVxdByDypLN3J60cDeapgJRAPJQrRiB2arRsn+uawzCF70V+fl5mArAGqZji76lE4/Aj3A/bvqKTeWeuQ4gtiBdEqmnk3mOQLouCMVsdLWz0GUnv0PgBl5eGr6MOhp4jAM9pk2RfuKWXRae3JjefxlJiiby/+FeRSVuxmHAhjQEHfyZYyE/lTSVLT23xSMsOLrrV16U+4cvZEFPiUnPAIgZ4wnhGl03TSTcL9qYL6z11VWkyGagVJbiG+nqb9HArofQzoNWk6taV/4H73jPyAX+0mMAHwrSlsvc2UGYPBjBmMyulm8n1ySB7yOOhBWiYKDv1mAy411ZYOuY2Onsip4aN+Qhj5jzP71W16F75QfoHI7B7x gaC4mfiA IzUAcwehLgqQKZLSPRNDl0Nc3CyUPe0GJoWp73kJ29EUQ0wY6hQQXmb4A8ymt8dJm+LK5c7ZwFLKbBluSlYkz/6WgyRN0AStaZFQVI92TgBJyip7JAHf7zJMzK40wHAWAlwltuaaVJATIb8ZD2Nv/KUk/lxS3s0352WlWNjZhH5gzEPXpDXkf7n+NcaGsSoz5rK1CJxyXtC35w2gBVqSbonGcLuwom2jPteuWjTxg1t2fxH96VdUIfGJ6J/O3ei6j/wxKtgh+VNkqYE+FGh+JWimG3X9yu/QPGjgyv4IduqDZkB4EJrT8NiriF40ApcQ2sd2VtQjCo47nIjcpdjQkmoZXZb0I0TvEAUcpxDCiRqSR5V82wiuu8LLzB66qirCzsv5hw2t9CLHLdZVoonNfIavbhT+ni9+o92ZLmgIiYsyBdE+H7uh6onbFL41fJsU+eMCUT2Mb81sSylEajSLd905tt/m+6vpKrqqfdhFzfYAYa+n/ZRFPLjaYHWTmY4FkBl+JASmpMlkLxC0YxD56zS3fC/qIz/nqBB0Qqm5d2PehkteuapoTCScbvw== 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: On 22.05.23 12:54, Yang Yang wrote: > From: xu xin > > Add a function test_unmerge_zero_page() to test the functionality on > unsharing and counting ksm-placed zero pages and counting of this patch > series. > > test_unmerge_zero_page() actually contains three subjct test objects: > (1) whether the count of ksm zero pages can update correctly after merging; > (2) whether the count of ksm zero pages can update correctly after > unmerging; > (3) whether ksm zero pages are really unmerged. > > Signed-off-by: xu xin > Cc: Claudio Imbrenda > Cc: David Hildenbrand > Cc: Xuexin Jiang > Reviewed-by: Xiaokai Ran > Reviewed-by: Yang Yang > --- > tools/testing/selftests/mm/ksm_functional_tests.c | 75 +++++++++++++++++++++++ > 1 file changed, 75 insertions(+) > > diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c > index 26853badae70..9b7fb94ed64f 100644 > --- a/tools/testing/selftests/mm/ksm_functional_tests.c > +++ b/tools/testing/selftests/mm/ksm_functional_tests.c > @@ -29,6 +29,8 @@ > > static int ksm_fd; > static int ksm_full_scans_fd; > +static int ksm_zero_pages_fd; > +static int ksm_use_zero_pages_fd; > static int pagemap_fd; > static size_t pagesize; > > @@ -59,6 +61,21 @@ static bool range_maps_duplicates(char *addr, unsigned long size) > return false; > } > > +static long get_ksm_zero_pages(void) > +{ > + char buf[20]; > + ssize_t read_size; > + unsigned long ksm_zero_pages; > + I would add: if (!ksm_zero_pages_fd) return 0; > + read_size = pread(ksm_zero_pages_fd, buf, sizeof(buf) - 1, 0); > + if (read_size < 0) > + return -errno; > + buf[read_size] = 0; > + ksm_zero_pages = strtol(buf, NULL, 10); > + > + return ksm_zero_pages; > +} > + > static long ksm_get_full_scans(void) > { > char buf[10]; > @@ -159,6 +176,61 @@ static void test_unmerge(void) > munmap(map, size); > } > > +static inline unsigned long expected_ksm_pages(unsigned long mergeable_size) > +{ > + return mergeable_size / pagesize; > +} I suggest to just inline that. > + > +static void test_unmerge_zero_pages(void) > +{ > + const unsigned int size = 2 * MiB; > + char *map; > + unsigned long pages_expected; > + > + ksft_print_msg("[RUN] %s\n", __func__); > + > + /* Confirm the interfaces*/ Missing space at the end of the comment. But I suggest to just drop this comment. > + if (ksm_zero_pages_fd < 0) { > + ksft_test_result_skip("open(\"/sys/kernel/mm/ksm/ksm_zero_pages\") failed\n"); > + return; > + } > + if (ksm_use_zero_pages_fd < 0) { > + ksft_test_result_skip("open \"/sys/kernel/mm/ksm/use_zero_pages\" failed\n"); > + return; > + } > + if (write(ksm_use_zero_pages_fd, "1", 1) != 1) { > + ksft_test_result_skip("write \"/sys/kernel/mm/ksm/use_zero_pages\" failed\n"); > + return; > + } > + > + /* Mmap zero pages*/ Missing space at the end of the comment > + map = mmap_and_merge_range(0x00, size, false); > + if (map == MAP_FAILED) > + return; > + > + /* Check if ksm_zero_pages can be update correctly after merging */ > + pages_expected = expected_ksm_pages(size); > + ksft_test_result(pages_expected == get_ksm_zero_pages(), > + "The count zero_page_sharing was updated after merging\n"); > + Make sure that the number of tests (ksft_test_result*() invocations) is on any return path as expected (e.g., 1). if (pages_expected != get_ksm_zero_pages) { ksft_test_result_pass("'zero_page_sharing' updated after merging\n"); goto unmap; } > + /* try to unmerge half of the region */ > + if (madvise(map, size / 2, MADV_UNMERGEABLE)) { > + ksft_test_result_fail("MADV_UNMERGEABLE failed\n"); > + goto unmap; > + } > + > + /* Check if ksm_zero_pages can be update correctly after unmerging */ > + pages_expected = expected_ksm_pages(size / 2); Just do pages_expected /= 2; > + ksft_test_result(pages_expected == get_ksm_zero_pages(), > + "The count zero_page_sharing was updated after unmerging\n"); > + if (pages_expected == get_ksm_zero_pages()) { ksft_test_result_pass("'zero_page_sharing' updated after unmerging\n"); goto unmap; } > + /* Check if ksm zero pages are really unmerged */ > + ksft_test_result(!range_maps_duplicates(map, size / 2), > + "KSM zero pages were unmerged\n"); > +unmap: > + munmap(map, size); > +} > + > static void test_unmerge_discarded(void) > { > const unsigned int size = 2 * MiB; > @@ -379,8 +451,11 @@ int main(int argc, char **argv) > pagemap_fd = open("/proc/self/pagemap", O_RDONLY); > if (pagemap_fd < 0) > ksft_exit_skip("open(\"/proc/self/pagemap\") failed\n"); > + ksm_zero_pages_fd = open("/sys/kernel/mm/ksm/ksm_zero_pages", O_RDONLY); > + ksm_use_zero_pages_fd = open("/sys/kernel/mm/ksm/use_zero_pages", O_RDWR); > > test_unmerge(); > + test_unmerge_zero_pages(); > test_unmerge_discarded(); > #ifdef __NR_userfaultfd > test_unmerge_uffd_wp(); You should need something like this: diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c index 26853badae70..00df05bfc3a3 100644 --- a/tools/testing/selftests/mm/ksm_functional_tests.c +++ b/tools/testing/selftests/mm/ksm_functional_tests.c @@ -358,7 +358,7 @@ static void test_prctl_unmerge(void) int main(int argc, char **argv) { - unsigned int tests = 5; + unsigned int tests = 6; int err; #ifdef __NR_userfaultfd -- Thanks, David / dhildenb