From patchwork Sat Jun 18 08:38:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 12886246 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 AA5B4C433EF for ; Sat, 18 Jun 2022 08:38:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCA886B0071; Sat, 18 Jun 2022 04:38:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B7A606B0072; Sat, 18 Jun 2022 04:38:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A68D96B0073; Sat, 18 Jun 2022 04:38:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 96E076B0071 for ; Sat, 18 Jun 2022 04:38:25 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 6A5021207AC for ; Sat, 18 Jun 2022 08:38:25 +0000 (UTC) X-FDA: 79590704970.27.F1D7741 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf03.hostedemail.com (Postfix) with ESMTP id 56550200A4 for ; Sat, 18 Jun 2022 08:38:24 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LQ8Q922J8zhXYF; Sat, 18 Jun 2022 16:36:17 +0800 (CST) Received: from huawei.com (10.175.124.27) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 18 Jun 2022 16:38:19 +0800 From: Miaohe Lin To: , CC: , , , Subject: [PATCH] filemap: obey mapping->invalidate_lock lock/unlock order Date: Sat, 18 Jun 2022 16:38:20 +0800 Message-ID: <20220618083820.35626-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf03.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655541505; 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=+FmjA3Wwa3NjdLW/KWmfIVKfmHHbSiYE8gQPG3EgADU=; b=1OU88gECviegM3M38qSftm41XsOkH8fa+QLfW+iQU3WobHHkGVf5xzIO0F3D7ZmhQWuKty QGQmC8bm0nMqLjlmXQjypgixF+X9cMTSeXfS1/fryyLuODbjLc+kmslwSn+OhyiMN56m4J rTQsPeD0Tldr/TzXy26lT0jZSTveQ6A= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655541505; a=rsa-sha256; cv=none; b=mH9japgX8dCIstVhYa5bqoNlGJdlxa+ySrDODLqBVPHhpx8WMXoCfp2mNgyT1wT6tnTfaJ UscugSdhwc2M82EJKUORc/jpHSipc8EzNUB2jdPyEHFKQbuYiDFNGMY7dJN+Yx997mdMMV KHF5PbC812ETIXqlBORP3WpTTSpw52Q= X-Rspam-User: X-Stat-Signature: u1qp3iz44oig6kok78juaca5y97cxtaf X-Rspamd-Queue-Id: 56550200A4 Authentication-Results: imf03.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf03.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com X-Rspamd-Server: rspam05 X-HE-Tag: 1655541504-663152 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: The invalidate_locks of two mappings should be unlocked in reverse order relative to the locking order in filemap_invalidate_lock_two(). Modifying the code to obey it. Signed-off-by: Miaohe Lin --- mm/filemap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/filemap.c b/mm/filemap.c index 8ef861297ffb..9948b26e6400 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1009,6 +1009,8 @@ EXPORT_SYMBOL(filemap_invalidate_lock_two); void filemap_invalidate_unlock_two(struct address_space *mapping1, struct address_space *mapping2) { + if (mapping1 < mapping2) + swap(mapping1, mapping2); if (mapping1) up_write(&mapping1->invalidate_lock); if (mapping2 && mapping1 != mapping2)