From patchwork Mon Mar 3 02:03:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13998062 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 828D8C282C6 for ; Mon, 3 Mar 2025 02:25:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1219B28000D; Sun, 2 Mar 2025 21:25:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A99A280006; Sun, 2 Mar 2025 21:25:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E169B28000D; Sun, 2 Mar 2025 21:25:35 -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 C016C280006 for ; Sun, 2 Mar 2025 21:25:35 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 74A6B160A20 for ; Mon, 3 Mar 2025 02:25:35 +0000 (UTC) X-FDA: 83178648630.29.6E5E5C6 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf15.hostedemail.com (Postfix) with ESMTP id 9082CA000A for ; Mon, 3 Mar 2025 02:25:33 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=DWTYNiFh; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.181 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740968733; 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=CYVJH5MaLfbxaKGZoDOncyDyqc70bzD7eQWV2O8vsj8=; b=gkibOwPXSA+KkLy2ScbPgz2hiXppwnfTg5RVAoKbadhaJV778u+tIesfOwNWNWj1X/2kvs n6VNP0KX1QVMaNYCc4xeqYUWcG/n1CbngBg3ugY7Zd4p38tAKHzBAyLOk58FzhRf21vkLH hZRA9N7Q/RkTkN1i0qkwpBZbxnBbs7s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740968733; a=rsa-sha256; cv=none; b=P5lX5TVH+QPFqZoU2YjbdFLOT0YfJR+1+ATyE6FYz2aYaZx+UtKy2ny9ui159eSV1MHzWn Fu+BzlvfXt8DFthkj8EpyR5kgfkHJy9P8UnMRxH3IycH2nc2VEr1HgsooIlw4iP52+IjmR 6WnoYLnlIsOb03FtpVvDT2OI+Uiwcis= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=DWTYNiFh; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.181 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2234e4b079cso69136855ad.1 for ; Sun, 02 Mar 2025 18:25:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740968732; x=1741573532; 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=CYVJH5MaLfbxaKGZoDOncyDyqc70bzD7eQWV2O8vsj8=; b=DWTYNiFh0N5RlayShO2PGdKurtwhTLZWWO5b4XJxtbz3TnegW9h6SMxNFJDXc+jC+m 2GHzfw4uMB7A7bo8DrxcC2DosQ7h86pc7oSl/RKysJ5suFEG61pUrzrtexTtG9lVDYFy uwGk0LQjAbJi8dgbUyxfOXhgIT3cWyumdfLdk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740968732; x=1741573532; 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=CYVJH5MaLfbxaKGZoDOncyDyqc70bzD7eQWV2O8vsj8=; b=hewDagChFrWNSc1vtdJoxgD/KHUmSdOl4xlS2U3n/l3WjckOGSe37pGE6gHu1c8eMH TmCnPLAcv3fq1GJFd0/7f7EvfR1gvfxfc7SuwxWqQyW2QP7ZA1eBqm07am5kIDfwKbnP llx7vIFgeERbB0cCInEmtFFpI/OIB81cuSmrP4XjZv2eQv10gwIjI9n+d9yanrIFRHl8 GCPlLrO8eOwFQIBSZVZSgl5HEosUrk5Fyw/tH0Y15RbzIhiMmxg9CSv0mNLUx6Zlje0n pBaBGtxsUBCXvJ7J+adAGkTV4oNeKtEJdS8cVDJw2LwSysfk0wUrXUTUq9nPO2DvkD4U A5/w== X-Forwarded-Encrypted: i=1; AJvYcCWOXE6hcRzidGlrruisTW3NRjQ14pqpVrCqr9rcCQ+8Qf/9FB9hJASV/xhiCmaCbOO/6RAPWTnozg==@kvack.org X-Gm-Message-State: AOJu0Yyi29/4/PvQG3p0EA2V3/LXtv1bvDteD6/iiC0XcIJ7t1xfGQAH MMLbRF+oT/tzkrEIEYmtNndE1KJ/qeUYKEYHorlj3h5BSP6165mvUxgvzOBO2A== X-Gm-Gg: ASbGncuKfdE1wQJRYsfOB08s9RvpNpq4Wl8WVuMUNFirFZ6emtJNTzufASe5CXFhSY9 dhiB1fnn5gMXbbZlUvE3+Mg+SLPs+o6G68rt8L+qITLfHM2ta3CNltqLq/oUkj6vXqUiDAAinVl EXF029f7785PbyZpjkZB4WbBDMKiASwgXlfbjIc9GJtOzkYtSp7e2hZN5PMvl8tCBGBC7y0YZef H8EgivjtkVY+GZsDUw5OEjerDgOZ028iX+Cz+EcGiNpelZnQO/vVzcOJSrmaPbFv4GZAVVexNAg UtNhk4UNcijQ3MdgKxPQRMewl5uShfmKk0VTzehtdj+CAo8= X-Google-Smtp-Source: AGHT+IEgYxZUnegN30z6tSMQEsHJ1L6y7oPydeFduqm2ElX6isqJ4TV2BparuhraX3uF1fCfP0eGTw== X-Received: by 2002:a17:902:d2d0:b0:21f:6cb2:e949 with SMTP id d9443c01a7336-22369244fb0mr142389775ad.52.1740968732436; Sun, 02 Mar 2025 18:25:32 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:1513:4f61:a4d3:b418]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501fb004sm66940215ad.64.2025.03.02.18.25.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 02 Mar 2025 18:25:32 -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 v10 12/19] zsmalloc: rename pool lock Date: Mon, 3 Mar 2025 11:03:21 +0900 Message-ID: <20250303022425.285971-13-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog In-Reply-To: <20250303022425.285971-1-senozhatsky@chromium.org> References: <20250303022425.285971-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 9082CA000A X-Stat-Signature: epj1g9p1ticn8p434t41635jixiz5k65 X-HE-Tag: 1740968733-650585 X-HE-Meta: U2FsdGVkX1+1zhaotmqvqcT1MxJUR5N8D3IO9p9eM/q5SKwr7pKKLqd0b2jO9ig/cz+jLn7l3+XQcBlv+n6tR/DjMiiQsGL/F4kl6GiMEH3CSCe8qxHWskbVdAnZQe8HhDcPWKSwpn6WCB+KHqiK4I2GjPSL1wgR2XeSyfU6Rtas8uE5j4VMSrYMPy5rXBAbyrIn38NTMka2Ll2NnJt1Eejr8Fx0sZ7R1aAABxUrPmZcqV+8wY+la1QeH8jHclS/xQ//o2NO9jQylChpAvpk9p48Lfg/CAkMxyEbLWjbDrF0AOzuMBF5zWBxU2u0H5gXnqiyFpZaIgzyj/DAe1ZFZgFwwCLRUs23D55+JPyXrcOJpDBuvtt5SbrpsgrurZ9wf5/3hQfBySDSeeCjTiegjR6Jc8y5Qj3CrZIi4VU7wHKQWP2SFJwRA6bUibtoOwdsLVE/ta2PJ6CT1Sqxuf3fYvSqOUlFywg3LsETu9nrpMh9n3SEScMwzTOemEsR3cJpPFylUQfKNEirMqtKRel431hP8xaZ+ed1uqs8oFFbuHGjb73lNn+SVmsMCg6RkUXCHXIDKCUCkhSreMGR3afEqkWkDZAngESqnLIqAICYYTMGnhQwJS7+Vz4q0rz4F0nC/4wnYRrHc8oa+7pc6ZOqo58Y4sKt3lBOcrbC1iXoZX9blnhOLnHnZtqF/QUgUd3tar+gw/If0mxlz+GZfbKF0fI+Ot5IPG3Q18jeUMrqzNKaDSwyxuuwNQFVou/BSjsRQ/h6lBMG6mPDg9DVoHoFIr6bKGEIW2qAxbgKhmCzNW6SKsh4YP/gil9DppiKRTvH6CRlPe9voYVDCoRyF9EXvmpxFGQrbEYo31VrGW0i/sFX7CZIoEeoICUlTQwbj1hlTdpJeimkIMzY54YIE2vF/x/mtGJRR9EX/9J6/GB3lhe+9EyR2/jxhRo5M9/6fkN3D1RbYXSnBzBXTvkrjP2 /RnVaiOn GxAAgP0+9NEajJNtyCyriuT2YhI5Na/WZLDjiTH16NBAxFMQ8RNQRlk7IwMN1fHpK1xLdJT9SLA2pbUISDiOaBPy8sI/fNDuiwv4HsoYg+v6KggMhHiL35vSUkP9kGeLiHysY4eo/nHQwV3d6K8kuQC3BLcOAPsMAKoyaph5EvggnJZyogPHz6E0TBEqsHI10eUPC34Cog4rhi5DEJ8WZN7Awj2mz+D7krLb7ENycw2lu723AV1PmlVITqrfv00ECcw/SjA2LVnpSOPDQAO7O5HHnSYPlvz51ETqPbbvG+BeqL7xrMxtIQjp7rg== 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);