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 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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 --- 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 = { -- b4 0.10.1