From patchwork Thu Feb 27 04:35:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13993742 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 47FBCC197BF for ; Thu, 27 Feb 2025 04:37:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD6A428000E; Wed, 26 Feb 2025 23:37:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C5E30280005; Wed, 26 Feb 2025 23:37:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD8E228000E; Wed, 26 Feb 2025 23:37:40 -0500 (EST) 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 8D37C280005 for ; Wed, 26 Feb 2025 23:37:40 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 58D6512027C for ; Thu, 27 Feb 2025 04:37:40 +0000 (UTC) X-FDA: 83164466280.21.D09CD07 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf26.hostedemail.com (Postfix) with ESMTP id 7D439140003 for ; Thu, 27 Feb 2025 04:37:38 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Od9Byk5t; spf=pass (imf26.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 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=1740631058; 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=ZEqWbULFJyDHZ0uxeHUHEx9cW/XUYWqE9opCIKYGE7k=; b=UJfVjXoaL61KunOIfyCUCmQHTPezGT8CkZ9XQCGo/iPkDXeFaclzxl56VfnIMi6uX+icFG dwmxa9lOq6x/gaZGJcXRA94v40UdoaYxypEbpSIBDur7PPdzEVABRrkK+wFcuWABEAlU/a VB0yPLljAtPxWcc7K1jiXQXadiUNuNc= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Od9Byk5t; spf=pass (imf26.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740631058; a=rsa-sha256; cv=none; b=waClyY4HV2JwnWhGX2O5EnjtIFagM+i5Gov8zH296pJbt4iujbNwQQRdjzqlVOMOvBv0H3 FALxEHnyt3FlTi9DpCI6/0n2RTI23yeI96nP6kzlpAUvK0z2IsZl41+Tk2lrp2SbmXIr2K mmTP4HTQ4g4phjl99PQqtodSfDqB7VM= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22128b7d587so8489835ad.3 for ; Wed, 26 Feb 2025 20:37:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631057; x=1741235857; 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=ZEqWbULFJyDHZ0uxeHUHEx9cW/XUYWqE9opCIKYGE7k=; b=Od9Byk5tMoNJUSF9ny26N6rmRxJcLJQbcnMVaAhJBTGhNUO5SqZYpYbcp6vv9Behf/ Suss62ce/eWTg8RIloAtrOoenX8zciwIVrVKbqZ2vKDvEzImVf7sb9luMj6yXFW19P3H 3U4keyzxWmier2D+PhBxZ38EinEwAuU+7EzB8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631057; x=1741235857; 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=ZEqWbULFJyDHZ0uxeHUHEx9cW/XUYWqE9opCIKYGE7k=; b=oR1BxoWkxNa0My9x8IePHaq8xr3oyrHzkFpoXO0pPmPhQbRGUqdjHGgC/eaOv87A+O 5Hv4juPfQjeySmuRWY2niGfLwlTe171rHfFd8caxfeUgACI6dLStKxxGBcN0I0EVXURP 0sxPF5wwFaCcMOOTM1B4PA+Al+42cocKNBN/BJs2bTHWw7+JEzAaI2T/xSe8kbGvLdze e06vb4KGcAG6KmYwWeDDPD6Qo8fZqdQrOx1RIazmR6+uZmsaRvIKD2XgTqWVteSQf/tv +85OOu3a34fuhkWsJAzn1sRBmaReD7EOtTW7eUW5lRkLdB8t+VOCaFDRxoBWJSrF7cE0 /Bag== X-Forwarded-Encrypted: i=1; AJvYcCXw2CM7oGQzKPd9/pYpC7iYE6WlNLtIJfdSKHQBI02OJZjlDVn9jJA7JUgMVBhAtDba++CJZAlEVg==@kvack.org X-Gm-Message-State: AOJu0YyHARe9CVllZLn+PlNGuaI+pkXxEYipIFBn6tkrJUewLCUl6nEg 7hhSMfnHtIn0XqR6JfzcRR/+SatOEb3OV6h0fca5eWoLdvk53fLXNevzTRe0eA== X-Gm-Gg: ASbGnctho0G2c27+UnOOCaEIf3xf6Y0LUemOrGF+ciIIaVLvpoYXTzcRpgJ13OwMPC5 HsDyRWlFnFDKgt5xq0VSxxLGLxqd8YmxVYPbDBCF66wxShnngZDcj5DTBHsIq0GBGRicDBGTjnc yTTHBXEijPAA3PrCAzqiobDXr3qfSOu5Oor+S0JBX3FwgnRZ1HclbFboXKUqWVQNERCrWt/8o8T XWc2iV3e4dBMQivdYBJC8V2+5qrGc63GjFfSfZpI0LowqwtIzX6wv30bOATvGPWxdsQ8BhkYDNo 0cQ9EV+EwRspPVDu+GrkQBfExGHu X-Google-Smtp-Source: AGHT+IGjRG1+LdYUr60qs0ikZWZDjzWHfWUJZUn2QU7B7wuT5jMjcjNdqY/z652mUps+J+R2kLTanA== X-Received: by 2002:a05:6a21:48d:b0:1f0:e7e2:127e with SMTP id adf61e73a8af0-1f10ad3ffabmr9855132637.23.1740631057375; Wed, 26 Feb 2025 20:37:37 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-7349fe6c1desm500488b3a.73.2025.02.26.20.37.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:37 -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 v9 12/19] zsmalloc: rename pool lock Date: Thu, 27 Feb 2025 13:35:30 +0900 Message-ID: <20250227043618.88380-13-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog In-Reply-To: <20250227043618.88380-1-senozhatsky@chromium.org> References: <20250227043618.88380-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7D439140003 X-Stat-Signature: jnsu3rb85g84ii8s9uj9f6zf7pjm77s6 X-Rspam-User: X-HE-Tag: 1740631058-117609 X-HE-Meta: U2FsdGVkX18FXvOfaQu0sLLf5LVCwEBFWPdxXSOxgi2kw5Q5PmTALCx052Dizk0JYsjJ/ON3kjkufBi5W/JroWTIpdY8hz0uuaHiVL4sSrxMRm1Eq4mFMjo7usny2m7GH/BbKGjWwvyjFprmISyS2BJb1udMDh/a6J3vHqwy9MCCZxoFWnJh+pwB0xJNImff3zWJMrBv9BCyHPBJW+h0RoGBLKVOT/LpcjQ0tj2Y87C1dP8q0B9oLlN/GdeTQCccfBYdy/CiT3N6JopYWW5gCtzxKPQu8NEpnpv/hWDaPKyWADMXV4RO3WoywxWA6v5oY3ANQjmgGbHgFsU0mp6sw+lMqSWXwfnlVlumu6/3vmrbO6AR4Ms87wEf74xBLFkLRHANH0KCwXA4WPdX5brZf/mBJcwvSTDrsyRyhX7dVMc8XR1MOEIlThhOLrtxq3IGrkuUSWnS9GMX8NKwI2bI3RqU4pyuxc/Ghl2PDPGCCWV9PqpyIJbl/j0ZmFuKURJmUAllnqKec5UEbcyPQ6u9mkF9Zg8mDOqiVa2Je7DZ8GvRWj8AlHWCUeZj+/ElW3MWc9IH37QCbCPoeJMk3ufaYazv3qszobxcEFel7byCz/Oqq3hIQNE/pgl0zijmHiLLQupByogxyWxLN1IKV0KK4V+530U0WJHqjteyeEjP7PCWB1YCF2+VtcR0pAgvCQns7+46KerwDpSV/Ua7ugoZjYy/Ua/sFzzyQ01Y/o+258YR+iV6FFhSWQWCqfhS7C6TFAfThWN7Xq29XIWuq7oXy/w5MhhT9ylDCfGzXxaMKkWGRmGPLz5ZuR7geitDtcDkZdVsW1dJtmP+nE6ZHekGotHFeTwwILYmpTi63VIjjM9mFLyLefWkTFZ00lMBLZQ2CemOPnUXlehytQVWwtsJYt9/SrauSZyjIhJmYLnCDdGJWbwFgPatzTQikiX4AdVR9TxAgPuUyvnQPV6J0mR KXgcUDNN FVRQ57m5WZ9UuruZxNf9yItqQBPBF50fHkJlAlW8bnqkf671XVbATbBX2r22wRDTQC5+lDLLzE41ITOrgPy2zMIWexA+jb1+ThR6W+qNu9Wnp/6knZLwxfHYil+CYJgPixly+H4tZNdH4D/f/K/AIJME5Q7uYVuclo2SbYXSioaPdIQrKxCvHTRyCuXv9xJQIU+1oKU1kRLkgIFYJ4OoDhsS2kgxBuwEI6Il34eS1YdgJObsFjUux4l1hbDtjpPGWKupAK/j7MFAhhHQPlgZFk/49PHYW3EocifqjwG40Xp1kP9GoNpImxoS04A== 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: 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);