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=-10.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 992BCC43462 for ; Tue, 13 Apr 2021 20:17:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BDAF613CC for ; Tue, 13 Apr 2021 20:17:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239164AbhDMUSR (ORCPT ); Tue, 13 Apr 2021 16:18:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50257 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240613AbhDMUSQ (ORCPT ); Tue, 13 Apr 2021 16:18:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618345076; 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=F+gpcGbjpJnW75HsT83fn38nMLIN2HNyr9uneAl6PwM=; b=KeWalMasVBWTktJ1RotRr34RFTLNSyzW1bCcxZpv7Eljnnj/EncE37JaFHr2GLIJVVdEUY PkaiHZzyXPtMHlC3Hp+VFI5fLMb4nvOegVT2YWtgVOmCrLwUCDppn3pNNCkxp5t01YX1jY fEfC9PRIySqWS1DHyfAIIoqbmTiTPtE= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-497-kq5fHDXcM3K-TKxDqzDsPA-1; Tue, 13 Apr 2021 16:17:53 -0400 X-MC-Unique: kq5fHDXcM3K-TKxDqzDsPA-1 Received: by mail-qv1-f70.google.com with SMTP id b13so8576991qvz.18 for ; Tue, 13 Apr 2021 13:17:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=F+gpcGbjpJnW75HsT83fn38nMLIN2HNyr9uneAl6PwM=; b=ik4jkjmngBg0avhX0wWqUaiPE7B4ErXUQqAGtilKKsm0xlWP7HugsoQrYejHVsS/aU 7CBZljriDq0JppexL5V0LAqTPV4ytSjtUiWEzwlQKeGfVJa38/N4ILGiu5DLMHGI8ZAV 4IFHYKBtYDR0VU3uEY9OWZyFPYReAGSEnC8yeIMa9Z56S5o9i7CFPaI1RRtq3qbtO3cH p9jLoxLNl/ZiEHJ6SkpmM7KaF4pOu04w7ksTbNd03FBEjbkb4LqYlkpJfBaASV2tsAyL Us25ZCQCR2HPj3wv8VZG02drcwiA9v5w8oE0c90uhm7k3T3tawP1JixN9o453kfUgWTp WMhQ== X-Gm-Message-State: AOAM532Mx9N6b/UAHk5j3Ii4FliAMswBLV3aHMhWObGqANX9PVYEAn9/ w/bj1VGE3Hxwri+aYfQNAfmaMq9rytbuaWu/q3vIPGIl3gSgnP06qEQ8QoC+qbAvOuhGamiPEge KdOCG7jDhI9uPS2zyH9zDoWn39w== X-Received: by 2002:ac8:7fcd:: with SMTP id b13mr31785945qtk.68.1618345072906; Tue, 13 Apr 2021 13:17:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzm8QhI4YsPfqqtubp6A3TgshHmvxjOKTuerTRIoNikR75RHHmVPZbkbKxWJoODRS6zRKCi6Q== X-Received: by 2002:ac8:7fcd:: with SMTP id b13mr31785923qtk.68.1618345072692; Tue, 13 Apr 2021 13:17:52 -0700 (PDT) Received: from xz-x1 (bras-base-toroon474qw-grc-88-174-93-75-154.dsl.bell.ca. [174.93.75.154]) by smtp.gmail.com with ESMTPSA id q67sm8814016qkb.89.2021.04.13.13.17.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 13:17:52 -0700 (PDT) Date: Tue, 13 Apr 2021 16:17:50 -0400 From: Peter Xu To: Axel Rasmussen Cc: Alexander Viro , Andrea Arcangeli , Andrew Morton , Hugh Dickins , Jerome Glisse , Joe Perches , Lokesh Gidra , Mike Kravetz , Mike Rapoport , Shaohua Li , Shuah Khan , Stephen Rothwell , Wang Qing , linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Brian Geffon , "Dr . David Alan Gilbert" , Mina Almasry , Oliver Upton Subject: Re: [PATCH v2 6/9] userfaultfd/selftests: create alias mappings in the shmem test Message-ID: <20210413201750.GF4440@xz-x1> References: <20210413051721.2896915-1-axelrasmussen@google.com> <20210413051721.2896915-7-axelrasmussen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210413051721.2896915-7-axelrasmussen@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Mon, Apr 12, 2021 at 10:17:18PM -0700, Axel Rasmussen wrote: > static void shmem_allocate_area(void **alloc_area) > { > - unsigned long offset = > - alloc_area == (void **)&area_src ? 0 : nr_pages * page_size; > + void *area_alias = NULL; > + bool is_src = alloc_area == (void **)&area_src; > + unsigned long offset = is_src ? 0 : nr_pages * page_size; > > *alloc_area = mmap(NULL, nr_pages * page_size, PROT_READ | PROT_WRITE, > MAP_SHARED, shm_fd, offset); > if (*alloc_area == MAP_FAILED) > err("mmap of memfd failed"); > + > + area_alias = mmap(NULL, nr_pages * page_size, PROT_READ | PROT_WRITE, > + MAP_SHARED, shm_fd, offset); > + if (area_alias == MAP_FAILED) > + err("mmap of memfd alias failed"); > + > + if (is_src) > + area_src_alias = area_alias; > + else > + area_dst_alias = area_alias; > +} It would be nice if shmem_allocate_area() could merge with hugetlb_allocate_area() somehow, but not that urgent. Reviewed-by: Peter Xu -- Peter Xu