From patchwork Tue Feb 20 11:36:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13563898 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 3CD51C54787 for ; Tue, 20 Feb 2024 11:37:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BFF426B007E; Tue, 20 Feb 2024 06:37:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BB0B16B0081; Tue, 20 Feb 2024 06:37:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A01CB6B0082; Tue, 20 Feb 2024 06:37:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8B65D6B007E for ; Tue, 20 Feb 2024 06:37:31 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3589F140671 for ; Tue, 20 Feb 2024 11:37:31 +0000 (UTC) X-FDA: 81811981902.30.35C81F3 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) by imf26.hostedemail.com (Postfix) with ESMTP id 49A5114000E for ; Tue, 20 Feb 2024 11:37:29 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=hx+4yBZK; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708429049; 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:in-reply-to:references:references:dkim-signature; bh=kzQqWreho0C7h7BUSKhkqs4L21k4ROBRD+6NpEqJHvk=; b=nOXRN6lb553+ScOPHt66RwgQU5hINnEpZl6IDBjZZRYv3IBylcLf1yBWlTq41hzwM7Ad2c 6xKeTaGULv2DGIfqGR/q/3zsH/EZNkXAqdSzYt+15Mm5b+jyGV5Zioi5MPXJ5lV37sJZ2W GGfEMZRBB5uFSdKdGD5y+km6ql1mrO8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=hx+4yBZK; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708429049; a=rsa-sha256; cv=none; b=7B7wN+VLudGdqRZoyBG+ic5EwL+s81gsScVx/k/FRkZQvAFdSLdYsR6DH3nvkT+kbdr/L9 BYfAj0pBqomvdMSj37F7NIIQkE+6t/YY+qezNHgR4StGhQ6axG0otF92ag+XaN73wBDOY4 PQb9AHgG7zhRfqxEERaIicUtEcFGuNs= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708429047; h=from:from: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:in-reply-to:references:references; bh=kzQqWreho0C7h7BUSKhkqs4L21k4ROBRD+6NpEqJHvk=; b=hx+4yBZK6F1f+K+KobCMKspcH9mU4c02Ya7/2WJ8h1KS2L4WAHusTpcx6exILhAFInTUL7 SjK2RjNlhSZnKKiORgS17ixwOUfDdrDWC12dFCue+HGWSq6lKKLAGf7WKDev6RYIaevBYL y+iI/Zos7kTYfT5NxuryApctqyk8JNc= From: Chengming Zhou Date: Tue, 20 Feb 2024 11:36:58 +0000 Subject: [PATCH RESEND 1/3] mm/zsmalloc: fix migrate_write_lock() when !CONFIG_COMPACTION MIME-Version: 1.0 Message-Id: <20240219-b4-szmalloc-migrate-v1-1-fc21039bed7b@linux.dev> References: <20240219-b4-szmalloc-migrate-v1-0-fc21039bed7b@linux.dev> In-Reply-To: <20240219-b4-szmalloc-migrate-v1-0-fc21039bed7b@linux.dev> To: hannes@cmpxchg.org, Sergey Senozhatsky , Minchan Kim , Andrew Morton , nphamcs@gmail.com, yosryahmed@google.com Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708429041; l=2263; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=UHSVodPnpBiivncRsTV1Arftl0WePz5UFf9WpjK+7+4=; b=163nW1R+RMQ+orBAqT5aCtZHUFeStvc1n+OYnymxXb76UYU7LE63Rfti+6qmooU5Daaopmvrh ZVuF8XTU4yRCV6oUXqz5lv+X9XhHDAJCUFRaebMIpUHJhvKi7iKCv4M X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: 77j7ct9iqkgdbsx3x3iaxbx7hki8n7wu X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 49A5114000E X-HE-Tag: 1708429049-412080 X-HE-Meta: U2FsdGVkX18xrO9B0IRXobiKs7SEu+orsi8ebPZtxlnJ1dvsG2JhUSTl7hsAF7V3jlGRo9IrZyD8hHSf1CF71jnCXJ3YtbGwGjnt469UzpGy0F/CysB51VXnre5KHfZBKfB/Pmbqu+ONpNmzo2UxMaar49raaVggR5jpP+HdTEzl1Ddm44Hzkuowc6G7RSawZXJgdi+VI7RFLhrSylDnmrYp/W9XpnBZ1h8KH6SQnL0d1C8plhgmrKT8obmXnn8U1gBmlJPGzHMdbaqxS8nM1b/vsvVllOiIPpjYNXiuMVFst2x5O5CCDR/wx+hwR696eR0NKJUprM421cfjywHNnqXXtd+00Mqc6pMXWapdT4zPTUmNmSD0RJ4muj8ccoRqqCqMvc4jB+GJoFhU5oQ6uwHBx2/G5r+lA46jpPTHMr4sMMBUe1JUtR6wnNIPqdDgGJIopcmOSuMMjdt++mBSvUcgV1NVSXlUGa6+eBNr+Bg9VDXzAsZaP3uGqf7ekkwsp4VgfeHwS02fcLFBj3M3tx6g11diEM04fmRrVqUCXWSonCfPIPX5YOOz+PwTUQLnn61d38Rqz6J3dZQfxuopPQASN0VTrL6Q64VumuiEdXhR9uWI4gjjDsOLYhWMpDydILuyZK4/IgUxzlscTyh3GlX6+H+7HhNKxABb+kFwPeuGrS0Ao2MUbTWIkcBCyI8nAp5jedPsK7W885blkw8gs90YllE3h127L6jjBpZdXvu/VcQAS3x3cWBzi93dRxNlAHc9OrlWTma1rZAolcCSQWu6aIG3tZjCmGMWRK3ANe2yHYq2bheCPhwzKfFR3daQAn2PM3Q1Dc4e+av3b3k0mP22BGZ7jQthwqqLZu+beVrvwExuIyMIfMQwdaERvlfLPTp2xEiZaBWD1m6xa4upml2nGEX107UqNN5eMTOlBiZ7dsnhcMPKlJITk4RXZvsn2TNNEB08+ks7BjasdVP /BKHEN93 4ZHhm/VbHvwzCN7gQ9vu8POFnyMOOXXfm3/STUJKF3Y+geLqhMd4e/6hjwuvY7jVUTuQMBJK3fbuKhHtK8OdUdD6T8Gy0x3QHSEjTHdeEO0Ewr5eFrqLGgNcOV511ALVaktpCTsxdFsW0kNo1mRgnVq/RehccZm9YnebDNRAZK7Qy0IpJF6tL0bEB+H6916RP6+2xJh9RmCdX97njgqLpQIvliRhkDs46b6sgUAS0VuTI3tA= 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: From: Chengming Zhou migrate_write_lock() is a empty function when !CONFIG_COMPACTION, in which case zs_compact() can be triggered from shrinker reclaim context. (Maybe it's better to rename it to zs_shrink()?) And zspage map object users rely on this migrate_read_lock() so object won't be migrated elsewhere. Fix it by always implementing the migrate_write_lock() related functions. Signed-off-by: Chengming Zhou Reviewed-by: Sergey Senozhatsky --- mm/zsmalloc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index c937635e0ad1..64d5533fa5d8 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -278,18 +278,15 @@ static bool ZsHugePage(struct zspage *zspage) static void migrate_lock_init(struct zspage *zspage); static void migrate_read_lock(struct zspage *zspage); static void migrate_read_unlock(struct zspage *zspage); - -#ifdef CONFIG_COMPACTION static void migrate_write_lock(struct zspage *zspage); static void migrate_write_lock_nested(struct zspage *zspage); static void migrate_write_unlock(struct zspage *zspage); + +#ifdef CONFIG_COMPACTION static void kick_deferred_free(struct zs_pool *pool); static void init_deferred_free(struct zs_pool *pool); static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage); #else -static void migrate_write_lock(struct zspage *zspage) {} -static void migrate_write_lock_nested(struct zspage *zspage) {} -static void migrate_write_unlock(struct zspage *zspage) {} static void kick_deferred_free(struct zs_pool *pool) {} static void init_deferred_free(struct zs_pool *pool) {} static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage) {} @@ -1725,7 +1722,6 @@ static void migrate_read_unlock(struct zspage *zspage) __releases(&zspage->lock) read_unlock(&zspage->lock); } -#ifdef CONFIG_COMPACTION static void migrate_write_lock(struct zspage *zspage) { write_lock(&zspage->lock); @@ -1741,6 +1737,7 @@ static void migrate_write_unlock(struct zspage *zspage) write_unlock(&zspage->lock); } +#ifdef CONFIG_COMPACTION /* Number of isolated subpage for *page migration* in this zspage */ static void inc_zspage_isolation(struct zspage *zspage) { From patchwork Tue Feb 20 11:36:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13563899 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 572B7C48BC4 for ; Tue, 20 Feb 2024 11:37:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD7496B0081; Tue, 20 Feb 2024 06:37:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D83F38D0003; Tue, 20 Feb 2024 06:37:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C24368D0001; Tue, 20 Feb 2024 06:37:34 -0500 (EST) 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 ADA876B0081 for ; Tue, 20 Feb 2024 06:37:34 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 721F3160637 for ; Tue, 20 Feb 2024 11:37:34 +0000 (UTC) X-FDA: 81811982028.05.6019173 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) by imf20.hostedemail.com (Postfix) with ESMTP id 790BE1C001A for ; Tue, 20 Feb 2024 11:37:32 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=oPjn6G6S; spf=pass (imf20.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708429052; 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:in-reply-to:references:references:dkim-signature; bh=92Vtmk4shKGDy68G7cvQyAOzVy7wB5PQ3z9H0ogo7j8=; b=doJcA6HQYjw8JJRz4xhIfB7lRQlQpyf3LOl971ru0H8eR5kfvnXxG1cp+XBBLaJXcgIWK1 emI4EMsFWaFCrhUBI0EHvCRQzw0f4qe1Rq2TG+IEjAOsICC5QvCMHDijAqE0A+UBdeVFlx ujivU3av4K79y0RvbU8SloviH/ky8N4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708429052; a=rsa-sha256; cv=none; b=IEpyiXzKA/SsqISfhFmbHlTa95O4U73p87BJlT0rgZoESBVnitAKYi/SCWiLmLmBdjiDZv nSxHyKZXFOjTLMO4ofNlI4yGm8zWRCK2qPQyXZqoGOwxz5sCteyeqrZ5Vja/QK7Rk7lSNW SVkN8hKMKMhoC3VsoGK42JmDRp+4TgY= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=oPjn6G6S; spf=pass (imf20.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708429051; h=from:from: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:in-reply-to:references:references; bh=92Vtmk4shKGDy68G7cvQyAOzVy7wB5PQ3z9H0ogo7j8=; b=oPjn6G6Sm/vrC4om3sEOub6fZmmj5FSnVFKEkEH7SgYTvgp/jDUgGz84ktCIkpOeFOxDM1 aaZVmFQv4ip0oB8UG+ursJb5tM3HpMRXVGwjdzGBrp+dMoxzHmx+32D3PswWnuc04qd5BZ vjKroKX4jLtlQRmCUe7EaIrZA9EktAs= From: Chengming Zhou Date: Tue, 20 Feb 2024 11:36:59 +0000 Subject: [PATCH RESEND 2/3] mm/zsmalloc: remove migrate_write_lock_nested() MIME-Version: 1.0 Message-Id: <20240219-b4-szmalloc-migrate-v1-2-fc21039bed7b@linux.dev> References: <20240219-b4-szmalloc-migrate-v1-0-fc21039bed7b@linux.dev> In-Reply-To: <20240219-b4-szmalloc-migrate-v1-0-fc21039bed7b@linux.dev> To: hannes@cmpxchg.org, Sergey Senozhatsky , Minchan Kim , Andrew Morton , nphamcs@gmail.com, yosryahmed@google.com Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708429041; l=2959; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=OUia51YESybtl45fp4ZaNAosIUgwtCmJ4/X7GVIhXhM=; b=8ijbXFuBVbIAfmOXcNTVodntrXfcwjB4acsw5QXCN052rSsXXdYpcn6HbsyCIPUDL5ekuERGC VMk9bAuraaKBIadh21NRdWVdE5N/IMKOvjmOxFePXE7syuPQng8VanC X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT X-Stat-Signature: rdkt5yastiow6rdsuwwjpygqk8zxuuxh X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 790BE1C001A X-Rspam-User: X-HE-Tag: 1708429052-415200 X-HE-Meta: U2FsdGVkX19lbm/Qjux+wcvFCr3AYty9a+iKUnyUB46gKalQxbkLeWyTtUlqbCXvvN/Bl0+VA6ylm9B06Hc4B2v0UnItT7e+ehCWXx76eqIjBW7n+wgffleDDGVxwRThbYZ8xWwSpaokmsFW1DZBYumDda1i21ar+UK8mPVyqd9jf/oYhx06B68wAETHvhgzbLTSgaIlq9JtC/xx+MLiVt/H9iMb3Wv8uJlloLBHsAl/TTgWBjW6kaBvuxPvyuaeu0HZFGYhF/nripFxaiETctw+8sjZnildXkVFWhjmnzHS++tUxnq95PgtaX7QhxPjB1ji/crga176/h4cvd3WA3h5UjJ10UOJthgj7/xMpCRcoGsfmpHClpjE5gjSEocqv1QdoqJ/Vw8bibxO+eB98TjFNfi55xzQeZ0aAy2+NpcjNp1vKLO9JX02IDvu23x8cUoz7/Z8qpYXIvgsCpke7LtdgMMeWIERrBw25yi8YzU2/6RNm8/p9H1GjvYxeysUCW4dM3rQrqIWKjiWjpd1t9Uv0Kws2tVJuX3+Ou8dnEo9a3ZUGKUodgTVRNYwbvCJLdzWWxIQiPSdVkj1qpj6XHrY1kolNqeDn8yjP1Tk5cuqY065PvtnZiXwbSIEAQgF+eimCSnI26WAT+5AFNOePQsXFuEWfH9IDwnBYhB7X+MZBO781BLk9FYWl8Z5vBULsz4N6fyBLJMZC2CZROzAPqLrV1Ai/+eFpRVb0jAjTYoCrJkLxYGLntZ9Msz49rXOZq/5m27ET77nDMctuqgE/sP+c8IjCJwwDTvcac4NeGH+lVqPP+eVocpnKpeMWyodT0isWY1lIE0XYJMvnv7dM/k3KKznL58cEkb8tHgZ81zEWmtjjEgAVUVL0X3w54N/I1Zwszz3MuDgjwzWPZwuvJNnFRwVf3kM2V2yb5lKRWOvyvyv91MGXbxCEI7WRjs8sm2mRBGjqaTt5pV1b/E UgCglYUo HnKDNoKKXtLNvwwQQ7W50GiQfz9bfVvFDpf5aPDLhWTWNFmrCX9Pxl1CSKFvnSD+IdlFzV/Kx8ldmdyJ3akpXzn50zBsfl9/CKCy60Nq+VtW80J76LzrJvo8Uewobq1HpDTnrnXuVM6xIBAeG0DkoHp0D4s9ctdsOv4kT2WbykDiVW0g7cCReUa4Mqw== 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: From: Chengming Zhou The migrate write lock is to protect the race between zspage migration and zspage objects' map users. We only need to lock out the map users of src zspage, not dst zspage, which is safe to map by users concurrently, since we only need to do obj_malloc() from dst zspage. So we can remove the migrate_write_lock_nested() use case. As we are here, cleanup the __zs_compact() by moving putback_zspage() outside of migrate_write_unlock since we hold pool lock, no malloc or free users can come in. Signed-off-by: Chengming Zhou Reviewed-by: Sergey Senozhatsky --- mm/zsmalloc.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 64d5533fa5d8..f2ae7d4c6f21 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -279,7 +279,6 @@ static void migrate_lock_init(struct zspage *zspage); static void migrate_read_lock(struct zspage *zspage); static void migrate_read_unlock(struct zspage *zspage); static void migrate_write_lock(struct zspage *zspage); -static void migrate_write_lock_nested(struct zspage *zspage); static void migrate_write_unlock(struct zspage *zspage); #ifdef CONFIG_COMPACTION @@ -1727,11 +1726,6 @@ static void migrate_write_lock(struct zspage *zspage) write_lock(&zspage->lock); } -static void migrate_write_lock_nested(struct zspage *zspage) -{ - write_lock_nested(&zspage->lock, SINGLE_DEPTH_NESTING); -} - static void migrate_write_unlock(struct zspage *zspage) { write_unlock(&zspage->lock); @@ -2003,19 +1997,17 @@ static unsigned long __zs_compact(struct zs_pool *pool, dst_zspage = isolate_dst_zspage(class); if (!dst_zspage) break; - migrate_write_lock(dst_zspage); } src_zspage = isolate_src_zspage(class); if (!src_zspage) break; - migrate_write_lock_nested(src_zspage); - + migrate_write_lock(src_zspage); migrate_zspage(pool, src_zspage, dst_zspage); - fg = putback_zspage(class, src_zspage); migrate_write_unlock(src_zspage); + fg = putback_zspage(class, src_zspage); if (fg == ZS_INUSE_RATIO_0) { free_zspage(pool, class, src_zspage); pages_freed += class->pages_per_zspage; @@ -2025,7 +2017,6 @@ static unsigned long __zs_compact(struct zs_pool *pool, if (get_fullness_group(class, dst_zspage) == ZS_INUSE_RATIO_100 || spin_is_contended(&pool->lock)) { putback_zspage(class, dst_zspage); - migrate_write_unlock(dst_zspage); dst_zspage = NULL; spin_unlock(&pool->lock); @@ -2034,15 +2025,12 @@ static unsigned long __zs_compact(struct zs_pool *pool, } } - if (src_zspage) { + if (src_zspage) putback_zspage(class, src_zspage); - migrate_write_unlock(src_zspage); - } - if (dst_zspage) { + if (dst_zspage) putback_zspage(class, dst_zspage); - migrate_write_unlock(dst_zspage); - } + spin_unlock(&pool->lock); return pages_freed; From patchwork Tue Feb 20 11:37:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13563900 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 F1870C48BC4 for ; Tue, 20 Feb 2024 11:37:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E31A6B0085; Tue, 20 Feb 2024 06:37:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 791686B0087; Tue, 20 Feb 2024 06:37:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 60A218D0001; Tue, 20 Feb 2024 06:37:38 -0500 (EST) 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 468DA6B0085 for ; Tue, 20 Feb 2024 06:37:38 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1D4AF160620 for ; Tue, 20 Feb 2024 11:37:38 +0000 (UTC) X-FDA: 81811982196.07.AED2FBA Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) by imf07.hostedemail.com (Postfix) with ESMTP id 3CEC14001C for ; Tue, 20 Feb 2024 11:37:35 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rw7EWm1j; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf07.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.185 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708429056; 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:in-reply-to:references:references:dkim-signature; bh=Y+Zlu/jyffC3tcPYynjlrJGPDukZUfRAC+HVlLoluho=; b=U4i+AREq7csWXpGgcbaP4zE7aQZAXVLr4gOwG4/FpT8YKFJjauxt1GkVEXsLw96qIVu2EP x2FoxcRokCyDaJyUSLH546V/6NjPplzv3+EoZ1gb2YXQMI60RMfkSUesEGzNAWG3xJpZGv Vi4Ccxhhnbo5pnaNXjQd08PeYgz68BA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rw7EWm1j; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf07.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.185 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708429056; a=rsa-sha256; cv=none; b=DkNWJ2l3OfrJhHfPJSzZmmo80qcW/y/bfhIGuk23FJQ3hXGYxDv382gVxd/muUy8/4RSdN 4WnMHdL1oFNX0ICBfDui3s0Qq7IWi82C+Gcc1mRVVTdaF4LXHyXpAugGzg1XymbPrElSmU GjtJGURxv0VKwOKI+oXSh7fV0vmDy1Y= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708429054; h=from:from: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:in-reply-to:references:references; bh=Y+Zlu/jyffC3tcPYynjlrJGPDukZUfRAC+HVlLoluho=; b=rw7EWm1jRAZ0ejyR0syJMxY+LC8andr9N4hT/S2TcsUdJVzr5zpj1ve+7DC0aFKLOP6Zh+ oQAbX4OcdcWxRXxp0WVl9onzMqu+Bu4Srq5jwKDUIbVPErTVJ6F3iLf7W+N/3VP2mgkjg8 CojlsKYsoHjEm5Q7HClBNZpzfqtRCIk= From: Chengming Zhou Date: Tue, 20 Feb 2024 11:37:00 +0000 Subject: [PATCH RESEND 3/3] mm/zsmalloc: remove unused zspage->isolated MIME-Version: 1.0 Message-Id: <20240219-b4-szmalloc-migrate-v1-3-fc21039bed7b@linux.dev> References: <20240219-b4-szmalloc-migrate-v1-0-fc21039bed7b@linux.dev> In-Reply-To: <20240219-b4-szmalloc-migrate-v1-0-fc21039bed7b@linux.dev> To: hannes@cmpxchg.org, Sergey Senozhatsky , Minchan Kim , Andrew Morton , nphamcs@gmail.com, yosryahmed@google.com Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708429041; l=2725; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=4NV6DsrM5S+/h7ppU/k8FOJs/bnqzH3nRRreQTC9eDs=; b=kFZpk3aIR7kadOlGiYlEg29vShKRkOcKdJVmvW0zBNOCVbMMCVgKRPWfv2u+eEVnktHzunOZC ngUBXQ3+ObdCLuVC2DKsIPzNqJKn3UcHHx0R9m/63qvgYW0ar4p5gkN X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: 5f96yoec6ocu1ry3ikuekrq3xyyqj6se X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 3CEC14001C X-HE-Tag: 1708429055-131042 X-HE-Meta: U2FsdGVkX1/SbNdzekkocpZ3n1VvImc43SefEB/EZeVGM+PKz0lG3Yj4qq1CXf74G+3VzOPr5TE0zjeBQKwHG3gq/d2ovupTRbGKpZxqxC+OCbFVqhL6j/nEpcd/4Rtzy6qVkQgCJfWEfQd9xviMNMdHeraTG6Gzh46bZ0ih9+6JBmvVc3tJXyrR7w25bCL5jNBVxaaI1DuwMXcCMgldH0m7Y2GilV5DKrFRAM8JFNVaadluYN3uYXfbJU8UhT7pTfS2Y8ck0bKq6+izUuB3WaXrraUvu8ioVxC8jKqLXgg3IhzKDZly2Gq4X6Kanm6xZuGybjrkCd0ts6qgSB7mkTFhNwyzG9aMj/Z4FgMJYmT7CW/n4HLGueIDQYA4vz++1ReMSqpc+dOsoIdV4JVm8zeFu5fcPmpF8KKaWdnjV2VHCBUfTltqy46sjL6fFM2eoL0UQRKdWIW7cbHhlunyKhIrGO0vQWJvtjrNdLOEST0WxOrkV+m6FWF/vCK+trvZNvRp8jTXY9UkA67fFVfY0PClVpAzNTKBnOWYvRSzRp4YNUdJMMzV6/uogIS8iqKzkT8aNpA7QR4SRVEKvZMWtfHKdi9b11v5AutGWGjNWLXD0s3LJ8goS2HA51dJC/wgQ9rgA0h6P5nYbH2utC2g0xAuF3oRdTeNiAGmclV1gqL+nvDivckRB3aSVjnQ3OxM61oSlbN6Um7u17QrhN9P8dwSTOb2PbFGqAFWHhFPgH0sYHauK6k20AmHCmf4iIPoe8jqEaZdcLmbw0kE1hZTB3/vYleDVexWw3/Vz/8/hHwV8Uatyy8lJ+kLi6fEGUQyQKBDkWuLfyom/D8fm0CtHZ0GW1iJGC07/TMoUzS2kLJC0Xr+OcSl2vr72NERK6go8PiwllD3bhKhZt1cQR7aTpQXbPSNnpXzrgG7kWeJV2Pz40NnoWweKcxfTnBdvd5DPCFffjC1IbBl7a63CH7 K45gq0m2 N+/wt2afyz2nMe9Mws70GpTDQacZKqIgt8bjFqdhPXMsG9SypxLXHVd6a0+BG9R8mqkwKBu9TmL4SotwUSF/hzOQJxAZY1Bvm9w04kXprTdPYQDJWj8QQWDZ5wBXP0BA64mGvbZRFkco7di4= 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: From: Chengming Zhou The zspage->isolated is not used anywhere, we don't need to maintain it, which needs to hold the heavy pool lock to update it, so just remove it. Signed-off-by: Chengming Zhou Reviewed-by: Sergey Senozhatsky --- mm/zsmalloc.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index f2ae7d4c6f21..a48f4651d143 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -116,7 +116,6 @@ #define HUGE_BITS 1 #define FULLNESS_BITS 4 #define CLASS_BITS 8 -#define ISOLATED_BITS 5 #define MAGIC_VAL_BITS 8 #define MAX(a, b) ((a) >= (b) ? (a) : (b)) @@ -246,7 +245,6 @@ struct zspage { unsigned int huge:HUGE_BITS; unsigned int fullness:FULLNESS_BITS; unsigned int class:CLASS_BITS + 1; - unsigned int isolated:ISOLATED_BITS; unsigned int magic:MAGIC_VAL_BITS; }; unsigned int inuse; @@ -1732,17 +1730,6 @@ static void migrate_write_unlock(struct zspage *zspage) } #ifdef CONFIG_COMPACTION -/* Number of isolated subpage for *page migration* in this zspage */ -static void inc_zspage_isolation(struct zspage *zspage) -{ - zspage->isolated++; -} - -static void dec_zspage_isolation(struct zspage *zspage) -{ - VM_BUG_ON(zspage->isolated == 0); - zspage->isolated--; -} static const struct movable_operations zsmalloc_mops; @@ -1771,21 +1758,12 @@ 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; - /* * Page is locked so zspage couldn't be destroyed. For detail, look at * lock_zspage in free_zspage. */ VM_BUG_ON_PAGE(PageIsolated(page), page); - zspage = get_zspage(page); - pool = zspage->pool; - spin_lock(&pool->lock); - inc_zspage_isolation(zspage); - spin_unlock(&pool->lock); - return true; } @@ -1850,7 +1828,6 @@ static int zs_page_migrate(struct page *newpage, struct page *page, kunmap_atomic(s_addr); replace_sub_page(class, zspage, newpage, page); - dec_zspage_isolation(zspage); /* * Since we complete the data copy and set up new zspage structure, * it's okay to release the pool's lock. @@ -1872,16 +1849,7 @@ 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); - pool = zspage->pool; - spin_lock(&pool->lock); - dec_zspage_isolation(zspage); - spin_unlock(&pool->lock); } static const struct movable_operations zsmalloc_mops = {