From patchwork Fri Feb 21 09:38:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13985086 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 C9BA0C021B3 for ; Fri, 21 Feb 2025 09:39:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C25F6B00AE; Fri, 21 Feb 2025 04:39:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5736F280008; Fri, 21 Feb 2025 04:39:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3EC2A280004; Fri, 21 Feb 2025 04:39:42 -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 205BF6B00AE for ; Fri, 21 Feb 2025 04:39:42 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A2AFF1A0BA6 for ; Fri, 21 Feb 2025 09:39:41 +0000 (UTC) X-FDA: 83143454562.04.4002AB1 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf08.hostedemail.com (Postfix) with ESMTP id B8CF416000A for ; Fri, 21 Feb 2025 09:39:39 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=gJ+U52h1; spf=pass (imf08.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.178 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=1740130779; a=rsa-sha256; cv=none; b=phQot4rgOqobbNCPLTkrs2uioANN5Fmcas8PUQd/G+OfUYcTmjxFELFQysK7vTxcDzrMMt 8asBBCVvbyJKATBO6ASGqxBUsCdr5khJV2zLxRlHxTKyrdlGN8L6NGNT0S258Gd/oZcYxj KTjYm75f/SuQ5xFnAGpAA2BO8aX0sb4= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=gJ+U52h1; spf=pass (imf08.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.178 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=1740130779; 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=GXv+/ysnpWhGCjHCfYNcyvUjP7ajCktC9DuW161tgaZFhbBESBLrU9MumpyLpXdfjtWVVI epi8W3LGzuSfNWYuJmPj5i+wOZbsQEI21roQGjy5GrjibJHZmZ8qH4xqeMUrRkJe7gUqO4 NkrqPLqkj/Q9KxGKYJrlK4z1bDIspFQ= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-220f048c038so34294475ad.2 for ; Fri, 21 Feb 2025 01:39:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130778; x=1740735578; 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=gJ+U52h11Uka+VemE+FkjTa+/WX3B6B2c8FeN2xHFpAuhQLVHwkZWjrWUkso+2rBQH XLSI5yBEHYbIoTMQxwUuBgFR2Nc8jZF0BhbJkVjOSpfZZ0PqkDBnR0aGH5K9iOFg1hwg 1QBDBeh1/hFuwaP6qI9odh+v2Ojcr6D1Yzzh0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130778; x=1740735578; 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=qW49lsOXLrlJk915SqVKKl6XkLuqzVmNnNeDGORHCDyy6b7lVU/C+VNotNodUz5+vV VU2/5of8sDX59AGHYEUVuBH1bSSFX2rqNoFigfaesfIT1xHVHvcgsaGKZ7H2tvHpn/+E RlLPCfdafthBKuWHiY5NPunnpfiqVFu+mJiWdgCMKZilzNqQxppI2JfoHRy5TyxQmTXO +baBt2KfWXbEjEi94Fvk/K8ikuGSRU5fnn4IoIxTcBtMXCA46sjUz2Y18ED1R5IxOVhr GeQo5J3+8X6V7hh5rWn8DOGQTPL0JquHnPskpWBBd1WSAJsessRqQE/E7ZB5uzexiq+X rRxw== X-Forwarded-Encrypted: i=1; AJvYcCXv4g9L2vT6Vgd9hpiyNUQqEFZEFMXIOl/hwIw73P1I+1mwJHRxhl5AVmg9h93s8aT2sINVW03ufg==@kvack.org X-Gm-Message-State: AOJu0Yxbs9K74BqlB38rDf1uVct9//V0Tb0yIsY8K3yjUegfxdz1+cxN Yt+2kpQgsZFG+TWfKkZEaUJb5WwH3ZTSX/hBchTChJSDkH5wjbMStbmWq8RVwQ== X-Gm-Gg: ASbGncvjAjPzYKHGbPvj9XW49Awlr7x3Pc+XPf9d6GrtxAyPiw3vwq7aGT3hN+wtRpH RAWNNA+vRuhovkoKp4fFeaKq4wCC+1E6lHOEewp86SLYw642vzJ91+TNlrpOMjRO1zPtTujczMs tlRrgAqqFEiSUm6Hik4D5o7E48Jv9xDk5sIAoFLgyvtyPefC+eBNJhStuvBRFBY3jrDnScgvlpV ZZ9tpANt6OT47XGia+pgy2Uk8EHxOyuVIcNaSsQyTjfwmqZic4iygVOHC32+36NoFIx81VFQQX/ +ZJXU0L8hJu6HXdYEvEPgUtFNuI= X-Google-Smtp-Source: AGHT+IFJSxFh0kIH2ZWbOryRmu8nKtsDecZCxDfSknljeAwZwRajmYNb6qKYJjX34w+hU0iVAuRclw== X-Received: by 2002:a05:6a21:6004:b0:1ee:c6bf:7c59 with SMTP id adf61e73a8af0-1eef3cdcb24mr4527195637.23.1740130778665; Fri, 21 Feb 2025 01:39:38 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73274bdf0aasm9692864b3a.125.2025.02.21.01.39.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:38 -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 v7 10/17] zsmalloc: rename pool lock Date: Fri, 21 Feb 2025 18:38:03 +0900 Message-ID: <20250221093832.1949691-11-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: B8CF416000A X-Stat-Signature: cpxmwiqpjqdwe87ii3ja9nez6ehg6s1i X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1740130779-637034 X-HE-Meta: U2FsdGVkX1+60oHkN4KdbB98IgIVR5dp5rg4gdmQ6JXv1QdEEkIp0rODFDczQBZhVmlThsRA1VuB28Goesieb8UWMt7L3RDDgPFHFUYmJF6xCSnMpdSQdymwMA7NBJVdc7Bq3BFEb1q4ahuv2JZXHQ99C44guXv0+e8XU5AqeGxMFRrbTEyHKfftY8fHJkXVUM7rF/IPEHAqG2n9g5ex5KSN+bselFNFvyV/RRLz3EBp89He00dkeiwRQnMVITpjmOW/MxXvhBd4p6GtXqp6oSpks2354pdZ7soWCsTCdk42jgknqpu0JTrRBaOTU5qnBQ0TkBaUuvOyTsXI1ElujZvePrdq991NsntrH0gprHcbx2g3pSwuq4/jAb8doH3fDHUZfX++KvJTmcfkB2/lrwu2pZpQt4OPA/UO5Vey6ezaV/8Leym7RPmdUaUQkcBAxx7DznfbzaUWb40uAF288iSXfW5SdU7CnusR+m1OIkRiWkfMc+oIaNTxvyGxfWewiJii/UK7afssB/y/JNxJ9s90cjTgFpi81Y8IQz5y/xSbWk5rc9l4wIiiyRAqvidjFNzm38+TPzG7N5vOqbSUe8ZJbB/Q8jiqsiVUhpVfnNYrOjz5YRxR0nTU0keGeCAUxSIejUK+Pn4bdeIagb4TOBo0XH3f1jM6W0wQ+LwFylTZ+GxkoRii0Iit9I5/OSD2TofzCY6bdQ6FuqnsPfUT5vSeFaPL0iCy2mvXuh9zPfw2JW6xaO7kYIUJ2TSocakYv1+wTw+vY6Xv/ygv74rfBqHmLzQzD0vROHr6ozFVvuEpKlgEXqk119b1WxqLsQzz3f2Z3dz7OLu+LDIoVVBaw9H8ta6J0FSm4y9p2AsfmIv+opmQAfxjzIcI9/T0/YkO/I73lp8fHq/tSfrGd2Vrwi88oGfQ+slIF0E2YNITaKZuolXbw2tPKp7GY/FAizwSXq9qsItccJqRVFpZ/b5 rH7TxO3S GQQNAr1CLUWq7922Wa0rok3RyO6PSKHeT9BxmYlg/bs6JrzQ354gZC9Q8ymzFTzdhRqzkNVPO2x/XkoxJfpm7vLhw/XiKSOdnJOQucZ1uEY2NcHXE6/jzVKxRvjLcTz6RCPXu/ido5AwPHATA/+ja73h60LdcJcK7Lj+zOLANFHFKbW/RhIt5BxJKu7WMRbx56xs1ZVSgih39qAejp75Dco8IgfH16yFOAL58Db57/P9cDFw1ZhLxU+gWRkzC8le2M9BXqoZrLFadaWqqnOmciPPkMVh8zKqw0W6qtWsSdvfUgnk3/hGsplrJig== 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);