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 B9DC8E75458 for ; Tue, 3 Oct 2023 13:08:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 567028D0070; Tue, 3 Oct 2023 09:08:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 517698D0003; Tue, 3 Oct 2023 09:08:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DFA28D0070; Tue, 3 Oct 2023 09:08:39 -0400 (EDT) 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 2DB688D0003 for ; Tue, 3 Oct 2023 09:08:39 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 010BC1CA1F2 for ; Tue, 3 Oct 2023 13:08:38 +0000 (UTC) X-FDA: 81304179558.07.7C43FFA Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf21.hostedemail.com (Postfix) with ESMTP id 88EA71C0096 for ; Tue, 3 Oct 2023 13:07:32 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=tOXjeMZG; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Tc5HhKdZ; dmarc=none; spf=pass (imf21.hostedemail.com: domain of jack@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696338452; a=rsa-sha256; cv=none; b=jFlICTrbAYRmZrwZXXLttCSRCXOn+mAsjOsD9eCO9FN+YWXNdTuIoYDMriAjx48g6giZBM 3wKznZb4YLUvBnbJhSHlOJGp93bGFW81pF0d8M8nWloF0ZWWpznqECIZuAYCnwRRwHnaqW E3F0C9SGnxsEhEgJS/hPwxu3bV6lQ3A= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=tOXjeMZG; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Tc5HhKdZ; dmarc=none; spf=pass (imf21.hostedemail.com: domain of jack@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696338452; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=FrpETq8twusJ5sdH9d+XrhUFsRvR1gF/4TiRFUUmkNo=; b=ytgzDUI0mhyKSMo405eu49p/H97aqHz4qhBDtTCH+UtDXM9sUy5PHUhVsCMkD/6kF++NKW dIJ/PWPxFHfVmmn+/OUaZU0ohY0Hx369TdZENNNMJ9vykB4Tg7dkN780wXp2TOW1204sIN w0g0eECOsessV6CI9oN2GE8+1KxJ6tI= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A76911F45B; Tue, 3 Oct 2023 13:07:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1696338450; h=from:from:reply-to: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=FrpETq8twusJ5sdH9d+XrhUFsRvR1gF/4TiRFUUmkNo=; b=tOXjeMZGVlb97/Zga+TON5k8gXv2c7gmG4KxASLu0sE/TvavPKgmvnkSVcpY5tCwIgqIMJ JdgDc1Hx1IuePwvXuFIRv9VJMtfufVzx6B8B1RPpjjOF8rfyiHvgKAYr3VGQLitpsCbAl3 fiVAJ0Oh6Dnx/oe7HtEjBFRLL1WG5JI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1696338450; h=from:from:reply-to: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=FrpETq8twusJ5sdH9d+XrhUFsRvR1gF/4TiRFUUmkNo=; b=Tc5HhKdZU8QKXE3JUQyWi4uE30im3D3QubNCSrnQjD7NHbDOKkdpTAkHv1shINBQYVdCIF jz/GIVFtdYoFfJBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9A6D4132D4; Tue, 3 Oct 2023 13:07:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0Aa4JRISHGWVLgAAMHmgww (envelope-from ); Tue, 03 Oct 2023 13:07:30 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 48209A07CC; Tue, 3 Oct 2023 15:07:30 +0200 (CEST) Date: Tue, 3 Oct 2023 15:07:30 +0200 From: Jan Kara To: Hugh Dickins Cc: Andrew Morton , Christian Brauner , Carlos Maiolino , Chuck Lever , Jan Kara , Matthew Wilcox , Johannes Weiner , Axel Rasmussen , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 2/8] shmem: remove vma arg from shmem_get_folio_gfp() Message-ID: <20231003130730.hiag5s6ubditcazg@quack3> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 88EA71C0096 X-Stat-Signature: tgr5r4qx8bppfjh5sdqecnqpn9fwd384 X-HE-Tag: 1696338452-293801 X-HE-Meta: U2FsdGVkX18YQW1S7t/T6AtT4O4VX8lKkB9fKsKyoh+Y1Jv0UPJU1/m6SVA/MIocWbJcmikl2UF64xZ+dlep+F4aVOp1VFatZsHZL/fMqhrGj8yC+GSKWE5QhhxccYpUSKCKWXx+ESCOrAbWq5Hp46r4CSUkVYf6eQq1tqL0yZuI5I9qBNkXduBGrRUiovAWCbnCHZgpGz2eOiUWxgjDJknLMDS3Ts2v/u+yux9219KpDuigH3MAQYEoRRPl6CB36+u+jMN5o+RpV7dH/c9mKjKAs0BK3phxzpNVg3n3ZwPqAo7IsXeRNaEi5Zt9wMcl4FJ5vI0z1L7xHjpolZU2sjCsV1p7OWwvl62jc6V3GOIH3lW3hXBY+4cfdQ18qe2PUbDTWujtyyGER0jFgxYd5bqpp1UWlSJ8qXO7aWbWYLIGhDnKO+wbTliZHPZoEQXjyNgqJ9n+llZcJqooUjgzd9xKT43CsUdpV8mC8ojxrVf7uZhtIrmivtR8bDxTwYuWsL5fbtJzcAu5JoLLjske+usoiyIWGhR/2M01iwfYUktoKjfguF3fdfIMKXPPb/mPntfXi14OU0Hl8gHc6CG4L3zko7TO0evrvA4O9EnzpixrflCJQYta+MtiuscLCWshyN0cwnAN7eecIbtWzVjegPi4puDnDAIrelT5a+asvww6F+NjWsfjjlc/PjerNdc5/MD66aeCQLJ8z3X2rb9wZOe7xpL/Qg0RU2sn45HQaFMkE4WFxoMjLr5TZsZRgLDbjRlZ6hN8QrzAa4+Zh61Sk6b7WmFoYNwFNACS0eOS6MTZ9DcEUL6rWITFlqAK4AYkw0pty0U6eYu/0KPHbBT7myJX33hl8gig7Ut7v4qLJLOlR03VFxJcGAsMR9aIiG5/N43Afe6v1UyCV0Nv/o4rbf602jJZC5Qmv9w2o1eXoOgifhlNwD78S0OnSyFTT+TnmGtp8CYhOHxWX+wnhFd 6FjqQPp2 1CmiVl7bsHxYf2YYTpENIJhTr7PlZje1no7VTlb+bWeYaA1QwLssGSOFX9+g4+1l+wKmMuY9vPV5hdJNGvMA4ZBzVzqquZumuywCR9GHzjbd7f+jYtK223CW32SzlUG6GCJRGUaOIBwKowKYMvE9P6sqaXPTbZdlS1nZ5HoojLHI4kFt1yFD7TYfgAGRFjrXP7OqXCG7nd43vLCPbAQ6yRXUHocPfLJvLx/+xC4ha2So0f+VImDnJZlbZBngQOCufNCXarQdT7fyfn8wtmQceLeAoI5W1ZYmL6WU9eA7jocYA87jqIOF+4KisvhvjdRoWsI53 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 Fri 29-09-23 20:26:53, Hugh Dickins wrote: > The vma is already there in vmf->vma, so no need for a separate arg. > > Signed-off-by: Hugh Dickins Sure. Feel free to add: Reviewed-by: Jan Kara Honza > --- > mm/shmem.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 69595d341882..824eb55671d2 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1921,14 +1921,13 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, > * vm. If we swap it in we mark it dirty since we also free the swap > * entry since a page cannot live in both the swap and page cache. > * > - * vma, vmf, and fault_type are only supplied by shmem_fault: > - * otherwise they are NULL. > + * vmf and fault_type are only supplied by shmem_fault: otherwise they are NULL. > */ > static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, > struct folio **foliop, enum sgp_type sgp, gfp_t gfp, > - struct vm_area_struct *vma, struct vm_fault *vmf, > - vm_fault_t *fault_type) > + struct vm_fault *vmf, vm_fault_t *fault_type) > { > + struct vm_area_struct *vma = vmf ? vmf->vma : NULL; > struct address_space *mapping = inode->i_mapping; > struct shmem_inode_info *info = SHMEM_I(inode); > struct shmem_sb_info *sbinfo; > @@ -2141,7 +2140,7 @@ int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop, > enum sgp_type sgp) > { > return shmem_get_folio_gfp(inode, index, foliop, sgp, > - mapping_gfp_mask(inode->i_mapping), NULL, NULL, NULL); > + mapping_gfp_mask(inode->i_mapping), NULL, NULL); > } > > /* > @@ -2225,7 +2224,7 @@ static vm_fault_t shmem_fault(struct vm_fault *vmf) > } > > err = shmem_get_folio_gfp(inode, vmf->pgoff, &folio, SGP_CACHE, > - gfp, vma, vmf, &ret); > + gfp, vmf, &ret); > if (err) > return vmf_error(err); > if (folio) > @@ -4897,7 +4896,7 @@ struct folio *shmem_read_folio_gfp(struct address_space *mapping, > > BUG_ON(!shmem_mapping(mapping)); > error = shmem_get_folio_gfp(inode, index, &folio, SGP_CACHE, > - gfp, NULL, NULL, NULL); > + gfp, NULL, NULL); > if (error) > return ERR_PTR(error); > > -- > 2.35.3 > -- Jan Kara SUSE Labs, CR