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 EB714C001DC for ; Mon, 17 Jul 2023 17:22:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 75D0C6B0072; Mon, 17 Jul 2023 13:22:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70CA56B0074; Mon, 17 Jul 2023 13:22:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D5298D0001; Mon, 17 Jul 2023 13:22:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4F6156B0072 for ; Mon, 17 Jul 2023 13:22:21 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 15F19804BE for ; Mon, 17 Jul 2023 17:22:21 +0000 (UTC) X-FDA: 81021772482.25.AC617B6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf23.hostedemail.com (Postfix) with ESMTP id C26F714000B for ; Mon, 17 Jul 2023 17:22:18 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LLSpegoF; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689614538; a=rsa-sha256; cv=none; b=ff1DrH0TqaCYjoiZtPADsb1scU/no5cmc/FS3ysuVzMgarZ3UxH7TjKfETK7s2yy8Ve5fd 4n9gifzG+gCBkYASdOm12vt92fj3Or2kPPGJKoRm7LOyXEF/4vo7hbYOxlSU9TH+p39jIR QmutFTfMfG1AWidKbl2mTJCx0Gtq+j4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LLSpegoF; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1689614538; 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=uS2WS/BDTnCQtRW2bGAzVXx+rq+QgojxjwNbtUWSj4U=; b=gtO3bTIBTcjs64mGdJHw13+emDHFEoxCmG1W6FJBUG19+3K3K+JlxXrxt7zAtf8levduZ5 xBNDJFV1swq9JPlbxq+rlkV19UBnLL3CWtltloum8sllowpnV0v59P98sS3RuVneQzbITc kuhXDXZpr64IHSg7qnDx/AaEC13feOw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689614537; 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=uS2WS/BDTnCQtRW2bGAzVXx+rq+QgojxjwNbtUWSj4U=; b=LLSpegoFlzcy1PDeKqYpDlX9c9+mZHzkBfqeMspUpOiEC/7KUhkUa9yTsRSMpeG2jBMWOl 6uQ0QY9DBmvYBKvMZXpmlyA2Rqe7rlCzQllaZen93Wk744RFAzXOf7DG8EcIvNfVdd+j6z cDtgLtlBVuZjwke+DoRvvj/F4VG1nw0= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-264-W9BN0v3lMGGSaE3LFiHDbQ-1; Mon, 17 Jul 2023 13:22:16 -0400 X-MC-Unique: W9BN0v3lMGGSaE3LFiHDbQ-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-31443e13f9dso2761926f8f.0 for ; Mon, 17 Jul 2023 10:22:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689614535; x=1692206535; h=content-transfer-encoding:in-reply-to:organization:from:references :cc: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=uS2WS/BDTnCQtRW2bGAzVXx+rq+QgojxjwNbtUWSj4U=; b=hMwulTKsKa/ViH3FErz2zqjykVCMqeW8YrtMQT8V1gSLyrKvdZq7lbTsDjtaHm+tOf xGXLz+5WOX+GWqFiaEGetXtoHxvSDEMTot/qnZiA0kQ3F2FdVthCzDciD1B4OBA/bn7S PFDY9PbYvoTJErLoSKLaHThrWxKFTtgdBIy1yVb8H2OG49+zYDzX0VshuPmOgZWS2Pcd WYda0GEwRw2gnfowU6sbTYrnm7uGWRuUiw9oJ+76Ux99bnDmpMNLFgY+gqa8fSANgSxX 6uNaF0syaEpkO+eXZ3LCe9ZIVljZWHXqLGoWosnvlsCCbPb/2fgrMQgWO+lyU+qUEI2p iaSQ== X-Gm-Message-State: ABy/qLYUswiVXaXTJnM/Z8jl76jzg0Anzi5Fg5fAROQVA5cSTZUfpA4Q Cbj5s29Eq++DKD74/R/JE0qZc16QzzpffJJNIalJJ7o2XW0mGVAN3cdLidXahpPcZEsHMf8VQci BDI3ComOZwNs= X-Received: by 2002:a5d:4b06:0:b0:313:e5f2:7cbf with SMTP id v6-20020a5d4b06000000b00313e5f27cbfmr10455324wrq.58.1689614535149; Mon, 17 Jul 2023 10:22:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlG5w0pwpqpuswQO0mr5p24K4kS+T7JyG79MOUp+x29Ro/O73yqXbI5EoQaDa7+hAzceVJDQfw== X-Received: by 2002:a5d:4b06:0:b0:313:e5f2:7cbf with SMTP id v6-20020a5d4b06000000b00313e5f27cbfmr10455308wrq.58.1689614534778; Mon, 17 Jul 2023 10:22:14 -0700 (PDT) Received: from ?IPV6:2003:cb:c735:400:2501:5a2e:13c6:88da? (p200300cbc735040025015a2e13c688da.dip0.t-ipconnect.de. [2003:cb:c735:400:2501:5a2e:13c6:88da]) by smtp.gmail.com with ESMTPSA id k8-20020a5d5188000000b00314172ba213sm19579156wrv.108.2023.07.17.10.22.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Jul 2023 10:22:14 -0700 (PDT) Message-ID: Date: Mon, 17 Jul 2023 19:22:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v2 4/8] selftests/mm: Fix thuge-gen test bugs To: Ryan Roberts , Andrew Morton , Shuah Khan , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= , Mark Brown , John Hubbard , Florent Revest , Peter Xu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org References: <20230717103152.202078-1-ryan.roberts@arm.com> <20230717103152.202078-5-ryan.roberts@arm.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230717103152.202078-5-ryan.roberts@arm.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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: C26F714000B X-Stat-Signature: 3494bkbxm3u86er99ytgtnr8z5ynu8xy X-HE-Tag: 1689614538-983843 X-HE-Meta: U2FsdGVkX18MRR21bpPZxKFKHUHaAvPxOrNZ4lNq2AedOhUeCujpzUA+TYV9IK1V0Bw3muzfug/1G9KXP7vBsoOoG2isC16oFxeay4ZBllaFXOoheJTURB6Q25Xe7SVCTjENv8PkbhTPYa5MARSe4jzoKXGWx95ifV+aO9DrCR7NJ/MnBOzcLZNbgn/npYG++KzdNzM7BKYQV6TrkderbihoVIvKmhYZnW14dyNc2MCJz/YvVdsS2XN0OfOp/zRNaTcpM8KOn/00fuqBqokNksh5JdfdQfbVct3AnNdOGGf1SjPRK9cpQJYG/YyeNiufy7Csb5fhKvNdJvnjJJdafqbLuJ0cpQVifATlfIHmHdxoIeZrGdPN/xsbisxkr1LFBklEg1QxjeAEPMPWC/p5xrxuw7oXDwnL5iKKV7BJTZBpENFdfT0/tP+1JTaIqhhF5X5bwMSrXzJFmwnDb9iaElpeqPQYVjL9UYgTXSjS+iYP9ZuoJ+XVDOEoUaAuW7VhuTaOL43IogaRwhgKNj2/uN5jVZrHLA8t/UEJpvowu3ZWdtxSXlZO4UAc1V7ahYFcidMmUVp/Oc57UDbmfyXKIR0leXqTKpVXJQqPrW6qXEuhNhJnCBoellvsHInrbKCxvHVAU29KSai7qCkSqdlGIZ6UiQOeXsVA7ZGBSvXetpHQrZIBhZZOm90CdyJxmj+n0eFW8WC5uDUEZm/TR7lKKolauzFcdI7goIFL7zi33qbJQ7VdQj90ntL+NwaIE6/EBKMclPITwnkW/WmpV3inTkspTPuR2lSYKcv7mR+ySmyr0OzACC6pUiLC//3PWJpXG9+euAzlAytR1+WJAk1v92hG1PMOwAs9T11kncfzGw9CZxyNFmi5T9wWrS/V3PJ9dQm9h3Jq70ClJF3btYl3lv7bjDBNqgi7vZwQF5Q9qbzW9wmaut0NsTNsalbx26zSbH87J3+eykeQS9+sN8P E3xQcplW xt+yM5bW4ZtZ8zCFchqobSOLyPNWWpGxwum/rGDcGRzf5vWZ3AbRo2SuQ9jIcar5ok/Nflg/GJxNQbYNs64jsJjUcZFyq2i2kaOI4VdMpqZo6hr2qRaz0QPS4DzoAn1uQzVqTZYNgkx+mYQvfXf6apSXgPyy4WEmtzuGV9Jy7VeidVkkWloCtdoDgTITeYfIsEon10ZpuslT8rVl3hf25liwKwiTxdmOu95CQtxtOn5Z6iOg9S1IDyOvvlETvhgJm0sYyzDMWSqb0tGMn7NB4DrZjMxEZcF5axsXwHnY1/kZm5/oqlO/VjD15Ep3bwZAsPxGF+Bu/6h0ZaDil9Lf40Yr23/a1vYjQBi45XdKskYaERsHwtD5Ru1gxJQ== 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 17.07.23 12:31, Ryan Roberts wrote: > thuge-gen was previously only munmapping part of the mmapped buffer, > which caused us to run out of 1G huge pages for a later part of the > test. Fix this by munmapping the whole buffer. Based on the code, it > looks like a typo rather than an intention to keep some of the buffer > mapped. > > thuge-gen was also calling mmap with SHM_HUGETLB flag (bit 11 set), > which is actually MAP_DENYWRITE in mmap context. The man page says this > flag is ignored in modern kernels. I'm pretty sure from the context that > the author intended to pass the MAP_HUGETLB flag so I've fixed that up > too. Makes sense to me. > > Signed-off-by: Ryan Roberts > --- > tools/testing/selftests/mm/thuge-gen.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c > index 380ab5f0a534..16ed4dfa7359 100644 > --- a/tools/testing/selftests/mm/thuge-gen.c > +++ b/tools/testing/selftests/mm/thuge-gen.c > @@ -139,7 +139,7 @@ void test_mmap(unsigned long size, unsigned flags) > before, after, before - after, size); > assert(size == getpagesize() || (before - after) == NUM_PAGES); > show(size); > - err = munmap(map, size); > + err = munmap(map, size * NUM_PAGES); > assert(!err); > } > > @@ -222,7 +222,7 @@ int main(void) > test_mmap(ps, MAP_HUGETLB | arg); > } > printf("Testing default huge mmap\n"); > - test_mmap(default_hps, SHM_HUGETLB); > + test_mmap(default_hps, MAP_HUGETLB); > > puts("Testing non-huge shmget"); > test_shmget(getpagesize(), 0); Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb