From patchwork Wed Jul 10 07:20:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: zhangchun X-Patchwork-Id: 13728960 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 755C1C38150 for ; Wed, 10 Jul 2024 07:19:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C30F06B0092; Wed, 10 Jul 2024 03:19:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BDF4E6B0095; Wed, 10 Jul 2024 03:19:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA8156B0096; Wed, 10 Jul 2024 03:19:33 -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 8B3016B0092 for ; Wed, 10 Jul 2024 03:19:33 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 283AC81BC9 for ; Wed, 10 Jul 2024 07:19:33 +0000 (UTC) X-FDA: 82322992626.16.D81E553 Received: from h3cspam02-ex.h3c.com (smtp.h3c.com [60.191.123.50]) by imf07.hostedemail.com (Postfix) with ESMTP id BCAC34001C for ; Wed, 10 Jul 2024 07:19:29 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of zhang.chunA@h3c.com designates 60.191.123.50 as permitted sender) smtp.mailfrom=zhang.chunA@h3c.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720595947; a=rsa-sha256; cv=none; b=uC2kj6wU7FhnjE8Sf6kqGr1jKm9pHMb9RuaK8/MP9fkqqKZDWPlYViB8PzR626MQindYLm vrUvSqnrDNM0LG2M6uXniS1QOVHVexWMWpe53Z6hlyoN26+60sygsn82y2Ibg2FgnT20he J6VxsC0kAq6SDwOCmHiPRzhoq3XbEpI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of zhang.chunA@h3c.com designates 60.191.123.50 as permitted sender) smtp.mailfrom=zhang.chunA@h3c.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720595947; 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=ug5imKgMqARouMD86Ve1NXCr7rG5Fq996OOvCbwJiLI=; b=GDHnJz2qbDO7M3I1/Z8W44Y5WiBakCiGbofrci/uSoEGUgvhUd6f4xa9M2U4D+K5MV+/pZ M+W/zqTpSyGLeXBmDWcrLEJ6JOgLvOqH0WfKj6M943XlGm0p00xuLJKECgxArDoprIRDI2 CAqX3nMH+fHtJITlfNFmFbANIijtggU= Received: from mail.maildlp.com ([172.25.15.154]) by h3cspam02-ex.h3c.com with ESMTP id 46A7Ilen021949; Wed, 10 Jul 2024 15:18:47 +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 5AF482332F6C; Wed, 10 Jul 2024 15:23:03 +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 15:18:49 +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 15:20:13 +0800 Message-ID: <1720596013-56862-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: BJSMTP01-EX.srv.huawei-3com.com (10.63.20.132) To DAG6EX09-BJD.srv.huawei-3com.com (10.153.34.11) X-DNSRBL: X-MAIL: h3cspam02-ex.h3c.com 46A7Ilen021949 X-Rspamd-Queue-Id: BCAC34001C X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: z7ab3hn8em7n3sndezbtbre7t9em6df5 X-HE-Tag: 1720595969-473715 X-HE-Meta: U2FsdGVkX195FHEf4jBHCOLqqT3m0FqdsJroKCfHvhVwwW79u66cFrpnBCHok9+31GXATy9yyhAMDJ2dS+60oQxK9lS4nEgwygs8V7BP8aS8ytgJswoAQVIFLiE5nOigVkpooRsacUWLfYRtcgZbX+lfAtLYnfv9cUre6KG1mCRr6nBvpuL9ciF3c/rCF1ITLfrtlnv73fvEejpIrIHVk9BXi6deUSfbA6o2aGFNH7RPrQIZfSQckw4YdOW0/vlQI+yapTN2XdoHuWxmfZtP5nVkYuAs7GRSL3q476MbmQpboDp+KcOgf33K+MUdhoztu4fvh67rRoyWqi3e5qdI3kKVFBL6B/XaYnKqg6pgv4PdmrrdyWeCNxEGCeQ88bgs4dQeVvms6kT/JVupgBICiTOhVft6W3b34kWryXnpLSb293Ln4zropL1Zeh7JkdiQQw6V4YAnprwqMqlCbHZyV2qbelbu7Ve1HAxvtPdwFUVGnJfaxK76gQ7/FSDAoIg3+vtnIeM6/dWyRYfOCaoz6XtVY74PWqMCu/KKkCWHUHc+e7pH+B2XelHyhxSpqn3Si3hxGOyTA59rTPLhMTBVEfsWX3tA4/g5hMDHXfsCAsfW9/fGcRV5scbSf/mvMH3+iRlJ13VG/HRRpleBsp/zMhIjtQp85qhHCNgGEqGyrsgKDt+W/Z6aifi3iH9FpCIOUJFfjT44C4vGMruT/qRc/MtR0i5xyjaA14KwVzg93zUyYUAEKF6ZSqCs/ZT6Ab/vuKOqnWEjVA4ugUHQevSACcN1sV6EuVAC6WKCriOQZrZ4BKbPbbcmmqnrYLNELhUF608CNO/l0ixhvMeh37LXoK15XXdX6YVqv9wojC2VZozhFiq9cIhb0KQo+nljDXC8mk6RJmx5vvzBAcxAzfPBWHt7EXTWTbposu5Hg1O8PxfaQvcTpunWuqJ/OxZaHYIOBPfpxVo0T8QYLwONuAj 5ns3k/jQ 5QsWQq2OoFs8qGWx4Bf5Oe/76A3ELP9QpSJ0/nZP7CCKfDWqbUO/rxcXD4nF7QK+OUmtVpgJ+dmOdgb22RhEBlziIM3j1PUXOLRqMf6h1Kc/RnAGHJbwdRFzuM7V9u/IgewzHVxv1wbqFlkCn+F3CGRN/uVEDsAqkvX4ZwzMctRBVWMW1E4x1xFE7AEqz9C0DTosSa5Eob0N6r5ZwD6M6b5R/TADpcTMR/hJ16DavJgokjyXT+n8op9Ez5GobNN4AE25IGwNIcjbRoAiySKGwnxHfE2m1cdcZ92znewRdLQS5PXuKNOCxdj1Tig== 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 Suggested-by: Matthew Wilcox Signed-off-by: zhangzhansheng 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)