From patchwork Thu Mar 2 23:27:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13158044 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 71EF8C678D4 for ; Thu, 2 Mar 2023 23:28:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47DC66B007B; Thu, 2 Mar 2023 18:28:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E0766B0080; Thu, 2 Mar 2023 18:28:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 05EAE6B007D; Thu, 2 Mar 2023 18:28:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DBAAB6B0078 for ; Thu, 2 Mar 2023 18:28:06 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A5D51A17EF for ; Thu, 2 Mar 2023 23:28:06 +0000 (UTC) X-FDA: 80525548572.14.36467DE Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf09.hostedemail.com (Postfix) with ESMTP id 0B17914000E for ; Thu, 2 Mar 2023 23:28:04 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=TFaKHOzs; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf09.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677799685; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Fz4rjXU4pv+JoX8GiRxuwd31ga6ygJiOfjuBNAA23TI=; b=zbAnl9rKO2tQp7dXxI+62SHmeBott/xePiLSx+W+KpAXur+7mCaR46Wjk0Y/YFb9NbQHPs lcSO3NKgmkCXG6bzWOyET39A96w5L1rOANDus+pzsxEG7Uv8q9YFpKiAP3saA5mqEiQhkE G8F5PimshvywXD5irj+vcNAs/iTOddI= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=TFaKHOzs; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf09.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677799685; a=rsa-sha256; cv=none; b=p/W8fgea3itw88ZqxiNDsOIPcyPPiwklV12RjCxBnj6HmUspXn9vuNYL1Tek++VqHucWAn OaUUZCHhBckMcFQNhr9kKscKmDnIjNT9i7fUL0OFRKoOjZn/b4iGn1KzLBsL6wh8xPk+9U gtFb2KTKF4IDPldqgEZGcheb6grffYA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=Fz4rjXU4pv+JoX8GiRxuwd31ga6ygJiOfjuBNAA23TI=; b=TFaKHOzs5zZrjEDnSHRp+DurxS EZpK7uL5ROEanWcdSjADz8IiT9IvqFH7WDeg96aXeb7m3m2MRMicspkiYt/i4MJb32izDxDrcXfkR Ds12Y4SSHzRZi2EavEPEHkitO37g6qnc2bqD93P2Sq+ov2YZdiNMiwq8LHIGSBEKfaxEzkuVTb/Li eyQolkb0Tm/6Zpnk/sRhTSjX8E0AO5dabHME4Z4quDrlZlNbzf2m9AK6EB8FSAvjOQwlwch64nCYm vap3IRDQrZhqDi0Vi31lW7yLoGiYQQ7Tck2NBz7gPOMSSu22zuLA/5dPm8V7ADT8iujNfWaqSicNC 2GU4CIiQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pXsL9-003j3K-61; Thu, 02 Mar 2023 23:27:59 +0000 From: Luis Chamberlain To: hughd@google.com, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org Cc: linux-mm@kvack.org, p.raghav@samsung.com, da.gomez@samsung.com, a.manzanares@samsung.com, dave@stgolabs.net, yosryahmed@google.com, keescook@chromium.org, mcgrof@kernel.org, patches@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] shmem: set shmem_writepage() variables early Date: Thu, 2 Mar 2023 15:27:54 -0800 Message-Id: <20230302232758.888157-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230302232758.888157-1-mcgrof@kernel.org> References: <20230302232758.888157-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 0B17914000E X-Stat-Signature: rz6emoucq18jjsfugdnwjb4chru1e4sd X-HE-Tag: 1677799684-466242 X-HE-Meta: U2FsdGVkX1+TU2KKw5Y0Ukq/O5nWeZjx/FOFABDi7gPkJFqJN4s2morFuWJjFckV3NF61gqLw+aq0qZAADfjzIdRp7OZeaLckotvJz/J8TknwvK1lv/h4jEnzp+rQeKS5LaRdqCBX0WdFMwJeLQsDsPSu2jEeuTc/uFc8waZRpBbs/uITAA5z/hcJiEYFuNinTFsCmqQLlse5iEc5ynmagFHZp9kELs4MhRzJ8ABmbNz3XavF0NRJ9ue9vuzpbQ67gpbMlhkecLuyzxlXlqtc/OOkETkhuW9qweTu+W/5zEdQ/8lcaVX/YizTX5Loge3WlcSVLqUGD/b9eSOaVIyrokkVCnPI3nn3h6qtFmBA2dj3plbflQy531lQegqjiTrWLGPkZjqtTItwL9IVrvP1ArSucFFnDJ79NcgB5vZabadgcTQB9q0AonKqI4oofuzLI49pillRVnJA4o879aq06XA7vedmIp63gCBmEroNqaS7F8NKJ58BjFSWaAqKUYbspmWWAAA6Mif5l9m+BoHnhM8nQcknciRoR+YbpXS/KdyVuy0AGie11xwTTu36KgEO/AD6Dn5iaLUri3ky0SktFVp/GN+JW63b0c5bY+pajZWv8SJt7W8ZL07PWmrVHZOc6CtSU40SHzc9o4DVjNBOjHWAvDEIFr33G4hq5JtOlam3yH1FaWjon/FAn2vC6klatXXVdhnJIqYYQQgsDzv13KrLqFo7gfDKlw9ljBaG/mWJ2CNrPFkM50v423/9TzlFE9I/FKb7h/qyUor+HVjgKiVF77FJ0Ev5SJP3G1uE6XaMB7aaFsedOy6PTXpclGAljqJz6zF6f9TLd6j48N7r+VMMhG+JzuIi8BwdH7B9254QBv3c//rOHDZZd8aDTfrRqxGxZQdQxPDDliaHdwWLubYnzR3CBb3kvEIO8lz1uq2sQymm07H8cFTfUB87ExRw4j2hBDthbhWj+X0cam +ViD9MeF ogUkXkJ5Rbty9CZ6KocOdhykEBY7TtjlwWRZKLF96HvImRr38vaYvd6OU1yDCe/FbTlttLuvs8HGbjtaPYFs9D4zfTdEOctq89aaBafGVDXgZo6vnlWQp9elDN1pzWyaMdCSpi1P3viWhG9uTFVoGQ6h4Noj3sRipu4lX1iGap5C5DSGowwZEMvazYkSulLITlZpFdh1zDVHjVCJF1zFklqE7tlbO3MCq31bGlUoF5NQT88YO/GyKV5EdIEVh4xqfmrkgDTaQfoYzCRCsAy4f6dFXZAnwp1eN3VkqZWs/wri7upnIUUPTaGxLJ6gmCIm69KX6OfVAXrB2a2BMJUGdwnpxy5BEPgHB27vUz2cunQAE4mk1OMxXrCiEchlxazf8R05JWC02wRMN269K8knCDwsFe88QGpRdwNEKEOkWkbRi7OZqqca8zRUgqw+b5jrx++gujqi0ywCUpiQ= 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: shmem_writepage() sets up variables typically used *after* a possible huge page split. However even if that does happen the address space mapping should not change, and the inode does not change either. So it should be safe to set that from the very beginning. This commit makes no functional changes. Signed-off-by: Luis Chamberlain Acked-by: David Hildenbrand Reviewed-by: Christian Brauner --- mm/shmem.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 7fff1a3af092..2b9ff585a553 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1334,9 +1334,9 @@ int shmem_unuse(unsigned int type) static int shmem_writepage(struct page *page, struct writeback_control *wbc) { struct folio *folio = page_folio(page); - struct shmem_inode_info *info; - struct address_space *mapping; - struct inode *inode; + struct address_space *mapping = folio->mapping; + struct inode *inode = mapping->host; + struct shmem_inode_info *info = SHMEM_I(inode); swp_entry_t swap; pgoff_t index; @@ -1354,10 +1354,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) folio_clear_dirty(folio); } - mapping = folio->mapping; index = folio->index; - inode = mapping->host; - info = SHMEM_I(inode); if (info->flags & VM_LOCKED) goto redirty; if (!total_swap_pages)