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, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=ham 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 7D034C433DB for ; Wed, 20 Jan 2021 18:21:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D50B2233ED for ; Wed, 20 Jan 2021 18:21:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D50B2233ED Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 63BAF6B000A; Wed, 20 Jan 2021 13:21:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5ECFE6B000C; Wed, 20 Jan 2021 13:21:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 502596B000D; Wed, 20 Jan 2021 13:21:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0124.hostedemail.com [216.40.44.124]) by kanga.kvack.org (Postfix) with ESMTP id 387566B000A for ; Wed, 20 Jan 2021 13:21:47 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id F0A9D8249980 for ; Wed, 20 Jan 2021 18:21:46 +0000 (UTC) X-FDA: 77726971812.18.body33_240a2a32755c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 6C799100EC692 for ; Wed, 20 Jan 2021 18:21:45 +0000 (UTC) X-HE-Tag: body33_240a2a32755c X-Filterd-Recvd-Size: 5779 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Wed, 20 Jan 2021 18:21:44 +0000 (UTC) Received: by mail-pl1-f173.google.com with SMTP id s15so12954046plr.9 for ; Wed, 20 Jan 2021 10:21:44 -0800 (PST) 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=FztgeQYvJKPvTHinIajZixrVm6a1I7cVr2Glq2/9i0w=; b=W3T8XEhaf9K+imFAPKhIEnKr0YrjazEIOLw+UPe4a7fGB1/Do+hKikZcAFwT1jHsWx GaHsIeYD7mgWRT7wjIWkcdqwZv3UyveFeaH2M5smlNykayHg2L5iVlOi6/J+7gdKdQ+u WtYwBCeNxJDg5JF5Z8QSItox+v1lsKsD2iMg0GTsG/x2xt4S2+aL9EBrRMZeqDKA/WgB 9mO8s6XRzYlf79ZxAKf/tT1oqVXb5Ar0J7a+MJO8QaUh4XAJAZ5zWEXvS7D7mt+EeNw2 96X3RPYRwqzeDsTk1sKaja00yNT5CVkBxn0ZGzCUOhnDD/ICskkC5Yxl9+Jlq0ERnOZO zNdQ== 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=FztgeQYvJKPvTHinIajZixrVm6a1I7cVr2Glq2/9i0w=; b=DTk4dOKDHoG/Y+8e1us1RFppG+mZoBhP+VK3h6gx6TZu7XFqt8IbvaTzusxVFXNSUs u6Oz3A6RGxYoTxfDn/FJxsLTSzy0rs9e9RE2AWepsxHMIos11uytZWaup0+M7zpocuva P2feXOEe5T9l2tHuSYRLuSdcTLCNVC9ai2TDuZTDPmdSa1K5Syxxs8LeF0PtFndRVEg+ bkyfqClyx2NXCJu6TmPj7PjkoqlKsQBYI1rCsK3r7LbGQhip2xzhGNKDLlhiM7GYqQU0 CEzc2EqOGxYhNUX990retSNLp8iJ3hE5eSjvKpNJbj8scKGXBrgD4Yf3YNVQsL06IhV1 mZRg== X-Gm-Message-State: AOAM532eaRofZAMWs9pUGP/HfoEItyBFKSbz0a9SXVW0/94I7ULM2weS fYfDLhy8axbRgDvbCWr1PW+XoKFqsnf1tT9VvdGNOQ== X-Google-Smtp-Source: ABdhPJzNCwyPxlTxOcha/B3O+SRaZ+4OHivPiUcH3zrLFlzmALW91MKtuNsic/ILMnymXIm+/TCiRtc5HzfuxMQcIqg= X-Received: by 2002:a17:902:9f87:b029:de:9e09:ee94 with SMTP id g7-20020a1709029f87b02900de9e09ee94mr11102200plq.29.1611166903481; Wed, 20 Jan 2021 10:21:43 -0800 (PST) MIME-Version: 1.0 References: <20210120173612.20913-1-will@kernel.org> <20210120173612.20913-8-will@kernel.org> In-Reply-To: <20210120173612.20913-8-will@kernel.org> From: Nick Desaulniers Date: Wed, 20 Jan 2021 10:21:33 -0800 Message-ID: Subject: Re: [PATCH v4 7/8] mm: Use static initialisers for immutable fields of 'struct vm_fault' To: Will Deacon Cc: LKML , Linux Memory Management List , Linux ARM , Catalin Marinas , Jan Kara , Minchan Kim , Andrew Morton , "Kirill A . Shutemov" , Linus Torvalds , Vinayak Menon , Hugh Dickins , kernel-team Content-Type: text/plain; charset="UTF-8" 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 Wed, Jan 20, 2021 at 9:36 AM Will Deacon wrote: > > In preparation for const-ifying the anonymous struct field of > 'struct vm_fault', ensure that it is initialised using static > initialisers. FWIW these are known as "designated initializers", ie. struct foo my_foo = { .bar = 42, }; https://gcc.gnu.org/onlinedocs/gcc/Designated-Inits.html Reviewed-by: Nick Desaulniers > > Cc: Kirill A. Shutemov > Cc: Linus Torvalds > Signed-off-by: Will Deacon > --- > mm/shmem.c | 6 +++--- > mm/swapfile.c | 11 ++++++----- > 2 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 7c6b6d8f6c39..1b254fbfdf52 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1520,11 +1520,11 @@ static struct page *shmem_swapin(swp_entry_t swap, gfp_t gfp, > { > struct vm_area_struct pvma; > struct page *page; > - struct vm_fault vmf; > + struct vm_fault vmf = { > + .vma = &pvma, > + }; > > shmem_pseudo_vma_init(&pvma, info, index); > - vmf.vma = &pvma; > - vmf.address = 0; > page = swap_cluster_readahead(swap, gfp, &vmf); > shmem_pseudo_vma_destroy(&pvma); > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 9fffc5af29d1..2b570a566276 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1951,8 +1951,6 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd, > si = swap_info[type]; > pte = pte_offset_map(pmd, addr); > do { > - struct vm_fault vmf; > - > if (!is_swap_pte(*pte)) > continue; > > @@ -1968,9 +1966,12 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd, > swap_map = &si->swap_map[offset]; > page = lookup_swap_cache(entry, vma, addr); > if (!page) { > - vmf.vma = vma; > - vmf.address = addr; > - vmf.pmd = pmd; > + struct vm_fault vmf = { > + .vma = vma, > + .address = addr, > + .pmd = pmd, > + }; > + > page = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, > &vmf); > } > -- > 2.30.0.284.gd98b1dd5eaa7-goog > -- Thanks, ~Nick Desaulniers