From patchwork Wed Dec 20 06:51:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13499606 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 0C5EFC3DA6E for ; Wed, 20 Dec 2023 06:52:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6DA2E6B0088; Wed, 20 Dec 2023 01:52:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 687FE6B0089; Wed, 20 Dec 2023 01:52:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5780D6B008C; Wed, 20 Dec 2023 01:52:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4514C6B0088 for ; Wed, 20 Dec 2023 01:52:10 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 113A2140296 for ; Wed, 20 Dec 2023 06:52:10 +0000 (UTC) X-FDA: 81586277220.27.1F79805 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by imf13.hostedemail.com (Postfix) with ESMTP id 0D3A320008 for ; Wed, 20 Dec 2023 06:52:04 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.131 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703055127; 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; bh=Y9aLLQuybvZFpR1+3DLyDBIO7hf39UljgquPzBTAhwg=; b=nryXIaKzAvy6Y/Yx3Q8BRWPf82LDSgklGspwVjHaHIpQRyJswSO+gSMIAIsixtbvsESVZh 0PyzI99DafJWaE+NAs8vjDpPvt1n58NZNaQvISoGAwKFTZrFcZuL4iyL5wwpIIGd3+sLVa VfPqaU1ElEO85To+Jy71ZSX68aNzG6o= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.131 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703055127; a=rsa-sha256; cv=none; b=VqYKCS2jzM1JkE1Bkqu8dtdqfz08V2OiS+VzF7Ln4HJKB+Ifa4lYCqIQzFgkXUQ91OiYrB lATvs8BbyqR0bd42ctl0qIQjqXcwT+aNK7nLdn4drKFz0V4xT9mJCkohK9mvaqb87R9zU0 FiAJM/IxnkIid9uPOEXTZVusQ8+jGoQ= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R221e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=15;SR=0;TI=SMTPD_---0VytDXe5_1703055119; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VytDXe5_1703055119) by smtp.aliyun-inc.com; Wed, 20 Dec 2023 14:52:00 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, nphamcs@gmail.com, david@redhat.com, ying.huang@intel.com, shy828301@gmail.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH] mm: memcg: fix split queue list crash when large folio migration Date: Wed, 20 Dec 2023 14:51:40 +0800 Message-Id: <61273e5e9b490682388377c20f52d19de4a80460.1703054559.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Rspamd-Queue-Id: 0D3A320008 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: n569zmsppq1p13f16u3z7oe6gn33fqkc X-HE-Tag: 1703055124-65689 X-HE-Meta: U2FsdGVkX1+mN6S2HhgoRe9JcywWhbed4hD8yjyi/94RrcPblB72fDEuvXjq9JIDqc6PxsfvLO180SOfY69zgSHoA1wvCyWQ7B9WWn0ShvodwEPpo/PKlyczVtCiB+faJtZKaAweUhXlrN3pT6yZCW1RwU4gqLVT1yUBfleMPkzrRew1zsev+MwvkGnua085CGPiLCe3OdF8GA7bIFUwAsJ6uoEBPGVGOBUOuP53H4b8Cd5aXjzjrbuROhVSusqt+n8u/R1QbFJzfCcS3hylcoVYJOIdTKO25v/s460Qqv63f/b2a1BQXFi653KSE1nOLh/8L0K5XM1Fhd+W069vc78UcWC8EOP7Zdd5s0upq6BId1Vm8hrtsuwYPLBR6gigxSbbiq4DRMIpYtruwDQ//B721wjaTakURDxCw8efNGI9TrFb0DA1XZDFPj5r1X3DvFHRjDdYhjV2mw/frZGPJ9hCxtWWoczYYBvLaSa1liWQM48zcLQfQJZ+eElkEHpTAXoSuAPBxWxpw6z4ThFs3iKEe41/pwqroRWhKU8G5wvUl6aqefkZfc84feL2ifNmEyEgwzkemUB3kqtUtfetA/m9/Hlvz3CzFUa7x3y1Nc3uG3tO78HDU/O+nxDXFOL6eVRy8ejcV/kUBOmlj57/825igd1hpOqYMhSIkqPaQfsTvQZQ0d+qzRiBDAA/BGDRbtHOJ8P+DFdu8AeEDkDhqiD6GOerYKWN/DE+cHzcBgJ8gI0WNORdP4XhgaFW8mo7jcLCtAGJmAMK6aeVcgWD/w03SrVcfv2O5E3cqGL+8v8Auu8dFjnZzhQat4UrGEj4VwZRiZJ1+vjvNqZZPyX4bKXXKABda1I39daJoW9f796AnhFqJOHk0U8mm07PbGTuGtiUQEMPuvu6mR+rDJh1Gjc1B5vXoRMJG4WIDljJ6tQfaBtk18BaVHynr9SLGh5vYcgJYj9We06vowRKS1Z yE0lKyd/ B5CPDtD4FQaJJQtcqMOSxvr0PJd+6PQWjrYMcvexuFkR65hEEmahhI3OkFlswFwIxeOlsb/XyZDp234PqmJoW3FuxR4TUlDQhTXTriITBbYDEJSHN6FZoxFiTTQ== 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: When running autonuma with enabling multi-size THP, I encountered the following kernel crash issue: [ 134.290216] list_del corruption. prev->next should be fffff9ad42e1c490, but was dead000000000100. (prev=fffff9ad42399890) [ 134.290877] kernel BUG at lib/list_debug.c:62! [ 134.291052] invalid opcode: 0000 [#1] PREEMPT SMP NOPTI [ 134.291210] CPU: 56 PID: 8037 Comm: numa01 Kdump: loaded Tainted: G E 6.7.0-rc4+ #20 [ 134.291649] RIP: 0010:__list_del_entry_valid_or_report+0x97/0xb0 ...... [ 134.294252] Call Trace: [ 134.294362] [ 134.294440] ? die+0x33/0x90 [ 134.294561] ? do_trap+0xe0/0x110 ...... [ 134.295681] ? __list_del_entry_valid_or_report+0x97/0xb0 [ 134.295842] folio_undo_large_rmappable+0x99/0x100 [ 134.296003] destroy_large_folio+0x68/0x70 [ 134.296172] migrate_folio_move+0x12e/0x260 [ 134.296264] ? __pfx_remove_migration_pte+0x10/0x10 [ 134.296389] migrate_pages_batch+0x495/0x6b0 [ 134.296523] migrate_pages+0x1d0/0x500 [ 134.296646] ? __pfx_alloc_misplaced_dst_folio+0x10/0x10 [ 134.296799] migrate_misplaced_folio+0x12d/0x2b0 [ 134.296953] do_numa_page+0x1f4/0x570 [ 134.297121] __handle_mm_fault+0x2b0/0x6c0 [ 134.297254] handle_mm_fault+0x107/0x270 [ 134.300897] do_user_addr_fault+0x167/0x680 [ 134.304561] exc_page_fault+0x65/0x140 [ 134.307919] asm_exc_page_fault+0x22/0x30 The reason for the crash is that, the commit 85ce2c517ade ("memcontrol: only transfer the memcg data for migration") removed the charging and uncharging operations of the migration folios and cleared the memcg data of the old folio. During the subsequent release process of the old large folio in destroy_large_folio(), if the large folio needs to be removed from the split queue, an incorrect split queue can be obtained (which is pgdat->deferred_split_queue) because the old folio's memcg is NULL now. This can lead to list operations being performed under the wrong split queue lock protection, resulting in a list crash as above. After the migration, the old folio is going to be freed, so we can remove it from the split queue in mem_cgroup_migrate() a bit earlier before clearing the memcg data to avoid getting incorrect split queue. Fixes: 85ce2c517ade ("memcontrol: only transfer the memcg data for migration") Signed-off-by: Baolin Wang Reviewed-by: Nhat Pham --- mm/huge_memory.c | 2 +- mm/memcontrol.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 6be1a380a298..c50dc2e1483f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3124,7 +3124,7 @@ void folio_undo_large_rmappable(struct folio *folio) spin_lock_irqsave(&ds_queue->split_queue_lock, flags); if (!list_empty(&folio->_deferred_list)) { ds_queue->split_queue_len--; - list_del(&folio->_deferred_list); + list_del_init(&folio->_deferred_list); } spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ae8c62c7aa53..e66e0811cccc 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7575,6 +7575,17 @@ void mem_cgroup_migrate(struct folio *old, struct folio *new) /* Transfer the charge and the css ref */ commit_charge(new, memcg); + /* + * If the old folio a large folio and is in the split queue, it needs + * to be removed from the split queue now, in case getting an incorrect + * split queue in destroy_large_folio() after the memcg of the old folio + * is cleared. + * + * In addition, the old folio is about to be freed after migration, so + * removing from the split queue a bit earlier seems reasonable. + */ + if (folio_test_large(old) && folio_test_large_rmappable(old)) + folio_undo_large_rmappable(old); old->memcg_data = 0; }