From patchwork Tue Jul 25 18:04:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13326259 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 C52A4C001E0 for ; Tue, 25 Jul 2023 10:04:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4E546B0081; Tue, 25 Jul 2023 06:04:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD5D36B0082; Tue, 25 Jul 2023 06:04:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4E916B0083; Tue, 25 Jul 2023 06:04:39 -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 912756B0081 for ; Tue, 25 Jul 2023 06:04:39 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 66EF91C9926 for ; Tue, 25 Jul 2023 10:04:39 +0000 (UTC) X-FDA: 81049699878.05.7F6B94C Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf03.hostedemail.com (Postfix) with ESMTP id C94092001A for ; Tue, 25 Jul 2023 10:04:35 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; spf=none (imf03.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690279476; 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:in-reply-to:references:references; bh=awPybspYBqJhakmb86/rO0BqZIwjOzPt8SuDXp7yaAM=; b=IIg/KsVKnGPp4YUPhETURL8G5H1sDZgjekHuXZjkzid1jPQ0lN1IO7toCN44Nn60vFAkfN SP0aW0z5+orNkz1Z2QAmrdmDFqsCWRk9MmQLR5qSg0jAR6/K5ZLrwZJ41itaZ8PUgf5bVL GQ1IXer50SWxZtVrcgBJTfUTViSVdLY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690279476; a=rsa-sha256; cv=none; b=L4jYo6RDZD2iUacpdRX0/Epwf3doy2987eiF1MzBVITdW70s9wwuGvqadwuc8AAaPVpChk /eDbe7ICk4otPSytdLUFHKBsykHms6tDXxh4urxwSlzbyul90RF1MgyvLwbxGWEi31W1zd 6y8qySRcOS4bq2Y/h9wJCSxFb+BUpuE= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; spf=none (imf03.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9CLN5hYGz4f3kjs for ; Tue, 25 Jul 2023 18:04:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgAXC+ksnr9kFkPOOg--.2821S4; Tue, 25 Jul 2023 18:04:29 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: willy@infradead.org, baolin.wang@linux.alibaba.com, david@redhat.com, shikemeng@huaweicloud.com Subject: [PATCH 2/4] mm/compaction: use "spinlock_t *" to record held lock in isolate_migratepages_block Date: Wed, 26 Jul 2023 02:04:54 +0800 Message-Id: <20230725180456.2146626-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725180456.2146626-1-shikemeng@huaweicloud.com> References: <20230725180456.2146626-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgAXC+ksnr9kFkPOOg--.2821S4 X-Coremail-Antispam: 1UD129KBjvJXoWxGryUGFWDKw13JFyDuF4rKrg_yoW5ury8pF ykCasIkr4kua4agF1aqrs5uFsIg34fJF47Ar43K3WfXF4ftF9rGw1IyFyUurWrZr13AFZ5 CFs8Ka4kAa12v3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6I AqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTR d73kUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: C94092001A X-Rspam-User: X-Stat-Signature: 1ek3tu7otumsya6uf15renor9yb6m8wd X-Rspamd-Server: rspam03 X-HE-Tag: 1690279475-907495 X-HE-Meta: U2FsdGVkX1+urIbI5phzLE7lWG/Qodu6GoZ+3sS1ywrD+hV2hYSdterP+NanB1FhaZVzVBFqnU8BzOymvDcpGZA5t09iE+uULjPARA0rPPOWctpo4ukLSJs7Um85u2Dz5MfeA3niOCfaIq4aVrkXFDsVL3OmsV5n0CT/2WhbMRumkG2IEAP5CG3eDd1oTHn250M7aomVphx5Jg42cbvYI2K5YfKfb/FzNiCRRW2YD4dbnLfI1i5pGVwQVmAinHTXlusDP3U51yMFstoNoFp6n/Okc4ictZ78u46csgHIuMKZm6GiLRZUrjQx4VysNibJpDidnFMfCDR3D7g2xkZyrEV+mO7QhrE+jGkG0wbXEBlGj0xV5p33xuIsDagtp5yOn7uqwNv0A4vH/RWSBjihtdYs7eAfQu71x5DkFtt+XSQTtLe0TnYY715ppKHAafDA8x9ZbGNNUddKwSLbbcD/oov3nr6eFbq7eQ/Vi0WFK9+/4EVc4rB8e6ZE2KOHu8nnbwbrJN9NGRj4uYIy398vbPrygXEVg350Z1+3IIOmwwJi8dF5u+qpTH4zF8uykFs16NcBrQj/Ycbr6PIG3qeezx7D1FLRU3E8H2lQw+Cj+OE+RES1CdSVHmf3HLdCgzxs3Cw7afj/s9rzZ52qY91pVksJ9QsTbZ9vVkKxwdAAjwFpqAuYAqNrUVutxdkTjztfFAEKKX1kv9p5HAfUuLhnv/E8oIzXLteoJ1ajrgcFGv9lsQI5ZrzyR6LDr1XwBQXkR1R1DjB7zJvKv3ATUGIWWoBRoOkVDT7BquTT4yHmUaAsWrA7H8dMEmqgyzodba+pgxbPr/Nwmy6McD3fYNOm1t7fEAHPakReF30ND3v2+g/OgN6AqyPkSmWRtjArE/MpZPBVptwnPVBU2DwgIFmMfj81n9xaAL9phBqu5CRjj2lMDpKGq3xU3OB8ocxoo9G8Hvlou09YB/Y3BAopfEt 0m9j9EbO xKZgwcP11y8oWWu3CvTLVthRD+AmmN8M0b6OmgdCqyRQkQkrwWI+xxhlgbauTC6PjTYuOZl9D17nrZiGElm/wIPRybKh0pfgSL0LlFHQKJpIC4KQtIhy0CSQTZJB35cIwtaPwIpRS68cVCa8CgYitpbzIyk1Tf4c35fJkQJ/hDt2KKmT7GF50cvR1V2tSWqgZaSDexAwfRuUrm/kya2rP4ukzcokonh+llFUQ9amFbzMfnOv9dMnWHC+jYikyKMqwzSrPa7R1n9R8Vh4ClOLseN9kLhRgw+Hy/Y76pqSZkUgkp6i3OKmgRFaIuDy59S42oYgJ 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: Use "spinlock_t *" instead of "struct lruvec *" to record held lock in isolate_migratepages_block. This is a preparation to use compact_unlock_should_abort in isolate_migratepages_block to remove repeat code. Signed-off-by: Kemeng Shi --- mm/compaction.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index dfef14d3ef78..638146a49e89 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -840,7 +840,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, unsigned long nr_scanned = 0, nr_isolated = 0; struct lruvec *lruvec; unsigned long flags = 0; - struct lruvec *locked = NULL; + spinlock_t *locked = NULL; struct folio *folio = NULL; struct page *page = NULL, *valid_page = NULL; struct address_space *mapping; @@ -911,7 +911,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, */ if (!(low_pfn % COMPACT_CLUSTER_MAX)) { if (locked) { - unlock_page_lruvec_irqrestore(locked, flags); + spin_unlock_irqrestore(locked, flags); locked = NULL; } @@ -946,7 +946,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, if (PageHuge(page) && cc->alloc_contig) { if (locked) { - unlock_page_lruvec_irqrestore(locked, flags); + spin_unlock_irqrestore(locked, flags); locked = NULL; } @@ -1035,7 +1035,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, if (unlikely(__PageMovable(page)) && !PageIsolated(page)) { if (locked) { - unlock_page_lruvec_irqrestore(locked, flags); + spin_unlock_irqrestore(locked, flags); locked = NULL; } @@ -1120,12 +1120,11 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, lruvec = folio_lruvec(folio); /* If we already hold the lock, we can skip some rechecking */ - if (lruvec != locked) { + if (&lruvec->lru_lock != locked) { if (locked) - unlock_page_lruvec_irqrestore(locked, flags); + spin_unlock_irqrestore(locked, flags); - compact_lock_irqsave(&lruvec->lru_lock, &flags, cc); - locked = lruvec; + locked = compact_lock_irqsave(&lruvec->lru_lock, &flags, cc); lruvec_memcg_debug(lruvec, folio); @@ -1188,7 +1187,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, isolate_fail_put: /* Avoid potential deadlock in freeing page under lru_lock */ if (locked) { - unlock_page_lruvec_irqrestore(locked, flags); + spin_unlock_irqrestore(locked, flags); locked = NULL; } folio_put(folio); @@ -1204,7 +1203,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, */ if (nr_isolated) { if (locked) { - unlock_page_lruvec_irqrestore(locked, flags); + spin_unlock_irqrestore(locked, flags); locked = NULL; } putback_movable_pages(&cc->migratepages); @@ -1236,7 +1235,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, isolate_abort: if (locked) - unlock_page_lruvec_irqrestore(locked, flags); + spin_unlock_irqrestore(locked, flags); if (folio) { folio_set_lru(folio); folio_put(folio);