From patchwork Fri Feb 21 22:25:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13986387 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 5F1ADC021B3 for ; Fri, 21 Feb 2025 22:31:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8AB628000A; Fri, 21 Feb 2025 17:31:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E39FA280004; Fri, 21 Feb 2025 17:31:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8C9828000A; Fri, 21 Feb 2025 17:31:06 -0500 (EST) 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 ACA93280004 for ; Fri, 21 Feb 2025 17:31:06 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5F69CC089A for ; Fri, 21 Feb 2025 22:31:06 +0000 (UTC) X-FDA: 83145398532.05.45551FA Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf15.hostedemail.com (Postfix) with ESMTP id 6085EA000D for ; Fri, 21 Feb 2025 22:31:04 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=PyW519XT; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.176 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740177064; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5HvQEcjJeXsHC85jXzgvN7MoOE9VPDedZeSd2dLCsl4=; b=J3ZNLw+bHzrQ2FiPKUCUzq3ZWmHLnoMypefDP5KBkrV+tz0MthpjCbW06frwaY27r7iFGh WVynt1a7w01z2OD3iOTdkxgE4dP7547roLz6OdlDGIZdYN1bTCcNLJZ1CvVhY/RqBkLiuQ KZ0XynD7hKZ6XGE33i/KliCUyDoBFRE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740177064; a=rsa-sha256; cv=none; b=elflGJRWHrRNC7I5D1NcyRy1uNAI+ZaGyUoIFzqe3Fs5BBT/jgOeooM82v9Gy+hisuZ2bN 0np25H/6rs2IygHcWv1mET7RS66XTojb1h8B5gWjEvodteGn/WwO0eh6PGAuCFp4mdt6ep pWG7ShLW1dbL59AiH2sClX4JsgO07CQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=PyW519XT; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.176 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-220f048c038so49789815ad.2 for ; Fri, 21 Feb 2025 14:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740177063; x=1740781863; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5HvQEcjJeXsHC85jXzgvN7MoOE9VPDedZeSd2dLCsl4=; b=PyW519XTdYDZwOoiWyYshlGjMHm/cW6s+n4VRUpgbSpR6Gf6tyMePOyxsUHKuC5wVo iFl2+rbldNxQpsbVxxe1wwxX4KQNEUBbH9H8p2L6+2bYX+p++s0uY++FiMTQKxbrdVVJ upcdU3awYciS0qbjPk0H/Iqx7snsrH+rOjZ3E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740177063; x=1740781863; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5HvQEcjJeXsHC85jXzgvN7MoOE9VPDedZeSd2dLCsl4=; b=FWJTxiGQkNdRV6lVUrxivj58quOmAjN7GIG7bAsW5s3tSsss2lc+qpH+wEy66znrRH f5XXZdiMezgSJK25w/IHO+YCGjrSn8bb1Jg43g3l2ozINZfI6KhV7tGxgMDIjbV2gpiP 4WfMFlGt2W6l66zJk5uEH+Jz4GzdxXbn18O7ygGptTJ2CAWl7ERAyfFx0FGTFuensFjd oo2B0qIiSqm+zsNRrUvWpHq9x0M/0JNg7N+6275TdE8WDK11mPqrr4MwrHGo1mGRAv7r m0NZhCNz56KbVgIPenF2riwoEBZcIi0B2kl49+ZfD0NePIk+OzHnoFUFWhobiy5eg+xe CVOA== X-Forwarded-Encrypted: i=1; AJvYcCUR+tsZLbmRg6Uh70YLeWO6uXA6N2BjHvwlDcbaNUEwJeFnxmqGkNBMBSUBKu653Sh1u5kvLrgMhQ==@kvack.org X-Gm-Message-State: AOJu0Yz38z/bnjRyuEQ88d+P+Koj6/2JDrU8BTHlRlOCOqcSIwnA6Qdh dGJv8l+NkzsFqO2GE2o+r8xMWK/+Ad9Fs78dyRuF4bwxOma6fTK+XQOrYytXyw== X-Gm-Gg: ASbGncvEdAq6OjCPskuNOo2dZlcyNd8hvIhxCn2CtWIMgWxqOCMGH4GS4vVx4UYTm71 vqO/5F0fozTPHE+6LweTySGOps//QQibukC9QD37y4TwSu8gB64w15V9wpusOlM86/A/ogWQZAi I3Yio0jLmFQgC/l6WiRR1mIsrV4Or8y+Rl1V497ZVT+1gqj8tDKcOV46zp1byaRFXAn7haDZzxW CzI9Vko9ssywsevrNJJGxs9OyCXuZ+KP2GFErRgWTSDI7s98r0Bs1KMfQMqX0P8Q0+z4y5UsCHm /BG9d2KtjkKcc/kqyzmcJqB0HPo= X-Google-Smtp-Source: AGHT+IGH+xDdgjkZXGk8hJrCHMpFTK6rCRlJkYunn5adYXvOt3xJPKeFvrD1nPrfp4BOcOqmXKFuTQ== X-Received: by 2002:a05:6a21:730a:b0:1ee:e20f:f161 with SMTP id adf61e73a8af0-1eef3dc6819mr10529598637.34.1740177063308; Fri, 21 Feb 2025 14:31:03 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-adecac2150csm10427909a12.67.2025.02.21.14.31.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 14:31:02 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v8 10/17] zsmalloc: rename pool lock Date: Sat, 22 Feb 2025 07:25:41 +0900 Message-ID: <20250221222958.2225035-11-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221222958.2225035-1-senozhatsky@chromium.org> References: <20250221222958.2225035-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 6085EA000D X-Rspamd-Server: rspam07 X-Stat-Signature: c4idmutann57xjsrkmpgs389qequaw9q X-HE-Tag: 1740177064-695494 X-HE-Meta: U2FsdGVkX18hxqYeoH8eK+/m69FiFSf+lHrsdzNOKUWGaE6LKiBzt/kKRzRFgC+XZMmkInAttHNlqkwKz/QpgkLvumMtDiDJvZTQ4oZtXVrAowKTlHzuItXL6/8qftNAvZ4hqvJmBTHq01x9+wxujselB80mbPzd38WYUKfn8cXfEoiNZ6T65yXIJJxeiW6L1gPMC5YB4yM+DqYkbNOBogiMU8bzu4IVm8UlX5okg4OBfeu2TCS54FAs0RSyC5+jtJp2QiYVaOu4Swfzr8ZWEEqcf2AnTobz+gX3z4FcwMdYNvtrsguawoF6oTK247gM2TDzE9Fw8E7tWpxXEsF4uFvhKpI5xcY1D/VGMun368/QgJdVIsQ3tme+WlT6H0wU8W5kR/S8SBSBVwyLbxh26D45Y+5zZOllU19LRPjZE7/eZJigzKC7tcGu4jbFVrsN0t4wnMVzqltHLkEQJ91eqdBkgU/h5dbFcxa7gaXo1vTWGnJOkkqn37rVBow2ILVoCrbvh2RJJkQjnGGjnpNRrIYDoqPyuKleOe5cK796Bwg5lKuc1BTtJ0Q26Ak3PPrnzUPOZ4VXioiVGlrXciUhJVNlU5vVa0IvLp4E6sImo4TfO23Iu5rUzo93RlN1k60XN58aJedyAXEdHWVFGhipoRUutO8zJoOr3NvGs3SPu3QFzbhSbEPM64+PMDYxCGXuRpJpAD0Pc/P7g1ClcQQCrwDBlpsLAonZgiO1Ug7tIpy6M2FQ9JSP43pimDqB6RW1SUOSSIi+XJG+7w2MRLrgfQeGPB4P7H0e1UZHy0BknH3B2ywHUEnLpC7UmtTPV2JVwWz9atMcIQJpadpastS7t+aswFmYwnBl7gn+vYxiTG2Bu5YRKn0U/R9fzMUY9dzARdRmXNMXbl+Suo+HcZIJhWmukvhp5LVHkrHGERb4N/4CIrsi0kWPY+X5fIXLjaQGJ9cXMGjIm6MYbM+TO34 gS9jRlqc CVO3AWobYmgrmM4Fg5a+y1mwN0S3Fq4V8qSTGVnS+3o1SX66X4sU6OGNE/ta+C+rloMtw1mQA0hAvYHTttWZ5XVx5cGH5efh7nKc/BIzlPXb+zYJitynVAMKA1GIInfxvsmW0RVdirdQy7ZrTYNiMDcYNJmq6gvUNa+wqUaoYosRyUTYg1pGLib5Rhz7Z+6AYhXIXHKblfNEPoUwkScO5RyhXaJz4xYonfU0PMy5s+6ylY+JE5b2ZhDqoivMxWrQriTJXxttI2BM2HkSkvjBCfQsZaXr1tMJ0J6AcJxL4fKh4DO8i3YKIPQ0gWA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The old name comes from the times when the pool did not have compaction (defragmentation). Rename it to ->lock because these days it synchronizes not only migration. Reviewed-by: Yosry Ahmed Signed-off-by: Sergey Senozhatsky --- mm/zsmalloc.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 817626a351f8..1424ee73cbb5 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -18,7 +18,7 @@ /* * lock ordering: * page_lock - * pool->migrate_lock + * pool->lock * class->lock * zspage->lock */ @@ -223,8 +223,8 @@ struct zs_pool { #ifdef CONFIG_COMPACTION struct work_struct free_work; #endif - /* protect page/zspage migration */ - rwlock_t migrate_lock; + /* protect zspage migration/compaction */ + rwlock_t lock; atomic_t compaction_in_progress; }; @@ -1206,7 +1206,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, BUG_ON(in_interrupt()); /* It guarantees it can get zspage from handle safely */ - read_lock(&pool->migrate_lock); + read_lock(&pool->lock); obj = handle_to_obj(handle); obj_to_location(obj, &zpdesc, &obj_idx); zspage = get_zspage(zpdesc); @@ -1218,7 +1218,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, * which is smaller granularity. */ migrate_read_lock(zspage); - read_unlock(&pool->migrate_lock); + read_unlock(&pool->lock); class = zspage_class(pool, zspage); off = offset_in_page(class->size * obj_idx); @@ -1450,16 +1450,16 @@ void zs_free(struct zs_pool *pool, unsigned long handle) return; /* - * The pool->migrate_lock protects the race with zpage's migration + * The pool->lock protects the race with zpage's migration * so it's safe to get the page from handle. */ - read_lock(&pool->migrate_lock); + read_lock(&pool->lock); obj = handle_to_obj(handle); obj_to_zpdesc(obj, &f_zpdesc); zspage = get_zspage(f_zpdesc); class = zspage_class(pool, zspage); spin_lock(&class->lock); - read_unlock(&pool->migrate_lock); + read_unlock(&pool->lock); class_stat_sub(class, ZS_OBJS_INUSE, 1); obj_free(class->size, obj); @@ -1796,7 +1796,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page, * The pool migrate_lock protects the race between zpage migration * and zs_free. */ - write_lock(&pool->migrate_lock); + write_lock(&pool->lock); class = zspage_class(pool, zspage); /* @@ -1833,7 +1833,7 @@ 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 migration_lock. */ - write_unlock(&pool->migrate_lock); + write_unlock(&pool->lock); spin_unlock(&class->lock); migrate_write_unlock(zspage); @@ -1956,7 +1956,7 @@ static unsigned long __zs_compact(struct zs_pool *pool, * protect the race between zpage migration and zs_free * as well as zpage allocation/free */ - write_lock(&pool->migrate_lock); + write_lock(&pool->lock); spin_lock(&class->lock); while (zs_can_compact(class)) { int fg; @@ -1983,14 +1983,14 @@ static unsigned long __zs_compact(struct zs_pool *pool, src_zspage = NULL; if (get_fullness_group(class, dst_zspage) == ZS_INUSE_RATIO_100 - || rwlock_is_contended(&pool->migrate_lock)) { + || rwlock_is_contended(&pool->lock)) { putback_zspage(class, dst_zspage); dst_zspage = NULL; spin_unlock(&class->lock); - write_unlock(&pool->migrate_lock); + write_unlock(&pool->lock); cond_resched(); - write_lock(&pool->migrate_lock); + write_lock(&pool->lock); spin_lock(&class->lock); } } @@ -2002,7 +2002,7 @@ static unsigned long __zs_compact(struct zs_pool *pool, putback_zspage(class, dst_zspage); spin_unlock(&class->lock); - write_unlock(&pool->migrate_lock); + write_unlock(&pool->lock); return pages_freed; } @@ -2014,10 +2014,10 @@ unsigned long zs_compact(struct zs_pool *pool) unsigned long pages_freed = 0; /* - * Pool compaction is performed under pool->migrate_lock so it is basically + * Pool compaction is performed under pool->lock so it is basically * single-threaded. Having more than one thread in __zs_compact() - * will increase pool->migrate_lock contention, which will impact other - * zsmalloc operations that need pool->migrate_lock. + * will increase pool->lock contention, which will impact other + * zsmalloc operations that need pool->lock. */ if (atomic_xchg(&pool->compaction_in_progress, 1)) return 0; @@ -2139,7 +2139,7 @@ struct zs_pool *zs_create_pool(const char *name) return NULL; init_deferred_free(pool); - rwlock_init(&pool->migrate_lock); + rwlock_init(&pool->lock); atomic_set(&pool->compaction_in_progress, 0); pool->name = kstrdup(name, GFP_KERNEL);