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 B9AD7C3271E for ; Mon, 8 Jul 2024 21:28:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE76A6B0092; Mon, 8 Jul 2024 17:28:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B988D6B0098; Mon, 8 Jul 2024 17:28:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A10A96B0099; Mon, 8 Jul 2024 17:28:09 -0400 (EDT) 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 7A10C6B0092 for ; Mon, 8 Jul 2024 17:28:09 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 9573A1A1565 for ; Mon, 8 Jul 2024 21:28:08 +0000 (UTC) X-FDA: 82317873456.27.6F0E43C Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf21.hostedemail.com (Postfix) with ESMTP id F39621C0002 for ; Mon, 8 Jul 2024 21:28:05 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="crwg6/vg"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf21.hostedemail.com: domain of 35FmMZgYKCAU3z4mftlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuzhao.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=35FmMZgYKCAU3z4mftlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuzhao.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720474063; a=rsa-sha256; cv=none; b=yYnVB16K/We1tDcCxU0CRPRVE6re8+FNV6zY6UAkmCD6k0hd+wpMtoJPqYcl59vON+yIiw DGWfdvg0zeTV6ta5cj305jIrJY2u0OotIl7atCiYmxpRGB50/W5L3dEPgeK8YARb4LBk2G t8P79K9krXcx0aduEdm50UxIjAuadho= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="crwg6/vg"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf21.hostedemail.com: domain of 35FmMZgYKCAU3z4mftlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuzhao.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=35FmMZgYKCAU3z4mftlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuzhao.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720474063; 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: references:dkim-signature; bh=/TY24y9pPj6qKzi8Thkqn2Z0GLOC7Boxtia/ZunSEuA=; b=l3xPtkvGcz6jKMr5bI5rO7/1JyxFyyXED9Rcd1P+ZoMO20pJnkZ58FU/ftyD6JDkA2e6et hVRyAGoNbV9Kv5Vi2+wHhz6lkzJRM1hwWn0KCc0jaw8syg8i10rKUYf8582ZLrBrGWAKt+ Ei9PzjNrZZtWIRmC032y+xeY6muBrAw= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e02b7adfb95so8349424276.2 for ; Mon, 08 Jul 2024 14:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720474085; x=1721078885; darn=kvack.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=/TY24y9pPj6qKzi8Thkqn2Z0GLOC7Boxtia/ZunSEuA=; b=crwg6/vgOk0kKUUyfyulc84P1SM2pNNgwipBoOmq7BRU63js3BWs5iaFmR5aBovfOr 6WgsLk/H/VXLtBjv9HY6390VaV810ygmIMRZGVxHoChYrntcH/bo93iuzylQqlzlo22P lQ4t1pgywRQYRWeniwYfaN5galjrQszZ+fmNMKP1AwBq8ktZz8HkLTAAbCiLiPjs08Da 1CvOwzhgaCfFGSvjUCq/UARow2TGnF23VCyX6M04NS/3++on22vlDzd9JbXvDqxd7eMZ m4MpW4im76wG05Lh+FeooePKqUQhUjgMsuqDebiDZ8IXfOyYMgcoD51IpMN0GXld75Pf kW4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720474085; x=1721078885; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/TY24y9pPj6qKzi8Thkqn2Z0GLOC7Boxtia/ZunSEuA=; b=NFQZcHd+nC82WKOaqqHk50rKnIm5jb3rYuxz4VATGvh3WVXnhLMV691AciqkWl4Lwz kJ+2EhJi5WXQgfl1qwEgMAF6wtl1kwFGM/ssEFIMS9s41Nj7xy9EI1lrv7jN9WI0aPbP Y3ICHghDR+D+83ES7gy9tQMjnLXLGBbMnwG2enzmBERG8EUZxkvtUSizcU9fyFlRFURk VgBBdXTHynlg4ble38lF7iuiKiH9hAvQg1wc+oJTtfuw/6aT6XDGeE7USGbSnZbepqQ/ FXATAs9b8NH8gjUJJj9/41GqnUwQ9g74Jf5SqyJy2zwmK3sD7943kOsNgl2tKFDWGwH5 723w== X-Forwarded-Encrypted: i=1; AJvYcCWbNYzDCCxIdymzgtt3IQ+Ev9iRP9ayOmEHOmMD3mwCeFvMcAyOYvN87iSsb847HqRweKs4Y7WBYMeBYF+bNX7NT7s= X-Gm-Message-State: AOJu0YwYCjvfLxbStQoI/KTlpqx4a+4oxS6weY3NFuIclLJXQ/wO1s+5 AZrVEJwPz+eEvlyAkj4I2LfxSYvc1IRYRwp7TSxHzIjWz2yMA0r7A2xmd5dLKeTb3ukGIeAIhZe XlQ== X-Google-Smtp-Source: AGHT+IFPaoT+0JeZqOGBuuBQ7SnQNqAFXgIKe35KGee83N0v93aXFTJlMQQDVA/DV+kJteIJoGtx5mPKvcs= X-Received: from yuzhao2.bld.corp.google.com ([2a00:79e0:2e28:6:386c:9fc4:1a37:2b64]) (user=yuzhao job=sendgmr) by 2002:a05:6902:1106:b0:e03:3c8c:e82c with SMTP id 3f1490d57ef6-e041b17e019mr20463276.9.1720474084855; Mon, 08 Jul 2024 14:28:04 -0700 (PDT) Date: Mon, 8 Jul 2024 15:27:53 -0600 Mime-Version: 1.0 X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240708212753.3120511-1-yuzhao@google.com> Subject: [PATCH mm-unstable v1] mm/truncate: batch-clear shadow entries From: Yu Zhao To: Andrew Morton Cc: Bharata B Rao , "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: F39621C0002 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: h1oczk3cin6mr9398rkbxmbbjdy889p6 X-HE-Tag: 1720474085-306756 X-HE-Meta: U2FsdGVkX1+PRGOpXJX+FVSrIwxxmLtfH3japZoFnXfligOZUoNdE4mJ51xu0BBmUkcVvPm3sf+hyIfWH3FADcWGQxdnOiyFFDxFkyq5ffriPSzf18mHZMGzLsq/yrr4TZZIN86oDIzj9ovoLE6Z6j/kDOlFO0HAr+tfTFx6S3J6spFCEdHkW7DRkqDsaAr08eBSX/ueiaqZwxTRsHBnZ/z2dElA8kczhEfwwZP2Mn63IlgC8iHHEpuJUe7GqzpbrpzlT4kvd8WOybaT/27cb6PyJcQiNGiSNXTUImbJvcBAMpOVAPSX7NZIvMT10OW1Zd25ECDMTft4JO6v1NNXVjCgsq8v8fJ3VEAiltC8AiFjh9sq8M4BmeKvXzsxG7obg/543kzE4rjnvYh0x3RaqU1+9pjCeJnvghzWJCFehJrvOCQL5GAGf8KLf/lpULIYuFCQRItpdyuQLZstIxtlnQgOTuOFkM05WP2DxAvo9gArECLq9VRrzk1exeAbEgaMX7q0998KK4YJrQS0/ggr+IuMFJIOsCXbjC6QoqwoMwwdNh/9MZLaow2UIiIb+a643e5kKaetr7XoP7wTBTqJXKQzhj6ra/0v02FARJZuBe8RtgbNGKcGSv1PCsaCUKDnfKldDoUhqdBWnDOKwtwQyi605KmR3KLaNrFm8BmQI3EcwaXxfaAEMkGlZI9Dg2LQh0xOKW1A9FsUnq/U76F0S/LjIrKqUjvJY+9Cy0zPNVNjxcFDeSw7XykvsUCgy/jYyg9GCHVCl398ys5dRcxkM5VYHBipfz5PVd0+gQc8Pe+JKHQ8RiHTNcoiKcUzWdGynQjSAOsriaW9jhaY+8pNPUMt4y6ZlaqB5KNW/7KL6+oVMc4U1/viELKQubEZ2f/a5J0VcZzgmGyPFeoN0GhxlpdFuqH5OZ0xh5uwneqQjrIGBsoownu/R7SkI4ahLvaqGi/+AKUCNyp56baGk2t aKOsIEgp RP6NrNMXxcBm0+tgXaNVn5eIZ/xtXDzR7qApylK5M/bt3k6h53hjHyREO7v20rAhjNCFOyx8/PBwRX6gCxHLrSWZALJO0g5kvkXmN9zfmul1CCj2kjOQ+C027j34P9jSP6kZWRdfZLRZ8Dd/J2ghNX90MrEr8HzRAdz0XMN3EviPuY9FBjciyXXEiFifNiVFAhq5rmPpg+UbInR4ncM/wwJwSSPvg62xBljxBip7s/3lFNBKg8RSXXxrtGDDZ3u3Ow/6ZyXTV+8cvCioAK95Dxc2J6RgAUwQ/Os+7NS2EE0UHk+VceGHCRPPBEueHfc4L9J27PJZ1sBX986vMbJdQVuXQdfU+t1x87Mk53OmbXR8rgUQaYMTSllrlk/SZkUXpBTdK+KX4iSqshoN9/PKSvHA4E2hrEBoZYWo0HDoETq68BVT2CPNWS2k6DKnG0owP6r4iW0y0uwiM+UoAiV7gbp4J5khi4EAKg5l+Ngq9xAzVLbyLV6ahryeVZs6BXn6ZbazYSMyyfp4vaku/fWKEePOHw77vza7i82Ip1ikvimctlHr9RBsEUbMkVJItpkNps64tGT2of5kEZCsYHrXgad6FYA== 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: Make clear_shadow_entry() clear shadow entries in `struct folio_batch` so that it can reduce contention on i_lock and i_pages locks, e.g., watchdog: BUG: soft lockup - CPU#29 stuck for 11s! [fio:2701649] clear_shadow_entry+0x3d/0x100 mapping_try_invalidate+0x117/0x1d0 invalidate_mapping_pages+0x10/0x20 invalidate_bdev+0x3c/0x50 blkdev_common_ioctl+0x5f7/0xa90 blkdev_ioctl+0x109/0x270 Reported-by: Bharata B Rao Closes: https://lore.kernel.org/d2841226-e27b-4d3d-a578-63587a3aa4f3@amd.com/ Signed-off-by: Yu Zhao --- mm/truncate.c | 67 +++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/mm/truncate.c b/mm/truncate.c index 5ce62a939e55..bc12e7ff7d6a 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -39,12 +39,24 @@ static inline void __clear_shadow_entry(struct address_space *mapping, xas_store(&xas, NULL); } -static void clear_shadow_entry(struct address_space *mapping, pgoff_t index, - void *entry) +static void clear_shadow_entry(struct address_space *mapping, + struct folio_batch *fbatch, pgoff_t *indices) { + int i; + + if (shmem_mapping(mapping) || dax_mapping(mapping)) + return; + spin_lock(&mapping->host->i_lock); xa_lock_irq(&mapping->i_pages); - __clear_shadow_entry(mapping, index, entry); + + for (i = 0; i < folio_batch_count(fbatch); i++) { + struct folio *folio = fbatch->folios[i]; + + if (xa_is_value(folio)) + __clear_shadow_entry(mapping, indices[i], folio); + } + xa_unlock_irq(&mapping->i_pages); if (mapping_shrinkable(mapping)) inode_add_lru(mapping->host); @@ -105,36 +117,6 @@ static void truncate_folio_batch_exceptionals(struct address_space *mapping, fbatch->nr = j; } -/* - * Invalidate exceptional entry if easily possible. This handles exceptional - * entries for invalidate_inode_pages(). - */ -static int invalidate_exceptional_entry(struct address_space *mapping, - pgoff_t index, void *entry) -{ - /* Handled by shmem itself, or for DAX we do nothing. */ - if (shmem_mapping(mapping) || dax_mapping(mapping)) - return 1; - clear_shadow_entry(mapping, index, entry); - return 1; -} - -/* - * Invalidate exceptional entry if clean. This handles exceptional entries for - * invalidate_inode_pages2() so for DAX it evicts only clean entries. - */ -static int invalidate_exceptional_entry2(struct address_space *mapping, - pgoff_t index, void *entry) -{ - /* Handled by shmem itself */ - if (shmem_mapping(mapping)) - return 1; - if (dax_mapping(mapping)) - return dax_invalidate_mapping_entry_sync(mapping, index); - clear_shadow_entry(mapping, index, entry); - return 1; -} - /** * folio_invalidate - Invalidate part or all of a folio. * @folio: The folio which is affected. @@ -494,6 +476,7 @@ unsigned long mapping_try_invalidate(struct address_space *mapping, unsigned long ret; unsigned long count = 0; int i; + bool xa_has_values = false; folio_batch_init(&fbatch); while (find_lock_entries(mapping, &index, end, &fbatch, indices)) { @@ -503,8 +486,8 @@ unsigned long mapping_try_invalidate(struct address_space *mapping, /* We rely upon deletion not changing folio->index */ if (xa_is_value(folio)) { - count += invalidate_exceptional_entry(mapping, - indices[i], folio); + xa_has_values = true; + count++; continue; } @@ -522,6 +505,10 @@ unsigned long mapping_try_invalidate(struct address_space *mapping, } count += ret; } + + if (xa_has_values) + clear_shadow_entry(mapping, &fbatch, indices); + folio_batch_remove_exceptionals(&fbatch); folio_batch_release(&fbatch); cond_resched(); @@ -616,6 +603,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping, int ret = 0; int ret2 = 0; int did_range_unmap = 0; + bool xa_has_values = false; if (mapping_empty(mapping)) return 0; @@ -629,8 +617,9 @@ int invalidate_inode_pages2_range(struct address_space *mapping, /* We rely upon deletion not changing folio->index */ if (xa_is_value(folio)) { - if (!invalidate_exceptional_entry2(mapping, - indices[i], folio)) + xa_has_values = true; + if (dax_mapping(mapping) && + !dax_invalidate_mapping_entry_sync(mapping, indices[i])) ret = -EBUSY; continue; } @@ -666,6 +655,10 @@ int invalidate_inode_pages2_range(struct address_space *mapping, ret = ret2; folio_unlock(folio); } + + if (xa_has_values) + clear_shadow_entry(mapping, &fbatch, indices); + folio_batch_remove_exceptionals(&fbatch); folio_batch_release(&fbatch); cond_resched(); -- 2.45.2.803.g4e1b14247a-goog