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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46C25C41513 for ; Thu, 3 Aug 2023 19:07:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229802AbjHCTHA (ORCPT ); Thu, 3 Aug 2023 15:07:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231906AbjHCTGr (ORCPT ); Thu, 3 Aug 2023 15:06:47 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 964363A90 for ; Thu, 3 Aug 2023 12:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691089525; 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: in-reply-to:in-reply-to:references:references; bh=pPDr3fHEuj+B4yeJMYhNPLAGlxXe+c7xVHr2n9vPefY=; b=VW7C+229dJ/5Z9ZvgL/ZirL8YGYjjAyH6QDdBJJohCWVLSET5kjuhkxSWjOuvOapSYxv0t TnSKlwRvsOmoYnVftqbt5p2xaKCrW3+XDjPDECdUowkWAKkpDBAT/Q2Fb9RkBcHPTtFq/V ptgMOcc71nUn+HoQ1saqreYtDb+HsuM= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-436-KV5UQJJtM7uDTEwipBxnEw-1; Thu, 03 Aug 2023 15:05:24 -0400 X-MC-Unique: KV5UQJJtM7uDTEwipBxnEw-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-76cb292df12so32374385a.0 for ; Thu, 03 Aug 2023 12:05:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691089524; x=1691694324; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pPDr3fHEuj+B4yeJMYhNPLAGlxXe+c7xVHr2n9vPefY=; b=eZEYD8b6H3duR4haxiqOhz6UFOr+nBKlhHbNAk0i6/yhPr0JGskFqyqJ0a72fjcBNe t/dh9CtwWwAzRuhlKWVGnBpA1QLRU+ER3BV/w0f6TwPuspw/zrD3kLYxa9ukUPdEz7+3 AsscZ9UuXdKHH+6cOWFjQgo8p75Q3Aoo5E8JNJkN8du1fubTQTCipbj5GlKAgSvotxWa n2IjgFrIp0ZvcWM3mN3ETqfE9+idOgAO0gZj9rPhW5GzCztdyAw5lqPx61Yui9IVGQRh k3Vq1mKeqBtP1cCHKhd6RWDlhB251sPlt9lsTevELOTlURWy8DpUQAJ9R35BLvUB787a 9E7g== X-Gm-Message-State: ABy/qLY8UZAL+/UqrJgqd7/FVNSia6oMF/Ioikx0y8ud9Tt1VLYDkUz8 7TosF/n2UaNNpyMe14cZSxbGD4fn3S+icAg78grs2Rx8x+XG+Y68ccJP5EXb4kaYhf5j/svWoM7 Uu9om5Otw0OoP0xsyIfE82q3vCw== X-Received: by 2002:a05:622a:c1:b0:400:8036:6f05 with SMTP id p1-20020a05622a00c100b0040080366f05mr24001859qtw.2.1691089523796; Thu, 03 Aug 2023 12:05:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlH2ykL98pmKhK3SiQ2b6vrIhtlRShiCOrIVRmlDJBxu7aT77VMcWW+uQQCpCeqHjK8Bd8KhMA== X-Received: by 2002:a05:622a:c1:b0:400:8036:6f05 with SMTP id p1-20020a05622a00c100b0040080366f05mr24001840qtw.2.1691089523525; Thu, 03 Aug 2023 12:05:23 -0700 (PDT) Received: from x1n (cpe5c7695f3aee0-cm5c7695f3aede.cpe.net.cable.rogers.com. [99.254.144.39]) by smtp.gmail.com with ESMTPSA id m25-20020aed27d9000000b0040fe0fdf555sm135924qtg.22.2023.08.03.12.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 12:05:23 -0700 (PDT) Date: Thu, 3 Aug 2023 15:05:21 -0400 From: Peter Xu To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, Andrew Morton , Linus Torvalds , liubo , Matthew Wilcox , Hugh Dickins , Jason Gunthorpe , John Hubbard , Mel Gorman , Shuah Khan , Paolo Bonzini Subject: Re: [PATCH v3 6/7] selftest/mm: ksm_functional_tests: test in mmap_and_merge_range() if anything got merged Message-ID: References: <20230803143208.383663-1-david@redhat.com> <20230803143208.383663-7-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230803143208.383663-7-david@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Thu, Aug 03, 2023 at 04:32:07PM +0200, David Hildenbrand wrote: > Let's extend mmap_and_merge_range() to test if anything in the current > process was merged. range_maps_duplicates() is too unreliable for that > use case, so instead look at KSM stats. > > Trigger a complete unmerge first, to cleanup the stable tree and > stabilize accounting of merged pages. > > Note that we're using /proc/self/ksm_merging_pages instead of > /proc/self/ksm_stat, because that one is available in more existing > kernels. > > If /proc/self/ksm_merging_pages can't be opened, we can't perform any > checks and simply skip them. > > We have to special-case the shared zeropage for now. But the only user > -- test_unmerge_zero_pages() -- performs its own merge checks. > > Signed-off-by: David Hildenbrand Acked-by: Peter Xu One nitpick: > --- > .../selftests/mm/ksm_functional_tests.c | 47 +++++++++++++++++++ > 1 file changed, 47 insertions(+) > > diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c > index 0de9d33cd565..cb63b600cb4f 100644 > --- a/tools/testing/selftests/mm/ksm_functional_tests.c > +++ b/tools/testing/selftests/mm/ksm_functional_tests.c > @@ -30,6 +30,7 @@ > static int ksm_fd; > static int ksm_full_scans_fd; > static int proc_self_ksm_stat_fd; > +static int proc_self_ksm_merging_pages_fd; > static int ksm_use_zero_pages_fd; > static int pagemap_fd; > static size_t pagesize; > @@ -88,6 +89,22 @@ static long get_my_ksm_zero_pages(void) > return my_ksm_zero_pages; > } > > +static long get_my_merging_pages(void) > +{ > + char buf[10]; > + ssize_t ret; > + > + if (proc_self_ksm_merging_pages_fd < 0) > + return proc_self_ksm_merging_pages_fd; Better do the fds check all in main(), e.g. not all callers below considers negative values, so -1 can pass "if (get_my_merging_pages())" etc. > + > + ret = pread(proc_self_ksm_merging_pages_fd, buf, sizeof(buf) - 1, 0); > + if (ret <= 0) > + return -errno; > + buf[ret] = 0; > + > + return strtol(buf, NULL, 10); > +} -- Peter Xu