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 0F2AEC43461 for ; Wed, 19 May 2021 22:17:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E23BF61355 for ; Wed, 19 May 2021 22:17:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229983AbhESWSp (ORCPT ); Wed, 19 May 2021 18:18:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbhESWSn (ORCPT ); Wed, 19 May 2021 18:18:43 -0400 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0E9AC061760 for ; Wed, 19 May 2021 15:17:23 -0700 (PDT) Received: by mail-il1-x132.google.com with SMTP id l15so8390616iln.8 for ; Wed, 19 May 2021 15:17:23 -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=5wgl05064bo/wrhGEEMBj308K0kQaD0/2stg8PGthI0=; b=H6+SABy0HV4MGm3RGyJtz6pogFgzYS75atH5aoZhE6LIjuSASSLpiVi2cTcJqD1CZy XTQ34IZDiAjannkogmRFrctR7ETtoQ83cmiNdGMhQqnlVxOVzH1ZI+hmDuE8x0xvNuBS Jtsh9aeSiGvHKr8JVL7KalSSNMMxJeD5NUxqM8vVgN+x7OQBhj4wJGbep5q8F7IiEAek 2XtUak8fA2EHe5UJw1RYfhXqOLpYGPQqr0RPNQg6f+soqQggdyv8Vtx6gsrD7pLJ087U BocGya1tu3TXC4kB/AAjBp3wA6XCMcU44DqdAdxk0sNhUje2WDByAFUQNii0t6NUvnbL 9Jiw== 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=5wgl05064bo/wrhGEEMBj308K0kQaD0/2stg8PGthI0=; b=EXtN/0Agxfw8mGyX58rW3RwoTh/tFfkV2VLLHV+w0fjAzVURqnFDQKYPkYNAyJ9tP/ qGminMLX+G9UbQa8lZ2MoSJM7wavD0GYkrDd3GUVF+TfSEb/zo6qcwIEj8NL7IkahpRD 5UGw/SjyP0ksIg/lvSksPnVvQp2f6BwjA1RtXPQaqc3Ez3n9kbfo+tFfRKKEkPB+1duC a26Xw/nd8kJD1QPxgpr90834r39+qK0RsRtkAxOhCImUIJ7BeD+47KcgkdfRPQ0w7gJB mpPDBngxiOLp23cqMFWxZtbbdW7CzTkgJSfzEklKVA1VU1reJlXmt9YJVCAiDVRVjMOj +N5Q== X-Gm-Message-State: AOAM533jOiZxQoVp8PlrLt/WbzVx+EDQ5bs4GTyhtBwhUmI/mjBag/MC GHD0S0yF/BkpVwfe9zhmsoLpBF7OVKKuVcaMghTFKw== X-Google-Smtp-Source: ABdhPJzOuNXE276R25wv+szT69fRMzJgkvdYpulEGNtX8Xfx1YJ1vxarp3QWt6xXw5xq4KBBUjMWe8MTFYkiZvXOJ9Q= X-Received: by 2002:a92:340a:: with SMTP id b10mr1424032ila.301.1621462642818; Wed, 19 May 2021 15:17:22 -0700 (PDT) MIME-Version: 1.0 References: <20210519200339.829146-1-axelrasmussen@google.com> <20210519200339.829146-7-axelrasmussen@google.com> In-Reply-To: From: Axel Rasmussen Date: Wed, 19 May 2021 15:16:46 -0700 Message-ID: Subject: Re: [PATCH v2 06/10] KVM: selftests: refactor vm_mem_backing_src_type flags To: Ben Gardon 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: linux-kernel@vger.kernel.org On Wed, May 19, 2021 at 3:02 PM Ben Gardon wrote: > > 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? Ah, apologies, this is a mistake from splitting up the commits. When they were all squashed together, we set region->fd = -1 explicitly just above here, but with them separated we can't depend on that. I'll fix this in a v3. > > > 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 > >