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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D27B4E77198 for ; Wed, 8 Jan 2025 02:41:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6089E6B0082; Tue, 7 Jan 2025 21:41:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5910C6B0083; Tue, 7 Jan 2025 21:41:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4319D6B0088; Tue, 7 Jan 2025 21:41:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2527C6B0082 for ; Tue, 7 Jan 2025 21:41:12 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C5EA4160E3C for ; Wed, 8 Jan 2025 02:41:11 +0000 (UTC) X-FDA: 82982732742.21.53894F7 Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by imf13.hostedemail.com (Postfix) with ESMTP id B7EEC20006 for ; Wed, 8 Jan 2025 02:41:08 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=odVpL4hR; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.124 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736304070; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LtmJxFHr8zPtAUr4goIsq9kiiAdDmXqBnP+rU6IOmBE=; b=0rNMfwTN4ZJ8Z1ppulAuGmYoO5B/QpYczM3teKDJsFG9ex3Om2lSWyDqzaLoeQb7bk1hOd SxewAcO/3e+gp/3DSQxXIDXZbLQNMVq6rulm6ahDopWKdHDp/J01BTsPU7r8vjoNY15kd0 3yQeq+ueZEJ+ZDCFaC8N+LwXvmLCizg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736304070; a=rsa-sha256; cv=none; b=vUtcej3JFcoezBbcpGgougNbU+TpKfRmm8kIWGWUnM8tsFDlNOSherOPPwOxsxOol7k0CS 5H0DgEMgCHNd3bNT4qaHhsd8u/Ayn5EzKOn7+2B1JrMPwMKCTWsYnft/zHD7j7AwSMh7Ed PhYpqinJcLsesgjo4Esg1ItytNeelW4= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=odVpL4hR; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.124 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1736304065; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=LtmJxFHr8zPtAUr4goIsq9kiiAdDmXqBnP+rU6IOmBE=; b=odVpL4hRJLj7v/4vn47JGCypeEFisI8XGYVFQlF237UYMUy4s0g2YeOUwg3asxWOkLNOrwEHSNar0pSSOOyB0CqNp53wGNyh6NJ664tDaOStxAPKaVFvJwhr3I90/COI5PQQ37mY22YWOZ12ZVrcy2KR69KV2g/0HPKQllzN9cw= Received: from 30.74.144.127(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WNCFcNG_1736304063 cluster:ay36) by smtp.aliyun-inc.com; Wed, 08 Jan 2025 10:41:04 +0800 Message-ID: <3dfe49b0-e852-4989-ac03-22418cc2e1a1@linux.alibaba.com> Date: Wed, 8 Jan 2025 10:41:02 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] mm: shmem: skip swapcache for swapin of synchronous swap device To: Andrew Morton Cc: hughd@google.com, willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, kasong@tencent.com, ying.huang@linux.alibaba.com, 21cnbao@gmail.com, ryan.roberts@arm.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <3d9f3bd3bc6ec953054baff5134f66feeaae7c1e.1736301701.git.baolin.wang@linux.alibaba.com> <20250107182943.a36b6876985dac7d34ef07a2@linux-foundation.org> From: Baolin Wang In-Reply-To: <20250107182943.a36b6876985dac7d34ef07a2@linux-foundation.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B7EEC20006 X-Stat-Signature: 5pys39kbroj9dnrjb4f85ei94zsnbg7k X-Rspam-User: X-HE-Tag: 1736304068-471303 X-HE-Meta: U2FsdGVkX1+f1SZRRS6nn+LsVeKLjZQ7szXOduoVdbP7TpqPyCt+BjXc59IShfVnjHL6i6HHT6/oDUVArheqNTE1uM0ICDaZIY9hWVanReBbEgbCwvs5w39keM0rW75aBispEfZwej3WxT7k7JBsrap0SAqYscrT1yLHkWOirTdCG+FDELBwb249CsnPYp6LlGsZMeaVEg+wLFR2i7cGqVbd/g/h++Z8SsI78CYFsV7wj8sumAK5rJxgsCtaXDBgeP2NGdEUiAmBkpT09M8QLBXMG3ceWNzCDSscvbhrxuO3GoNUKQ1WPqZJv6tVWxwen2yKdolT9uC+5nKSB6OLj74W3i0icQsIFP7oADEfuATvSMzDAt3hCCXTZ6Xee1l3Pc4IhaRJ2iNiRS9RFREn+nStxvNqiF/X4cZc/g6V189iCI8iX1rkyWky0kRzudGPbnwmhkqZ/QfyWDhQVNLSDjYC9ips0O4Ut2zl2f3Xh3S1gKzR++FsrhlGvyejlIaGLUAtF86hU+zfwm4rs0b464T5yDkB967vuxoCKYQmonwuMxikRjgWYJvo7lQhjE5bP9OMk27OMcbgR412mb8VbSzxso9ksBqI/rYM+lnl3scVlIJfSulAUEnts2Et3jqszUynf2Rn2YjlqgCj5Lg7gnSbgWmsbScCeSuX7Kb1aLRzJ/RScH7BcEGQtmFA8tY3NooqYvR/0KuT1tAjf+3eEVIbWI0PwhPprOZdGn3AF7RGjQBTjUSvrkJ9OFhzHxAXkRabJItOg+/BUJPlup+SKJXslGdaLFdvlaAA8r0LDylBns5cyXKb4MurV/TuSFM1p0XN3rWuPPOknWjl+047Zo/5HgLvHwizGdaRWuSJMxnSj669C163DBy8zmrnctt/KoJy0MkIP9UGBTQ5d0nZij/eAOVryiGJc3TGaHHimwWI0XYCCWAUwSkeLfl8iBoPoJXTT4FjQq08VyHYOxM n2VN1XPL Jkl/mkJWXQ+TAw+3oDnIBVTLaSudPZmWqEl0qvKEyLTFZTWGoAXo02aL3PZUtiiJGReOEqgQ1gKeVwZjnbVsRMjQhoGRv7CdRZKDDTaTjy51II15e3W2TH3osKyPF/eoE4/aOn063RKkb4n8KjbNunR+hjMaQdXsULHFdrIBDqjsjW08akCPjbTESBIGeTbVBPEbBp/KTYHAHLuxceSWlszMlUD2UvfDbWh6mI3RLxDs+mio4ijyukmBSCPTT2mqgNEmm8oInELkrZItVhgwkXbc6mQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000007, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 2025/1/8 10:29, Andrew Morton wrote: > On Wed, 8 Jan 2025 10:16:49 +0800 Baolin Wang wrote: > >> +static struct folio *shmem_swap_alloc_folio(struct inode *inode, >> + struct vm_area_struct *vma, pgoff_t index, >> + swp_entry_t entry, int order, gfp_t gfp) >> +{ >> + struct shmem_inode_info *info = SHMEM_I(inode); >> + struct folio *new; >> + void *shadow; >> + int nr_pages; >> + >> + /* >> + * We have arrived here because our zones are constrained, so don't >> + * limit chance of success by further cpuset and node constraints. >> + */ >> + gfp &= ~GFP_CONSTRAINT_MASK; >> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE >> + if (order > 0) { >> + gfp_t huge_gfp = vma_thp_gfp_mask(vma); >> + >> + gfp = limit_gfp_mask(huge_gfp, gfp); >> + } >> +#endif >> + > > Can we do this? > > --- a/mm/shmem.c~mm-shmem-skip-swapcache-for-swapin-of-synchronous-swap-device-fix > +++ a/mm/shmem.c > @@ -1978,16 +1978,14 @@ static struct folio *shmem_swap_alloc_fo > > /* > * We have arrived here because our zones are constrained, so don't > - * limit chance of success by further cpuset and node constraints. > + * limit chance of success with further cpuset and node constraints. > */ > gfp &= ~GFP_CONSTRAINT_MASK; > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > - if (order > 0) { > + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && order > 0) { > gfp_t huge_gfp = vma_thp_gfp_mask(vma); > > gfp = limit_gfp_mask(huge_gfp, gfp); > } > -#endif > > new = shmem_alloc_folio(gfp, order, info, index); > if (!new) > _ Yes, looks good to me. Thanks.