From patchwork Wed Jul 10 12:20:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: zhangchun X-Patchwork-Id: 13729240 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 7309AC3DA42 for ; Wed, 10 Jul 2024 12:19:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF8326B0083; Wed, 10 Jul 2024 08:19:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D81566B0088; Wed, 10 Jul 2024 08:19:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C21B16B0089; Wed, 10 Jul 2024 08:19:21 -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 A72476B0083 for ; Wed, 10 Jul 2024 08:19:21 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 39D9081CFD for ; Wed, 10 Jul 2024 12:19:21 +0000 (UTC) X-FDA: 82323748122.09.E8BAB85 Received: from h3cspam02-ex.h3c.com (smtp.h3c.com [60.191.123.50]) by imf01.hostedemail.com (Postfix) with ESMTP id 3F86040018 for ; Wed, 10 Jul 2024 12:19:17 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of zhang.chunA@h3c.com designates 60.191.123.50 as permitted sender) smtp.mailfrom=zhang.chunA@h3c.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720613943; 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:content-transfer-encoding:in-reply-to: references; bh=O5Gd+2W3kqJlCWzO+yx1rflzAncKJwHT5nB0IUGnz0U=; b=PHJJCHEEqGgVDimlf4jkMVGP/I3JUlAjMGPX/4U42a/PYFzVm+qBtLjAsHCk0VVAckasXp zBYkJzP+EEkaYBIbVLY6Jg43nd0ycT4nm8OgrPER43tD216GBF57xqsjgD792pJ14NvClD cHq9PyjeJV76sA9fMnK3455XcatrcjM= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of zhang.chunA@h3c.com designates 60.191.123.50 as permitted sender) smtp.mailfrom=zhang.chunA@h3c.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720613943; a=rsa-sha256; cv=none; b=4aLr0RiCD5ilmUQv2qkecUSWkRV+EMDYrUy0WxPus35AYjKevyR/R3o0YBSPTEVKxgAw8S 33KzO/zGOyi73IXcc/zjz90j4CZRZGfqfR/3zmJKX5makqQukW/OM24pLju9Brv44iac/e QKE2pcHoEGgh8W2hPbXBwKRpZaghYzE= Received: from mail.maildlp.com ([172.25.15.154]) by h3cspam02-ex.h3c.com with ESMTP id 46ACJ2NP094860; Wed, 10 Jul 2024 20:19:02 +0800 (GMT-8) (envelope-from zhang.chunA@h3c.com) Received: from DAG6EX09-BJD.srv.huawei-3com.com (unknown [10.153.34.11]) by mail.maildlp.com (Postfix) with ESMTP id ECAB32004BCE; Wed, 10 Jul 2024 20:23:19 +0800 (CST) Received: from localhost.localdomain.com (10.99.206.13) by DAG6EX09-BJD.srv.huawei-3com.com (10.153.34.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1258.27; Wed, 10 Jul 2024 20:19:05 +0800 From: zhangchun To: CC: , , , , , , zhangchun Subject: [PATCH v2] =?utf-8?q?mm=3A_Give_kmap=5Flock_before_call_flush=5Ftlb?= =?utf-8?q?=5Fkernel=5Frang=EF=BC=8Cavoid_kmap=5Fhigh_deadlock=2E?= Date: Wed, 10 Jul 2024 20:20:28 +0800 Message-ID: <1720614028-2260-1-git-send-email-zhang.chuna@h3c.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.99.206.13] X-ClientProxiedBy: BJSMTP02-EX.srv.huawei-3com.com (10.63.20.133) To DAG6EX09-BJD.srv.huawei-3com.com (10.153.34.11) X-DNSRBL: X-MAIL: h3cspam02-ex.h3c.com 46ACJ2NP094860 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 3F86040018 X-Stat-Signature: 31c4re8s414yctnw9zz4pirx8u47d37j X-HE-Tag: 1720613957-470085 X-HE-Meta: U2FsdGVkX18/rn0WvI6mpTJfgeGbc94u2jeGDXP6g1ITsS2VAQkhXpGMqMVkgyc7cnAtUbPo5qZQ9HJCPZIkIYRXhiYqNGuJlgx3zVOChd3TLZkQ0ZxmSafjkUehxSb2NQRJhgEskcK4C58ylwsMdLpasvqhQpWJB8en783NBvCxtMnjFw7rdq3tWjyVR/rpmGCytIxpucZP+dQRmKbV+vmgX9S036MiaI/yYq/7fmu8FjxwZVDBGfTMiTeQDpH8zDt0C0TRV86+OTgp8KGZ6OP6OkgdIOGNfnWT/SO880ImJ/ZwbrSkRPGGdKNNddfzcpdjK1fUZ6TCL8Gc+CAzsRQHHCEqv5Ia/Br071kS7E9TBtwkWgCipF8tZ6Y7bKDzSSksbKOVRIxo+WTaEgHeY8/lbbKW/6b9ZXVhqZnGupxoJ5cF0zNArdj346AbbyGQevDYpaLeRa/MnKqG2uassPAAAT/7hLISBO9SPW3sqdYaRKeRVMfb2mHsyI/W+YE+lLUORWyArOBCStMQPgHAxdYGt7rkHYOOy6UrRpenJy2dYAb0WEr3hY9YrXT4BUYnFbipD1/poYxedN4DOkGrkQVoRYjngmrYwqyAEPOwHWEmhb453F7+Xqq7EXNU29FQcXktQpCrWf4H3QQnWl2E8CBkcp/mpLF92cWmaXG+ntFnH2KHfKOac1u44z3ueWviFRMpBb6Up258yDEZQpXz9AN9sC2B3CtM6YpkLwfqKcgNiX//XCOcj+2WnTM369Euit4JZ32I8CVdovmP3TTd4zqUHhHspXVm9GZ1K0/MsbGmsTTZ0TrKz1yZBYzlg7JoQKQaZnbpDXd7j4QjqDKmNQVbZuX26aokGqC1umy3brod6h6NiHHFyroivtDJc59gq+h8ejcVjeDmZgaOY6mbqbFh1fJenoyJYbwS/yBA8H/JuxTmOQsbrLEiXUmfsR8fg+p9V1fmATcY1D4yBTc Zh/KCE98 9ZFnWQJgkZD4vcpamQ+b3IbvcO9tB4Cr+eJfPwq2lFRx7QjjaHnKSgGlTtstA4JRJ+SM/XIfqF6TJBi9JBheG785PXP3DerIMxFPP4Ksfo+Ck9rTsPnZXcHCgkRDF0DVbYtVUzgB2DTLYMmaHbKF9sXvR8LdG09vx1Ys1ZN6nupAA4PspJLjJBUFasc8tL6/V/UQ9Do14hY0vEQhP7szXI779rdGc+4gfgPQAZpx4uvDpVPqKO4RJ0HQRkl6m6kBYuyc5obTRwNrx6HsusFxlZQlxMjA3S89dY9NTBCbqCIfGnepannuKZ4Ww5NzdUuzFMp7YJI41/f8QBxa6Gi8hXHj24EICQc8kG1DQSKjupEDiIBLUJA/zHeo0DaSN9gRQ9kIoXTPEoDcmAUrFa/M1D09p+GeD7JHD5q5CNKRAnfnkzZqXoItFfXZU7PUls8WIkITTZpZhXxIynxBsaH3BNBaWoQ== 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: Use kmap_high and kmap_XXX or kumap_xxx among differt cores at the same time may cause deadlock. The issue is like this： CPU 0: CPU 1: kmap_high(){ kmap_xxx() { ... irq_disable(); spin_lock(&kmap_lock) ... map_new_virtual ... flush_all_zero_pkmaps flush_tlb_kernel_range /* CPU0 holds the kmap_lock */ smp_call_function_many spin_lock(&kmap_lock) ... .... spin_unlock(&kmap_lock) ... CPU 0 holds the kmap_lock, waiting for CPU 1 respond to IPI. But CPU 1 has disabled irqs, waiting for kmap_lock, cannot answer the IPI. Fix this by releasing kmap_lock before call flush_tlb_kernel_range, avoid kmap_lock deadlock. Fixes: 3297e760776a ("highmem: atomic highmem kmap page pinning") Signed-off-by: zhangchun Co-developed-by: zhangzhansheng Signed-off-by: zhangzhansheng Suggested-by: Matthew Wilcox Reviewed-by: zhangzhengming --- mm/highmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/highmem.c b/mm/highmem.c index bd48ba4..841b370 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -220,8 +220,11 @@ static void flush_all_zero_pkmaps(void) set_page_address(page, NULL); need_flush = 1; } - if (need_flush) + if (need_flush) { + unlock_kmap(); flush_tlb_kernel_range(PKMAP_ADDR(0), PKMAP_ADDR(LAST_PKMAP)); + lock_kmap(); + } } void __kmap_flush_unused(void)