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 C1CF6C05027 for ; Fri, 27 Jan 2023 01:19:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 279D36B0074; Thu, 26 Jan 2023 20:19:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A76C8E0009; Thu, 26 Jan 2023 20:19:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0FD96B007E; Thu, 26 Jan 2023 20:19:45 -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 648DE8E0001 for ; Thu, 26 Jan 2023 20:19:45 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 29CC5C0A9D for ; Fri, 27 Jan 2023 01:19:45 +0000 (UTC) X-FDA: 80398821930.15.75C6C39 Received: from lgeamrelo11.lge.com (lgeamrelo13.lge.com [156.147.23.53]) by imf05.hostedemail.com (Postfix) with ESMTP id E1F7510000A for ; Fri, 27 Jan 2023 01:19:42 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf05.hostedemail.com: 156.147.23.53 is neither permitted nor denied by domain of max.byungchul.park@gmail.com) smtp.mailfrom=max.byungchul.park@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674782383; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=J/LqlnG5zc04uMC4V9U7W+u/BW18Wd8gDOP8crsz6R4=; b=vs0L8XgVj1GEbwzMYQp9w03zVyl0+S6iGZo6jStn/W1rvxE+hUwb/0rllrHK/wUWD1Mkyq 6qKYHYQmrm4M9JASV11/kOiBAXf7Q9/DpFSVSduVyHf1N5c9+ZTWuCBd5fqbIKxrRWByfQ oZDVnq6uXhDdgIUJFl4E2wwY+27udCo= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf05.hostedemail.com: 156.147.23.53 is neither permitted nor denied by domain of max.byungchul.park@gmail.com) smtp.mailfrom=max.byungchul.park@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674782383; a=rsa-sha256; cv=none; b=XK/Ap1/GY86Ft0ACraOUQVcMMAskB3gaEH71pPq8uctD8kH5JyLdt2GBEXlSZrqgcEqwBu HqdpI0M4eBXoaRb+PIqgQ4nldGLEMksrySOghYqdbfnABzb7bul9rRj5p6TtxolFf0kg+h hqZA0uWKFkBXrWRRODCRPoYfzfdB1Z4= Received: from unknown (HELO lgemrelse7q.lge.com) (156.147.1.151) by 156.147.23.53 with ESMTP; 27 Jan 2023 10:19:41 +0900 X-Original-SENDERIP: 156.147.1.151 X-Original-MAILFROM: max.byungchul.park@gmail.com Received: from unknown (HELO localhost.localdomain) (10.177.244.38) by 156.147.1.151 with ESMTP; 27 Jan 2023 10:19:41 +0900 X-Original-SENDERIP: 10.177.244.38 X-Original-MAILFROM: max.byungchul.park@gmail.com From: Byungchul Park To: linux-kernel@vger.kernel.org Cc: torvalds@linux-foundation.org, damien.lemoal@opensource.wdc.com, linux-ide@vger.kernel.org, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, will@kernel.org, tglx@linutronix.de, rostedt@goodmis.org, joel@joelfernandes.org, sashal@kernel.org, daniel.vetter@ffwll.ch, duyuyang@gmail.com, johannes.berg@intel.com, tj@kernel.org, tytso@mit.edu, willy@infradead.org, david@fromorbit.com, amir73il@gmail.com, gregkh@linuxfoundation.org, kernel-team@lge.com, linux-mm@kvack.org, akpm@linux-foundation.org, mhocko@kernel.org, minchan@kernel.org, hannes@cmpxchg.org, vdavydov.dev@gmail.com, sj@kernel.org, jglisse@redhat.com, dennis@kernel.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, vbabka@suse.cz, ngupta@vflare.org, linux-block@vger.kernel.org, paolo.valente@linaro.org, josef@toxicpanda.com, linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk, jack@suse.cz, jlayton@kernel.org, dan.j.williams@intel.com, hch@infradead.org, djwong@kernel.org, dri-devel@lists.freedesktop.org, rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, hamohammed.sa@gmail.com, 42.hyeyoo@gmail.com, chris.p.wilson@intel.com, gwan-gyeong.mun@intel.com, max.byungchul.park@gmail.com, boqun.feng@gmail.com, longman@redhat.com, hdanton@sina.com Subject: [PATCH v8 08/25] dept: Apply sdt_might_sleep_{start,end}() to PG_{locked,writeback} wait Date: Fri, 27 Jan 2023 10:19:01 +0900 Message-Id: <1674782358-25542-9-git-send-email-max.byungchul.park@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1674782358-25542-1-git-send-email-max.byungchul.park@gmail.com> References: <1674782358-25542-1-git-send-email-max.byungchul.park@gmail.com> X-Rspamd-Queue-Id: E1F7510000A X-Stat-Signature: q1uj49sxsom9e86bpxormk1z4spce8xm X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1674782382-959834 X-HE-Meta: U2FsdGVkX18LcpHNgI6w4eRkUJ8P1E+WoYLFMPyTSz3vSpP7SQVms93AHh4NzYkgtmXKheewujvQFcShpstd1bwaRto6XXUtPym7MJXrK5cOO/Q6bSyxc26sfDFAqQnGORjk2Qwh+M0HWLgMd+Fszxle/PVwOvZByi8WST3ypRErhZ4kfPWgpo7uyD4dofnxLr3QJU7NVtAsZGYIEQJ0P90FBXD5WDv1CEWOpsXeSU/vsYIOqakbgzUKUeO5xBWP2QqVb+gD7YNT+q1iOosZ7wg4oI4siMZTRscpJ8CLiHxS5LAgHNA5tgGieF6nCb097wxDJAz1F1x2R7StMOgYDPgDMsfvZQexzK2UoFqRJxZCYj8muYP3zL9fPBFPgPQ24o5UIsVRFbWWw8dDVrZNJUsQsW3gdMAdqif4YvyvDbDvtGo2/1/8BxKO3xgdvNWOOzJU9Zw6yWz7E7U+TYO3MQ//IMeibXo/5B7xOOnunJJRo+uyZzn/kJeTgYygZUbduuTO+BBbIcqgfuKf7vNa7UwSjFbhLQjLOLO5oti5+h88UfhQGf3m9X2XaAFaEAZRZZHTQNx0TI90PlIfnQD7t9nXEoztRJFqm53LiuERUqnMYSJuDzUpbDq538RFHlTx/SYOVPO28T+yx2Dj5Oc20Hsy6PLoUZ5JUJIOuKrKYBuKtrcPnw37H24y5d3qYVS0VVpiBV4sIwDOFE8VZbCZ633G0wA2433bmu3/5KW/Hm4qO3oE0hwPNPSXIVSfd114cDU+CHOP9gCt8Sgo6gigd8K1MrwimhdQ0OYwAps++X7vzcno8FEtfIlWBzo8rE3SJuzwOo5PPNs+uePBUsVXL8YebP2JJBTtPpF23s0RCpXCDn8MS4BScJydXEjhpFGeLdznsmpBpknnHcvoaanSIoVwi3EQATaUMpDoyg/bzs7zVOkC1Z9IS712U7JcCjWuGZUM2bpvPdHSlhHbVsm XfkAr1bu RVNbTvakbWOAHyTgOytApAs+RbUP99bzUwRxpewnZzFeFlc6xjsgnEOSfggs77cucPQYQqavszokP9DySkDolAIaQXvvGtvsvZri+Sx5tN5/2MBkkmALZY+WymapTJV0JkjBEpkkx4hQqmj/bbrES5gRjM6ZbEFHFMWXD7OsCd6B3jL/XtGCMQzIdXO5I8SI60Ga+AgzlWuyGr9s87DqYeqLmkXaqkNnCh1/VJdKeizpyrgYuX1kIoIoqo5YRXfQvbykjVNSfB5SfXdlxjBmO96pEzswWjgB3qB65djsvF4AV6JZEgXpvXmsoA72zXUvg6pyBq5lHHnXm7LMPa9/FhyaTFeRExftARgokUIuSjUhZ00FJW6iEnPfuAw9uqBa9VNoQVyoVlLEleyI2pfvqua3oFOQOarSjis5URK0BQ9L18DN9Aov3a1NfnX8p1wndFLgziLQBMN2wKNXbYCIvEEMg57RyMODrwuJ5xpgMldkKOxs= 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: Makes Dept able to track dependencies by PG_{locked,writeback} waits. Signed-off-by: Byungchul Park --- mm/filemap.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mm/filemap.c b/mm/filemap.c index c4d4ace..adc49cb 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include "internal.h" @@ -1215,6 +1216,9 @@ static inline bool folio_trylock_flag(struct folio *folio, int bit_nr, /* How many times do we accept lock stealing from under a waiter? */ int sysctl_page_lock_unfairness = 5; +static struct dept_map __maybe_unused PG_locked_map = DEPT_MAP_INITIALIZER(PG_locked_map, NULL); +static struct dept_map __maybe_unused PG_writeback_map = DEPT_MAP_INITIALIZER(PG_writeback_map, NULL); + static inline int folio_wait_bit_common(struct folio *folio, int bit_nr, int state, enum behavior behavior) { @@ -1226,6 +1230,11 @@ static inline int folio_wait_bit_common(struct folio *folio, int bit_nr, unsigned long pflags; bool in_thrashing; + if (bit_nr == PG_locked) + sdt_might_sleep_start(&PG_locked_map); + else if (bit_nr == PG_writeback) + sdt_might_sleep_start(&PG_writeback_map); + if (bit_nr == PG_locked && !folio_test_uptodate(folio) && folio_test_workingset(folio)) { delayacct_thrashing_start(&in_thrashing); @@ -1327,6 +1336,8 @@ static inline int folio_wait_bit_common(struct folio *folio, int bit_nr, */ finish_wait(q, wait); + sdt_might_sleep_end(); + if (thrashing) { delayacct_thrashing_end(&in_thrashing); psi_memstall_leave(&pflags); -- 1.9.1