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 X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 846FCC433B4 for ; Wed, 19 May 2021 22:02:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6278B6135A for ; Wed, 19 May 2021 22:02:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229598AbhESWDm (ORCPT ); Wed, 19 May 2021 18:03:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbhESWDm (ORCPT ); Wed, 19 May 2021 18:03:42 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F81DC06175F for ; Wed, 19 May 2021 15:02:21 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id k16so14554546ios.10 for ; Wed, 19 May 2021 15:02:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=KjKALoKKOmlz2AI87YPMcDlAiDlQ+C2SA5yV8xy9e30=; b=GulxcP71aCfA8/1Ov92kYpKSCgBNmVMcoJ0Xwk9g+qz+xVAsMVjTgIjmhLFe32zeqI pmIg4uzL4VuYERTJHvAL5tHZwyWH/Ixq2KwfACa4HS0GnLpSlkLUvbw3gLnSzE0cxiEy 9eJFOYcACbiCb6Y97Kx5CNwKk6bU6ZSTl9CEb3i/GLBtDyTMrARt0KunLoL0hCn/HzgJ /SJgikCBP0zFnnvhUc0cFgLUAMH3C6Vku45DE5AokQ7GNy05Y2bqUPW/uOOEy7lgS0Lg fZhh6jdrWJhvZhDWW71l6V4ggVuxyN3aVo0oDaZzGG72NdvUXXXaLMlONng8ZcDBV1D2 tZKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=KjKALoKKOmlz2AI87YPMcDlAiDlQ+C2SA5yV8xy9e30=; b=Vf0co+7CRjhWanb6fvUpp6t+FVLcIXx+3cliJCgSWkRpz5za7HLBpkuiA6Hr+IFan3 1QvE9T4a5YN8AC1iTmYUyOsvh9Exy85VdMsF1Dw0FeEIguoQ2rkMwhrprl0njTgTerRL /1H3ggNPt80JYjysNglZQF3GtMbG3Su57WFSlLKYKajhtkhm20oeLuHeBPAIANWoyy5S Ze0V7heu7280TDzJuWqOY3TyFPDb4+HQA+SiWD9RPWbH3h9U+vKEMomkpcIQkq6cmm+A m4yyfFDhm+XnEJmgEAR7Wn0B79uJoW5u/jZaVvPlAzh/OtaTMEYbxb35DLA1g8OLq5/8 cU6g== X-Gm-Message-State: AOAM53390vEMBq4Y9jKdqlWAA0t2LpBi0Yab5dmtv04A10h5Btn9e9Vy hoNSGka2HavbxajWbBx20dlo9JE3n98kautx6Rm0pA== X-Google-Smtp-Source: ABdhPJwP/BDyuyo0K7yylFghXGYgutJyWgpb1PVZZjpGEKeLlyJwMDg44J9DK1D6XjI81I1ODmGpiWHlhICcjVWT7a4= X-Received: by 2002:a05:6638:124b:: with SMTP id o11mr1666273jas.4.1621461740225; Wed, 19 May 2021 15:02:20 -0700 (PDT) MIME-Version: 1.0 References: <20210519200339.829146-1-axelrasmussen@google.com> <20210519200339.829146-7-axelrasmussen@google.com> In-Reply-To: <20210519200339.829146-7-axelrasmussen@google.com> From: Ben Gardon Date: Wed, 19 May 2021 15:02:09 -0700 Message-ID: Subject: Re: [PATCH v2 06/10] KVM: selftests: refactor vm_mem_backing_src_type flags To: Axel Rasmussen Cc: Aaron Lewis , Alexander Graf , Andrew Jones , Andrew Morton , Emanuele Giuseppe Esposito , Eric Auger , Jacob Xu , Makarand Sonare , Oliver Upton , Paolo Bonzini , Peter Xu , Shuah Khan , Yanan Wang , kvm , LKML , linux-kselftest@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Wed, May 19, 2021 at 1:04 PM Axel Rasmussen wrote: > > Each struct vm_mem_backing_src_alias has a flags field, which denotes > the flags used to mmap() an area of that type. Previously, this field > never included MAP_PRIVATE | MAP_ANONYMOUS, because > vm_userspace_mem_region_add assumed that *all* types would always use > those flags, and so it hardcoded them. > > In a follow-up commit, we'll add a new type: shmem. Areas of this type > must not have MAP_PRIVATE | MAP_ANONYMOUS, and instead they must have > MAP_SHARED. > > So, refactor things. Make it so that the flags field of > struct vm_mem_backing_src_alias really is a complete set of flags, and > don't add in any extras in vm_userspace_mem_region_add. This will let us > easily tack on shmem. > > Signed-off-by: Axel Rasmussen > --- > tools/testing/selftests/kvm/lib/kvm_util.c | 5 ++- > tools/testing/selftests/kvm/lib/test_util.c | 35 +++++++++++---------- > 2 files changed, 21 insertions(+), 19 deletions(-) > > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index 0d6ddee429b9..bc405785ac8b 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -759,9 +759,8 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > > region->mmap_start = mmap(NULL, region->mmap_size, > PROT_READ | PROT_WRITE, > - MAP_PRIVATE | MAP_ANONYMOUS > - | vm_mem_backing_src_alias(src_type)->flag, > - -1, 0); > + vm_mem_backing_src_alias(src_type)->flag, > + region->fd, 0); I don't see the region->fd change mentioned in the patch description or elsewhere in this patch. Is something setting region->fd to -1 or should this be part of another patch in the series? > TEST_ASSERT(region->mmap_start != MAP_FAILED, > "test_malloc failed, mmap_start: %p errno: %i", > region->mmap_start, errno); > diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c > index 63d2bc7d757b..06ddde068736 100644 > --- a/tools/testing/selftests/kvm/lib/test_util.c > +++ b/tools/testing/selftests/kvm/lib/test_util.c > @@ -168,70 +168,73 @@ size_t get_def_hugetlb_pagesz(void) > > const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias(uint32_t i) > { > + static const int anon_flags = MAP_PRIVATE | MAP_ANONYMOUS; > + static const int anon_huge_flags = anon_flags | MAP_HUGETLB; > + > static const struct vm_mem_backing_src_alias aliases[] = { > [VM_MEM_SRC_ANONYMOUS] = { > .name = "anonymous", > - .flag = 0, > + .flag = anon_flags, > }, > [VM_MEM_SRC_ANONYMOUS_THP] = { > .name = "anonymous_thp", > - .flag = 0, > + .flag = anon_flags, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB] = { > .name = "anonymous_hugetlb", > - .flag = MAP_HUGETLB, > + .flag = anon_huge_flags, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_16KB] = { > .name = "anonymous_hugetlb_16kb", > - .flag = MAP_HUGETLB | MAP_HUGE_16KB, > + .flag = anon_huge_flags | MAP_HUGE_16KB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_64KB] = { > .name = "anonymous_hugetlb_64kb", > - .flag = MAP_HUGETLB | MAP_HUGE_64KB, > + .flag = anon_huge_flags | MAP_HUGE_64KB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_512KB] = { > .name = "anonymous_hugetlb_512kb", > - .flag = MAP_HUGETLB | MAP_HUGE_512KB, > + .flag = anon_huge_flags | MAP_HUGE_512KB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_1MB] = { > .name = "anonymous_hugetlb_1mb", > - .flag = MAP_HUGETLB | MAP_HUGE_1MB, > + .flag = anon_huge_flags | MAP_HUGE_1MB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_2MB] = { > .name = "anonymous_hugetlb_2mb", > - .flag = MAP_HUGETLB | MAP_HUGE_2MB, > + .flag = anon_huge_flags | MAP_HUGE_2MB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_8MB] = { > .name = "anonymous_hugetlb_8mb", > - .flag = MAP_HUGETLB | MAP_HUGE_8MB, > + .flag = anon_huge_flags | MAP_HUGE_8MB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_16MB] = { > .name = "anonymous_hugetlb_16mb", > - .flag = MAP_HUGETLB | MAP_HUGE_16MB, > + .flag = anon_huge_flags | MAP_HUGE_16MB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_32MB] = { > .name = "anonymous_hugetlb_32mb", > - .flag = MAP_HUGETLB | MAP_HUGE_32MB, > + .flag = anon_huge_flags | MAP_HUGE_32MB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_256MB] = { > .name = "anonymous_hugetlb_256mb", > - .flag = MAP_HUGETLB | MAP_HUGE_256MB, > + .flag = anon_huge_flags | MAP_HUGE_256MB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_512MB] = { > .name = "anonymous_hugetlb_512mb", > - .flag = MAP_HUGETLB | MAP_HUGE_512MB, > + .flag = anon_huge_flags | MAP_HUGE_512MB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_1GB] = { > .name = "anonymous_hugetlb_1gb", > - .flag = MAP_HUGETLB | MAP_HUGE_1GB, > + .flag = anon_huge_flags | MAP_HUGE_1GB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_2GB] = { > .name = "anonymous_hugetlb_2gb", > - .flag = MAP_HUGETLB | MAP_HUGE_2GB, > + .flag = anon_huge_flags | MAP_HUGE_2GB, > }, > [VM_MEM_SRC_ANONYMOUS_HUGETLB_16GB] = { > .name = "anonymous_hugetlb_16gb", > - .flag = MAP_HUGETLB | MAP_HUGE_16GB, > + .flag = anon_huge_flags | MAP_HUGE_16GB, > }, > }; > _Static_assert(ARRAY_SIZE(aliases) == NUM_SRC_TYPES, > -- > 2.31.1.751.gd2f1c929bd-goog >