From mboxrd@z Thu Jan 1 00:00:00 1970 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 6E745EB64DC for ; Fri, 21 Jul 2023 06:37:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E0F4128019D; Fri, 21 Jul 2023 02:37:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DBFA2280190; Fri, 21 Jul 2023 02:37:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C88C228019D; Fri, 21 Jul 2023 02:37:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BA66D280190 for ; Fri, 21 Jul 2023 02:37:52 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8FAA114010C for ; Fri, 21 Jul 2023 06:37:52 +0000 (UTC) X-FDA: 81034663584.15.582FE9E Received: from mailgw02.mediatek.com (mailgw02.mediatek.com [216.200.240.185]) by imf22.hostedemail.com (Postfix) with ESMTP id 19263C000D for ; Fri, 21 Jul 2023 06:37:48 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=mediatek.com header.s=dk header.b="BC6yyje/"; dmarc=pass (policy=quarantine) header.from=mediatek.com; spf=pass (imf22.hostedemail.com: domain of andrew.yang@mediatek.com designates 216.200.240.185 as permitted sender) smtp.mailfrom=andrew.yang@mediatek.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689921470; 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:in-reply-to: references:dkim-signature; bh=8PU+yLqgU8QTJBPsYq/TunQLzed36dffCDsGG++Ehj4=; b=b1WSDpje//6VQHM45n9atpjQy9s3g6Uz3tn0HDR2Yvt9hoxTWUZRRHHRnAS6sx3P9k/9hw BSg1oh0cg1jl/Cl+BNeOt9CDTM2KYxYpTyVGAGKP3uJquHYXYRf0P6+GagzcIiU7NEo/9s RywcwKY/2H73FsrRfpBww79R7zlOtoA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=mediatek.com header.s=dk header.b="BC6yyje/"; dmarc=pass (policy=quarantine) header.from=mediatek.com; spf=pass (imf22.hostedemail.com: domain of andrew.yang@mediatek.com designates 216.200.240.185 as permitted sender) smtp.mailfrom=andrew.yang@mediatek.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689921470; a=rsa-sha256; cv=none; b=rSSMf3IDps8Qi3OxhouSFuGGgEvc5GCHsTeKOEDerpxz/0jIL07Kmjj6T9KWGafr2YlPVc gSVbEje06vxCzoSi6sc3g6QRdj/Zaw/WRHszSKOEGK5pl2hnh1sOfc4YlQJmmHj6CT+V/J NILAOivky5BWKsPAIgx3TSFyzhX98ts= X-UUID: 1893056a279111ee83ed1395ce914268-20230720 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=8PU+yLqgU8QTJBPsYq/TunQLzed36dffCDsGG++Ehj4=; b=BC6yyje/DPkjGRTu+OcNYoePBzsC/1kTblnXEpQjJkrom8MJQJd+LJnxJ/Gft9iB2t7Ji2i4L9B7QzQ4wosoUuferBugCcMtZLIqxVOOrd4FYereCMegVjM52p2DaoK0w1gv8W9Jd+j/dyb5+ADnjTnN15PunAsrS8d+zXLgq2A=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.28,REQID:9be94428-9de3-49ce-93a3-0c5faeaa0967,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:176cd25,CLOUDID:dc86dadc-dc79-4898-9235-1134b97257a8,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO, DKR:0,DKP:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 1893056a279111ee83ed1395ce914268-20230720 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 130673627; Thu, 20 Jul 2023 23:37:43 -0700 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Fri, 21 Jul 2023 14:37:08 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Fri, 21 Jul 2023 14:37:08 +0800 From: Andrew Yang To: Minchan Kim , Sergey Senozhatsky , Andrew Morton , Matthias Brugger , AngeloGioacchino Del Regno , Sebastian Andrzej Siewior CC: , , Andrew Yang , , , , Subject: [PATCH] zsmalloc: Fix races between modifications of fullness and isolated Date: Fri, 21 Jul 2023 14:37:01 +0800 Message-ID: <20230721063705.11455-1-andrew.yang@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain X-MTK: N X-Rspamd-Queue-Id: 19263C000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 33jq6q71ozkg6d7r3i3ewep1di44jyg9 X-HE-Tag: 1689921468-76604 X-HE-Meta: U2FsdGVkX1+2ObZQe0S7UvdB7FRzH5meD0FOf8MS8FEtFRv5CKH0Y766N2K9MWnRwXX5iy2YDyDc0RoPWy9dJ1qxR9yOJs/wviDpt6IaijCIxa/HrIiyLP7WZblSeXZnW+HGIgu1HwgZ1tNIQd8sgO3i/0H9Dno1uYlXShD/qq7L9U6uSPZ/wITKQwk5VOATlsSFq0HVRm5NXciEFol18k/fCwPbfK/PPGRUeytT8Y5Lx8PC7VUvkTEdjJBK5cOiEjfYmmwGgTNfijYCN2TcSG9J0y4Zvc28QSmWS+UOJYwcf641a0I8pOGlz7fBNH0JR6zoOM8GOaCjTe4ixEo8RWuIeYw7EglxT865FOZek98N5IvJKKoxTPy2QM5NGXSx2wxJf6G5eTQkfAE9NUVRUbdhQBUaYFdQ5KUDLxN5g+Vr9EyKgW5WjXyvX0g/TS2VqNrUYgMNC1O+2TJROnGD2zcFbvQlKQjaavmKj+INYCy+xoQDP2fLM5VVOJqDDhckDCBpPJN5oSZwSC8w3kHGzoZ2ToQFGSXc9Mw4s/KR5JosQvkKZKKNNKWWEfiTXanBvOzzRKEz6k9br7Krj+rIPjHvKNrhAVq73QE+Uds4lNNsXlfSgonVRUJgzjWVxJ00u3egyyO+EQD9y9qkvu/rp4l3YA28ufd9anhjsnSuwV9vXmcNsSk3sDldYdLYppDRS775b2eHsBsfCXF/f3HLYPLK1IsBa/HnBywf/3bDquJ7rhOSN2jHi4nQP6wO+8zojbcZhRNwwrBK+QQv1IceIzYC9XUPIYZDQ5e0rnXZN3/k7q15BRcEqvXgZg6MyFKyQRO4+EWai0RVUJoW2himlIKmHvRyFEYwrEUcoOP6uAypLgrro2h6XcJNroYN5PoIQPuo5EYuNSI2hP+wA/MXHlBZRCTDYuIhMqYNqD13ysE0ILUrwrO3a8oRsnGAO63RBnHgALe/12npcB551ne UJGxWjIA jDoXw+xD24AA/fIW9vVjJR86UJ9bg/sR4W/t79qpRRr6qaKP0QCK1lFNgFTMeElmR3EwXzfDd72y2BmAomBTpzvAG4d+6m/WzmMeqDfvaJs4E2Eixz3g/uIpSe4R152BYWiCFcoGkQUMBQWdzkO4gzorxm4ONbF4qW2ckDWD747iTg+Av3G/wPAdNm4pgb/PArC2nLS4ymi+67u1vyScbDqYjGY4rZ1zZr8yrSDz4CGQtj5opKx5aYz2/og== 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: Since fullness and isolated share the same unsigned int, modifications of them should be protected by the same lock. Signed-off-by: Andrew Yang Fixes: c4549b871102 ("zsmalloc: remove zspage isolation for migration") --- mm/zsmalloc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 32f5bc4074df..b96230402a8d 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1777,6 +1777,7 @@ static void replace_sub_page(struct size_class *class, struct zspage *zspage, static bool zs_page_isolate(struct page *page, isolate_mode_t mode) { + struct zs_pool *pool; struct zspage *zspage; /* @@ -1786,9 +1787,10 @@ static bool zs_page_isolate(struct page *page, isolate_mode_t mode) VM_BUG_ON_PAGE(PageIsolated(page), page); zspage = get_zspage(page); - migrate_write_lock(zspage); + pool = zspage->pool; + spin_lock(&pool->lock); inc_zspage_isolation(zspage); - migrate_write_unlock(zspage); + spin_unlock(&pool->lock); return true; } @@ -1858,8 +1860,8 @@ static int zs_page_migrate(struct page *newpage, struct page *page, * Since we complete the data copy and set up new zspage structure, * it's okay to release the pool's lock. */ - spin_unlock(&pool->lock); dec_zspage_isolation(zspage); + spin_unlock(&pool->lock); migrate_write_unlock(zspage); get_page(newpage); @@ -1876,14 +1878,16 @@ static int zs_page_migrate(struct page *newpage, struct page *page, static void zs_page_putback(struct page *page) { + struct zs_pool *pool; struct zspage *zspage; VM_BUG_ON_PAGE(!PageIsolated(page), page); zspage = get_zspage(page); - migrate_write_lock(zspage); + pool = zspage->pool; + spin_lock(&pool->lock); dec_zspage_isolation(zspage); - migrate_write_unlock(zspage); + spin_unlock(&pool->lock); } static const struct movable_operations zsmalloc_mops = { -- 2.18.0