From patchwork Fri Feb 14 04:50:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13974472 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 24E16C021A4 for ; Fri, 14 Feb 2025 04:53:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BA4DC6B00A0; Thu, 13 Feb 2025 23:53:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B2E22280002; Thu, 13 Feb 2025 23:53:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 958B6280001; Thu, 13 Feb 2025 23:53:20 -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 7354F6B00A0 for ; Thu, 13 Feb 2025 23:53:20 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E2881141DAB for ; Fri, 14 Feb 2025 04:53:19 +0000 (UTC) X-FDA: 83117331318.08.6E8C7B4 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf26.hostedemail.com (Postfix) with ESMTP id 0E8E4140004 for ; Fri, 14 Feb 2025 04:53:17 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=mMTG3v7L; spf=pass (imf26.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.45 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=1739508798; 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=nEsYVf2FanYsVWFazbZFyY/NjoKwvYYj/znay1eygdw=; b=wNkSQOlDeSueKWA6iojigwzDAqdFxZuvk80ytVrRssqM+DpyikCYcb8zZVxW8VhZv3lfpu nAc+rAclLEVQOR6ghTPSg4onTWBOG55R6pQGvzINHyL1B+wyu/GfQeXw8VC8i1hLpe7Iwh MF8XYRZ3QbXAAPxa9mqWlo9EggPuSq8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=mMTG3v7L; spf=pass (imf26.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.45 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=1739508798; a=rsa-sha256; cv=none; b=G9oeUk4T6hYpnHPmrNHXxX5rTwBb4PKY4epRQ2y9MFZbEOykkzvY0RhYsnz+HsQ4jA5rGb QbZqLed5zEq6QPP5T4bsfQjCmPA+/keNt7+g4PmvkZCCCAdRe4WoqYaox8TyQ/AkPlZ3tc wLvkpi7ksNywJYFeDpLY5bRzDm4Sahs= Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2fa1fb3c445so2434736a91.2 for ; Thu, 13 Feb 2025 20:53:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739508797; x=1740113597; 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=nEsYVf2FanYsVWFazbZFyY/NjoKwvYYj/znay1eygdw=; b=mMTG3v7Ljp8Ado/dUX1idE/cbbKvPXlbaB1z1y/5FMfeaCCqmnY36Wn/BIA7sf0c3I 0HHAvK/FxUf/Fz1ANPlKmq8IHT7qKCqTwCsIFbHVSm2mXzUVxlr4cz4H9GSnmKF6iuRF Jlyp2uqTHGN6ZCML0RXCNZjlVq89giU9i/i4o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739508797; x=1740113597; 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=nEsYVf2FanYsVWFazbZFyY/NjoKwvYYj/znay1eygdw=; b=RMadukvL7GkbC6xllGXlFBi+7nFyFDLgDxp62azFsxjY7vyQO5CezJ72sNecp7VXWs xneBQn7qQ8KuWIHFB8Vol48oglJ+0W68UWRCIQ2SNMweA1r5P+z3A829i0tZ2jr0xI6e yPpuIzR6H4KaRY4nHvkVl2UTeNuBD55//4qmXSScPx4m0kWK466GK7KxtfGugYpfpVB5 2igV/n9y9Zaz5hsbszuT9VWdqEukQN4+l+06eEDST25/SC4qB/IDDoYtLOOWrd46mMsf i5YLy96Vj9ZgJgoJcqgOEJVn58ADRHYKGwnd3857dxz5zKSk4HtS6SCuhOHTXIB2TqT7 hvEg== X-Forwarded-Encrypted: i=1; AJvYcCXfbl82Uk3pEtMxXeSCVAwgBLa8aOc5BYU1rDRFIQCtesLSkBnvwu+vDF3WI3z2s57Rw8nmWDM34w==@kvack.org X-Gm-Message-State: AOJu0YzywctyvJ/wr+QvzqjGXVAMOev9xxhBiA/8S2b1L0GiNwfIMarP 0BTMiyPMzezih9hGO5Xj9hVbaBw/Mu8C372SP4Z+PhAY7SLUx5ZDGUDhaEThug== X-Gm-Gg: ASbGnctNVVV3a4SF1RQnN2T+GfGRYjXARgGBGvdRdDGi+JKRxCtC79jyUZu5PcjGo1X Tk7uCpPrs1BMPY87m2z+a/lc3TTrqigHqoPYjF6UdEQp73nlfLlBEZHdHLCa6i40vNSJIDqI95S NxpDy6SbfMe8L7uTa90J9h4l34xN1a0h8PjAvoVoD+rj+H5U9EMRwaNsx4vGJa42UGona72p7Lg NknfWSPwZWIYQ8Kr7L+JHyaFaGT6rgbWw3Ql+0IV5/H9QgcULSuYyiMTXwgvgYCvKYisJGBmW7O tFpiQZzCJ4US3Ea1Hw== X-Google-Smtp-Source: AGHT+IGwpYmFxf0CUvgBN28Mu9LR6po8v4fVBJ8EuK4NGdlYOspY9jkFKQ6vUxoKOF+lj1g+wrgKpQ== X-Received: by 2002:a05:6a00:8c8:b0:730:7970:1f8f with SMTP id d2e1a72fcca58-7322c5a9058mr14486712b3a.12.1739508796987; Thu, 13 Feb 2025 20:53:16 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:942d:9291:22aa:8126]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73242764cd1sm2272338b3a.149.2025.02.13.20.53.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Feb 2025 20:53:16 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v6 10/17] zsmalloc: rename pool lock Date: Fri, 14 Feb 2025 13:50:22 +0900 Message-ID: <20250214045208.1388854-11-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250214045208.1388854-1-senozhatsky@chromium.org> References: <20250214045208.1388854-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0E8E4140004 X-Stat-Signature: gq6ppbqkzn1gra7zzugcsusfake6bcs5 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739508797-645382 X-HE-Meta: U2FsdGVkX1/yciUbgLN+OZUnTt/gEdpB4AdqhHbh0YM9AK9lVzUJZ9czYKMsf4U8i906q9MAf8MZjmL1mKAenHJlqLF67MlUYCXm1IKKJjWF1Zde7wdIq9fwAZYBRAZ9Vdwm9WFXkwisUWKVeiUSeNdQbJF05+vvMvvNTeU9wKrtkRYNZwo2IxvsyNDQrLIpRh6ygOqWNcSyF+vWGpeDUpZk/P8H4wOxufM4jkhcq35v4mnjGK3Mv++9OWPatfukQu3jwE9z3XWXzc26q0v/yPvp6sjBpY/0JeQEWRnlJ+i6cJVad6oTzqK21S75uyv6TTgaHcs2RjdCC3IHRFIPA/m/RIygL9EplRaYsVwe7qPZOTga9aZUDCkBjC/Nqjwx0CDri1dBUbF0qtDxcmr+dDy3emmN4cyd0Dt3/Mpvo1cCUTZfmKzkr0prx6bjIr8TM008DDHBLaFiil5xZsj6qnESexQJIPuGzwUiAKNBVW+hQA5MEyUEWY6Bt+gOxs83ZBa/a1leC7WFft4XVYlVX6wBDwTfrxWzAXUy9O908daVqBsSVymQBoKkpPN87H1F3Hhppt3nJu3f03iNXVsTrg8vprNyDT9ZoOJOG9cdMXdRP07QXRTkFgXI1IANselm/6GPwdCx/BH6o+ACBoW4vrqo70rU3Ox/fSwuZNa3ljXPvmx9e08jerREMx29d27CDw+jTCU5tqhHSZtmHxV1L3NIMEk76E0s1c7fZ8b6ZB6WbqHKEfli+qwOqYRRRjN5Pj1GiKJB0gz1EmGU7jo0VQMq/DirLzdQham+ncoD+sG1xOzw7/9x+r+/wt22/PFQJiH1HdyWnKFH305rsNegP5HIhztuHYAUgTHotfrUteaS2GL+VBKVo0bkYjs4f7iuSjUR27oRvcRFUNvbr9eAsRQ+x21xQ/gtWaI9pEfT4+I2GzqcmTad7QhFh2RopqXpwIR0eHM1njIe/DQY6Hv /5DmWASa hKZyXKHTnTmpHBwWQVX0oUPT23UGeA8mQQ/HYGJOrvF6pfeYEr6CQ0bqAJD/SDMa/yoh+0LZH8a5u8F/DwO6Jc+/lcXg8w/FqyFHLvV28I8rTAMu1EqzTiI6W77ImyiTaD75/wOYuW5CJ2ohhkfXIFa1QkQfFkZO5tLLPcRhW3fAsX3YZf8oRRoKRAxD6CxA4npq8ixNbsuEjc4Sy2yicUv+KSXWYBpj9Gp4ls1OlHM3pm6CceiPvci7oYw4/nYqPTM9LrfAgxKFWwHKFowpg34UZJgHA+Lt0b1yVw4mwOWW8LUiWXFtTs+q8TA== 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. Signed-off-by: Sergey Senozhatsky Reviewed-by: Yosry Ahmed --- mm/zsmalloc.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 6d0e47f7ae33..2e338cde0d21 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);