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=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 CBB78C433DB for ; Tue, 16 Mar 2021 16:17:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5CD2E650FB for ; Tue, 16 Mar 2021 16:17:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CD2E650FB 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 E1ED06B006E; Tue, 16 Mar 2021 12:17:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD1156B0070; Tue, 16 Mar 2021 12:17:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2ECF6B0071; Tue, 16 Mar 2021 12:17:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0039.hostedemail.com [216.40.44.39]) by kanga.kvack.org (Postfix) with ESMTP id A2B966B006E for ; Tue, 16 Mar 2021 12:17:40 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 4DB94180AD838 for ; Tue, 16 Mar 2021 16:17:40 +0000 (UTC) X-FDA: 77926243080.14.19A05E9 Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by imf20.hostedemail.com (Postfix) with ESMTP id 54271351C for ; Tue, 16 Mar 2021 16:17:34 +0000 (UTC) Received: by mail-io1-f47.google.com with SMTP id y20so19453794iot.4 for ; Tue, 16 Mar 2021 09:17:34 -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=HhXlLpunwgdGqmi7lTefsnkX5/gTgDLW0xKii60Gcgw=; b=lBhcK5IrLiroft2/P+7HH1z/nUhKX97GFLSyY8BgXSS+RaXp14xRd96D8fRxhFPHZI 3OrcJnkaFO5+epsMFy3ib38bMI5lfSMF3tHdlZ56G8xQoYW+0RrgcG60ekPEHPWgAqI1 QNizX+rYvrbbArES/So2gu30yDDArZSQBJal1xdy59qhI0ZLBg1qiLyJriHsUJX9EwzL U5jG0bcIgxKxtBXyI8kSCp9iXpI7ahCPbvS0nYmZ+d7JErXIIZOW7MwcL3nBc+3DiXL8 WapG93nRyPeE6lYCrihbfot9iGSLLdf4s4MbLZbCmWRX/9tqi06C2k1toVELnKY5+4Yz hbJQ== 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=HhXlLpunwgdGqmi7lTefsnkX5/gTgDLW0xKii60Gcgw=; b=a7HAsE66PHQn7P3TxDZY5IZrkD06Ow5WuJe5AN067pFydzqcXEJm4dlfd7/0Q/2evs o2EGBcM57w7C0W3RumdU5gGag8ukynvnW3AX/LJb3uR5GwIcFA+ZvioW8yA0m6u7Y4Ni H1qxJbLGmpFhkPzNPfryDyXEnepRi3LkYTT8lN2s9Yj2E+LcehhUWY0h2SAWcuHdqR7c n1AD/p6uWt1sC/ETVLujxWS/1Tb5FtA0SmjnDlfQNZXVCTDAVIrHDAug/WqaSMcEAiF0 0W1SXSV5kkfZwrJZ1heyaAhFkVov1xFCDtRVkIiJew8u9YxJ4WjYzN8Ue+kczi4unqxc zhaQ== X-Gm-Message-State: AOAM530ahYDwwLQT6ViqcVUmjpmXl0JOIvFRxu2lJfFLYnETO94APY4m M8Y8xOAM+2qnYuM8Qb2+aPwy22xO25Y5nf1RA7BmAg== X-Google-Smtp-Source: ABdhPJxLBP2ZkqDsxUal5VTcqXIbNKFDPmc1d/5Wk7yMuG00a3vA7erNsm7zuQnLrCDjai8bSkBdTE+BeLmAE4pqCmQ= X-Received: by 2002:a5e:8610:: with SMTP id z16mr3811755ioj.57.1615911453452; Tue, 16 Mar 2021 09:17:33 -0700 (PDT) MIME-Version: 1.0 References: <20210316094910.23827-1-sjpark@amazon.com> <20210316153930.29827-1-sjpark@amazon.com> In-Reply-To: <20210316153930.29827-1-sjpark@amazon.com> From: Axel Rasmussen Date: Tue, 16 Mar 2021 09:16:57 -0700 Message-ID: Subject: Re: [PATCH v2] mm/shmem: Enclose shmem_mcopy_atomic_pte() with 'CONFIG_USERFAULTFD' To: SeongJae Park Cc: Andrew Morton , Hugh Dickins , amit@kernel.org, Linux MM , LKML , SeongJae Park Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: cyc5h7wejh7i4u15459pfegdrr35wtqx X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 54271351C Received-SPF: none (google.com>: No applicable sender policy available) receiver=imf20; identity=mailfrom; envelope-from=""; helo=mail-io1-f47.google.com; client-ip=209.85.166.47 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1615911454-996218 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: Sorry for the build failure! I sent a new version of my patch with this same fix on the 10th (https://lore.kernel.org/patchwork/patch/1392464/), and I believe Andrew has already included it in his tree. On Tue, Mar 16, 2021 at 8:40 AM SeongJae Park wrote: > > From: SeongJae Park > > Commit 49eeab03fa0a ("userfaultfd: support minor fault handling for > shmem") introduced shmem_mcopy_atomic_pte(). The function is declared > in 'userfaultfd_k.h' when 'CONFIG_USERFAULTFD' is defined, and defined > as 'BUG()' if the config is unset. However, the definition of the > function in 'shmem.c' is not protected by the '#ifdef' macro. As a > result, the build fails when the config is not set. This commit fixes > the problem. > > Fixes: 49eeab03fa0a ("userfaultfd: support minor fault handling for shmem") > Signed-off-by: SeongJae Park > --- > > Changes from v1 > - Remove unnecessary internal code review URL > > --- > mm/shmem.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 547df2b766f7..c0d3abefeb3f 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -2359,6 +2359,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode > return inode; > } > > +#ifdef CONFIG_USERFAULTFD > int shmem_mcopy_atomic_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, > struct vm_area_struct *dst_vma, > unsigned long dst_addr, unsigned long src_addr, > @@ -2492,6 +2493,7 @@ int shmem_mcopy_atomic_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, > shmem_inode_unacct_blocks(inode, 1); > goto out; > } > +#endif > > #ifdef CONFIG_TMPFS > static const struct inode_operations shmem_symlink_inode_operations; > -- > 2.17.1 > > > > > Amazon Development Center Germany GmbH > Krausenstr. 38 > 10117 Berlin > Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss > Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B > Sitz: Berlin > Ust-ID: DE 289 237 879 > > >