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 4CBEAC54E71 for ; Fri, 22 Mar 2024 21:07:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 851E66B0083; Fri, 22 Mar 2024 17:07:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 802616B0085; Fri, 22 Mar 2024 17:07:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CA4A6B0087; Fri, 22 Mar 2024 17:07:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6019D6B0083 for ; Fri, 22 Mar 2024 17:07:12 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 30B911A0270 for ; Fri, 22 Mar 2024 21:07:12 +0000 (UTC) X-FDA: 81925910304.09.3D4C069 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf30.hostedemail.com (Postfix) with ESMTP id 6793D8000C for ; Fri, 22 Mar 2024 21:07:10 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=d+R4GW41; spf=pass (imf30.hostedemail.com: domain of soma.nakata01@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=soma.nakata01@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711141630; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=1XeA+1BAAqVXX6Ddia15d3yogqfe8/erMo6VyCuZWoM=; b=w9+96S07rH+eOmoTEqB9cpkbp8rbE3DwcxINVfj/phr94zHZx09H4jfNaeb+7wqKqZ5ZdQ vGhfMM/gnXRK8Y5F9qp7dZoOPbRnyJQqVuZEsDIeCoeTJecjxGMf4g4RucrK0HmPqbIFBm 5c0I9kcNdjIbYX5aGHXm2Cxl32jqkjs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711141630; a=rsa-sha256; cv=none; b=uDEsfH2GcwIbGqgx97qn82VR4sjf2FogMcJLF9oHHa6IvCxg8yabq+LDeHcCSspLdCu86y Twbw1beDsIzXLVBPs2EmIoDugPxhWti7oR6uOS/2VxlLZ6mCoMsm2fghuxSaShfyHVvjaV nvPazx334wM24gFKzW8BfLM4UC763TM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=d+R4GW41; spf=pass (imf30.hostedemail.com: domain of soma.nakata01@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=soma.nakata01@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1dddb160a37so16728555ad.2 for ; Fri, 22 Mar 2024 14:07:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711141629; x=1711746429; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1XeA+1BAAqVXX6Ddia15d3yogqfe8/erMo6VyCuZWoM=; b=d+R4GW41WO9TmyytoV3P0SAUBpu/Kc1V2A0N7ngm8HNnzw5JanvJ8ilBb3mpP0oKS5 H+m/M18PdTWlEYnY6GObG/26rchCVorv2P3NPpZzgBavczLnpdLIdSuJIIrm3WFvDCu3 Vi6fw13bGU4zHVB+Yo169lUdWiQESWTHJGSMmllBmVg9HyNQBRs6tcj3iScl8ALzsm6l R+dM0a7qKLK81O98nx3IMqPfAkiddIo0qUhfEu5yi/9Xr9nqhyTpVVteEgYc7T+XG/5h +I58mjD/xvbFWFSZAhCr0UH4iyX9tR2BvWnqXrROks/bwQGfydeTgXFAu9a0y+W6FFCo 5i7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711141629; x=1711746429; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1XeA+1BAAqVXX6Ddia15d3yogqfe8/erMo6VyCuZWoM=; b=Lm6kEQBEq35Wu5iLMna7Rp2fhjzVEoCJEKoHUoHe5cW5Q+U90dPgLcQ1+c0xzXywwA HjaXjis2+87xunahEnvEM8l981wJZBK8DVtJjla2tQsJ8nrMHNvK+RUIub2CL7u+giTF TBx8Nii9a3CK6w74Wdgj6TSPrvWRE+LXM10YFYm/ev7T4PguvdAfLaR47G0yK4MZ+bor 8zo/kY1zWYn9AFlG3Aw932yLFE6z5AyPUOO0cI5ezTdTZ/9CrrUaLglMixafLqy7Hbap IuNHIzNZ087jOxY1uqEZsUsYn16d14hvK3/4CTJliVvmOtF1Kg/w71FsStumaO2SHWFO 4fUA== X-Gm-Message-State: AOJu0Yw0tkMQHWxpfbeDdJyZp7nF8UBGLJi00vPbqgXBE+Hf7qpc8H30 lhp91OoGkPIL9s5Ynvm+BzQteaVcPZlXFlWK69NAGhT9Y1S6uw5dJXGnVGvfLBg= X-Google-Smtp-Source: AGHT+IFgMy1CSPUjv+TNn7WAnGnMfNGDWz+egwFlwmPjHLf9tI2fPtnVT3pxannuIeETTJXF3HkIog== X-Received: by 2002:a17:902:eb92:b0:1dc:4bf6:7eb4 with SMTP id q18-20020a170902eb9200b001dc4bf67eb4mr1047502plg.31.1711141628851; Fri, 22 Mar 2024 14:07:08 -0700 (PDT) Received: from localhost.localdomain (58-190-164-40f1.hyg1.eonet.ne.jp. [58.190.164.40]) by smtp.gmail.com with ESMTPSA id a4-20020a170902ecc400b001dddce2291esm187307plh.31.2024.03.22.14.07.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 14:07:08 -0700 (PDT) From: Soma Nakata To: linux-mm@kvack.org Cc: soma.nakata01@gmail.com, "Matthew Wilcox (Oracle)" , Andrew Morton , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/filemap: set folio->mapping to NULL before xas_store() Date: Sat, 23 Mar 2024 06:04:54 +0900 Message-Id: <20240322210455.3738-1-soma.nakata01@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6793D8000C X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: oazcjyn1168bjk83cz4fcdhdtzpuiusc X-HE-Tag: 1711141630-409825 X-HE-Meta: U2FsdGVkX1/EXxXNvnAwofzF5k2Ks9cWWUsVzWZ0oXw/T10UodQ4WpAHhRp+guZCVT42scntR1zOgoSQLZk9eNRk61bce2cC17d7OEu+iqx/qTNVljjBHsH06URjAX0X5++2xr4e4Y68bUvh5fOLaZXhsflkCxJRNwmhSJsQfcqlk7SzvhEVWhnPVg40nx2CDLLhEhynLpYoAzYmm7hTGypFTl99/vLYEDpRE/gxIrQeN8/WfNI4Lj0RRwhjWv0lLsYUD47X78DmdPBCWV8oigEjogQvWi7NRYDW6j9HimbILWVHxKW5XXZGXrq3v8O02eupQpDDUzQypfbgRMX2GGNbZZ43RBZ/u46dacDrNZIS/EM8tYRjqpVNxXPg1GnYAdWG0bjcZzzPUVZNfGWtkKIOciiTrTkSywRieB3eGI9Jt4HmyzaWFWjs2yjSm4/Y3U1nM/DE1TQst6AI4cC8aEoDu3Uzv4RYMDyQLdYa/jziiZ8t78JJ1BXPfh5cLfQ4xFYlfOu4BxkbvJG7k/0jbs9cWrv/eKy7aUfXFz3Vdl3K/kJ+tEDmI/WQY/+x7Y8HceDhiCGjoFT9XIvQ3k49C1bkL83iLCilBDEZ29bhnA3uwNm/fS9fBPu8oPe5valZtVTrL4ozUO6YuMDe2tvBMJPGkqYddSCx1S8gMb6ADIyGoEMugbv74huFzMLjEtzwOeSXQMR116I41335JQPtHXtOm35hk/RXk0zFVVQh5m1iU37vOIopTrNM8Exfm/CT7qPxf7f2yZnJPoOeAMETMQPA8bLEsXLO0I2gexSzTo050Zi2gasdQqEweI/PENjCIWyVa/dBOvVjGwtSQZBAu1sZoO715jOOCdb2QaQenTKEPLUZ4QXr2zV+y10guni9/chl0HF6NlSc1rAKNUbIXl530xTJY0yndrs35+Vsq9SmV+KVwLWPVQVmH7fBBnMhcQUujslJIcRjTSn5ZVT jNS3S9VX g0IuEFLA4quxvPTucP6nqKiZiamXenirgoimEbauZMgxD6g69jY97wkVSsL6yuXyeX04vopW2ZV9MmqIs9qZ3MT2o5nalOgc5b0IQMJbrOThxX0M0BnwL6Phr8tAi+hd1lO+R7CGXn7j3i6zPX3YqLKg2spwLXoMsFrBFDFrUKIz7rvg9s0bH86W/p1nGl0pXWnO6qAGDD9GNCPzv8miu8mYwADxbBQBv7CLyEBzRrtE/oVSIL666goiQrpaouWDNofWoWIr3TJuuE70TW5IDYn6bVGLxDULe6Ut1A1zzR7rOCceoWVuDQwTUQ+/ncZris4xsXWu3IiqAz2HNJhv6YNG6TagF5xzJ7Oxh3tdWlt+1QZpFpZx1PQHof/wWrJGZa8GJ8qi7usNa1kyopwWekPWmC789FIK6ynv7o29GC2W9nuFjguBmdAwwdzCOctoiOWf+1MM7OWZr5FIy2UElp8zXatlQlZvYTDjmkPZMaf74AHDoZHgkt8iEapkR3/s9n5YNqIle90MnI/8EvfL4Z2M2v+J3POLfk68QQtPfre0FfyWJV2NXTMPHcg7t9F9VxWiG67h131ErwmmQorKvZO2Bwg== 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: List-Subscribe: List-Unsubscribe: Functions such as __filemap_get_folio() check the truncation of folios based on the mapping field. Therefore setting this field to NULL earlier prevents unnecessary operations on already removed folios. Signed-off-by: Soma Nakata --- mm/filemap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 2723104cc06a..79bac7c00084 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -139,11 +139,12 @@ static void page_cache_delete(struct address_space *mapping, VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); + folio->mapping = NULL; + /* Leave page->index set: truncation lookup relies upon it */ + xas_store(&xas, shadow); xas_init_marks(&xas); - folio->mapping = NULL; - /* Leave page->index set: truncation lookup relies upon it */ mapping->nrpages -= nr; } -- 2.25.1