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 ACE17C47DD9 for ; Wed, 27 Mar 2024 11:31:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 292F46B0087; Wed, 27 Mar 2024 07:31:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 241746B0088; Wed, 27 Mar 2024 07:31:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BB1C6B0089; Wed, 27 Mar 2024 07:31:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DE8776B0087 for ; Wed, 27 Mar 2024 07:31:34 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6188C120C80 for ; Wed, 27 Mar 2024 11:31:34 +0000 (UTC) X-FDA: 81942603708.17.D28F2B3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 2263E1C0016 for ; Wed, 27 Mar 2024 11:31:31 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JoPl42VU; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.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=1711539092; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=dWxZ4WRdswms2rm8EgoVXdH5NE/nbgBS4Td+lyBqXJg=; b=PyAxPqmsqm05Ld2M76kt5bNICSyofjuXauOADAkAUYanoc2XcwXXPbvj14cwYErF25LYvZ 7SkwPS4ysoJ4kSa9RnXjOuIO/+/8xfPArGNg+VLmcFQH4PbxlbKQJoAFWxXZYQz4VULNbM sOOSAv7C9fNBcyzVLXgAtuq18+EwVgQ= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JoPl42VU; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.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=1711539092; a=rsa-sha256; cv=none; b=i/XgXijBfK617ZBd++mb6wNd+PiIUDP9sMcCoBuo+pBh0zCchVEDg9Dzh9NdvT7Wm35Jrs XVAK37oXB265htCvZFrLVWM+D4OjGRSEy136HeVNMd5aNdBpkusQXlal04AriPQBCPxOsT 8vGAj7ZgAl1gCE6bvBDZ92KQn3RIWaY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711539091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=dWxZ4WRdswms2rm8EgoVXdH5NE/nbgBS4Td+lyBqXJg=; b=JoPl42VUoD/MR/YA4+vHVUHt4RQ8PdOXX6V1BmD6hEK/Pesgy2gTygEA+a9qvFX4Ozjn/e 8nUwa04KZHPy7Gu1vcS4spLm3NgC/cSxvHpyCV2myQlc+ol1Nk14fnGwDoOKnpqedR5l0u Vm0xyLnv/tnvPn/bXn/3EabBwN7i8Ic= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-107-N4f3eYw8Pn2PZiO3aQOUUg-1; Wed, 27 Mar 2024 07:31:29 -0400 X-MC-Unique: N4f3eYw8Pn2PZiO3aQOUUg-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2d6fcb884bbso3671731fa.1 for ; Wed, 27 Mar 2024 04:31:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711539088; x=1712143888; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :references:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dWxZ4WRdswms2rm8EgoVXdH5NE/nbgBS4Td+lyBqXJg=; b=gE5lG72r+hWw1NecnQDjsEN4D4YbXkAmWBHBmieAk1ZB8qOjvS2HwFAEqOCTPoodph hsLfh/Zd1fwFSz71a4fqxQqs+BTohFJ56pve79ED5Yl+Jk6g9ckMNWo4Vh17w+W120Bv A7vwaTX02EAfjjEiYVEgQqXnXQsxWG2Hjga+b2nk0KADaejg2FsPyWtwXeR9EuUgRS7B P5SLuqZ6XOcOPYfNbrR2cDskwSJTsoQoyxjqfw3NAE6oLUeZfQjqie8ddouLMV88PzA8 6fC5oJpf+53OYjr7LBTnBmkZZBM68RFOecvQcaObEFZAw9b0iRiqoWUuaMKFoTfETXos YIdw== X-Forwarded-Encrypted: i=1; AJvYcCVa4BgfUt7rF07vmiGY3O5SDCnUQOvs5bU141DZRrBi2EnkNFai0+9n5a45rl1pd3dghzZJ9ZGo7sfJ1+NfBQsd12Q= X-Gm-Message-State: AOJu0Yz/yjVvXUHNgo/M37ZZr0vNeIncgdhV59OvFGO3Ij2YHuRDK0Je /OefIt/wikUEHqKxHStv1hjVc/juRRfF9zT8neuU5xP5i/FbURL9Z+GKxXvBxeXMowfCSEK7mUn QlkrJMjMkADKrf4neQlo7ykIPiaOloZPmS1lxWym4xk/RqzkK X-Received: by 2002:a2e:2c18:0:b0:2d4:9489:67ba with SMTP id s24-20020a2e2c18000000b002d4948967bamr820953ljs.12.1711539088392; Wed, 27 Mar 2024 04:31:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDAr3P4WDNXXoUzmRR4keHvnc1OGXZngyeXHFTuoZ8scdIcmRek4O+CNouQnIsOMDwq+MWTQ== X-Received: by 2002:a2e:2c18:0:b0:2d4:9489:67ba with SMTP id s24-20020a2e2c18000000b002d4948967bamr820920ljs.12.1711539087710; Wed, 27 Mar 2024 04:31:27 -0700 (PDT) Received: from ?IPV6:2003:cb:c708:8a00:362b:7e34:a3bc:9ddf? (p200300cbc7088a00362b7e34a3bc9ddf.dip0.t-ipconnect.de. [2003:cb:c708:8a00:362b:7e34:a3bc:9ddf]) by smtp.gmail.com with ESMTPSA id e9-20020a05600c218900b00414895d014fsm1835725wme.41.2024.03.27.04.31.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Mar 2024 04:31:27 -0700 (PDT) Message-ID: Date: Wed, 27 Mar 2024 12:31:26 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 2/3] selftest/mm: ksm_functional_tests: refactor mmap_and_merge_range() To: Jinjiang Tu , akpm@linux-foundation.org, shr@devkernel.io, hannes@cmpxchg.org, riel@surriel.com, wangkefeng.wang@huawei.com, sunnanyong@huawei.com, linux-mm@kvack.org References: <20240327060922.1484395-1-tujinjiang@huawei.com> <20240327060922.1484395-3-tujinjiang@huawei.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240327060922.1484395-3-tujinjiang@huawei.com> 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: 2263E1C0016 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: pfg5kgkfhqg9rqnxui6s68hpwddmy174 X-HE-Tag: 1711539091-319322 X-HE-Meta: U2FsdGVkX1+EIK5n5LD7FoQfgR3ENIcsy2KaJ0JKs+zoL5+vwxWcANZWGvl2JjxrhIrzVo9rTbKNZZDIuDLs6fYEqakHK2toq5QMRT57aoyzQ4/7mR7gcXpmB06kHTnpV2Le7RvO+DktdFF1V8E6NjuedKYB0y7Y/7iqUwNEvuGb0BWlgeQWBx8zJ1Kq9qdamMGJteA+vh9hGcjo5h3JNgo8vt2IvR5LxuqffLauSZHtNm5egvFaAOKz0rt5c+D/dbKH/Qum4Loyjz3r9rb7rAq9wh1X3ThRDGC6DyI1NBVg3OHqqp2Zh8aac4QmRwQmXbBkyPDBlHq5cKrx0bb9E0NZX0hZ5bytKIgHg+W7NOzbVyhlV/Q/qqWBTpYI1w+PQHmLpDKB0UaBHWEC6G3PLhJift0LiMLWO6bmi2mseTdXIMPGRE2gk3mBz88eGJNJfSZJCWYbHHBUpWQtJvtsaNSzcoSZUlIgeBISqp+jz1VKz+FtU3G14f0434uVrZ8sb0Hdpkc/TLaaxCNnTSoTkSmJq1HlTAmVzqEC2E/t7cL51L1Nzdcn7ICKpoNDRvD0IrIUK2MUkb5cUMNtePl8Pu+wk6x1Yn3YOTVst2X9E7UIte4ya+4imO6+kHJbEtgDePsw8zVtLQkNELLwrV8wN7FLjrmtv/T4a1ZSBpofQsb7Ot8BVvpr58sRLFQj57xM+x9qooCT5riQzsJam5lOoGZlIIR5Z7w2kCA1L5EdagGpe2dsk3bhsvCC4UjwxL3iXiOeS6TFqcm+9Mb3zn88nTYaDMZEZwW2SvR75XTSmcwXAesh33l4NZVII49idI9h1+OtaZ+OF6+h6mQ8ICe1Y9Njvmjdizs3RIEeTEHE1ljsGNCrUE7nlRiGBb760vPvAZH93lLeRy5WlRvzxBJlVztnQMCvV6hwPMqbWdljdb7Fa0Wd4raqkS0z0ayIHBhxuq1hMfT909+ZU/WqX99 o9Ldr0zo +locSGshdRKOmb9lRn4Yfp4fhq0dLl+njLYGYhlcklr4H0/lJ8YH7kSPTby1QpPUwoGGqkF0+1DA80UhyoEoUz2WXDxEXbFFfUMDm8a0sFK7khgTmFUl9DkCyYFf241R7x2ypGiN5qhUvGiZQiwU8k0C2Hv0qlnlOWxX9Nqy9msTqxx5+By9NXFcCbQj7ubGNwJeKaf9a6dzHY5xrUSr5h+VQwHIhbuHDsx+z0d7PujvN0JZgo9W+bGrvRp/71d6xcVxrimT7YseoO+6azqnvX5O0XiUFzmITFOouaeSVI7+wVjKDTOaEgkBR4Z2h0R6TnbXyQefeYH8fwpw/m3C4JWj98oLcH3pJvHbJkpUJ9lEq6G6hwx4I9Kdg/vLM5JU7tE/4SrGoIprbSIscQ6vhUnqFBaR7GbuRGSfshNvaiXF7GCVV7nVggBC5opZRRrk76bLmrEWOadvGWQvyMIh+UDYNNggdWFltHDVj+PDEF25yv1BHC3bPdg16x/5KCWSLFOjuohbmhG0cIxs= 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: On 27.03.24 07:09, Jinjiang Tu wrote: > In order to extend test_prctl_fork() and test_prctl_fork_exec() to make > sure that deduplication really happens, mmap_and_merge_range() needs to be > refactored. > > Firstly, mmap_and_merge_range() will be called with no need to call enable > KSM by madvise or prctl. So, switch the 'bool use_prctl' parameter to enum > ksm_merge_mode. > > Secondly, mmap_and_merge_range() will be called in child process in the > two testcases, it isn't appropriate to call ksft_test_result_{fail, skip}, > because the global variables ksft_{fail, skip} aren't consistent with the > parent process. Thus, convert calls of ksft_test_result_{fail, skip} to > ksft_print_msg() and return differrent error according to the two cases. > The callers of mmap_and_merge_range() then call ksft_test_result_{fail, > skip} according to the return value. Introduce mmap_and_merge_err_print() > helper to make it easier. > > Suggested-by: David Hildenbrand > Signed-off-by: Jinjiang Tu > --- [...] > > @@ -209,14 +228,28 @@ static char *mmap_and_merge_range(char val, unsigned long size, int prot, > * accounted differently (depending on kernel support). > */ > if (val && !get_my_merging_pages()) { > - ksft_test_result_fail("No pages got merged\n"); > + ksft_print_msg("No pages got merged\n"); > goto unmap; > } > > return map; > unmap: > munmap(map, size); > - return MAP_FAILED; > + return err_map; > +} > + > +static inline int mmap_and_merge_err_print(char *map) > +{ > + int ret = -1; > + > + if (map == MAP_MERGE_FAIL) > + ksft_test_result_fail("Merging memory failed"); > + else if (map == MAP_MERGE_FAIL) MAP_MERGE_SKIP > + ksft_test_result_skip("Merging memory skiped"); "skipped" > + else > + ret = 0; > + > + return ret; > } > > static void test_unmerge(void) > @@ -226,8 +259,8 @@ static void test_unmerge(void) > > ksft_print_msg("[RUN] %s\n", __func__); > > - map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, false); > - if (map == MAP_FAILED) > + map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, KSM_MERGE_MADVISE); > + if (mmap_and_merge_err_print(map)) I like the concept. The following would be cleaner and result in less churn: 1) Rename mmap_and_merge_range() to "__mmap_and_merge_range()" 2) Introduce a new mmap_and_merge_range() static inline char *mmap_and_merge_range(char val, unsigned long size, int prot, enum ksm_merge_mode mode) { char *map = __mmap_and_merge_range(val, size, prot, mode); char *ret = MAP_FAILED; if (map == MAP_MERGE_FAIL) ksft_test_result_fail("Merging memory failed"); else if (map == MAP_MERGE_SKIP) ksft_test_result_skip("Merging memory skipped"); else ret = map; return ret; } 3) Use __mmap_and_merge_range() in patch #3. No need to adjust any existing callers of mmap_and_merge_range(). -- Cheers, David / dhildenb