From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 866D01EB5D6 for ; Thu, 27 Feb 2025 04:36:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740630999; cv=none; b=W656edPWTN7140B3jSg+s6CpAvjSQ8cb7fjHqEUlFSvoTk9U/oPmliFDyFBGHoW7LSTrdr3l993RtRSXPePIWWi1oUvwrLt20n2JYKperkVhhCIIl6ZCNySWNZYsKwzPhMAZwhc/hEEk9H0VFYcaaAuH4cezrJgiH3muPxjgNcQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740630999; c=relaxed/simple; bh=vQyIdQY0kaLvNLjXmsmXnP/oCIc/09Y9M1Oedf4ZMVg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NefvLqqCuVAHNbUkqmFPfUdd5zE2hpOt7BvXEzpZEbl/KFR5gyjXZuG8Z9YGG1dVqneOcQNHv2GzLSlKOYphw3Tj9oKRXGhVXp/HMZaIJiyVAo8FeR6fs1MptWnotTfmc+maG3D98umhx+EH3DQsaqj30r05G7q/NLn01O0FieU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=GFuSPvHy; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="GFuSPvHy" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2fea795bafeso256425a91.1 for ; Wed, 26 Feb 2025 20:36:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740630997; x=1741235797; darn=vger.kernel.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=NR62rHb3pebtfvQHNCZtoXwLqkDdn/SbiRV6/pPxB7w=; b=GFuSPvHyPSF3fK4HRTEOfM9mT3M3gCS7oUdJUs1k284FhI396lE2yiaMKmlXOW2aCb b+CUVqonh84w6wRtbaUy7iRRAgGOCILeeIyQvDsvnOXeBm9A/igNe/RoljtvR51yDCCH mjFyWzlq/r1ZugCBBI0i6RZGZc1G2fMe/YVos= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740630997; x=1741235797; 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=NR62rHb3pebtfvQHNCZtoXwLqkDdn/SbiRV6/pPxB7w=; b=bQRuLZVAFIYU+YDYgB/KalwuGkQ9Gvx6WNfOjny2oZ0SlGwqT2Jf0mcp5/Mgd56y2F zRhBE1hotfsRpbU7780NQ4g/cm4CJB0MQWq4YGP1XE+1dvr7OWFMW7/uIyjvaZFXep6d LDjoQkTps3+RGpeLfzpUwGJe0HurSFWrc17J0U4UzOQtFOpB92q3ASKnATh2MWee4YEq CTyX1NplcdQ2vduh9SYeU6nTBxJ+riy1+4hn6/t8n/A7xnqPQxq5tlK0v4P6Ry7xQNd1 3xzNzfJ2/AThkX3okHIAxLiF+4yooaW4UEvHfubgTishupYwio6J7cFU6rol4Wxh7QpV rbYA== X-Forwarded-Encrypted: i=1; AJvYcCVbVnpnYodwZWkZ73gshRCRGjeBpaBEBECM5udGGxwjmTyHoEtyrfa2OiiYzFq/RglvDXPs6k3cergHyjY=@vger.kernel.org X-Gm-Message-State: AOJu0YzKnK/k2Z2Oc+rtYnZXZwY5jN8qQqRNKP6vP91U3c3xdYsAjKqU 3Pe4GB+aR6CVIrQKdPaiOEk7SNr60iyo7oc97rEUXKqQwDtZWB9RY8dshPjI7w== X-Gm-Gg: ASbGncue/CMgu/i8Zk7v4C8CBDhNb00acoC2i3oPDJ5yeVwjMhN93CS8EA83Ne7pWAp XVbymdx4YVejPX/iOqsPbtJXFTjlaNtv85xKvkZTHbn+O7Ei4uXvM95hS0TGPIRj1whwQZH8DeS HXpK+zBKT4PStveZUGdTuNiOn4ZffCKOgo5t/pUT1SPRgrTguRGdxvIpHlSBU9ljMbuUStzeLPa tTFwo8mOkFCRG/AMu1uvAuYRzc3URte33P84X7aEvA0p69ci/+wLRwGo3yXASfCK8sMOT8J/3jz vJ6aTCbbxZComPKhT8eMrJL6kVCS X-Google-Smtp-Source: AGHT+IH/UF6t7IzFfea6GJp3N/IG0r3W9xlvoHcoiOhurhjeGRrnZ4qGrFjng8ecS9ungkxHCpZQfA== X-Received: by 2002:a17:90b:184e:b0:2ee:c30f:33c9 with SMTP id 98e67ed59e1d1-2fea12f4accmr3176743a91.14.1740630996801; Wed, 26 Feb 2025 20:36:36 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fea6752060sm548358a91.3.2025.02.26.20.36.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:36:36 -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 01/19] zram: sleepable entry locking Date: Thu, 27 Feb 2025 13:35:19 +0900 Message-ID: <20250227043618.88380-2-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Concurrent modifications of meta table entries is now handled by per-entry spin-lock. This has a number of shortcomings. First, this imposes atomic requirements on compression backends. zram can call both zcomp_compress() and zcomp_decompress() under entry spin-lock, which implies that we can use only compression algorithms that don't schedule/sleep/wait during compression and decompression. This, for instance, makes it impossible to use some of the ASYNC compression algorithms (H/W compression, etc.) implementations. Second, this can potentially trigger watchdogs. For example, entry re-compression with secondary algorithms is performed under entry spin-lock. Given that we chain secondary compression algorithms and that some of them can be configured for best compression ratio (and worst compression speed) zram can stay under spin-lock for quite some time. Having a per-entry mutex (or, for instance, a rw-semaphore) significantly increases sizeof() of each entry and hence the meta table. Therefore entry locking returns back to bit locking, as before, however, this time also preempt-rt friendly, because if waits-on-bit instead of spinning-on-bit. Lock owners are also now permitted to schedule, which is a first step on the path of making zram non-atomic. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 56 ++++++++++++++++++++++++++++------- drivers/block/zram/zram_drv.h | 16 ++++++---- 2 files changed, 55 insertions(+), 17 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 9f5020b077c5..ddf03f6cbeed 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -58,19 +58,56 @@ static void zram_free_page(struct zram *zram, size_t in= dex); static int zram_read_from_zspool(struct zram *zram, struct page *page, u32 index); =20 -static int zram_slot_trylock(struct zram *zram, u32 index) +#define slot_dep_map(zram, index) (&(zram)->table[(index)].dep_map) + +static void zram_slot_lock_init(struct zram *zram, u32 index) { - return spin_trylock(&zram->table[index].lock); + lockdep_init_map(slot_dep_map(zram, index), + "zram->table[index].lock", + &zram->lock_class, 0); +} + +/* + * entry locking rules: + * + * 1) Lock is exclusive + * + * 2) lock() function can sleep waiting for the lock + * + * 3) Lock owner can sleep + * + * 4) Use TRY lock variant when in atomic context + * - must check return value and handle locking failers + */ +static __must_check bool zram_slot_trylock(struct zram *zram, u32 index) +{ + unsigned long *lock =3D &zram->table[index].flags; + + if (!test_and_set_bit_lock(ZRAM_ENTRY_LOCK, lock)) { + mutex_acquire(slot_dep_map(zram, index), 0, 1, _RET_IP_); + lock_acquired(slot_dep_map(zram, index), _RET_IP_); + return true; + } + + lock_contended(slot_dep_map(zram, index), _RET_IP_); + return false; } =20 static void zram_slot_lock(struct zram *zram, u32 index) { - spin_lock(&zram->table[index].lock); + unsigned long *lock =3D &zram->table[index].flags; + + mutex_acquire(slot_dep_map(zram, index), 0, 0, _RET_IP_); + wait_on_bit_lock(lock, ZRAM_ENTRY_LOCK, TASK_UNINTERRUPTIBLE); + lock_acquired(slot_dep_map(zram, index), _RET_IP_); } =20 static void zram_slot_unlock(struct zram *zram, u32 index) { - spin_unlock(&zram->table[index].lock); + unsigned long *lock =3D &zram->table[index].flags; + + mutex_release(slot_dep_map(zram, index), _RET_IP_); + clear_and_wake_up_bit(ZRAM_ENTRY_LOCK, lock); } =20 static inline bool init_done(struct zram *zram) @@ -93,7 +130,6 @@ static void zram_set_handle(struct zram *zram, u32 index= , unsigned long handle) zram->table[index].handle =3D handle; } =20 -/* flag operations require table entry bit_spin_lock() being held */ static bool zram_test_flag(struct zram *zram, u32 index, enum zram_pageflags flag) { @@ -1473,15 +1509,11 @@ static bool zram_meta_alloc(struct zram *zram, u64 = disksize) huge_class_size =3D zs_huge_class_size(zram->mem_pool); =20 for (index =3D 0; index < num_pages; index++) - spin_lock_init(&zram->table[index].lock); + zram_slot_lock_init(zram, index); + return true; } =20 -/* - * To protect concurrent access to the same index entry, - * caller should hold this table index entry's bit_spinlock to - * indicate this index entry is accessing. - */ static void zram_free_page(struct zram *zram, size_t index) { unsigned long handle; @@ -2625,6 +2657,7 @@ static int zram_add(void) if (ret) goto out_cleanup_disk; =20 + lockdep_register_key(&zram->lock_class); zram_debugfs_register(zram); pr_info("Added device: %s\n", zram->disk->disk_name); return device_id; @@ -2653,6 +2686,7 @@ static int zram_remove(struct zram *zram) zram->claim =3D true; mutex_unlock(&zram->disk->open_mutex); =20 + lockdep_unregister_key(&zram->lock_class); zram_debugfs_unregister(zram); =20 if (claimed) { diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index db78d7c01b9a..8a7d52fbab4d 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -28,7 +28,6 @@ #define ZRAM_SECTOR_PER_LOGICAL_BLOCK \ (1 << (ZRAM_LOGICAL_BLOCK_SHIFT - SECTOR_SHIFT)) =20 - /* * ZRAM is mainly used for memory efficiency so we want to keep memory * footprint small and thus squeeze size and zram pageflags into a flags @@ -46,6 +45,7 @@ /* Flags for zram pages (table[page_no].flags) */ enum zram_pageflags { ZRAM_SAME =3D ZRAM_FLAG_SHIFT, /* Page consists the same element */ + ZRAM_ENTRY_LOCK, /* entry access lock bit */ ZRAM_WB, /* page is stored on backing_device */ ZRAM_PP_SLOT, /* Selected for post-processing */ ZRAM_HUGE, /* Incompressible page */ @@ -58,16 +58,19 @@ enum zram_pageflags { __NR_ZRAM_PAGEFLAGS, }; =20 -/*-- Data structures */ - -/* Allocated for each disk page */ +/* + * Allocated for each disk page. We use bit-lock (ZRAM_ENTRY_LOCK bit + * of flags) to save memory. There can be plenty of entries and standard + * locking primitives (e.g. mutex) will significantly increase sizeof() + * of each entry and hence of the meta table. + */ struct zram_table_entry { unsigned long handle; - unsigned int flags; - spinlock_t lock; + unsigned long flags; #ifdef CONFIG_ZRAM_TRACK_ENTRY_ACTIME ktime_t ac_time; #endif + struct lockdep_map dep_map; }; =20 struct zram_stats { @@ -137,5 +140,6 @@ struct zram { struct dentry *debugfs_dir; #endif atomic_t pp_in_progress; + struct lock_class_key lock_class; }; #endif --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0209E1EB5F0 for ; Thu, 27 Feb 2025 04:36:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631004; cv=none; b=u7CQcRAJleWrNb8NZbPbWNIV0JM9Danf5QKrW0A5RkvOkTXa+PWfOLgTnNKVbivdvgOBhlYXdJbF9nWMpYDVC0iYi6quNd87DJDMyzgtIzZBz2LnhM4VxEZHeyejbMqh7FebVfhBTzow1d6adSFAJ28rm3xCcsH0w9b+IQ1rsgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631004; c=relaxed/simple; bh=oM2weTCG6aXFCSbtyL8s8eEDcdB0ofZTgnmGMVi6B3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VQ7VtjI8XvjCuKpWTkGOx9hH7b/eTM3rPpumDoilhWPl1ndjcdnJRWR2KkxT5fRxz6kPusuUXdEu5gFcgmjZLaVqRnJY1kQPPV933BRDVpH5wfXa3a+TYPHfJGhSCEJG5NHjgxe8JGYeqwHyPt78ELHA7lWSVn5YvKAHGYmthMA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=T9gt1wP+; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="T9gt1wP+" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-220c8f38febso8025085ad.2 for ; Wed, 26 Feb 2025 20:36:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631002; x=1741235802; darn=vger.kernel.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=k3g8UcvdgyQ3xyw+tSoX3H8q6cI5L8QKqPIepd+Unng=; b=T9gt1wP+k7PWMzr8J9mXzx+0JTgHOsIKcFOZ1fbfOrFam3q1nBUZ+TI5DH1gjg1Qjn ohZyGAkVnH8g0y7EmDDExY08jv92Jp4LEBkotskqKGqJKetuaH/8tNsTUQXx1kw1i1pS n9dYMDJov5w1llBDSyTHJORKXDJkA76SRuXQI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631002; x=1741235802; 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=k3g8UcvdgyQ3xyw+tSoX3H8q6cI5L8QKqPIepd+Unng=; b=bzXy/g/kCkC3UeKhVGxXiQqgsPPvT4+jt/Fx++MhqMe2iJBZk473Pghyp9EoVRFuCW cbzphfoaUxLhI53SrQeeHcC4Auf/C4e7q6GBvfzgF05cdB0bPrY2WagB4Gv9gJdh+tU/ T5yedNGA1yXoH2Ojpg8EPodhq17FxhHJihfF08AheuM833Rt5wHHdescN7TtLBglOK/1 QiOY5G735vgJCwPQuonCzTdnK1YV8rS8ReDPs1A6jt9u5YPcdmtwPIdm+uGp6oguvl0y eRIuOXHxcZrrovQVFWdeLutjD0rm4gCXOyxc8Oe17RUrTCCAjQ8zOiaaPp5BXImNO9iJ wTXA== X-Forwarded-Encrypted: i=1; AJvYcCWvIRzOsDVJPdsIRu1cBwZdncQNc0BWSNiEXr0hQgkaokMJZFsIfEKRPJ80fYNT/8j7XVsy8q1VGTCB2VY=@vger.kernel.org X-Gm-Message-State: AOJu0YxKJgwBjiPMREWRMvr6Y+qgA4JzHFcPHQLV7muLQdKJcBE7WYTQ 6JGkkAIjUo1RVn+xMC25aA7wo5wE39p5o/hUUe2nSRxG3YXeMllULdam6mT/8g== X-Gm-Gg: ASbGncuR16BnEEsOLEyCLScQBw7z+tVNEv8eqGEEx7K7P5v1BOO409fDdRzJA8uEjlo pNQ4t5gexill+toSH4sGseIgC1hxBqLOCZOMfQHmIN0eJp1E2woKSfNRReorYzJS/csfzs/NQan xsrhW6kILy7ObsUN25H6r9mcvA/Hc1tCfcBwltnYls4+gytMm/4/BigR581jc8xETwTjm8quLFe SAlfv6BlsaC9kJABvg0E95fFPk6ZOwuZ7LSO90uqYFMxE+t3uQMbaU4m2Y93lnPu5N8ThAMLZ5f fVRp1Jp1UrJ8VQvUZKyTZMij6mg6 X-Google-Smtp-Source: AGHT+IFKqiVpX1vg0EKtsAPxxL19rWKpvI+zaBubIUtbgTf7uq8NxOqv9BQnr4f0Yj2mw3OI5Ik1WQ== X-Received: by 2002:a05:6a00:23c1:b0:730:4598:ddb5 with SMTP id d2e1a72fcca58-73426c8d300mr33904409b3a.2.1740631002104; Wed, 26 Feb 2025 20:36:42 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-7349fe4cc2asm515402b3a.52.2025.02.26.20.36.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:36:41 -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 02/19] zram: permit preemption with active compression stream Date: Thu, 27 Feb 2025 13:35:20 +0900 Message-ID: <20250227043618.88380-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, per-CPU stream access is done from a non-preemptible (atomic) section, which imposes the same atomicity requirements on compression backends as entry spin-lock, and makes it impossible to use algorithms that can schedule/wait/sleep during compression and decompression. Switch to preemptible per-CPU model, similar to the one used in zswap. Instead of a per-CPU local lock, each stream carries a mutex which is locked throughout entire time zram uses it for compression or decompression, so that cpu-dead event waits for zram to stop using a particular per-CPU stream and release it. Suggested-by: Yosry Ahmed Reviewed-by: Yosry Ahmed Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zcomp.c | 41 +++++++++++++++++++++++++---------- drivers/block/zram/zcomp.h | 6 ++--- drivers/block/zram/zram_drv.c | 20 ++++++++--------- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index bb514403e305..53e4c37441be 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include =20 @@ -109,13 +109,29 @@ ssize_t zcomp_available_show(const char *comp, char *= buf) =20 struct zcomp_strm *zcomp_stream_get(struct zcomp *comp) { - local_lock(&comp->stream->lock); - return this_cpu_ptr(comp->stream); + for (;;) { + struct zcomp_strm *zstrm =3D raw_cpu_ptr(comp->stream); + + /* + * Inspired by zswap + * + * stream is returned with ->mutex locked which prevents + * cpu_dead() from releasing this stream under us, however + * there is still a race window between raw_cpu_ptr() and + * mutex_lock(), during which we could have been migrated + * from a CPU that has already destroyed its stream. If + * so then unlock and re-try on the current CPU. + */ + mutex_lock(&zstrm->lock); + if (likely(zstrm->buffer)) + return zstrm; + mutex_unlock(&zstrm->lock); + } } =20 -void zcomp_stream_put(struct zcomp *comp) +void zcomp_stream_put(struct zcomp_strm *zstrm) { - local_unlock(&comp->stream->lock); + mutex_unlock(&zstrm->lock); } =20 int zcomp_compress(struct zcomp *comp, struct zcomp_strm *zstrm, @@ -151,12 +167,9 @@ int zcomp_decompress(struct zcomp *comp, struct zcomp_= strm *zstrm, int zcomp_cpu_up_prepare(unsigned int cpu, struct hlist_node *node) { struct zcomp *comp =3D hlist_entry(node, struct zcomp, node); - struct zcomp_strm *zstrm; + struct zcomp_strm *zstrm =3D per_cpu_ptr(comp->stream, cpu); int ret; =20 - zstrm =3D per_cpu_ptr(comp->stream, cpu); - local_lock_init(&zstrm->lock); - ret =3D zcomp_strm_init(comp, zstrm); if (ret) pr_err("Can't allocate a compression stream\n"); @@ -166,16 +179,17 @@ int zcomp_cpu_up_prepare(unsigned int cpu, struct hli= st_node *node) int zcomp_cpu_dead(unsigned int cpu, struct hlist_node *node) { struct zcomp *comp =3D hlist_entry(node, struct zcomp, node); - struct zcomp_strm *zstrm; + struct zcomp_strm *zstrm =3D per_cpu_ptr(comp->stream, cpu); =20 - zstrm =3D per_cpu_ptr(comp->stream, cpu); + mutex_lock(&zstrm->lock); zcomp_strm_free(comp, zstrm); + mutex_unlock(&zstrm->lock); return 0; } =20 static int zcomp_init(struct zcomp *comp, struct zcomp_params *params) { - int ret; + int ret, cpu; =20 comp->stream =3D alloc_percpu(struct zcomp_strm); if (!comp->stream) @@ -186,6 +200,9 @@ static int zcomp_init(struct zcomp *comp, struct zcomp_= params *params) if (ret) goto cleanup; =20 + for_each_possible_cpu(cpu) + mutex_init(&per_cpu_ptr(comp->stream, cpu)->lock); + ret =3D cpuhp_state_add_instance(CPUHP_ZCOMP_PREPARE, &comp->node); if (ret < 0) goto cleanup; diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h index ad5762813842..23b8236b9090 100644 --- a/drivers/block/zram/zcomp.h +++ b/drivers/block/zram/zcomp.h @@ -3,7 +3,7 @@ #ifndef _ZCOMP_H_ #define _ZCOMP_H_ =20 -#include +#include =20 #define ZCOMP_PARAM_NO_LEVEL INT_MIN =20 @@ -31,7 +31,7 @@ struct zcomp_ctx { }; =20 struct zcomp_strm { - local_lock_t lock; + struct mutex lock; /* compression buffer */ void *buffer; struct zcomp_ctx ctx; @@ -77,7 +77,7 @@ struct zcomp *zcomp_create(const char *alg, struct zcomp_= params *params); void zcomp_destroy(struct zcomp *comp); =20 struct zcomp_strm *zcomp_stream_get(struct zcomp *comp); -void zcomp_stream_put(struct zcomp *comp); +void zcomp_stream_put(struct zcomp_strm *zstrm); =20 int zcomp_compress(struct zcomp *comp, struct zcomp_strm *zstrm, const void *src, unsigned int *dst_len); diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index ddf03f6cbeed..545e64ee6234 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1607,7 +1607,7 @@ static int read_compressed_page(struct zram *zram, st= ruct page *page, u32 index) ret =3D zcomp_decompress(zram->comps[prio], zstrm, src, size, dst); kunmap_local(dst); zs_unmap_object(zram->mem_pool, handle); - zcomp_stream_put(zram->comps[prio]); + zcomp_stream_put(zstrm); =20 return ret; } @@ -1768,14 +1768,14 @@ static int zram_write_page(struct zram *zram, struc= t page *page, u32 index) kunmap_local(mem); =20 if (unlikely(ret)) { - zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]); + zcomp_stream_put(zstrm); pr_err("Compression failed! err=3D%d\n", ret); zs_free(zram->mem_pool, handle); return ret; } =20 if (comp_len >=3D huge_class_size) { - zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]); + zcomp_stream_put(zstrm); return write_incompressible_page(zram, page, index); } =20 @@ -1799,7 +1799,7 @@ static int zram_write_page(struct zram *zram, struct = page *page, u32 index) __GFP_HIGHMEM | __GFP_MOVABLE); if (IS_ERR_VALUE(handle)) { - zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]); + zcomp_stream_put(zstrm); atomic64_inc(&zram->stats.writestall); handle =3D zs_malloc(zram->mem_pool, comp_len, GFP_NOIO | __GFP_HIGHMEM | @@ -1811,7 +1811,7 @@ static int zram_write_page(struct zram *zram, struct = page *page, u32 index) } =20 if (!zram_can_store_page(zram)) { - zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]); + zcomp_stream_put(zstrm); zs_free(zram->mem_pool, handle); return -ENOMEM; } @@ -1819,7 +1819,7 @@ static int zram_write_page(struct zram *zram, struct = page *page, u32 index) dst =3D zs_map_object(zram->mem_pool, handle, ZS_MM_WO); =20 memcpy(dst, zstrm->buffer, comp_len); - zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]); + zcomp_stream_put(zstrm); zs_unmap_object(zram->mem_pool, handle); =20 zram_slot_lock(zram, index); @@ -1978,7 +1978,7 @@ static int recompress_slot(struct zram *zram, u32 ind= ex, struct page *page, kunmap_local(src); =20 if (ret) { - zcomp_stream_put(zram->comps[prio]); + zcomp_stream_put(zstrm); return ret; } =20 @@ -1988,7 +1988,7 @@ static int recompress_slot(struct zram *zram, u32 ind= ex, struct page *page, /* Continue until we make progress */ if (class_index_new >=3D class_index_old || (threshold && comp_len_new >=3D threshold)) { - zcomp_stream_put(zram->comps[prio]); + zcomp_stream_put(zstrm); continue; } =20 @@ -2046,13 +2046,13 @@ static int recompress_slot(struct zram *zram, u32 i= ndex, struct page *page, __GFP_HIGHMEM | __GFP_MOVABLE); if (IS_ERR_VALUE(handle_new)) { - zcomp_stream_put(zram->comps[prio]); + zcomp_stream_put(zstrm); return PTR_ERR((void *)handle_new); } =20 dst =3D zs_map_object(zram->mem_pool, handle_new, ZS_MM_WO); memcpy(dst, zstrm->buffer, comp_len_new); - zcomp_stream_put(zram->comps[prio]); + zcomp_stream_put(zstrm); =20 zs_unmap_object(zram->mem_pool, handle_new); =20 --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E5301EFF84 for ; Thu, 27 Feb 2025 04:36:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631009; cv=none; b=GPf46vGA/ESXaWTj+TGzUrOVKmGvKg6cWVfJhrBQktWs7eRxK8C+7FJr//jmmmf38uaC3BgRgHeAxYyZxz5Hn+n1vRmfu/qlQKxtCaelyeTBEdv1VwBbfYCprvBLW/mL8weKbHNYIJIghrV5OFdzoeHg17oSvZl72Dnzf0JIJ0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631009; c=relaxed/simple; bh=0ebbS3dnmrYHdEmX8v8UM+4m+e+/JpKPeeS2maLbOCo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EgITai4LYxVRJuYLZ7mbeiTaKnLYVRJC4SRR1skeCowyNCqNmOjCsbdwuFIMaY8Mv26Kra0O76ZjOXQuzKg8GqMxWBERCIOwMZPRmP+mu+8mbdH+AWhyHWouFfjKNzFKAzkult1vkFeDw0j1o7r3S/mC/zWhaFxy18T8EaOoXAA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=ULpE2ptc; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ULpE2ptc" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2fa8ac56891so892785a91.2 for ; Wed, 26 Feb 2025 20:36:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631008; x=1741235808; darn=vger.kernel.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=56O4ZNY5k4tishEKpit5ayGqrbKDM0LZTadKzr6R7CY=; b=ULpE2ptcuNMxuAS4T6pO1MLgaP2iVEno3Q0ukdJuaecNlKYsZ6EioGqGWEiM/t88F2 MIZ2Q/NnMgOoBhB/Bi1N/UzeORyZt1EiiKNIioZOuMqCqJk7TskR+TkTHhOO0Xyvw4ir 4UkfhB3K1mH/WNHZZ602nIZYU4fgmAIY8p3a4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631008; x=1741235808; 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=56O4ZNY5k4tishEKpit5ayGqrbKDM0LZTadKzr6R7CY=; b=SvABHM2+49c0q03FO1uLf7QYUOze70/9FHWDyTYQ/CMaqVEzl9V/lMrMDK3KaKpPrk f+Nbb7qppNa/EvnDdOeoblHNJ7ktxuQBXPKRbnmso6HReZm345VuM4P4E30tXPGqKoCa 6oF30pgKGkptjTxOHNkokb17Tfrz7eIJV0p1zYvOiAycDoD67WKbk36K/y+KqaQ6uq/+ 2u8jf5wddmFD127L+uxBRdHrNFgFuirPWfaAC/nZRSIV9ji9APu7cM52vMyr5Z+XSaIq mHPehYHl+QIdR4CDSP9c62YywfxzK9DsGgehkpnnxb8DcC/pLJQbmj45d+It+4tR9XeV TD+Q== X-Forwarded-Encrypted: i=1; AJvYcCXXTj8YLE3FAQUJ7uDclBtD5Ph2gTd/cSKlXzqmag/HnOr1N0AciWWM0N43MVqpvfF6x9xzC57RfK7+ZrU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2O3vGJIvfZmv0+IhNp3gC7kalR/FexyVvhrFXbqJgaPuLwUzc ENbdgcQh3DaYykyKclxJY+KHo5hec3vrVvEPUnSgI/ZvciG4L4y3FhbSMBYRnw== X-Gm-Gg: ASbGnctQkomwdRQoOcMh76uSb1ZCN49HgBVOS7Idl5bnz5LYudqBPK0OdABuLU+aa0g 6nFSM7H3uiI79+e5KOzEzzQm48Olh3nMvG9ls6d9qAWk6aEOTjE+SXTAKTH4EJqhml3V49qyP0u PIgpHTk+jUBkenk9SUS2XWNWe+MzFqxn+siIWuyi6oXu5MiFR0HtFIrwFE2VMouMTb6yqebXMCv +V5JWqYvl7apj3aP/HoigsuSrQWQawoEchD3JiIPwBG+GzNoGMfTmYJ/XIEIzVtwsL4Upy9opUO eZDjZ+Q3eqHTv97EVBkBMj2yM8jH X-Google-Smtp-Source: AGHT+IGMIGgkdrOdgCZypYyXDBfzfhMe1xi1OCaXSVRhVGjTG8sqvOZYXxtnCpOaAmEsvUhAKgiqvA== X-Received: by 2002:a17:90a:c2c7:b0:2ea:3f34:f194 with SMTP id 98e67ed59e1d1-2fe68ad9a18mr16247712a91.10.1740631007917; Wed, 26 Feb 2025 20:36:47 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fe8284f064sm2587811a91.40.2025.02.26.20.36.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:36:47 -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 03/19] zram: remove unused crypto include Date: Thu, 27 Feb 2025 13:35:21 +0900 Message-ID: <20250227043618.88380-4-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We stopped using crypto API (for the time being), so remove its include and replace CRYPTO_MAX_ALG_NAME with a local define. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zcomp.c | 1 - drivers/block/zram/zram_drv.c | 4 +++- drivers/block/zram/zram_drv.h | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index 53e4c37441be..cfdde2e0748a 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -7,7 +7,6 @@ #include #include #include -#include #include =20 #include "zcomp.h" diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 545e64ee6234..ff662144b98b 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -44,6 +44,8 @@ static DEFINE_MUTEX(zram_index_mutex); static int zram_major; static const char *default_compressor =3D CONFIG_ZRAM_DEF_COMP; =20 +#define ZRAM_MAX_ALGO_NAME_SZ 128 + /* Module params (documentation at end) */ static unsigned int num_devices =3D 1; /* @@ -1148,7 +1150,7 @@ static int __comp_algorithm_store(struct zram *zram, = u32 prio, const char *buf) size_t sz; =20 sz =3D strlen(buf); - if (sz >=3D CRYPTO_MAX_ALG_NAME) + if (sz >=3D ZRAM_MAX_ALGO_NAME_SZ) return -E2BIG; =20 compressor =3D kstrdup(buf, GFP_KERNEL); diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 8a7d52fbab4d..8b66af0d162d 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -17,7 +17,6 @@ =20 #include #include -#include =20 #include "zcomp.h" =20 --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6DF428F3 for ; Thu, 27 Feb 2025 04:36:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631016; cv=none; b=sur0MW34/uiyiY9Df1IBoChdWUxv6ton2UMQyIYRJYpljSXNvYZfHAE9MXQXj3rVzHxkDWcSPiszYUCZAM/BJt3dE7EN+0s5DETDFNl9tlqIkoojJwBgSExQKdm3PlWtZF/JMkYcoMsB4VnAA7CN1JyIk5Mvds2coAdQLuYssTo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631016; c=relaxed/simple; bh=y13/X5I0NMpONPQH3KE1BqniWLLBNkpo+E2aXCNUnjw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DPKRIdoPE7blaBSVZAkgzdxLIn10rFHjiWY1JdCgmGJNjAACBCkDtCVXWE+jRopG4FqzfD6yTBLXwPAuTZ+TGGgCkOpdZ9AAdeVc7LqFUqG6U8KACWw29bVTBQJVWDtufJ8oFs72qZODepgbExv6yFEkymH+Ifc2xH4rkHZEMpc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=aPDGWL2K; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="aPDGWL2K" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2235908a30aso364035ad.3 for ; Wed, 26 Feb 2025 20:36:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631013; x=1741235813; darn=vger.kernel.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=DWBUXpwpeVKwHwztQYQNBbUUc1WcNoYn31qV1KKEn5Y=; b=aPDGWL2KKM5tveUwOnB/WP/vv3uPOXRS9BxvFreDaWGRT0uHHnk4PwD8KKiZgEdGXA 0F6cpU+ZfaoQKE8HNPaucwtqgT9dUVQDyMLOpTjs3mu32fhd8HTmDPgcHdpJl66k1tPQ e1luhXnKCubZ1xYSXksBba0rCMsl/XhOH7FSg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631013; x=1741235813; 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=DWBUXpwpeVKwHwztQYQNBbUUc1WcNoYn31qV1KKEn5Y=; b=s9zAAwH3o5nKLudYAYXHxR7pbkxssY8zG1VHR1jbWwaZ0QRJNhkmDpEB5e63vVxFfi S6EyQHmeaiRopV5VRgo/ElSu9qxj6hiN0iDBmfJjkfmo9vxc/zW9HsWVU1pI+delhkzx 3CkH1cPEo+XaEqbOehO1rcVoYT1bJsYvj2JUcisG9sPBr/sK7xDmb0pkXwUGv5QWWj8q LZHl7h0dwwT09ZueEGM6geiB9MedmcgR7Hw3ZJ4cumMGsmD3+Wal0PN/k6/TUqWmQrYW GTCqVYB3cS0kgxWqDPH+PjmoyhHPA7eiPomPPVcJHqFDXY0bWcwqysDjK4/+m1KpYjxA Vnwg== X-Forwarded-Encrypted: i=1; AJvYcCVmglrHaxFwsgcjZ50Mrz/kfYg9+DOT6fqAj4Apg5vuEvz3rZ1VzCdziSojlUhOSDqt9E+vnnlz2xaNqEY=@vger.kernel.org X-Gm-Message-State: AOJu0YwsCbwV4O1Vic89c7n+OIi2SnsGdRJksUFiarw2hQgkm6Aah2uJ zzF5SRAdHws5o2DtVeh3jfbVOgi3NAMi5Oer+CjtVtWxnlAfFOxaIDyd06DV9Q== X-Gm-Gg: ASbGnct3LBTygnZDM5BTzqCkbMmTZvw3kXrbx3l8lVDrgjvt2ShYChsgXfTFqAhfrzG i+13RaLW4PllAoMdek4G1gt16d685hllXJnfR1xaTT/QeKx+wNtZuVe4nzGOo3awes+6glw3Vhs uYRyTVqb8XKIDp4ZRcXakbLVrHuCghZqGtA8C66eTiPbNfAZY42rfFzpYtpdih21RsvPV0edMc1 32RhHr70ob6fYT62CM0ZO/dTJEejOiCtPWv9fJYCOSHMWgeUWjtVQSL3gABSKgmSS+Ojor/zCzt gH1x/+DQpjnpRQgNrX8alGJ2uU4N X-Google-Smtp-Source: AGHT+IHsEmBFpQZ3F93ddNTk7TR/BbwMCem5lOBEnuVdbTxvBpCIY+MLGxmXXQpOcN29GcZXld6Agg== X-Received: by 2002:a17:902:d2cc:b0:216:3e87:c9fc with SMTP id d9443c01a7336-22320082b84mr97602405ad.5.1740631013020; Wed, 26 Feb 2025 20:36:53 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fea6985226sm462165a91.40.2025.02.26.20.36.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:36:52 -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 04/19] zram: remove max_comp_streams device attr Date: Thu, 27 Feb 2025 13:35:22 +0900 Message-ID: <20250227043618.88380-5-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" max_comp_streams device attribute has been defunct since May 2016 when zram switched to per-CPU compression streams, remove it. Signed-off-by: Sergey Senozhatsky --- Documentation/ABI/testing/sysfs-block-zram | 8 ----- Documentation/admin-guide/blockdev/zram.rst | 36 ++++++--------------- drivers/block/zram/zram_drv.c | 23 ------------- 3 files changed, 10 insertions(+), 57 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI= /testing/sysfs-block-zram index 1ef69e0271f9..36c57de0a10a 100644 --- a/Documentation/ABI/testing/sysfs-block-zram +++ b/Documentation/ABI/testing/sysfs-block-zram @@ -22,14 +22,6 @@ Description: device. The reset operation frees all the memory associated with this device. =20 -What: /sys/block/zram/max_comp_streams -Date: February 2014 -Contact: Sergey Senozhatsky -Description: - The max_comp_streams file is read-write and specifies the - number of backend's zcomp_strm compression streams (number of - concurrent compress operations). - What: /sys/block/zram/comp_algorithm Date: February 2014 Contact: Sergey Senozhatsky diff --git a/Documentation/admin-guide/blockdev/zram.rst b/Documentation/ad= min-guide/blockdev/zram.rst index 714a5171bfc0..7ad4c86f8258 100644 --- a/Documentation/admin-guide/blockdev/zram.rst +++ b/Documentation/admin-guide/blockdev/zram.rst @@ -54,7 +54,7 @@ The list of possible return codes: If you use 'echo', the returned value is set by the 'echo' utility, and, in general case, something like:: =20 - echo 3 > /sys/block/zram0/max_comp_streams + echo foo > /sys/block/zram0/comp_algorithm if [ $? -ne 0 ]; then handle_error fi @@ -73,21 +73,7 @@ This creates 4 devices: /dev/zram{0,1,2,3} num_devices parameter is optional and tells zram how many devices should be pre-created. Default: 1. =20 -2) Set max number of compression streams -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -Regardless of the value passed to this attribute, ZRAM will always -allocate multiple compression streams - one per online CPU - thus -allowing several concurrent compression operations. The number of -allocated compression streams goes down when some of the CPUs -become offline. There is no single-compression-stream mode anymore, -unless you are running a UP system or have only 1 CPU online. - -To find out how many streams are currently available:: - - cat /sys/block/zram0/max_comp_streams - -3) Select compression algorithm +2) Select compression algorithm =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D =20 Using comp_algorithm device attribute one can see available and @@ -107,7 +93,7 @@ Examples:: For the time being, the `comp_algorithm` content shows only compression algorithms that are supported by zram. =20 -4) Set compression algorithm parameters: Optional +3) Set compression algorithm parameters: Optional =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Compression algorithms may support specific parameters which can be @@ -138,7 +124,7 @@ better the compression ratio, it even can take negative= s values for some algorithms), for other algorithms `level` is acceleration level (the higher the value the lower the compression ratio). =20 -5) Set Disksize +4) Set Disksize =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Set disk size by writing the value to sysfs node 'disksize'. @@ -158,7 +144,7 @@ There is little point creating a zram of greater than t= wice the size of memory since we expect a 2:1 compression ratio. Note that zram uses about 0.1% of= the size of the disk when not in use so a huge zram is wasteful. =20 -6) Set memory limit: Optional +5) Set memory limit: Optional =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =20 Set memory limit by writing the value to sysfs node 'mem_limit'. @@ -177,7 +163,7 @@ Examples:: # To disable memory limit echo 0 > /sys/block/zram0/mem_limit =20 -7) Activate +6) Activate =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 :: @@ -188,7 +174,7 @@ Examples:: mkfs.ext4 /dev/zram1 mount /dev/zram1 /tmp =20 -8) Add/remove zram devices +7) Add/remove zram devices =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D =20 zram provides a control interface, which enables dynamic (on-demand) device @@ -208,7 +194,7 @@ execute:: =20 echo X > /sys/class/zram-control/hot_remove =20 -9) Stats +8) Stats =3D=3D=3D=3D=3D=3D=3D=3D =20 Per-device statistics are exported as various nodes under /sys/block/zram<= id>/ @@ -228,8 +214,6 @@ mem_limit WO specifies the maximum amount of m= emory ZRAM can writeback_limit WO specifies the maximum amount of write IO zram can write out to backing device as 4KB unit writeback_limit_enable RW show and set writeback_limit feature -max_comp_streams RW the number of possible concurrent compress - operations comp_algorithm RW show and change the compression algorithm algorithm_params WO setup compression algorithm parameters compact WO trigger memory compaction @@ -310,7 +294,7 @@ a single line of text and contains the following stats = separated by whitespace: Unit: 4K bytes =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D =20 -10) Deactivate +9) Deactivate =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 :: @@ -318,7 +302,7 @@ a single line of text and contains the following stats = separated by whitespace: swapoff /dev/zram0 umount /dev/zram1 =20 -11) Reset +10) Reset =3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Write any positive value to 'reset' sysfs node:: diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index ff662144b98b..5f2c08337ba9 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1103,27 +1103,6 @@ static void zram_debugfs_register(struct zram *zram)= {}; static void zram_debugfs_unregister(struct zram *zram) {}; #endif =20 -/* - * We switched to per-cpu streams and this attr is not needed anymore. - * However, we will keep it around for some time, because: - * a) we may revert per-cpu streams in the future - * b) it's visible to user space and we need to follow our 2 years - * retirement rule; but we already have a number of 'soon to be - * altered' attrs, so max_comp_streams need to wait for the next - * layoff cycle. - */ -static ssize_t max_comp_streams_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - return scnprintf(buf, PAGE_SIZE, "%d\n", num_online_cpus()); -} - -static ssize_t max_comp_streams_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t len) -{ - return len; -} - static void comp_algorithm_set(struct zram *zram, u32 prio, const char *al= g) { /* Do not free statically defined compression algorithms */ @@ -2540,7 +2519,6 @@ static DEVICE_ATTR_WO(reset); static DEVICE_ATTR_WO(mem_limit); static DEVICE_ATTR_WO(mem_used_max); static DEVICE_ATTR_WO(idle); -static DEVICE_ATTR_RW(max_comp_streams); static DEVICE_ATTR_RW(comp_algorithm); #ifdef CONFIG_ZRAM_WRITEBACK static DEVICE_ATTR_RW(backing_dev); @@ -2562,7 +2540,6 @@ static struct attribute *zram_disk_attrs[] =3D { &dev_attr_mem_limit.attr, &dev_attr_mem_used_max.attr, &dev_attr_idle.attr, - &dev_attr_max_comp_streams.attr, &dev_attr_comp_algorithm.attr, #ifdef CONFIG_ZRAM_WRITEBACK &dev_attr_backing_dev.attr, --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 700021F5830 for ; Thu, 27 Feb 2025 04:36:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631021; cv=none; b=OKZiCfH/Lq3AELe2ig+67CxbzUFuL8IZ9JH3pqOMqCUhEf8ggeKJMwMGr3EQ6j4qHL1zURUrTCR70glgaRiX/GL1QUtNdrPPku4xKob3jDQHnZK1uHv2jqaThvwlcpg8p38chyizf2psuT0JLJ2hW7wV9QEb9M1tv39OZbOkwR4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631021; c=relaxed/simple; bh=nWo0kbrzIofdLaGq0AQCS3Ixn04Y92oVHz9liJwKC/I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MkyeuwjvgeD5OIbnbWoMC+s6Aktsagqp3KR5yt7dvWO7ZSAfVSt9PRBUL+QEM4bynDvnIRGAaSJtWhk3iB//Xko+ybYceQVPT7Zzx6lCcQPGitnz8ilJerC6hI8wiWaPYkltLuSg6EJUUBg5p74OI3f6DQD1Ef+W3HFS1412fF8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=DvQdBaIo; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="DvQdBaIo" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-220c8f38febso8027685ad.2 for ; Wed, 26 Feb 2025 20:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631019; x=1741235819; darn=vger.kernel.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=Be7BmKV5Rl+tSCSL+PenBDpRFLFJDOVjENq1jnQl0Z8=; b=DvQdBaIonyCPIMCOzJbQKWehdfqW7SA1KniYkpJxceOAxvLDQVZ/LM4oCLBWa3TYjT y4RCRmmHhSMnqmsFZGljG5EN1f7iOQY1c2Y90rtwixElCVVpQdEKeVTJivELm9a0eXX/ YI2Kx/IpX1seuywD03glk/L1cCeoO/1yz+hDI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631019; x=1741235819; 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=Be7BmKV5Rl+tSCSL+PenBDpRFLFJDOVjENq1jnQl0Z8=; b=bs+LWpRiDo2w8bcHUu+v4TtIiHdfpsxDexpwP1yIvqHwotxGu/FwxRRH95UpimfW8M VUG0Jtj7NanJIoT2eqEs26Mt/qNPSbQYaAFotEm5HWEDN8mPSbjg6v6G3UhV0MzIxqdk 9f+NpXvPcTO9FeFiMeo8joHJqrPC0gmNO+jq0Yj3/7pBmDvqZs7pwLfa0E52fgBSfGEx xe4zCdjv+0Z1BmZqCFWazmQrgFIljCFz453l7c9Hsk5afyZWuk2WYwvF9zG9uGdN2XR6 7p+JGi7zl8GqqfqJFsFjXUAwRgMjCj1IenyPjtESZaNTV9zvU1hHuESXco8oaEfD+j6y pW0A== X-Forwarded-Encrypted: i=1; AJvYcCVMg6mRpakJyozA54Tah6kznC3HWS8Kh9JNVMazhGkEcqD5ViD3piZFsYL4CrUv6DVn5E1/qfdEQhCcgHs=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4AK47Z6Qej75VEOwhyPQ+PltSh7tBzPwMf7eLkHVcTJHCCU8Y rerDcZxPqs2G5nl8qrLLz/xESwXoYA05o3xjkCMzHrf7Vi0WMBujBt5b++HFvA== X-Gm-Gg: ASbGncv2bK7Gsxz6xw2d3jnBHLYXuIOvXe5ZY/4+1H6pQbrVC6O29YjeMsWj8y6X0LF MD4UHqT3mEhhI1oHeAPbGfUdfWR/RSTyOcTn0Oafhi8dwCxjaWxGJkaR2rtdOoKn9GNkJL94Y0k Xvu2a/rsthepNXRBTzIQIcsDoKCz+Nm6naH49sHh8e9/3GXaIQ3ZXB/46jOO9Sahwzc2Y6S6izc 4Ur0E9dFx+KIEL2AxR79Xin7zelILCnSQ/lDV38ncyT5T4bjl3feD63A3doX2nV8cYXCKh4ZFD2 IejtkEPUUkaEyLlnCcD2fhI0rSTx X-Google-Smtp-Source: AGHT+IFJgaRFQVylaLj6I4IPqbcJ3f5L/ef1xGtQVqtC08AgMT8m0YWQWIDG6Ie7Da0oM3f1AlVfQQ== X-Received: by 2002:a05:6a20:72a1:b0:1e1:ca27:89f0 with SMTP id adf61e73a8af0-1eef3daad8bmr44973568637.37.1740631018819; Wed, 26 Feb 2025 20:36:58 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-734a003eb70sm485399b3a.124.2025.02.26.20.36.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:36:58 -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 05/19] zram: remove second stage of handle allocation Date: Thu, 27 Feb 2025 13:35:23 +0900 Message-ID: <20250227043618.88380-6-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Previously zram write() was atomic which required us to pass __GFP_KSWAPD_RECLAIM to zsmalloc handle allocation on a fast path and attempt a slow path allocation (with recompression) if the fast path failed. Since we are not in atomic context anymore we can permit direct reclaim during handle allocation, and hence can have a single allocation path. There is no slow path anymore so we don't unlock per-CPU stream (and don't lose compressed data) which means that there is no need to do recompression now (which should reduce CPU and battery usage). Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 39 +++++++---------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 5f2c08337ba9..28aa1c437d83 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1723,11 +1723,11 @@ static int write_incompressible_page(struct zram *z= ram, struct page *page, static int zram_write_page(struct zram *zram, struct page *page, u32 index) { int ret =3D 0; - unsigned long handle =3D -ENOMEM; - unsigned int comp_len =3D 0; + unsigned long handle; + unsigned int comp_len; void *dst, *mem; struct zcomp_strm *zstrm; - unsigned long element =3D 0; + unsigned long element; bool same_filled; =20 /* First, free memory allocated to this slot (if any) */ @@ -1741,7 +1741,6 @@ static int zram_write_page(struct zram *zram, struct = page *page, u32 index) if (same_filled) return write_same_filled_page(zram, element, index); =20 -compress_again: zstrm =3D zcomp_stream_get(zram->comps[ZRAM_PRIMARY_COMP]); mem =3D kmap_local_page(page); ret =3D zcomp_compress(zram->comps[ZRAM_PRIMARY_COMP], zstrm, @@ -1751,7 +1750,6 @@ static int zram_write_page(struct zram *zram, struct = page *page, u32 index) if (unlikely(ret)) { zcomp_stream_put(zstrm); pr_err("Compression failed! err=3D%d\n", ret); - zs_free(zram->mem_pool, handle); return ret; } =20 @@ -1760,35 +1758,12 @@ static int zram_write_page(struct zram *zram, struc= t page *page, u32 index) return write_incompressible_page(zram, page, index); } =20 - /* - * handle allocation has 2 paths: - * a) fast path is executed with preemption disabled (for - * per-cpu streams) and has __GFP_DIRECT_RECLAIM bit clear, - * since we can't sleep; - * b) slow path enables preemption and attempts to allocate - * the page with __GFP_DIRECT_RECLAIM bit set. we have to - * put per-cpu compression stream and, thus, to re-do - * the compression once handle is allocated. - * - * if we have a 'non-null' handle here then we are coming - * from the slow path and handle has already been allocated. - */ - if (IS_ERR_VALUE(handle)) - handle =3D zs_malloc(zram->mem_pool, comp_len, - __GFP_KSWAPD_RECLAIM | - __GFP_NOWARN | - __GFP_HIGHMEM | - __GFP_MOVABLE); + handle =3D zs_malloc(zram->mem_pool, comp_len, + GFP_NOIO | __GFP_NOWARN | + __GFP_HIGHMEM | __GFP_MOVABLE); if (IS_ERR_VALUE(handle)) { zcomp_stream_put(zstrm); - atomic64_inc(&zram->stats.writestall); - handle =3D zs_malloc(zram->mem_pool, comp_len, - GFP_NOIO | __GFP_HIGHMEM | - __GFP_MOVABLE); - if (IS_ERR_VALUE(handle)) - return PTR_ERR((void *)handle); - - goto compress_again; + return PTR_ERR((void *)handle); } =20 if (!zram_can_store_page(zram)) { --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C30161F5855 for ; Thu, 27 Feb 2025 04:37:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631026; cv=none; b=LrPhoa44CrC8jcRN1BrRCXFeE1OmAJEgLRzHKcHOvQHKphSXHBOEzlvP7iTEeDoLwdaPdxCIjUjsNtq4mobmGmS4QONtLaQxm20NBmGsXnwFo/LPDRNDkY16LPgmPblpjpoAuUltjtd34k9do+vR4pzz5T6bsXp3bwDiLKKaqqc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631026; c=relaxed/simple; bh=kDJSeyU5s05UEQ7rAR19C1RuUhlLEkX2VbKYXWUOEF0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EJjf8x4Jj34Shem68XNq/x4jTrxh6r2ZsR+SRTvfgpQrZpp8w38sgbMcbibd+loD3N2KTMUNPRqcDQUYC/pTzwW1F/iPHArSRehJcnAIKVVuwb8Xk9/62a4SThSPS50tyOCEE+o5gqYYmcFcT90xHEKkxec8qKuiAwySDOg2rk4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=cWch1WXE; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="cWch1WXE" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-22104c4de96so7258245ad.3 for ; Wed, 26 Feb 2025 20:37:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631024; x=1741235824; darn=vger.kernel.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=Vr9FTPnbuS7T/s7kIrPcS+bzGN5VDCIRcXkQbYpH7iY=; b=cWch1WXEJTG8y94tPPgMdJKuUWCo87jiQ1VLePijCjURyMelSk0b/LU6jEahUiLp16 l+wBcw+wCUl9L8Fi4zOMqXTBcii89BuQUox3pdpLrz/VTcOnNOBxNcArwVb6067BRV2C OmUCTWcMVCihAC0R82a+g/FFRFT/T9ojC/5Mk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631024; x=1741235824; 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=Vr9FTPnbuS7T/s7kIrPcS+bzGN5VDCIRcXkQbYpH7iY=; b=k7TSB7VxjOmNZk9XaXzAifZZAmcEq7FYWlEVm6zWrYqe532cdh7Xewda4QTZB/6zVc RvmmUhW+JScCLiQnRQXSLhCpzT5KOwt7mirSRRMxqxgGdbBsRG2aUFU1CBhyfwYIwdqf u9dzJXRuBfuBvdhnXCwKq8oHgLC1dRbT/QS9fJBTdfisAWBkG+vi+vNicEJX6z5SLJ0y JwEkFF+zDWSYWWqsChU9YkoPwgwmjvKCMAbnYxO04ruCMF1NXy3Bv/i36PKlvEeHAh8i ELTnYyBNadSGbFLA7wnyvCsCahHaxb0ni9zPyjeYHdxyhVHsU4HhWMFCpgnZdFRbjXR2 CaeQ== X-Forwarded-Encrypted: i=1; AJvYcCVMZ3SF51rndBBhmNAjOd4u55eMFXRVotEAjmzWpJXEt+oX46cNT6LOm5oI8YPNTuVR+fLj6lMHwlSa04c=@vger.kernel.org X-Gm-Message-State: AOJu0YwVR8fp7BnTU1EMzvNdfw6DKyijOfBx8oepnLoeFcMzNfQKYm0s tZ4whBt7P5f2dhP62FAwb7esrB/0i0SaIpTwMXDuFwsoJ1zbqVn5mZI1PgRXyg== X-Gm-Gg: ASbGncsOopTK+PMuwQHVqo6WdgjLsjNGHAYngVD/TVdjJwMr0F5cQ7UEI+L1xvqVwN9 qLGCGSO2nXVUT+bfWczSRQBIF884RdQUJsYQv2c1Fq5tQzcYTknpoXJenVshCP3bUiZ6TKTPj4E BwMduQpco83rgY7P1MLEWthNOX/kzPpxEpeOGZMd+kxK02wGCgDgwYeAf3io79FBsGSnm2eyY1/ 8KMsBkWphDZM+VjPvUa4mwyewBEA9IPqGz+DFfYoEpqKw3A3reOpcJc41gf3obxeRWc6rq3axJ6 RUiJ6AvTeVgISdCN46ly6BSEX813 X-Google-Smtp-Source: AGHT+IG7lkAWlRB5fX++3hFsx9jC6B8UxClPPlZOhyWNT72+u/H7C4m/UOugG8H83NzmmgRIdsxc9g== X-Received: by 2002:a17:903:22c7:b0:220:cd7f:cde8 with SMTP id d9443c01a7336-22307b5b218mr158250195ad.29.1740631024159; Wed, 26 Feb 2025 20:37:04 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223504e4d16sm4908435ad.189.2025.02.26.20.37.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:03 -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 06/19] zram: no-warn about zsmalloc handle allocation Date: Thu, 27 Feb 2025 13:35:24 +0900 Message-ID: <20250227043618.88380-7-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We normally use __GFP_NOWARN for zsmalloc handle allocations, add it to write_incompressible_page() allocation too. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 28aa1c437d83..08fc9821d71c 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1691,7 +1691,8 @@ static int write_incompressible_page(struct zram *zra= m, struct page *page, * like we do for compressible pages. */ handle =3D zs_malloc(zram->mem_pool, PAGE_SIZE, - GFP_NOIO | __GFP_HIGHMEM | __GFP_MOVABLE); + GFP_NOIO | __GFP_NOWARN | + __GFP_HIGHMEM | __GFP_MOVABLE); if (IS_ERR_VALUE(handle)) return PTR_ERR((void *)handle); =20 --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0D211EB5D6 for ; Thu, 27 Feb 2025 04:37:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631032; cv=none; b=gkFlROTCdhzPXiV192ulVLBrx1XQJNzNwnwuPw4FiO2zjNaVOveS3/ecfpdkyTYT8M4UzXWEzFIJVPg5QJe/WfJMOoPn0Nel6YST+gQiZmVkpiSs2hdnqNxVVxsvT5KTxb/qGcAcnGUvmul8MKzjT6RI8Ysxrimo4b4+xb8VfkM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631032; c=relaxed/simple; bh=N8lEzdFy6KjeZwz98GaDqkIP6EJ2Tdkarqv83T9/CFw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S1R3Hoh+fNedfJLBYO5UE7qOM0aCmh+nGl5+f1XJ2kXWa0pLWfyKParU6LqTSL2hsaMMLP1DXaAB/b5xNU+jDHH2pDCpLG63kmIKVslzSfxYLIqnIMdfLUTMpd0GykTu0dOfFWcR8Ofiv45k0aPgYk/7+StuVjHvMulksi5rOJc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=NqJ2hjIL; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="NqJ2hjIL" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2fe82414cf7so1075332a91.0 for ; Wed, 26 Feb 2025 20:37:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631030; x=1741235830; darn=vger.kernel.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=jjK5z/f2m0DncP7Ixpif51js64ejx6xQxz7bzy27nuY=; b=NqJ2hjILarTocOO14//oyigeev8pX85zpiZKxVoFxJ2TIwiHKO8CWD9Oi3TVIuDxMV xbo3P2W8QRCYx/0fDk1hGZ53jj+IGiXlK/+AuawwQAqb21o1/m3WpjA8H27N+u6rQpch 5KS7+7ItqCbVgj4Qv4fD1vfpecwYqkOy7crZ0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631030; x=1741235830; 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=jjK5z/f2m0DncP7Ixpif51js64ejx6xQxz7bzy27nuY=; b=WXOPT4eYzjrQqWJnkCuVaU9FHrCQnALJYW/X8kkD8G8Bxjg2IStzPg00JIvcxXtfAn FF5gZHK2fLW6rJwsyLhU3eig4tH7XkKiZDU6Xo1x6lwLbVmywuEbHgAD8myHWuImtNM4 eH3yxE+5L8h5P+lyTSlLN7m3ula14juGJ978SMBaGfuNhVSeZOFP6It/hvf8jN4u20yq aNSKcQSirbqTGWyVtWt7CkNWluKTTWBTcA7Vb7BO7vqd9tjbvvVCHfZYjLk+rq3W+VYg FkAn6rQu3HGfp/GEdMgQ+qz2b+4NLSWf+Rkx2Z8qgXNFydQ6ckMhe2cDvkL2ITdNk5J3 WCMA== X-Forwarded-Encrypted: i=1; AJvYcCXl3AxsN0W8JqZDelrtUJX5iFCOkxVkSj8CJhjOyVngkUTFdDGosjcqqeVBWEIci+UMXV7xg2TWOxMOh5Q=@vger.kernel.org X-Gm-Message-State: AOJu0YyV0IU5YDiltHgyOE+2pA9GC1GorQ1zjNihvM9aDHILiCDvAr+Y mNBNrRy5KW4jq8wiT6q/FFqN6jpo37N19v880F+ZXvgFUUTBDjm84akLPVNk9g== X-Gm-Gg: ASbGncsQvzfO46XIeCXBZtCk4U+/y45hiITdp3zW3RfqP9bhBC5vSl0JOAjdm6Zz8Op crwXiF2Ia91fI+dafjVn+xu0hfNye8q8So+Zx/Imb8ajCRoeIRzr9yBwMM05plUW0A5a/URTpyQ 00laBKOSHryTkDS3D2DDJ3c0jhHJTCYc37gj1I1gDVd0Um9a90QBfTPksqe+W61Ka/DB72LNFFX 5MbIyJIfIEsD09+TXvzOzdSjKumRA9Qxsok9Xw9N5R8amtgU7vmWczBNnW7qDXuyZiYChoUQYQ4 upcR49wv6itE9KTXZz8Jpvaw6k2Z X-Google-Smtp-Source: AGHT+IFGQH7QQ3h8Q2RsubEbMnBDcSEsStmitP3pSesQC9VI8bjIeDpBSGzc6iv7/4S9G/lG5bzkYw== X-Received: by 2002:a17:90a:c2c7:b0:2ea:a25d:3baa with SMTP id 98e67ed59e1d1-2fe68acd797mr14877858a91.5.1740631029968; Wed, 26 Feb 2025 20:37:09 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fea676b133sm474944a91.13.2025.02.26.20.37.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:09 -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 07/19] zram: remove writestall zram_stats member Date: Thu, 27 Feb 2025 13:35:25 +0900 Message-ID: <20250227043618.88380-8-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is no zsmalloc handle allocation slow path now and writestall is not possible any longer. Remove it from zram_stats. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 3 +-- drivers/block/zram/zram_drv.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 08fc9821d71c..6266884de1d0 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1437,9 +1437,8 @@ static ssize_t debug_stat_show(struct device *dev, =20 down_read(&zram->init_lock); ret =3D scnprintf(buf, PAGE_SIZE, - "version: %d\n%8llu %8llu\n", + "version: %d\n0 %8llu\n", version, - (u64)atomic64_read(&zram->stats.writestall), (u64)atomic64_read(&zram->stats.miss_free)); up_read(&zram->init_lock); =20 diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 8b66af0d162d..5ca87554aa26 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -82,7 +82,6 @@ struct zram_stats { atomic64_t huge_pages_since; /* no. of huge pages since zram set up */ atomic64_t pages_stored; /* no. of pages currently stored */ atomic_long_t max_used_pages; /* no. of maximum pages stored */ - atomic64_t writestall; /* no. of write slow paths */ atomic64_t miss_free; /* no. of missed free */ #ifdef CONFIG_ZRAM_WRITEBACK atomic64_t bd_count; /* no. of pages in backing device */ --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A36F1E835E for ; Thu, 27 Feb 2025 04:37:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631038; cv=none; b=cHSzO12gmPwuJbRTAEkI+9ohZPhILHdwVyANufDRKIJfrsoAyI5b6of0nILStmMZZa28ouMWgdaqAp/9OrC/hcahi0AFSGIRxGIDBPELKZM8EJaTT+sWrEvSGRtYgaoDTNa5ly0vDJLs+7rVRDiBpNyOR3N+M8s+yMaXSHWcslY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631038; c=relaxed/simple; bh=aJ6ksABudpk9q3gl+Zo4GQpK2nI63HdK4XLwS8BJ9Kk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ST1kxdCwUi4QKPsFfyxrjOLn6fh7IV/nf9rHhbQCTJUApWAIyLN1qSI/I264+BbpCb2lN9VADLbJ1pmt9yD/HX67k+MioioYaPOvKFsjKZDAfKErov4nXrnkAVOoYmFvUBy7Le5HwXoDNwkO/DbHN+iXjCS4D8VR+Hxaje3YrH4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=kQaONGUm; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="kQaONGUm" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22337bc9ac3so8033945ad.1 for ; Wed, 26 Feb 2025 20:37:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631035; x=1741235835; darn=vger.kernel.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=zkdYQ64vEruCdUV2Hjk4Cody4qJgi72PfTkPf6ILG94=; b=kQaONGUm7lSz9+Cwl9KkTJoxouiKw6SPuNpYCAqSfJrl21v9Goz1E4GEYyzqghcyeC 210omjmEx+8ISl/vFcCFtVbSNTYFhOXNLI9D123iTwXxdKWAdy3bef98HKuYRvWBNnP3 tCuB18GI4dYb6KwJxBmvdNAoxmoDcCOBG826k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631035; x=1741235835; 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=zkdYQ64vEruCdUV2Hjk4Cody4qJgi72PfTkPf6ILG94=; b=q6CIBm6DTvZsZDzjl46H8xFI6uDNrQy7Ny/R2jj3CQ1uj1fHyj+BE+lzUNYkPs7ZjF 1TEQnGsv5QXWA++ZiYsLpflY4Y0IaqGGjUX1OHPmb/2Js3W/HPvYDwrWuEhfg4E3qTek 9LdTQhoCfAEeVeoX7by2wIlv4pi44SYEv5LiRzDkz01hTeEumbIHmdt4tg49YJ7u0HfT 4AqFHJeVigPT2+vpO3viVkNon3Woh6w7NZrlnCb7Ic195YqPx8GI5bFa7CUaNsgxr36S 0X+KmwJiNyRnDYCuksmUXNuufriMsn5jbig1o0TM2+fFPGZYkTIMOJEkqBWnzatKe8Ir QiYQ== X-Forwarded-Encrypted: i=1; AJvYcCX93LA07s0wrHXPcwOa5kmPSh01hW64uP2gmRTHuEJfx1iwMsjg1TiLm0cwSTTprRFswN9hmY5RnECoBPg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyv7mbjGENzOOuVOxaznZL2Z8qO7m06Mgjv/2a3vHRQ6SVXVeiS ZBo4n9+skj5TVC3J+Di8snEko2V8qR0NSMlw1Qx64hWnDaMqPIsPL2iRSyU/TA== X-Gm-Gg: ASbGncvvpaCWQe0WXcSYa8iZwYtSaUG83PVSAEjlQqQ9oQEI4z20oKVhWKDDyDTnLYw zSJGFfylcJCZA2GptySQNLA9oX1AagXQqjRT/tBgvBjoRDkWaI9Z6MwCiIjpU683YVduWG8Sn3X +vn6qln5lxXr+RDZfDHWvZ7kuUb/o03QyptPV8CXHN17bA/F4ppW77NXi4f7XE5YwS990lSrlCX GpZX+i6ZyTwe+l6gfqOR05Plx2ot6ZZohCV6sr+km5Sn4H+XnE+BaCzQbpbm50MMTMpeHGEWrJs RMMfCaEB6RGiGsPLX5o8lneYekYt X-Google-Smtp-Source: AGHT+IG7ihHLtTFv8mxg66ATtd7LlmNyi9F2oOAdH3uY5mBvX7qlHeuZ1UTku6FwKKmo5fi5m1btJw== X-Received: by 2002:a17:902:f681:b0:220:cd9f:a180 with SMTP id d9443c01a7336-221a11db956mr390915765ad.53.1740631035318; Wed, 26 Feb 2025 20:37:15 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501f98a3sm5049295ad.63.2025.02.26.20.37.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:14 -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 08/19] zram: limit max recompress prio to num_active_comps Date: Thu, 27 Feb 2025 13:35:26 +0900 Message-ID: <20250227043618.88380-9-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the actual number of algorithms zram was configure with instead of theoretical limit of ZRAM_MAX_COMPS. Also make sure that min prio is not above max prio. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 6266884de1d0..12b99a557667 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2027,16 +2027,19 @@ static ssize_t recompress_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) { - u32 prio =3D ZRAM_SECONDARY_COMP, prio_max =3D ZRAM_MAX_COMPS; struct zram *zram =3D dev_to_zram(dev); char *args, *param, *val, *algo =3D NULL; u64 num_recomp_pages =3D ULLONG_MAX; struct zram_pp_ctl *ctl =3D NULL; struct zram_pp_slot *pps; u32 mode =3D 0, threshold =3D 0; + u32 prio, prio_max; struct page *page; ssize_t ret; =20 + prio =3D ZRAM_SECONDARY_COMP; + prio_max =3D zram->num_active_comps; + args =3D skip_spaces(buf); while (*args) { args =3D next_arg(args, ¶m, &val); @@ -2089,7 +2092,7 @@ static ssize_t recompress_store(struct device *dev, if (prio =3D=3D ZRAM_PRIMARY_COMP) prio =3D ZRAM_SECONDARY_COMP; =20 - prio_max =3D min(prio + 1, ZRAM_MAX_COMPS); + prio_max =3D prio + 1; continue; } } @@ -2117,7 +2120,7 @@ static ssize_t recompress_store(struct device *dev, continue; =20 if (!strcmp(zram->comp_algs[prio], algo)) { - prio_max =3D min(prio + 1, ZRAM_MAX_COMPS); + prio_max =3D prio + 1; found =3D true; break; } @@ -2129,6 +2132,12 @@ static ssize_t recompress_store(struct device *dev, } } =20 + prio_max =3D min(prio_max, (u32)zram->num_active_comps); + if (prio >=3D prio_max) { + ret =3D -EINVAL; + goto release_init_lock; + } + page =3D alloc_page(GFP_KERNEL); if (!page) { ret =3D -ENOMEM; --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 421DD2153E9 for ; Thu, 27 Feb 2025 04:37:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631042; cv=none; b=EID3sufJROJmzV/JVWU9MQ/An3R2/4F6szkVkVNov4oTC4kZmXyLEwK3trXWZKLATf/qLQWvv6TjPL9qdjw2003BHUaxxH1LZh15Xvx5H8e//+JvCDWXa8t7sr9s6w/wNbHCdc7O4a6Gp5Khmpb5y7sbUdLRla+kIOZj688hPAA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631042; c=relaxed/simple; bh=gOI0PnqaEgWx1Mwwhgi1f4gyeDamR4aCRebnN7RFpjI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DFD4tC4oAjG3ptbNz1CR8BtYZeVEeXweVyXUsUnpgV/ZvTk0FkQoL3BoTHyOWx/QcX1w2Et447ZMWZqeHeYkYMETK3APl2jv1yte4kJHtja5WM04rhz4c4MUnbc6otMR7dlR5F4JjXXoGHLIUQ9f8rcbEudaARrIWog+28pwjSA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=IenRPQ5T; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="IenRPQ5T" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22359001f1aso523055ad.3 for ; Wed, 26 Feb 2025 20:37:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631040; x=1741235840; darn=vger.kernel.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=k2tj7S14ByHudFFBWtU70rdMhsyqSn6b6QKduoDJaoI=; b=IenRPQ5TOzCYad4bDUl0adSP95w8LWbsFiGg7EBgxR7fLHUYXJ/lcSB1xoNk6sbNtK iuLGpVLQX/QVgbt8SsW3bZMCTMKFB0VaTs6PZq7slw4xokSbh85HEjSj60tXKLsR+9Zp 5ft7+/8MLwPhztwpGZNUD1BoC8TX/GdFgaYAA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631040; x=1741235840; 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=k2tj7S14ByHudFFBWtU70rdMhsyqSn6b6QKduoDJaoI=; b=rCpdIwzc5010zdpzP3LF6zGVmSxuPxYdwY1jwfR7KcYJyJIBpnxO+xspw7CVt6z7JV Eh3/RwqKjFC6zIrSFRN4lIswtUUvsIlyBKmkBK1NxQ2GpRy9Zz0DvReidbcjH3FcJC3N SYZWC4bfNWWLk13AebCOSlu1guM4FiVTh0WAc7K5yrFceHCC4HXNTRTFxpqH5c3lBM7G zaxJSxKUt5GiRD/8EAHnMwZI+OSwTHID8OpvP3MOruDqaC+i0ThN09tE3WL8Vb6hc9uX 5GUyybqhTVMo5NBEp8ZGi+jWQWLNlhQ/OXv3IdpQYoxbsclUBH6oGpq5JTrzRPpxkQII NGzw== X-Forwarded-Encrypted: i=1; AJvYcCUY1DlvhlJySb+/cYT25mU6Jpp+frNNbv0cqNk3V77CbI/h785rGnWDmkxLFUbHvLhJ5oSc7xp+Np2d9aU=@vger.kernel.org X-Gm-Message-State: AOJu0Yyl5dLrsqqUac46bzPy2F/iOivQiDBsgTifmtPkmG3A37eJE4mO W/cHtlpn2Pm1QzigK+rQGYOjusg92NiDoBVeLpV/twmMFkxivnlSa0ytd+V1ug== X-Gm-Gg: ASbGncuv0CoQjUBiOoL6ad+YYtwezU9GzqeTwXk+A6j4saVlVqSf6bQfQz2ZOrMy+m4 7eEHuHUnZty30bygn0PtrP+9IzqMqjkq6GTHxt2Q05utqFOHXqMUlPkG/o+YSvdPK4HvDCEFLYA eJu7xwk+rm38x+6rjnwawfmBaF1Sy8+yI7qxI+aJsOTZDddsxQ+AfrWMxLoqd2N4nkYGUVjYohv 82Kg91n3S7lm54hFzR4Tso2IKbmnldyOxSOvjhlAg4sKa1X4qvsaSxi4eXeOR88GeXjuZLMEzkD LQ3QrVw71meT6t0/t07brLteiOVh X-Google-Smtp-Source: AGHT+IEN+RE7KRyg5caAuRJqhyxwCNu+Sch604nCRIaPUWr0NHMHIZpiZPkRYwWAzDLUylZbTZZtGw== X-Received: by 2002:a17:902:d4cd:b0:220:f795:5f14 with SMTP id d9443c01a7336-221a10de0c0mr360128185ad.27.1740631040453; Wed, 26 Feb 2025 20:37:20 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501fb1f7sm5039955ad.98.2025.02.26.20.37.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:20 -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 09/19] zram: filter out recomp targets based on priority Date: Thu, 27 Feb 2025 13:35:27 +0900 Message-ID: <20250227043618.88380-10-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Do no select for post processing slots that are already compressed with same or higher priority compression algorithm. This should save some memory, as previously we would still put those entries into corresponding post-processing buckets and filter them out later in recompress_slot(). Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 12b99a557667..3a23dfed9542 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1823,7 +1823,7 @@ static int zram_bvec_write(struct zram *zram, struct = bio_vec *bvec, #define RECOMPRESS_IDLE (1 << 0) #define RECOMPRESS_HUGE (1 << 1) =20 -static int scan_slots_for_recompress(struct zram *zram, u32 mode, +static int scan_slots_for_recompress(struct zram *zram, u32 mode, u32 prio= _max, struct zram_pp_ctl *ctl) { unsigned long nr_pages =3D zram->disksize >> PAGE_SHIFT; @@ -1855,6 +1855,10 @@ static int scan_slots_for_recompress(struct zram *zr= am, u32 mode, zram_test_flag(zram, index, ZRAM_INCOMPRESSIBLE)) goto next; =20 + /* Already compressed with same of higher priority */ + if (zram_get_priority(zram, index) + 1 >=3D prio_max) + goto next; + pps->index =3D index; place_pp_slot(zram, ctl, pps); pps =3D NULL; @@ -1911,6 +1915,16 @@ static int recompress_slot(struct zram *zram, u32 in= dex, struct page *page, zram_clear_flag(zram, index, ZRAM_IDLE); =20 class_index_old =3D zs_lookup_class_index(zram->mem_pool, comp_len_old); + + prio =3D max(prio, zram_get_priority(zram, index) + 1); + /* + * Recompression slots scan should not select slots that are + * already compressed with a higher priority algorithm, but + * just in case + */ + if (prio >=3D prio_max) + return 0; + /* * Iterate the secondary comp algorithms list (in order of priority) * and try to recompress the page. @@ -1919,13 +1933,6 @@ static int recompress_slot(struct zram *zram, u32 in= dex, struct page *page, if (!zram->comps[prio]) continue; =20 - /* - * Skip if the object is already re-compressed with a higher - * priority algorithm (or same algorithm). - */ - if (prio <=3D zram_get_priority(zram, index)) - continue; - num_recomps++; zstrm =3D zcomp_stream_get(zram->comps[prio]); src =3D kmap_local_page(page); @@ -2150,7 +2157,7 @@ static ssize_t recompress_store(struct device *dev, goto release_init_lock; } =20 - scan_slots_for_recompress(zram, mode, ctl); + scan_slots_for_recompress(zram, mode, prio_max, ctl); =20 ret =3D len; while ((pps =3D select_pp_slot(ctl))) { --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E7B61EFF8C for ; Thu, 27 Feb 2025 04:37:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631048; cv=none; b=IQnb4wXq2d5VaxppRz54iV8zYpN2d93MSvGJGlX5eaOSP1Rb1iDOXNOO6aVjrEzJKwi8c25bretNl+V9mIzO66QsqzGf1pfZoMqhwI8TrSQlxYfKUeR8rp6NHICVpfxLjD2AGDNJljeQVIDdIYgoIL8jB7W8cFOtR0YAk+WLSQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631048; c=relaxed/simple; bh=RbjHDFkBxI4MbG7AG709nKXLWzCsfOvUs7CLTbEYEqo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l3pAZ+AAjBZI6H5FmTXoQCh3Se6EpD7ZXHIQvBwHk1GVfA2I4xsSwHPbK8AIsvZ/Z6p5CaArwpfcyM5aasa4YQ2WQAO7zGnvPu71w0rvJy4dtpYvMvFZL8MZSwbm3/0OjNhRy6cl+6oruxZrZlXROYEiJxBwXw51dmfJvXo7ajg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=dgiFKCQR; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="dgiFKCQR" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2232b12cd36so6314605ad.0 for ; Wed, 26 Feb 2025 20:37:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631046; x=1741235846; darn=vger.kernel.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=s6NLD2jL1GvsoHkQKXZoOwiQJj4KiHrs9duVpBtevTk=; b=dgiFKCQRklITU+lt0I72oSIqhuBPxXLD/0Uo10sl5n3bffizQBvyl05pQ0DYiBRP6X GkfKSVWWHSzkFtsLnzodGcmJGXZNVoo9cavxy//Z2Pokuu0G3oWO8MLUX8HEGSmhtyPF HJrIgcgHpjJ0iy7Uk2HJD8W5ALAV/qLqO3wwI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631046; x=1741235846; 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=s6NLD2jL1GvsoHkQKXZoOwiQJj4KiHrs9duVpBtevTk=; b=A3qHh8HGMUPv0NWOp8BJWk7C3NC99+ON8/y4O1hgQx0crK0LKKTE7ks3Gg4bvu855n Tv48zjDJlYD/teI1YUJ+34zA1WznPtDhsgefiuVVXIL4cxP4Y8145AieAMyKWm1gVBOt OZOKlQQPNzXf6kI+nWMcPT1x7SzZ3DJMSUX3NlyGLS5juwK9BeLtCsg1hqGt3foKm7j0 PT3IC13Kh2zzKSfJxcOf8EEG+hiT7aJUbL27kMoWsaNLl+sqiN/ZKK6o5fPAi6Ggdyor S1J1yqGI3iUjHqwacOJVg8QJqXQHgUtbcvI7jRIumtwMbJHl1FHP+EaEjztysXIZszxp gKhw== X-Forwarded-Encrypted: i=1; AJvYcCXlMs7f9hAN6RD3WWBqxA3zoyFJtNZmgX3OKvVE1Da7uDTHE+9+YieVlkGKYBuMDr7z4kFWHYYiGjeJch0=@vger.kernel.org X-Gm-Message-State: AOJu0Yyz0gz423/x8UVVMj2ahpSC8AcfiGfxF+OxwG8Rf5mhc+cqRCA4 hq1przAJuy375dM4zVRnkI71uNTlis0da2d8tzryNiVdVLQLoTs/SUk80bA+xg== X-Gm-Gg: ASbGncvT9mc9I05Re9+CpnVFsjiZNM6dzLh/Hqok5YOqWK+dSPV7zfkxe9RWf5Q4HTV l/m+hGL4EO7RaDn3r2NsCzCb3j4jOV5lSV/eH7XAEUD+nfLrKKHnWp0wSS/J2DPHA3iTOkrjcZ0 6Ns7AHBcImv+1doqrUSXgISs57W3ehnCMAYf6S24vy24Hfls1p1HkbdH9tzhP7wcAPEHv6K1c8w pq1bLR7OGdryVJOyw7XRsAZAzNOZQaUvcH0HzyGuqaMkh+RYIAsol8Jqd4jiohYTYgM4B6n/MU3 IMnecWYHAafl+LnXVULV/0kPI364 X-Google-Smtp-Source: AGHT+IE7XcAdc9vNrlMBc7Oz2yCA4ADvv2oX4w4TjS94Lh2tcodEasjQb7dK+y4SdRXQWBQQi/bf9w== X-Received: by 2002:a17:903:22cd:b0:216:2bd7:1c2f with SMTP id d9443c01a7336-2232009991bmr68248845ad.18.1740631045980; Wed, 26 Feb 2025 20:37:25 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501fa918sm5062645ad.69.2025.02.26.20.37.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:25 -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 10/19] zram: rework recompression loop Date: Thu, 27 Feb 2025 13:35:28 +0900 Message-ID: <20250227043618.88380-11-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reworks recompression loop handling: - set a rule that stream-put NULLs the stream pointer If the loop returns with a non-NULL stream then it's a successful recompression, otherwise the stream should always be NULL. - do not count the number of recompressions Mark object as incompressible as soon as the algorithm with the highest priority failed to compress that object. - count compression errors as resource usage Even if compression has failed, we still need to bump num_recomp_pages counter. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 54 +++++++++++++---------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 3a23dfed9542..6755ca90f737 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1888,9 +1888,8 @@ static int recompress_slot(struct zram *zram, u32 ind= ex, struct page *page, unsigned int comp_len_new; unsigned int class_index_old; unsigned int class_index_new; - u32 num_recomps =3D 0; void *src, *dst; - int ret; + int ret =3D 0; =20 handle_old =3D zram_get_handle(zram, index); if (!handle_old) @@ -1933,7 +1932,6 @@ static int recompress_slot(struct zram *zram, u32 ind= ex, struct page *page, if (!zram->comps[prio]) continue; =20 - num_recomps++; zstrm =3D zcomp_stream_get(zram->comps[prio]); src =3D kmap_local_page(page); ret =3D zcomp_compress(zram->comps[prio], zstrm, @@ -1942,7 +1940,8 @@ static int recompress_slot(struct zram *zram, u32 ind= ex, struct page *page, =20 if (ret) { zcomp_stream_put(zstrm); - return ret; + zstrm =3D NULL; + break; } =20 class_index_new =3D zs_lookup_class_index(zram->mem_pool, @@ -1952,6 +1951,7 @@ static int recompress_slot(struct zram *zram, u32 ind= ex, struct page *page, if (class_index_new >=3D class_index_old || (threshold && comp_len_new >=3D threshold)) { zcomp_stream_put(zstrm); + zstrm =3D NULL; continue; } =20 @@ -1959,14 +1959,6 @@ static int recompress_slot(struct zram *zram, u32 in= dex, struct page *page, break; } =20 - /* - * We did not try to recompress, e.g. when we have only one - * secondary algorithm and the page is already recompressed - * using that algorithm - */ - if (!zstrm) - return 0; - /* * Decrement the limit (if set) on pages we can recompress, even * when current recompression was unsuccessful or did not compress @@ -1976,38 +1968,32 @@ static int recompress_slot(struct zram *zram, u32 i= ndex, struct page *page, if (*num_recomp_pages) *num_recomp_pages -=3D 1; =20 - if (class_index_new >=3D class_index_old) { + /* Compression error */ + if (ret) + return ret; + + if (!zstrm) { /* * Secondary algorithms failed to re-compress the page - * in a way that would save memory, mark the object as - * incompressible so that we will not try to compress - * it again. + * in a way that would save memory. * - * We need to make sure that all secondary algorithms have - * failed, so we test if the number of recompressions matches - * the number of active secondary algorithms. + * Mark the object incompressible if the max-priority + * algorithm couldn't re-compress it. */ - if (num_recomps =3D=3D zram->num_active_comps - 1) - zram_set_flag(zram, index, ZRAM_INCOMPRESSIBLE); + if (prio < zram->num_active_comps) + return 0; + zram_set_flag(zram, index, ZRAM_INCOMPRESSIBLE); return 0; } =20 - /* Successful recompression but above threshold */ - if (threshold && comp_len_new >=3D threshold) - return 0; - /* - * No direct reclaim (slow path) for handle allocation and no - * re-compression attempt (unlike in zram_write_bvec()) since - * we already have stored that object in zsmalloc. If we cannot - * alloc memory for recompressed object then we bail out and - * simply keep the old (existing) object in zsmalloc. + * We are holding per-CPU stream mutex and entry lock so better + * avoid direct reclaim. Allocation error is not fatal since + * we still have the old object in the mem_pool. */ handle_new =3D zs_malloc(zram->mem_pool, comp_len_new, - __GFP_KSWAPD_RECLAIM | - __GFP_NOWARN | - __GFP_HIGHMEM | - __GFP_MOVABLE); + GFP_NOIO | __GFP_NOWARN | + __GFP_HIGHMEM | __GFP_MOVABLE); if (IS_ERR_VALUE(handle_new)) { zcomp_stream_put(zstrm); return PTR_ERR((void *)handle_new); --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 281841EFF8C for ; Thu, 27 Feb 2025 04:37:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631053; cv=none; b=Xg3D2N2vQqLP4X7xwyEtWcH/mEAHgzYAneptpESW+KygHx1c+c2Art+0S+REJP8rAgP9F8ZT7ZD3X518sLFKwCbJmrgN0I4yxIMTb5ZF4vfgYNKgSS4wf5azZViBv6j+/HXpptuNSZLgeBDX5Ge3XOJhvJfFb/ZOp49EeDvClH8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631053; c=relaxed/simple; bh=3ZU/JAkRZCtDJckZQQCn2jpwXitiZk8mc8tI7tKlqb0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xqi4QHycxGVZJxkWOCbMi3I0UE8pRkfVPH7wT03Vv56YFjSVV5aVH+VJVKXYV9LtuQtyNfMPgHD9Mv8hKudKV0Z+yzzLiYxyGmVEvdOzPWTaESSHcF/HBQ5/Pn7pEQ+4ojU1rcmTHP1UY+opfER6FchDiDqYZI5WIJYfiFdQvoM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=XBBqUcAe; arc=none smtp.client-ip=209.85.216.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="XBBqUcAe" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2fea795bafeso257177a91.1 for ; Wed, 26 Feb 2025 20:37:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631051; x=1741235851; darn=vger.kernel.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=atSj686udXXb8naSP/ilX+V3ED7QvGuQ33PoSFmI78o=; b=XBBqUcAens1o/luKjsmhwMeeaDlDwpVNYIsxpKQGOKVY6NtBqbV6qjgq/UxGb6XTMJ 2jz7q4A2L1nzuqb6OYB8vXqUUzb4asHc1RlS7tlX0Rtq0x2ko+cIrjnRgM7SaYwgFBRm FXgTAgOnfBETuZPdoEROtDGQXCdTNqmAZV6JU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631051; x=1741235851; 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=atSj686udXXb8naSP/ilX+V3ED7QvGuQ33PoSFmI78o=; b=Qy7HNpUH5a8zkfl9etQ3Qwv5QSKNygruDKH3MdhltuPRmlzWSoNwLhaJDlLwXngEzW zcsH5czlQQgEcI99wrFAQm/+tBgaHrBtFXBGxpAXVFlbrxJuZ0ggLzALz6i2U0kYNk+c UnEoilC3eQ/aSIS+9IrNh8KHyELjFUiXtGeuYKpN3wk/wJa9+FDGNtkwjcTFoH+Tzilf fMRjQDICkWPITbut9Xt6gAUW9fg/nJPmbBCY6vw+L4ibLBhOBHsWk/+Ixh8uSueW/Fzu 0gd4hq27Fqop9fau8ki7EVSgMvnQXGE9fD5Bk9yI89Wvsiqk8jFIAeNEceh27KTuppHv LPhw== X-Forwarded-Encrypted: i=1; AJvYcCU1sTy4zY/HLgyRs9bW/H23VRXC8ogHyoRm9oCtD9yo5cB1pmTzod88ap4Q5IfSs8baJ1P5FN2WJCfrLpE=@vger.kernel.org X-Gm-Message-State: AOJu0YzWXdM/VXcU5ZiRkMxJO+pLug4vdC4NxZ2GYifehu3kDgzVv2CH OFHTigeuZSu1ZJRkQsKOare2QeIP20d+ZZBpCXPu93OCgU7BjIW+wIw/FnuOOQ== X-Gm-Gg: ASbGncs3PPpP26a171diT3rO/IMKsBSNwiqjZQ7+jvkbxtYlcNu7+ds2GW1bHawcQni 0TKPlikK1zflf9GG/A+eNmSQ1vEqB8RJkYIs57UijziMgJPuo/wWKiCYes462JVhYL/HIzJ32ZU j8NJk8jIukYp2KMcbUSs08Y9Vy+2uLmlPV4D/rSohqVd+8lRpPYKPecf9rwWUvO5th6CpDCIbjQ TGbOhzMjMFvc4+aD91WvQ13NKXEbPEbptEZqew9KooK6LZJvscQvrky3eJMJPS/QuGd6tjISC4Z Vqz+S7+DfGjTfbRxjoZzJbO2mAzr X-Google-Smtp-Source: AGHT+IEJkvjK9xJSO0CePo42cX0OoaGvyhAPmRkoUPST+KqNGlEPU6xv/EJnWdmaTpIOPBA38FE11Q== X-Received: by 2002:a05:6a21:1515:b0:1ee:c8a4:c329 with SMTP id adf61e73a8af0-1f2e36efeefmr3287648637.0.1740631051528; Wed, 26 Feb 2025 20:37:31 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-aee7ddf246bsm411855a12.2.2025.02.26.20.37.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:31 -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 11/19] zram: move post-processing target allocation Date: Thu, 27 Feb 2025 13:35:29 +0900 Message-ID: <20250227043618.88380-12-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allocate post-processing target in place_pp_slot(). This simplifies scan_slots_for_writeback() and scan_slots_for_recompress() loops because we don't need to track pps pointer state anymore. Previously we have to explicitly NULL the point if it has been added to a post-processing bucket or re-use previously allocated pointer otherwise and make sure we don't leak the memory in the end. We are also fine doing GFP_NOIO allocation, as post-processing can be called under memory pressure so we better pick as many slots as we can as soon as we can and start post-processing them, possibly saving the memory. Allocation failure there is not fatal, we will post-process whatever we put into the buckets on previous iterations. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 50 +++++++++++++++-------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 6755ca90f737..7ad89df9a304 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -295,15 +295,24 @@ static void release_pp_ctl(struct zram *zram, struct = zram_pp_ctl *ctl) kfree(ctl); } =20 -static void place_pp_slot(struct zram *zram, struct zram_pp_ctl *ctl, - struct zram_pp_slot *pps) +static bool place_pp_slot(struct zram *zram, struct zram_pp_ctl *ctl, + u32 index) { - u32 idx; + struct zram_pp_slot *pps; + u32 bid; + + pps =3D kmalloc(sizeof(*pps), GFP_NOIO | __GFP_NOWARN); + if (!pps) + return false; =20 - idx =3D zram_get_obj_size(zram, pps->index) / PP_BUCKET_SIZE_RANGE; - list_add(&pps->entry, &ctl->pp_buckets[idx]); + INIT_LIST_HEAD(&pps->entry); + pps->index =3D index; + + bid =3D zram_get_obj_size(zram, pps->index) / PP_BUCKET_SIZE_RANGE; + list_add(&pps->entry, &ctl->pp_buckets[bid]); =20 zram_set_flag(zram, pps->index, ZRAM_PP_SLOT); + return true; } =20 static struct zram_pp_slot *select_pp_slot(struct zram_pp_ctl *ctl) @@ -737,15 +746,8 @@ static int scan_slots_for_writeback(struct zram *zram,= u32 mode, unsigned long index, struct zram_pp_ctl *ctl) { - struct zram_pp_slot *pps =3D NULL; - for (; nr_pages !=3D 0; index++, nr_pages--) { - if (!pps) - pps =3D kmalloc(sizeof(*pps), GFP_KERNEL); - if (!pps) - return -ENOMEM; - - INIT_LIST_HEAD(&pps->entry); + bool ok =3D true; =20 zram_slot_lock(zram, index); if (!zram_allocated(zram, index)) @@ -765,14 +767,13 @@ static int scan_slots_for_writeback(struct zram *zram= , u32 mode, !zram_test_flag(zram, index, ZRAM_INCOMPRESSIBLE)) goto next; =20 - pps->index =3D index; - place_pp_slot(zram, ctl, pps); - pps =3D NULL; + ok =3D place_pp_slot(zram, ctl, index); next: zram_slot_unlock(zram, index); + if (!ok) + break; } =20 - kfree(pps); return 0; } =20 @@ -1827,16 +1828,10 @@ static int scan_slots_for_recompress(struct zram *z= ram, u32 mode, u32 prio_max, struct zram_pp_ctl *ctl) { unsigned long nr_pages =3D zram->disksize >> PAGE_SHIFT; - struct zram_pp_slot *pps =3D NULL; unsigned long index; =20 for (index =3D 0; index < nr_pages; index++) { - if (!pps) - pps =3D kmalloc(sizeof(*pps), GFP_KERNEL); - if (!pps) - return -ENOMEM; - - INIT_LIST_HEAD(&pps->entry); + bool ok =3D true; =20 zram_slot_lock(zram, index); if (!zram_allocated(zram, index)) @@ -1859,14 +1854,13 @@ static int scan_slots_for_recompress(struct zram *z= ram, u32 mode, u32 prio_max, if (zram_get_priority(zram, index) + 1 >=3D prio_max) goto next; =20 - pps->index =3D index; - place_pp_slot(zram, ctl, pps); - pps =3D NULL; + ok =3D place_pp_slot(zram, ctl, index); next: zram_slot_unlock(zram, index); + if (!ok) + break; } =20 - kfree(pps); return 0; } =20 --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CABC1EB5DF for ; Thu, 27 Feb 2025 04:37:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631059; cv=none; b=k9H+EUg4mS6KAh8JiHuqTa1bXMxo33YiRlujfAJA/cnyNObhOKqqxKgE5Q/xT1rRg8plB7e5KrdeqBuEnQ0qG3Z4aYv4SvE729F8aeYmPWRj+6LHdbeCFmvEsDWjDpQkOH8JY/JAP2oO64UFIDhBVRVtKvVn2IidXfSOCs9MMoM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631059; c=relaxed/simple; bh=odlz8hoQ26Jw3Tf67oa3XzcHo7Ity+kkxSjAfuSnavQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tHXko/4kTlM1P9vMUh7t+EN07F1tpg5DlDL/UsRPo6tQhWnwJ9f1p9TfAqgPgAyBkBr/ywX1BMqPepTGAgG4e2LyMyfUFrp3f3rhh/QNZ9hObwhSgnKBG2G3DKrBmypEYrWD0qjl9yW+W6OjH/0jmwOcQwRd0gSNu7eiALU3cMw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Gf3zVeij; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Gf3zVeij" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22114b800f7so8822775ad.2 for ; Wed, 26 Feb 2025 20:37:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631057; x=1741235857; darn=vger.kernel.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=Gf3zVeijwf5loopOVzjPHrAWXaGIlSG0wN11j3KJslXJRVoNJI3+Zv3dBQINarSyN8 3+oJWnb3OLsigkxrkDwEwHl3qAEpP3Jn7Gj0+f64QVXrsSIG+HKCcAiyv7H3vCBs0vOl DYmbWxnfeLD4tcpk+V8yIxzFxDC1aMw+8FWbw= 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=gLUeyL1GnrAUDlfRzH+GxhYKKQ7pYgoyR5H+7zklGbnIEfmUvWbIG42YzWUKPYZekI PYwGCy62lsJfTaXRy7ReslHSgb7dQZwo0nnr0z5ohemxG+2iLFfNraHzYFejAtVaDmW8 04aIdShqJ8LpSHpq60sBOez4CiC2WpuZEmrubgc2qEz5uhO4UTwWByv7DbMFyZw6unB8 OwMw120jIaNok1+VfnWGdfkueBmajb1CfFfL4wuPtJzcbZO6WFtgDR9It/efxJ6YWD4E D/k4JAyGzREjGIVQt5TUu0ozVfO+C8v0g+HZ+r98v3u54koAwdfEq4e39QejLkz4Wlyg ww6Q== X-Forwarded-Encrypted: i=1; AJvYcCVnmPXIAGhBrJpjHyNchq6EfTT8tq1sbDXIgRNfIdggsAtlgHbCGI/Aa/aGEMQErg3pXKqRNCb1R+K/T5U=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4OdvjRI6AQmCMR9lcvdI5Zg9rMMbfR9ub1kkxMwC7bWAev7WF gU3eWkJ5Dd71id/d2eFjVaHdy1vj3NPyohiXGnihdOu/MyaddIj8xuQcVWye5g== X-Gm-Gg: ASbGncuWwZqi2fhCqSk67MAK0rLiof2hq9CBawUe1Cl4uE/tMPPMF4zQ/9nOm7uRBLD 7VQofX82KHAaP0D3IMCQ+P5d/ZcG6U0sTU8RMMMJlUCQMpYUsl1et+WKhU1ShvodOTOLMbTV3va h/KCB1uljfQ5wEg9JMHcUxqte3qp+v41FbfLBRwhBYgYJjVGlvSRk5DU7luJi/ddZjpcEjD/Gl9 gnnTeYgj7xgiWT9dWkUjWbTUig9QjYl2kWOuHn7Ct8HE2wbGpYa8xkeMT1//mDqzUnkS0XQpvVl vAv3uq9GUonLhfaR6gJmtBs2fQO2 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; }; =20 @@ -1206,7 +1206,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned lo= ng handle, BUG_ON(in_interrupt()); =20 /* It guarantees it can get zspage from handle safely */ - read_lock(&pool->migrate_lock); + read_lock(&pool->lock); obj =3D handle_to_obj(handle); obj_to_location(obj, &zpdesc, &obj_idx); zspage =3D get_zspage(zpdesc); @@ -1218,7 +1218,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned lo= ng handle, * which is smaller granularity. */ migrate_read_lock(zspage); - read_unlock(&pool->migrate_lock); + read_unlock(&pool->lock); =20 class =3D zspage_class(pool, zspage); off =3D offset_in_page(class->size * obj_idx); @@ -1450,16 +1450,16 @@ void zs_free(struct zs_pool *pool, unsigned long ha= ndle) return; =20 /* - * 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 =3D handle_to_obj(handle); obj_to_zpdesc(obj, &f_zpdesc); zspage =3D get_zspage(f_zpdesc); class =3D zspage_class(pool, zspage); spin_lock(&class->lock); - read_unlock(&pool->migrate_lock); + read_unlock(&pool->lock); =20 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, stru= ct 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 =3D zspage_class(pool, zspage); =20 /* @@ -1833,7 +1833,7 @@ static int zs_page_migrate(struct page *newpage, stru= ct 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); =20 @@ -1956,7 +1956,7 @@ static unsigned long __zs_compact(struct zs_pool *poo= l, * 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 *p= ool, src_zspage =3D NULL; =20 if (get_fullness_group(class, dst_zspage) =3D=3D ZS_INUSE_RATIO_100 - || rwlock_is_contended(&pool->migrate_lock)) { + || rwlock_is_contended(&pool->lock)) { putback_zspage(class, dst_zspage); dst_zspage =3D NULL; =20 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 *poo= l, putback_zspage(class, dst_zspage); =20 spin_unlock(&class->lock); - write_unlock(&pool->migrate_lock); + write_unlock(&pool->lock); =20 return pages_freed; } @@ -2014,10 +2014,10 @@ unsigned long zs_compact(struct zs_pool *pool) unsigned long pages_freed =3D 0; =20 /* - * Pool compaction is performed under pool->migrate_lock so it is basical= ly + * 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; =20 init_deferred_free(pool); - rwlock_init(&pool->migrate_lock); + rwlock_init(&pool->lock); atomic_set(&pool->compaction_in_progress, 0); =20 pool->name =3D kstrdup(name, GFP_KERNEL); --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36A5D21D3C4 for ; Thu, 27 Feb 2025 04:37:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631067; cv=none; b=fcKBCxnxCH+3x5hGRLFTIO0OmGZpzhc5I5UZPXYjaKRCZaFLFkW4Dftz/XY0HQjE1Aa3AzyHGsZ8y8buOnp+NmcOmA4ueRTOwsDF+Z3C/3A9FQlRkJsTDV0WKJlUBCPgswhHI/2NPAiWL1Bz8RgzKVo2LXw3bE9yxNW2xJLbsW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631067; c=relaxed/simple; bh=9xIWo+qYBIjDJDoi7mgugd4aIKN7ipYPVG8X4/plwdA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E+3yu3WhmZx2qU7MuOUMQ1T9Lpmblj9DHXooNwPYN6RYqQPl6DfVnGWYPtGi8NCHovpIwg0byQ63GDajIZgAtrbTN8hrJGeAjWYryKrLqSpdPgqWN0lUGWva1VTvf+JU8YjZUqagUf7+fnLFyGF452JaP+aIKTFXOEMUtMQku2A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=kjFxbXS0; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="kjFxbXS0" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2211cd4463cso8011355ad.2 for ; Wed, 26 Feb 2025 20:37:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631063; x=1741235863; darn=vger.kernel.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=GwrDBXsyO2EvEhOdvagCAu0rolY3IippWT1+2LO84LM=; b=kjFxbXS0oAV7YQLKc21aEoFKAiaDr6cR6QOON+gW+R/8vdYY5/Rr+kfQhT3XEHZQ7Z VQOfR1IEFEakNqTt171tjKeFlzae4v43jxoxAY4IkxmYUZH1kqxXEvR1fI0JLiOa7Vkm /wnKAnNv1+i/otlohxB/VSTlh6z3tPlHCLesk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631063; x=1741235863; 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=GwrDBXsyO2EvEhOdvagCAu0rolY3IippWT1+2LO84LM=; b=WArbxgtEWGDlRWZyQ5bwTstQSLJHZzXLTCQ1pAwGS2B+I4jqazL3JZ6O29rYZ+S/Za EOaJHWGdlVn6uAIsWsXBwboKeb2aSRAkudx0tbKIikn3Mpxpnx2DTTkKD26f4Fg2tKAx h9XBPpjtAuRGRIxUMAymEAadNyHwzs5MhU1m7BCP+3rAoRtQFtn+8+tpUB2TKOu2bNOJ 7fQOBY7n6sKUknmmHMPaoDQdA5TVxZ3pRPdrb10KCy/OWVxFcB7gn1ndqB0+DsjhKMCD SR1eiKf/VdrorzRd2cfT2FEMzpmos6obi2fBcYrMamD9vWvPoyggRFRjn3A3iFp+3Du4 1/Jg== X-Forwarded-Encrypted: i=1; AJvYcCV4d6P5cdoPg2jxFvA98u703KIyhmffzScEHs46IwRu4xqpYwevx177CBCiava+wPWlcCkXi5l31o7WZTY=@vger.kernel.org X-Gm-Message-State: AOJu0Ywerm2kadlH22IMW6RUtJxz4GrQRsZkWaOSB87c/88SG+iCoDgY wCuoTuCuv8itS2lobYMa6MdjNyF+ItKFmzdYQ4P+L4lQodP7clx/OC7rqHh7Mg== X-Gm-Gg: ASbGncs7hWIQqLbBzD3hp1GGSAiWz6O2LoglIT1mUzB7YMCEI2jg55kuzyWJqrwqY+i tqLKNC5U3t14m3oSambmloO0uxzA6JCT1wgO5qI2wf5bz3sdNYAG8yt3bXsLhSeMQOuaomL9Q7y m38xvYJV824nQtHNDcMTH6HOvJMWNCIWKlNCEER20cqBPycBprcQCZZLYquQNqtlMigYBYcBMbF cjve184jKdqgmuWTo405wRKrBZ1ZBLvz1LZo4j0H2ru//SNPNmRWi6HYApWsFgwVwe2mI8hM4jV PPg7X7Li8vuheYtHNkVgLVGltZVB X-Google-Smtp-Source: AGHT+IFrOSZSmfTMzWd5HqkTvrPS3qIgNLqZdoN+0693MnsV/OS8jz0BlediKk7QkapJlhesjLvlCw== X-Received: by 2002:aa7:84c8:0:b0:734:918a:4ecd with SMTP id d2e1a72fcca58-734918a5063mr4878646b3a.15.1740631063305; Wed, 26 Feb 2025 20:37:43 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-734a0024bd8sm501433b3a.91.2025.02.26.20.37.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:42 -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 13/19] zsmalloc: make zspage lock preemptible Date: Thu, 27 Feb 2025 13:35:31 +0900 Message-ID: <20250227043618.88380-14-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In order to implement preemptible object mapping we need a zspage lock that satisfies several preconditions: - it should be reader-write type of a lock - it should be possible to hold it from any context, but also being preemptible if the context allows it - we never sleep while acquiring but can sleep while holding in read mode An rwsemaphore doesn't suffice, due to atomicity requirements, rwlock doesn't satisfy due to reader-preemptability requirement. It's also worth to mention, that per-zspage rwsem is a little too memory heavy (we can easily have double digits megabytes used only on rwsemaphores). Switch over from rwlock_t to a atomic_t-based implementation of a reader-writer semaphore that satisfies all of the preconditions. The spin-lock based zspage_lock is suggested by Hillf Danton. Suggested-by: Hillf Danton Signed-off-by: Sergey Senozhatsky --- mm/zsmalloc.c | 171 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 118 insertions(+), 53 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 1424ee73cbb5..74a7aaebf7a0 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -226,6 +226,7 @@ struct zs_pool { /* protect zspage migration/compaction */ rwlock_t lock; atomic_t compaction_in_progress; + struct lock_class_key lock_class; }; =20 static inline void zpdesc_set_first(struct zpdesc *zpdesc) @@ -257,6 +258,15 @@ static inline void free_zpdesc(struct zpdesc *zpdesc) __free_page(page); } =20 +#define ZS_PAGE_UNLOCKED 0 +#define ZS_PAGE_WRLOCKED -1 + +struct zspage_lock { + spinlock_t lock; + int cnt; + struct lockdep_map dep_map; +}; + struct zspage { struct { unsigned int huge:HUGE_BITS; @@ -269,7 +279,7 @@ struct zspage { struct zpdesc *first_zpdesc; struct list_head list; /* fullness list */ struct zs_pool *pool; - rwlock_t lock; + struct zspage_lock zsl; }; =20 struct mapping_area { @@ -279,6 +289,85 @@ struct mapping_area { enum zs_mapmode vm_mm; /* mapping mode */ }; =20 +static void zspage_lock_init(struct zspage *zspage) +{ + struct zspage_lock *zsl =3D &zspage->zsl; + + lockdep_init_map(&zsl->dep_map, "zspage->lock", + &zspage->pool->lock_class, 0); + spin_lock_init(&zsl->lock); + zsl->cnt =3D ZS_PAGE_UNLOCKED; +} + +/* + * The zspage lock can be held from atomic contexts, but it needs to remain + * preemptible when held for reading because it remains held outside of th= ose + * atomic contexts, otherwise we unnecessarily lose preemptibility. + * + * To achieve this, the following rules are enforced on readers and writer= s: + * + * - Writers are blocked by both writers and readers, while readers are on= ly + * blocked by writers (i.e. normal rwlock semantics). + * + * - Writers are always atomic (to allow readers to spin waiting for them). + * + * - Writers always use trylock (as the lock may be held be sleeping reade= rs). + * + * - Readers may spin on the lock (as they can only wait for atomic writer= s). + * + * - Readers may sleep while holding the lock (as writes only use trylock). + */ +static void zspage_read_lock(struct zspage *zspage) +{ + struct zspage_lock *zsl =3D &zspage->zsl; + + rwsem_acquire_read(&zsl->dep_map, 0, 0, _RET_IP_); + + spin_lock(&zsl->lock); + zsl->cnt++; + spin_unlock(&zsl->lock); + + lock_acquired(&zsl->dep_map, _RET_IP_); +} + +static void zspage_read_unlock(struct zspage *zspage) +{ + struct zspage_lock *zsl =3D &zspage->zsl; + + rwsem_release(&zsl->dep_map, _RET_IP_); + + spin_lock(&zsl->lock); + zsl->cnt--; + spin_unlock(&zsl->lock); +} + +static __must_check bool zspage_write_trylock(struct zspage *zspage) +{ + struct zspage_lock *zsl =3D &zspage->zsl; + + spin_lock(&zsl->lock); + if (zsl->cnt =3D=3D ZS_PAGE_UNLOCKED) { + zsl->cnt =3D ZS_PAGE_WRLOCKED; + rwsem_acquire(&zsl->dep_map, 0, 1, _RET_IP_); + lock_acquired(&zsl->dep_map, _RET_IP_); + return true; + } + + lock_contended(&zsl->dep_map, _RET_IP_); + spin_unlock(&zsl->lock); + return false; +} + +static void zspage_write_unlock(struct zspage *zspage) +{ + struct zspage_lock *zsl =3D &zspage->zsl; + + rwsem_release(&zsl->dep_map, _RET_IP_); + + zsl->cnt =3D ZS_PAGE_UNLOCKED; + spin_unlock(&zsl->lock); +} + /* huge object: pages_per_zspage =3D=3D 1 && maxobj_per_zspage =3D=3D 1 */ static void SetZsHugePage(struct zspage *zspage) { @@ -290,12 +379,6 @@ static bool ZsHugePage(struct zspage *zspage) return zspage->huge; } =20 -static void migrate_lock_init(struct zspage *zspage); -static void migrate_read_lock(struct zspage *zspage); -static void migrate_read_unlock(struct zspage *zspage); -static void migrate_write_lock(struct zspage *zspage); -static void migrate_write_unlock(struct zspage *zspage); - #ifdef CONFIG_COMPACTION static void kick_deferred_free(struct zs_pool *pool); static void init_deferred_free(struct zs_pool *pool); @@ -992,7 +1075,9 @@ static struct zspage *alloc_zspage(struct zs_pool *poo= l, return NULL; =20 zspage->magic =3D ZSPAGE_MAGIC; - migrate_lock_init(zspage); + zspage->pool =3D pool; + zspage->class =3D class->index; + zspage_lock_init(zspage); =20 for (i =3D 0; i < class->pages_per_zspage; i++) { struct zpdesc *zpdesc; @@ -1015,8 +1100,6 @@ static struct zspage *alloc_zspage(struct zs_pool *po= ol, =20 create_page_chain(class, zspage, zpdescs); init_zspage(class, zspage); - zspage->pool =3D pool; - zspage->class =3D class->index; =20 return zspage; } @@ -1217,7 +1300,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned lo= ng handle, * zs_unmap_object API so delegate the locking from class to zspage * which is smaller granularity. */ - migrate_read_lock(zspage); + zspage_read_lock(zspage); read_unlock(&pool->lock); =20 class =3D zspage_class(pool, zspage); @@ -1277,7 +1360,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned l= ong handle) } local_unlock(&zs_map_area.lock); =20 - migrate_read_unlock(zspage); + zspage_read_unlock(zspage); } EXPORT_SYMBOL_GPL(zs_unmap_object); =20 @@ -1671,18 +1754,18 @@ static void lock_zspage(struct zspage *zspage) /* * Pages we haven't locked yet can be migrated off the list while we're * trying to lock them, so we need to be careful and only attempt to - * lock each page under migrate_read_lock(). Otherwise, the page we lock + * lock each page under zspage_read_lock(). Otherwise, the page we lock * may no longer belong to the zspage. This means that we may wait for * the wrong page to unlock, so we must take a reference to the page - * prior to waiting for it to unlock outside migrate_read_lock(). + * prior to waiting for it to unlock outside zspage_read_lock(). */ while (1) { - migrate_read_lock(zspage); + zspage_read_lock(zspage); zpdesc =3D get_first_zpdesc(zspage); if (zpdesc_trylock(zpdesc)) break; zpdesc_get(zpdesc); - migrate_read_unlock(zspage); + zspage_read_unlock(zspage); zpdesc_wait_locked(zpdesc); zpdesc_put(zpdesc); } @@ -1693,41 +1776,16 @@ static void lock_zspage(struct zspage *zspage) curr_zpdesc =3D zpdesc; } else { zpdesc_get(zpdesc); - migrate_read_unlock(zspage); + zspage_read_unlock(zspage); zpdesc_wait_locked(zpdesc); zpdesc_put(zpdesc); - migrate_read_lock(zspage); + zspage_read_lock(zspage); } } - migrate_read_unlock(zspage); + zspage_read_unlock(zspage); } #endif /* CONFIG_COMPACTION */ =20 -static void migrate_lock_init(struct zspage *zspage) -{ - rwlock_init(&zspage->lock); -} - -static void migrate_read_lock(struct zspage *zspage) __acquires(&zspage->l= ock) -{ - read_lock(&zspage->lock); -} - -static void migrate_read_unlock(struct zspage *zspage) __releases(&zspage-= >lock) -{ - read_unlock(&zspage->lock); -} - -static void migrate_write_lock(struct zspage *zspage) -{ - write_lock(&zspage->lock); -} - -static void migrate_write_unlock(struct zspage *zspage) -{ - write_unlock(&zspage->lock); -} - #ifdef CONFIG_COMPACTION =20 static const struct movable_operations zsmalloc_mops; @@ -1785,9 +1843,6 @@ static int zs_page_migrate(struct page *newpage, stru= ct page *page, =20 VM_BUG_ON_PAGE(!zpdesc_is_isolated(zpdesc), zpdesc_page(zpdesc)); =20 - /* We're committed, tell the world that this is a Zsmalloc page. */ - __zpdesc_set_zsmalloc(newzpdesc); - /* The page is locked, so this pointer must remain valid */ zspage =3D get_zspage(zpdesc); pool =3D zspage->pool; @@ -1803,8 +1858,15 @@ static int zs_page_migrate(struct page *newpage, str= uct page *page, * the class lock protects zpage alloc/free in the zspage. */ spin_lock(&class->lock); - /* the migrate_write_lock protects zpage access via zs_map_object */ - migrate_write_lock(zspage); + /* the zspage write_lock protects zpage access via zs_map_object */ + if (!zspage_write_trylock(zspage)) { + spin_unlock(&class->lock); + write_unlock(&pool->lock); + return -EINVAL; + } + + /* We're committed, tell the world that this is a Zsmalloc page. */ + __zpdesc_set_zsmalloc(newzpdesc); =20 offset =3D get_first_obj_offset(zpdesc); s_addr =3D kmap_local_zpdesc(zpdesc); @@ -1835,7 +1897,7 @@ static int zs_page_migrate(struct page *newpage, stru= ct page *page, */ write_unlock(&pool->lock); spin_unlock(&class->lock); - migrate_write_unlock(zspage); + zspage_write_unlock(zspage); =20 zpdesc_get(newzpdesc); if (zpdesc_zone(newzpdesc) !=3D zpdesc_zone(zpdesc)) { @@ -1971,9 +2033,11 @@ static unsigned long __zs_compact(struct zs_pool *po= ol, if (!src_zspage) break; =20 - migrate_write_lock(src_zspage); + if (!zspage_write_trylock(src_zspage)) + break; + migrate_zspage(pool, src_zspage, dst_zspage); - migrate_write_unlock(src_zspage); + zspage_write_unlock(src_zspage); =20 fg =3D putback_zspage(class, src_zspage); if (fg =3D=3D ZS_INUSE_RATIO_0) { @@ -2141,6 +2205,7 @@ struct zs_pool *zs_create_pool(const char *name) init_deferred_free(pool); rwlock_init(&pool->lock); atomic_set(&pool->compaction_in_progress, 0); + lockdep_register_key(&pool->lock_class); =20 pool->name =3D kstrdup(name, GFP_KERNEL); if (!pool->name) @@ -2233,7 +2298,6 @@ struct zs_pool *zs_create_pool(const char *name) * trigger compaction manually. Thus, ignore return code. */ zs_register_shrinker(pool); - return pool; =20 err: @@ -2270,6 +2334,7 @@ void zs_destroy_pool(struct zs_pool *pool) kfree(class); } =20 + lockdep_unregister_key(&pool->lock_class); destroy_cache(pool); kfree(pool->name); kfree(pool); --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BEF5227B8E for ; Thu, 27 Feb 2025 04:37:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631071; cv=none; b=a+uTDJ40hAjHDMlcr2ihziGiNTQtrKMPJ4o8qH8QvtUxwicABnaFQrzH88z5H3wJJdf4MgEG64AnDwAs9ixOPWbp/5C2Hqf0DKqL8Ed9UsN99Jf1dubSG3fJ40S6xTvw1qOBsw8G68tIFGP3eAMm3zovOmFO4dEvOaAEH81jgdw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631071; c=relaxed/simple; bh=YTxRDdOLOlPOoj4suLEt0fXJmIh58t2xvi+gw+BLvig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rWKKuOLcFtJrkDNbIpFExTAOzqenJqsE5jN7I//TGq5pvMYe3Y3Nj8HDkJJwLCbKDylq+U3ZQOBmhrP69HGYI1ksALPqbPqr6u1v9SrdirOadN/VuRyQtRdyyvXnzNgqFc2yAPgP0BTo0OAOaYQWNnLMber7qOPF3BNOZyaAXSg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=MZ97e1SA; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="MZ97e1SA" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2fe98d173daso903499a91.1 for ; Wed, 26 Feb 2025 20:37:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631069; x=1741235869; darn=vger.kernel.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=DBpeAJmv3dkwKu8bLvx37fcH2/07qN2DhOmgxltefRs=; b=MZ97e1SAxpLiSQkS/vcF2yXhoa2QfioFbyimJaJe4rwMBBjaTEGYzt86xhvH23X/ce lcF4tJIlLJFed7yVyo3X4JzBuQt3ykMm8RVGnbqD42yFzVqScv4YD2E14f3ih/W30ZsC dzEDiq/Ni7A1LW+OqenkHV8WcQHxko1eMIDck= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631069; x=1741235869; 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=DBpeAJmv3dkwKu8bLvx37fcH2/07qN2DhOmgxltefRs=; b=RtZseg6F5Lo+iBw9uaIcNJGCA1IVaBYDc0bDTE9S9/zcqIgXY6fu33fyeta3rmKFhp AGP3QxzExmoS/8yRhNGXAEeqpLSAYZifANeXundtUeCN9Nx/inyojYKaIRCCVNEfwL0W TCnDG/yK0067mYyKqwFKmDIGhtiPZP4AXKSkR1MTVr+bioaf4GJ4AtPVS2VdRuBUF80w 357bRxvC252/qy/jx9sDNa/LxrfojAxR4NnJunM3dK0uMQSaUmzsgpUCtjM6MifX8bm0 mcnvJCOozJPVZddNrYGmP9gjiM0ipEAkc8479afpuIc/xDklbZ7Lqn3lSVzzhbED/EWb qSeg== X-Forwarded-Encrypted: i=1; AJvYcCV4+AlJpL/DbSvaPaG+lPr8pvfMAVFwJZQ68Ew2Mt04pIcomDAZulSmoYcUB056fjbuUvJQIm0OuIJsuYw=@vger.kernel.org X-Gm-Message-State: AOJu0YyVp0B36hUcce8mlwoYNrXe3h7Vs7zPP/BrhsG1dos7mWgrNWl2 A7QgWAWjpanf1jJHsF3sJx+vfMA1htFKFPIyZ1uXUAc8NEvgoakbHA5pTneReA== X-Gm-Gg: ASbGncuaXWTJnyCoj5vF+lcSKM0FFmBiMCMfDCcuQE0+TfnYGu4/IJ/x0Bei/WZDQ9A XnO7tGhv6cT8eeoVI4UiR/90j9Qu0yX96mJBcIjaGiY6vOwp1ILdfeK8JxnZ5hhRTbQOZrSlzPE CrXM+6CUFzK7Qc7/5s/zsU0N1HnGaS8Ffq03kV+yEkzvGIMjxE49NoeUjGRmKAI2Ahx8SOM0bY1 2gOCPUFyyBnBz/n15jWquEF/5Hvgq1j5tSRAhtv43hi4K/8EdLiy6rg+JqQLmHrRcUvjAFNrQ2a Oq+TP6Ja7IVT8SSzArc5v0lpmmBB X-Google-Smtp-Source: AGHT+IGT9IFUdagZ07dcKsUPA3Ga8h0xkyUlcDu4WDHvdo9Rq1PU1sFyBt6xUxtOAdS37OHnC4HqBA== X-Received: by 2002:a17:90a:f28e:b0:2fe:7fae:59f7 with SMTP id 98e67ed59e1d1-2fe7fae5c01mr9272618a91.33.1740631069336; Wed, 26 Feb 2025 20:37:49 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fe6ded6ebfsm4534899a91.1.2025.02.26.20.37.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:49 -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 14/19] zsmalloc: introduce new object mapping API Date: Thu, 27 Feb 2025 13:35:32 +0900 Message-ID: <20250227043618.88380-15-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Current object mapping API is a little cumbersome. First, it's inconsistent, sometimes it returns with page-faults disabled and sometimes with page-faults enabled. Second, and most importantly, it enforces atomicity restrictions on its users. zs_map_object() has to return a liner object address which is not always possible because some objects span multiple physical (non-contiguous) pages. For such objects zsmalloc uses a per-CPU buffer to which object's data is copied before a pointer to that per-CPU buffer is returned back to the caller. This leads to another, final, issue - extra memcpy(). Since the caller gets a pointer to per-CPU buffer it can memcpy() data only to that buffer, and during zs_unmap_object() zsmalloc will memcpy() from that per-CPU buffer to physical pages that object in question spans across. New API splits functions by access mode: - zs_obj_read_begin(handle, local_copy) Returns a pointer to handle memory. For objects that span two physical pages a local_copy buffer is used to store object's data before the address is returned to the caller. Otherwise the object's page is kmap_local mapped directly. - zs_obj_read_end(handle, buf) Unmaps the page if it was kmap_local mapped by zs_obj_read_begin(). - zs_obj_write(handle, buf, len) Copies len-bytes from compression buffer to handle memory (takes care of objects that span two pages). This does not need any additional (e.g. per-CPU) buffers and writes the data directly to zsmalloc pool pages. In terms of performance, on a synthetic and completely reproducible test that allocates fixed number of objects of fixed sizes and iterates over those objects, first mapping in RO then in RW mode: OLD API =3D=3D=3D=3D=3D=3D=3D 3 first results out of 10 369,205,778 instructions # 0.80 insn per cycle 40,467,926 branches # 113.732 M/sec 369,002,122 instructions # 0.62 insn per cycle 40,426,145 branches # 189.361 M/sec 369,036,706 instructions # 0.63 insn per cycle 40,430,860 branches # 204.105 M/sec [..] NEW API =3D=3D=3D=3D=3D=3D=3D 3 first results out of 10 265,799,293 instructions # 0.51 insn per cycle 29,834,567 branches # 170.281 M/sec 265,765,970 instructions # 0.55 insn per cycle 29,829,019 branches # 161.602 M/sec 265,764,702 instructions # 0.51 insn per cycle 29,828,015 branches # 189.677 M/sec [..] T-test on all 10 runs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Difference at 95.0% confidence -1.03219e+08 +/- 55308.7 -27.9705% +/- 0.0149878% (Student's t, pooled s =3D 58864.4) The old API will stay around until the remaining users switch to the new one. After that we'll also remove zsmalloc per-CPU buffer and CPU hotplug handling. The split of map(RO) and map(WO) into read_{begin/end}/write is suggested by Yosry Ahmed. Suggested-by: Yosry Ahmed Signed-off-by: Sergey Senozhatsky --- include/linux/zsmalloc.h | 8 +++ mm/zsmalloc.c | 125 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index a48cd0ffe57d..7d70983cf398 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -58,4 +58,12 @@ unsigned long zs_compact(struct zs_pool *pool); unsigned int zs_lookup_class_index(struct zs_pool *pool, unsigned int size= ); =20 void zs_pool_stats(struct zs_pool *pool, struct zs_pool_stats *stats); + +void *zs_obj_read_begin(struct zs_pool *pool, unsigned long handle, + void *local_copy); +void zs_obj_read_end(struct zs_pool *pool, unsigned long handle, + void *handle_mem); +void zs_obj_write(struct zs_pool *pool, unsigned long handle, + void *handle_mem, size_t mem_len); + #endif diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 74a7aaebf7a0..147915ba04f9 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1364,6 +1364,131 @@ void zs_unmap_object(struct zs_pool *pool, unsigned= long handle) } EXPORT_SYMBOL_GPL(zs_unmap_object); =20 +void *zs_obj_read_begin(struct zs_pool *pool, unsigned long handle, + void *local_copy) +{ + struct zspage *zspage; + struct zpdesc *zpdesc; + unsigned long obj, off; + unsigned int obj_idx; + struct size_class *class; + void *addr; + + /* Guarantee we can get zspage from handle safely */ + read_lock(&pool->lock); + obj =3D handle_to_obj(handle); + obj_to_location(obj, &zpdesc, &obj_idx); + zspage =3D get_zspage(zpdesc); + + /* Make sure migration doesn't move any pages in this zspage */ + zspage_read_lock(zspage); + read_unlock(&pool->lock); + + class =3D zspage_class(pool, zspage); + off =3D offset_in_page(class->size * obj_idx); + + if (off + class->size <=3D PAGE_SIZE) { + /* this object is contained entirely within a page */ + addr =3D kmap_local_zpdesc(zpdesc); + addr +=3D off; + } else { + size_t sizes[2]; + + /* this object spans two pages */ + sizes[0] =3D PAGE_SIZE - off; + sizes[1] =3D class->size - sizes[0]; + addr =3D local_copy; + + memcpy_from_page(addr, zpdesc_page(zpdesc), + off, sizes[0]); + zpdesc =3D get_next_zpdesc(zpdesc); + memcpy_from_page(addr + sizes[0], + zpdesc_page(zpdesc), + 0, sizes[1]); + } + + if (!ZsHugePage(zspage)) + addr +=3D ZS_HANDLE_SIZE; + + return addr; +} +EXPORT_SYMBOL_GPL(zs_obj_read_begin); + +void zs_obj_read_end(struct zs_pool *pool, unsigned long handle, + void *handle_mem) +{ + struct zspage *zspage; + struct zpdesc *zpdesc; + unsigned long obj, off; + unsigned int obj_idx; + struct size_class *class; + + obj =3D handle_to_obj(handle); + obj_to_location(obj, &zpdesc, &obj_idx); + zspage =3D get_zspage(zpdesc); + class =3D zspage_class(pool, zspage); + off =3D offset_in_page(class->size * obj_idx); + + if (off + class->size <=3D PAGE_SIZE) { + if (!ZsHugePage(zspage)) + off +=3D ZS_HANDLE_SIZE; + handle_mem -=3D off; + kunmap_local(handle_mem); + } + + zspage_read_unlock(zspage); +} +EXPORT_SYMBOL_GPL(zs_obj_read_end); + +void zs_obj_write(struct zs_pool *pool, unsigned long handle, + void *handle_mem, size_t mem_len) +{ + struct zspage *zspage; + struct zpdesc *zpdesc; + unsigned long obj, off; + unsigned int obj_idx; + struct size_class *class; + + /* Guarantee we can get zspage from handle safely */ + read_lock(&pool->lock); + obj =3D handle_to_obj(handle); + obj_to_location(obj, &zpdesc, &obj_idx); + zspage =3D get_zspage(zpdesc); + + /* Make sure migration doesn't move any pages in this zspage */ + zspage_read_lock(zspage); + read_unlock(&pool->lock); + + class =3D zspage_class(pool, zspage); + off =3D offset_in_page(class->size * obj_idx); + + if (off + class->size <=3D PAGE_SIZE) { + /* this object is contained entirely within a page */ + void *dst =3D kmap_local_zpdesc(zpdesc); + + if (!ZsHugePage(zspage)) + off +=3D ZS_HANDLE_SIZE; + memcpy(dst + off, handle_mem, mem_len); + kunmap_local(dst); + } else { + /* this object spans two pages */ + size_t sizes[2]; + + off +=3D ZS_HANDLE_SIZE; + sizes[0] =3D PAGE_SIZE - off; + sizes[1] =3D mem_len - sizes[0]; + + memcpy_to_page(zpdesc_page(zpdesc), off, + handle_mem, sizes[0]); + zpdesc =3D get_next_zpdesc(zpdesc); + memcpy_to_page(zpdesc_page(zpdesc), 0, + handle_mem + sizes[0], sizes[1]); + } + + zspage_read_unlock(zspage); +} +EXPORT_SYMBOL_GPL(zs_obj_write); + /** * zs_huge_class_size() - Returns the size (in bytes) of the first huge * zsmalloc &size_class. --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6665822CBF4 for ; Thu, 27 Feb 2025 04:37:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631076; cv=none; b=VHUXnmBNycDWDuy9shjVUobTLhNJLYSQ0EKnN7oiWbWtjX3DFLN2OmkvcHGHrVI+NWsJTJd9kpWgMd/pLlvnEqcrFAspQyeWMJ5QJ/cl+6xPLmdJJ4p/fYbKG8XxKNnKU/V25m84UfsLQhmGOvlz6I1KqgOS0XqYV1P5c5FPz64= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631076; c=relaxed/simple; bh=Y1DGMDdF306tqns15ytiyh6756PpxvWDjG7kHbCED6I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VaTw24lMFNkT32Gz0NIHV9OZim6ke5eWXSOLJn8gFIdqzZiHdQvV9jn1YzlP/5AbS7ACPvW69tNDJbV7AHoHdE4a80/Vhnkkv90LtEkM2Jf728eK1X1A8Lzes0iPZ2tV5n1r1i7vuuHUNWCmR+8GtaGdYe7o1UL7n+Wesu3Nj3k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=XFjKFv+y; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="XFjKFv+y" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2235908a30aso378275ad.3 for ; Wed, 26 Feb 2025 20:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631074; x=1741235874; darn=vger.kernel.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=HzxKzH19wN3flX6Re4AXRoS/RZlbQkKv5ZSRzF7j4DA=; b=XFjKFv+y16pqG1xx+SL1AktW2sF/cbUf5bqfR9rTBNhKt9x7CSllaHKB42Z7KHINMR vHENGfuEF05VrDqlDj+sC+CarfxOhjoT7Q3TFqyF3SSXduGV8XXPBmpS6mVW2uIysq0z E5yX/i7KZpcQdK8F1Q3XGMg96cpWD5kycYNrA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631074; x=1741235874; 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=HzxKzH19wN3flX6Re4AXRoS/RZlbQkKv5ZSRzF7j4DA=; b=AwIgPP1mISkdIgHfuyu5VgOM/Vu4QLt3fous1HxPY+y9IsyyTxSrZWNWRP92Io1qCX ryELy+lbw/q1J/GErI1bFAuC9DFpG0YvcIre0jIsJPU6n/GUHnZ3XcxFTAf6p9e/YaCE qC1NpiETbfrbtqRh/O+40RTy8+BxipaNxu6YjlHCRiRPrxbGZttRSwjAT4X5UKuRnIvn pWbIC0zkvxY7LmF6WmaUbDWXhIS/R/8xXyHKb/Ye7l/grAfA/fy1WIR3zozXD9OMz7yh RDjC6CPJ49dAw9LFxOYxR+dqLjpQlPn00rFJ+7oRnDeStjL+yZbvctC0QI9SJ5HVUPTE 54SQ== X-Forwarded-Encrypted: i=1; AJvYcCV+XckPiv26lJZI9Z2EUnpWuU3kSBsn6uoQ6jnmk/wyfhovw57cFfchqKxo+4CmEFQrf8BeOX/MS/Fd74w=@vger.kernel.org X-Gm-Message-State: AOJu0YxjQuMuJao6ef+FtFJp7F/eHY17Rdcd8gOir5ZYugtrDtYSezbg MiF9f2EUXm2Anud0BFVMpZ5EYYnzJDvnxvg+Dg3rJ5k640UgGewUB/UPmY9otg== X-Gm-Gg: ASbGncvSh1uLmaT2V9UiMFOj2P70EXMyOyW9V384Vj4tM6ZF2JElWE6MOq8UcUa4iSG +wV0K3BYLwBRPvt2/J7q+KwLX57LvDJ/YfFieam7r4a68FcrDiGrbJ9Ct+yhnjZk5LOS5mF2u0k +Pb1CamCRj5qYDGVDXkN0eLOb3BdfhfZgkQQy/q35vMbJn2NvKFyBULY2Ph7IooPAV/tenpUpJW 3DYyMIQvtDBTCIvwHD4Rn5L+QfxYpYkrFzlVS20+d0JAgInlTiY90iLgXR2l1TDqNv6HdBR6TMd AJl61g5i5UZvpxyH+frCSkUEf3nJ X-Google-Smtp-Source: AGHT+IFihPm3YLRz0ki1R3h8+MO8xOX0re37Dk+wIL69kSAnv/pKGoOrc8itNvxpjLwlfq4K2/CuWw== X-Received: by 2002:a17:902:f541:b0:223:26da:4b6f with SMTP id d9443c01a7336-22326da4d3emr76424375ad.14.1740631074685; Wed, 26 Feb 2025 20:37:54 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501d5247sm4996945ad.26.2025.02.26.20.37.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:54 -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 15/19] zram: switch to new zsmalloc object mapping API Date: Thu, 27 Feb 2025 13:35:33 +0900 Message-ID: <20250227043618.88380-16-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use new read/write zsmalloc object API. For cases when RO mapped object spans two physical pages (requires temp buffer) compression streams now carry around one extra physical page. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zcomp.c | 4 +++- drivers/block/zram/zcomp.h | 2 ++ drivers/block/zram/zram_drv.c | 28 ++++++++++------------------ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index cfdde2e0748a..a1d627054bb1 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -45,6 +45,7 @@ static const struct zcomp_ops *backends[] =3D { static void zcomp_strm_free(struct zcomp *comp, struct zcomp_strm *zstrm) { comp->ops->destroy_ctx(&zstrm->ctx); + vfree(zstrm->local_copy); vfree(zstrm->buffer); zstrm->buffer =3D NULL; } @@ -57,12 +58,13 @@ static int zcomp_strm_init(struct zcomp *comp, struct z= comp_strm *zstrm) if (ret) return ret; =20 + zstrm->local_copy =3D vzalloc(PAGE_SIZE); /* * allocate 2 pages. 1 for compressed data, plus 1 extra for the * case when compressed size is larger than the original one */ zstrm->buffer =3D vzalloc(2 * PAGE_SIZE); - if (!zstrm->buffer) { + if (!zstrm->buffer || !zstrm->local_copy) { zcomp_strm_free(comp, zstrm); return -ENOMEM; } diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h index 23b8236b9090..25339ed1e07e 100644 --- a/drivers/block/zram/zcomp.h +++ b/drivers/block/zram/zcomp.h @@ -34,6 +34,8 @@ struct zcomp_strm { struct mutex lock; /* compression buffer */ void *buffer; + /* local copy of handle memory */ + void *local_copy; struct zcomp_ctx ctx; }; =20 diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 7ad89df9a304..1e2ba3590a39 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1561,11 +1561,11 @@ static int read_incompressible_page(struct zram *zr= am, struct page *page, void *src, *dst; =20 handle =3D zram_get_handle(zram, index); - src =3D zs_map_object(zram->mem_pool, handle, ZS_MM_RO); + src =3D zs_obj_read_begin(zram->mem_pool, handle, NULL); dst =3D kmap_local_page(page); copy_page(dst, src); kunmap_local(dst); - zs_unmap_object(zram->mem_pool, handle); + zs_obj_read_end(zram->mem_pool, handle, src); =20 return 0; } @@ -1583,11 +1583,11 @@ static int read_compressed_page(struct zram *zram, = struct page *page, u32 index) prio =3D zram_get_priority(zram, index); =20 zstrm =3D zcomp_stream_get(zram->comps[prio]); - src =3D zs_map_object(zram->mem_pool, handle, ZS_MM_RO); + src =3D zs_obj_read_begin(zram->mem_pool, handle, zstrm->local_copy); dst =3D kmap_local_page(page); ret =3D zcomp_decompress(zram->comps[prio], zstrm, src, size, dst); kunmap_local(dst); - zs_unmap_object(zram->mem_pool, handle); + zs_obj_read_end(zram->mem_pool, handle, src); zcomp_stream_put(zstrm); =20 return ret; @@ -1683,7 +1683,7 @@ static int write_incompressible_page(struct zram *zra= m, struct page *page, u32 index) { unsigned long handle; - void *src, *dst; + void *src; =20 /* * This function is called from preemptible context so we don't need @@ -1701,11 +1701,9 @@ static int write_incompressible_page(struct zram *zr= am, struct page *page, return -ENOMEM; } =20 - dst =3D zs_map_object(zram->mem_pool, handle, ZS_MM_WO); src =3D kmap_local_page(page); - memcpy(dst, src, PAGE_SIZE); + zs_obj_write(zram->mem_pool, handle, src, PAGE_SIZE); kunmap_local(src); - zs_unmap_object(zram->mem_pool, handle); =20 zram_slot_lock(zram, index); zram_set_flag(zram, index, ZRAM_HUGE); @@ -1726,7 +1724,7 @@ static int zram_write_page(struct zram *zram, struct = page *page, u32 index) int ret =3D 0; unsigned long handle; unsigned int comp_len; - void *dst, *mem; + void *mem; struct zcomp_strm *zstrm; unsigned long element; bool same_filled; @@ -1773,11 +1771,8 @@ static int zram_write_page(struct zram *zram, struct= page *page, u32 index) return -ENOMEM; } =20 - dst =3D zs_map_object(zram->mem_pool, handle, ZS_MM_WO); - - memcpy(dst, zstrm->buffer, comp_len); + zs_obj_write(zram->mem_pool, handle, zstrm->buffer, comp_len); zcomp_stream_put(zstrm); - zs_unmap_object(zram->mem_pool, handle); =20 zram_slot_lock(zram, index); zram_set_handle(zram, index, handle); @@ -1882,7 +1877,7 @@ static int recompress_slot(struct zram *zram, u32 ind= ex, struct page *page, unsigned int comp_len_new; unsigned int class_index_old; unsigned int class_index_new; - void *src, *dst; + void *src; int ret =3D 0; =20 handle_old =3D zram_get_handle(zram, index); @@ -1993,12 +1988,9 @@ static int recompress_slot(struct zram *zram, u32 in= dex, struct page *page, return PTR_ERR((void *)handle_new); } =20 - dst =3D zs_map_object(zram->mem_pool, handle_new, ZS_MM_WO); - memcpy(dst, zstrm->buffer, comp_len_new); + zs_obj_write(zram->mem_pool, handle_new, zstrm->buffer, comp_len_new); zcomp_stream_put(zstrm); =20 - zs_unmap_object(zram->mem_pool, handle_new); - zram_free_page(zram, index); zram_set_handle(zram, index, handle_new); zram_set_obj_size(zram, index, comp_len_new); --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CA7222E3E1 for ; Thu, 27 Feb 2025 04:38:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631082; cv=none; b=uweDJveRSS/OgFk8xOnwN2XHuZmqmyN+sypUQ7EbMz6Ayujm2CRK7M2XuV6QjemZMvdZNFOVOHfwiMA6EFGJvQZ8TEyup9p59TYVlw4qeHSXAPfHOmDlmfwBLdH8s2tk9WrQufguT/LWc8/SXo8nHyMleN7m9IbpGxBWjIi9UyQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631082; c=relaxed/simple; bh=K0rPiG252rZQIexLl37iIDHUBgLaUhjfUVSvoH/f+bI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oG/Cfaj/bMdQ6zQHNB1u6CG1HHONbBK1taQnr5LHfsa/wC2jJyMVhQkW2Z0lWL4028EBuYzLpU4PotYZaNtCBhZe2XTrJoHG3UmM2hHGmFASCyEf6BvwS2Z3D1hl5vlt8QCQYeu9JTiU1d5avGiVpuRGuHfACCHhtcJqkNg+Rv4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=HQ5csPYx; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="HQ5csPYx" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-222e8d07dc6so9974155ad.1 for ; Wed, 26 Feb 2025 20:38:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631080; x=1741235880; darn=vger.kernel.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=8vuEfNhU6ZAruk6qIF6JGw0mo2a915MB6BnSqH9CQes=; b=HQ5csPYxIFt5J/1Sappl8cXhjYWhL98FF4Ss2VhRYerYnsoQmofZgsMF5nznRHwjzU +gUljwZKhY/BD/ijv6Hd4ZHNqdnM1o5tEvxIS4WhDhhCFMY1Z2dHrU/0yMmb6t66ugUG wH56S5umOseji++o8rPuasPOIzsRRyRV3Ko3A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631080; x=1741235880; 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=8vuEfNhU6ZAruk6qIF6JGw0mo2a915MB6BnSqH9CQes=; b=iZxbn+ojrwt7ya5tB9G0alYitqGOkZ51tOk/4aOVKnP9kZh6yQJdimW1d+q6y0hghW 4XZONxjzBJt5ESKZQSF09+A5xMHK4x8OK2xIFHPjeHyahH1pVekwiCq30ByU9t3p3scG 5pku4XQPl7F7Uac7YVWXSetb5ShUnZJ6HUJ3MMOxOEBtz8bnrWwKkM485v2niSb6B28J H0r4EFAn0UXSSMWPFNGGFTR/hJ0iTJiWkULVpHXIKV2TrTEeZ8PQhlj2bfGqKIWVfYak uNceytsPahlAycLf1jTo325Q/yqnlURB3GlrKnHM3v5L4hqPiyg+zQx5Zgtlxnzbnapg UZ/Q== X-Forwarded-Encrypted: i=1; AJvYcCUs6xeBTnJ0LoBwmzQT4UknYw1LRp/64j5AqbMs3j9He8kc/k5k4HAcbstCnGfN3+hk+DwTHYix40nRSCM=@vger.kernel.org X-Gm-Message-State: AOJu0YxJCzJrK0JR1iLex2RfwV59okJMklWAmuCETxsb0doskKkO9Cw+ wUFfjpHIg33lDF9J0+P2Gdeo8IF0PKEyL1jMcAmDFiEzkxlfxv1+de2XCiqLGQ== X-Gm-Gg: ASbGnctGl5vVTQ9t8uheo7ihdofYCRDG70/iucPAaqD2oIWZ8KaTWWq85+W4vIb21F8 /+Y/3QApuzHilspotBgMIBdvvdYgu0Kud4+9sYPZQjXJ7mL9iK6W/dr0rJ6KANpZzyuRPsUGvz+ UG/Bjmv/vrwq54HM/C/4bG0iV2u6MjUYp/DZSv9yiJbRGLTgCr2rlmUfAiV/vnEfWzLZwiX5u3x i7uN8mmk1xC6qAql0WSTDAybhVBv5C8wlfQR8LqGMR+wvL3xS1FFbJxEtpL4hMTnJ5ASx8Lyp2f LYMFK1rRknYkACH9u+CHxCoOuMlO X-Google-Smtp-Source: AGHT+IEe2V/zeMcvZORXlCVMsgDJF6cKsc0Tcc+m2RnLoDmlcE2u9VnCp5uqjB7GRbUjo0EoaqQNIQ== X-Received: by 2002:a17:902:e752:b0:215:a303:24e9 with SMTP id d9443c01a7336-2234a1649d0mr25953335ad.3.1740631079813; Wed, 26 Feb 2025 20:37:59 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-22350533a10sm4886515ad.247.2025.02.26.20.37.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:59 -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 16/19] zram: permit reclaim in zstd custom allocator Date: Thu, 27 Feb 2025 13:35:34 +0900 Message-ID: <20250227043618.88380-17-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When configured with pre-trained compression/decompression dictionary support, zstd requires custom memory allocator, which it calls internally from compression()/decompression() routines. That means allocation from atomic context (either under entry spin-lock, or per-CPU local-lock or both). Now, with non-atomic zram read()/write(), those limitations are relaxed and we can allow direct and indirect reclaim. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/backend_zstd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/block/zram/backend_zstd.c b/drivers/block/zram/backend= _zstd.c index 1184c0036f44..22c8067536f3 100644 --- a/drivers/block/zram/backend_zstd.c +++ b/drivers/block/zram/backend_zstd.c @@ -24,19 +24,10 @@ struct zstd_params { /* * For C/D dictionaries we need to provide zstd with zstd_custom_mem, * which zstd uses internally to allocate/free memory when needed. - * - * This means that allocator.customAlloc() can be called from zcomp_compre= ss() - * under local-lock (per-CPU compression stream), in which case we must use - * GFP_ATOMIC. - * - * Another complication here is that we can be configured as a swap device. */ static void *zstd_custom_alloc(void *opaque, size_t size) { - if (!preemptible()) - return kvzalloc(size, GFP_ATOMIC); - - return kvzalloc(size, __GFP_KSWAPD_RECLAIM | __GFP_NOWARN); + return kvzalloc(size, GFP_NOIO | __GFP_NOWARN); } =20 static void zstd_custom_free(void *opaque, void *address) --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3117230242 for ; Thu, 27 Feb 2025 04:38:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631087; cv=none; b=PnTgp3uc3bzz2Kjix2mAznORV12vRxshdvxBzCp8DiwxfiiCSPM6RmCo0x5pfBv5XFFOHyYEFgHq0wFMsw9v5/tLcay5+Tsudlc2A8ceRZvIhJXeeirU6lus7y/nbpsa0edDJFQZKk7h2z1FBKupiC9ayIpV1S4lha64z0y0Brc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631087; c=relaxed/simple; bh=W31aHz42Z/T5ZpbsLubBQm+2xkwzX3XN0l4V3Rn0VQ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nSCUcgCeUjehoiUUnmnucum1Lkui8eTuJIehcu/BwH7J0a4JnRwJAUeVMG+w5+PLIkDrp5DSTz8F5YP4k/jSX/2PIsNsZUS4F4OotibQueK9sjYXG8vxjxxL4n6GGUuV4jxK5sLZYtgSMr6kljldxJrcpGuDNtlapDKgO2WzeqU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=UhkefBHV; arc=none smtp.client-ip=209.85.216.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UhkefBHV" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2fea65dcc3cso566810a91.0 for ; Wed, 26 Feb 2025 20:38:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631085; x=1741235885; darn=vger.kernel.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=5Z7L+E0AxAkJHYT9s94E/nR5ku/ie8tNmkgfIKxsvlQ=; b=UhkefBHVdCIsifzaBS1fW7KMPVCa1OjzaB6XI8yonREKNEV3i5hZhJ/G2HPU2e6CT6 q+P6Oo5UfL77T+IDVK0F2vZf7NthrEKEm9Ji8FJv1rZ9G+w8wjGixOthJn2wQmGW3x+b n4l5XPFwnKVkS7AV0dvf9AOGS4tT6MllfgM/k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631085; x=1741235885; 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=5Z7L+E0AxAkJHYT9s94E/nR5ku/ie8tNmkgfIKxsvlQ=; b=sLDgkpI+dIBECUT7864pHlUeq1QBNhfaIC3mio5DkIBc4o55OF8EpyYbMUzzr40bJV jJe8VCP0lkMrNXjR+1OL/WQGl6Fdm2omv0FxobQ2Yl5s9GK17wIjz+x0PbUiqlwpgSlq eMqoznfTW9I2IpUkoWhrsHC6BMceEoqEfQdQDJIgtmHct5q/Zg44JyBcitQpNOdRxUle TsmmKDUpCNqVfWcGKRHfST5zjBonn13ooPSIDGnpx7g4dm9EGiIBBZkz6chEeZDTVFyL q87SGYxfBCcF049JwKy/2mLspikeerUvZuo3fJ9P9Fgh7Shp7C1OS12tXi7DN82DeZtT Sp6Q== X-Forwarded-Encrypted: i=1; AJvYcCUZfudPXu3Px6DSm/71Bfitv+FKAOoprz1oU9zI338qPc7FH6NwYCwEFS4Wda2HdLuV31lfHF9T3Cqy224=@vger.kernel.org X-Gm-Message-State: AOJu0YyQEN9fkF2qymywEt001tSozmHvpeYuZeCXuUfUmkjHdBAf1YNd mp8Sw7Qwm6prUhPCRjmOAT6iF+fT+SgQrTEUdmnThckxbL1uRUsD4TRV7lZLNA== X-Gm-Gg: ASbGncuNXSEEbllHcEZkmCz+zxSvTJobh5nV3VqktdL/bUmme88Bkews3WAB+6Nka6u H+Ko8HhNYZHw8TdUrl0J+UUVJ7zC/J+JWNumYxjbWqhO9/FpcgTDGXvV1NFAi81plAxwUjCVBtO oAm7UUfjjjdJieLYEVIcmJ++JAM8avm5XyPx6qM5/qJ9HJjXbVC15HuTbzTUnIcS/ZtxqT7wRup fFYCQFlx/Scjut5hx0ouYRKOOfA7pPCt0ZjwfFh320KRFuxCUGyTkOMjoD/K7DZ6f4fka+XJAGo MFp008xr8EAi0ciF/Qi24K9vOYvh X-Google-Smtp-Source: AGHT+IHkiQZTH+QyI09NsnNe2+VUmytHTF3AQc8esT3P6nxO5c5MPzYujs2/5+Dmg9L+ktNJZYSfyg== X-Received: by 2002:a17:90b:548f:b0:2ee:5958:828 with SMTP id 98e67ed59e1d1-2fce86adf6cmr41590472a91.9.1740631085050; Wed, 26 Feb 2025 20:38:05 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501d2901sm5005945ad.30.2025.02.26.20.38.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:38:04 -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 17/19] zram: do not leak page on recompress_store error path Date: Thu, 27 Feb 2025 13:35:35 +0900 Message-ID: <20250227043618.88380-18-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Ensure the page used for local object data is freed on error out path. Fixes: 3f909a60cec1 ("zram: rework recompress target selection strategy") Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 1e2ba3590a39..e8375fcdb36e 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2013,7 +2013,7 @@ static ssize_t recompress_store(struct device *dev, struct zram_pp_slot *pps; u32 mode =3D 0, threshold =3D 0; u32 prio, prio_max; - struct page *page; + struct page *page =3D NULL; ssize_t ret; =20 prio =3D ZRAM_SECONDARY_COMP; @@ -2157,9 +2157,9 @@ static ssize_t recompress_store(struct device *dev, cond_resched(); } =20 - __free_page(page); - release_init_lock: + if (page) + __free_page(page); release_pp_ctl(zram, ctl); atomic_set(&zram->pp_in_progress, 0); up_read(&zram->init_lock); --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C591F234984 for ; Thu, 27 Feb 2025 04:38:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631093; cv=none; b=D1ARMUz7FwlSO9PK1Tmg3Jz+G/vthTKRb1FpKqHuLfvwFOGRjkIY93mJApYRMkW33ltw9Npm8h5uuFHSh421f0Q1NqqLOi3TvM4kpJaXZOSepiQj757i1X6n+prCChedCIV8dg15KeagPxw+OjyhM3GohIw2w3fIdNE/fQXIvjg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631093; c=relaxed/simple; bh=ZQwvICLouPvkcjgqyDAqTmLuJUwzgqhQEbOcyyDCppE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KviBmMPm2nrSVVTmdhSsJ0r4OJ2L8xP0WrP8tl6LGwk7BoK7F0NwXnM206MGmICynOrlunrcjVX8nuqyCUj0ygl2/r3iMrUDaV2YPmhmahPOzSTc4PyhtBJ6rSqM6kbNVo8hSP2RNPvVF22rFqhtdrwELjvuFmI2hgCiNx8Qqlk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=IeFwPito; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="IeFwPito" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2fe82414cf7so1076274a91.0 for ; Wed, 26 Feb 2025 20:38:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631090; x=1741235890; darn=vger.kernel.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=hD0ulf0FeWPvWMK0YywecJZZj4meHTFhM9R2+0rTTi4=; b=IeFwPitoMeudJxGC7I5dBwI0XTf4DQ6qjd0hrBz04p70fClLMyoLv2T9YKxGCiKrjP BQs+dE4ngbMDV/FtL4lxyjw9ajDv8S00XEOaaUdkxuqL94RnTwgZ9Wfdl9AhS4A7pBxL kcnk2YnfZ9fOcA1n72R93FOankYyryU+yQTLQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631090; x=1741235890; 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=hD0ulf0FeWPvWMK0YywecJZZj4meHTFhM9R2+0rTTi4=; b=ekeqh5bwoLBCx45y+C7lQV1Y6WSlAnIl7lOOgI6uG/M3DkMmHKrJ0BjaonEuCVsAuK WkVYRQLfNmDYBUdVKsAgg0Th5AFww9CIq5fYaQEil9LoiLkYUJfqtL/Fc8+Aaka7ipkF 6ZuAy7nMT1mhtfGyKkxqe/W8ImtOwiBjqPXEBJsdKuwi3RWGBREh+XK66o1/JkY8P89A y5WjdrylTQS5SgLm4DUC+s8LWGOB2x/7TVZEL8lsl7H6FvIltzqGXMcTtDHeVuOJb+Km 8sgmTqZMUwQIzkL11ex1bkpyzxbXVSRnG2ifybZumNtr3zitErmTr9QRpyRxU5SaFyk/ Vj6A== X-Forwarded-Encrypted: i=1; AJvYcCWWEePN42w2eB8cdyB2IMmoKsiMW8igFggBxWnQNIPDY4TQpPZSr4Mal3qpR8tQ02kmmQ4Cl/yYpwA66Ao=@vger.kernel.org X-Gm-Message-State: AOJu0YwEzcH1MZCJLeeAhAPbhV3soCVjL+2505QGZ0h+dpBVQdUkuJRt Z8ZalREaqS0mheuuVJGLSMc8WR3PPrAdt7jNxzM1VBlv/PK2awKLIIbIFve1Mw== X-Gm-Gg: ASbGncsgampXe68+1+wjzE744xx6QqJ5GS9VVFa6ZWmb8BjnzrYdhqM+aa/sAtudafz zZ0Ysrug1MK9IH4F/trHfAHzNHaca3huyDd0XJWb360+RIcl2YerA1KlhRDYc32ktdWVcJVxEKN A34n7y7SrNmv+8exHw04qp2zcnp7mEY5o7ZYNNnfWZRtPBzwKPnVY2OXa5Jwo88BMLsOmGOxq8c 83+pO5wMpxtyXBRypJVfzAmFkp/4KMHsfMrYGf3pZBqAfzmJgS40q9RQiGbZ6nxA94s63v6VedE E3UN9aCriPeevi26PZXms5LJpa3l X-Google-Smtp-Source: AGHT+IFidzq43r+0NRTs951DcUKcskfAO05VG8wu01wBEQtR1k0fOqC/zriCBDU47fEYDjlBVHYkmQ== X-Received: by 2002:a17:90b:4c8a:b0:2ee:3cc1:793e with SMTP id 98e67ed59e1d1-2fe692c7f83mr13786908a91.32.1740631090068; Wed, 26 Feb 2025 20:38:10 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501f97cesm5057285ad.60.2025.02.26.20.38.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:38:09 -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 18/19] zram: do not leak page on writeback_store error path Date: Thu, 27 Feb 2025 13:35:36 +0900 Message-ID: <20250227043618.88380-19-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Ensure the page used for local object data is freed on error out path. Fixes: 330edc2bc059 (zram: rework writeback target selection strategy) Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index e8375fcdb36e..5dac525f4cd3 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -787,7 +787,7 @@ static ssize_t writeback_store(struct device *dev, unsigned long index =3D 0; struct bio bio; struct bio_vec bio_vec; - struct page *page; + struct page *page =3D NULL; ssize_t ret =3D len; int mode, err; unsigned long blk_idx =3D 0; @@ -929,8 +929,10 @@ static ssize_t writeback_store(struct device *dev, =20 if (blk_idx) free_block_bdev(zram, blk_idx); - __free_page(page); + release_init_lock: + if (page) + __free_page(page); release_pp_ctl(zram, ctl); atomic_set(&zram->pp_in_progress, 0); up_read(&zram->init_lock); --=20 2.48.1.658.g4767266eb4-goog From nobody Fri Dec 19 21:14:06 2025 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BFE52356AF for ; Thu, 27 Feb 2025 04:38:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631097; cv=none; b=Y6eyddfEPSH+A1ln5wpyptU/7GAOq6uhioM/uQ2k9zDNXrf/NSWFNuQxhtu4zO5w0z7BudN7qgP3fgX0+l/yQJL36+gPTol+2VKpTOAwKEUwCheN8uQdjJP0UachssABlUZ6XFiHuMY/8Hev6crOEa6j+NlbJnGJhkZ6QZxL6Uw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740631097; c=relaxed/simple; bh=MhFopNXFcyHEqtXEyxX8y89MHsiQeb/nSeCVI2a+aiM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qn6zHPIy/8RbE/Yg+HR9LTBnmSUgcHXo0HjWn4Stx8CSMc3YtacWKJUgHAOTsYVHs5FKgIMw+RPmeFFPaRLo/827kLwJ2Y0dl3XnIViIlY+PN92ePOC3kF1bggW5XMFPsDc65Xv95I0ZNicn7qG7txcJ84CBuOHwjHesxLC11D8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=AdF/hgyR; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="AdF/hgyR" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-221206dbd7eso8474985ad.2 for ; Wed, 26 Feb 2025 20:38:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631095; x=1741235895; darn=vger.kernel.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=C/ge7B6UGXcSd47ZURwKYcUmpuFGdMGIsEsj1cDYmyw=; b=AdF/hgyRgXkv7QfS5GJFAIkqnG0/U71bbtXoXiT6iMHiQe+cjRr5VYPHIh+NufIe+F CSTvtgZuQvaRnv5qVGQT0TR0/9Ud48P1V8ph5kpcFtU/bA+3CYuteKUpdCeNbHIzjOrF Pm+AgH8XSj0g6Am10C/nzyCBJq7LSUeIkyfDs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631095; x=1741235895; 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=C/ge7B6UGXcSd47ZURwKYcUmpuFGdMGIsEsj1cDYmyw=; b=eWO0pKAmccYg8DYuiuXliqMIhpLo3Ih5uLlOQKqHdO+X4jAhXloeDz1+qU12Vg9L2m b/bJ7xRyO08YklGh2LkzPh1Xr99iMICIHG+ayzamRMOjf2L0yrzhtpldCnTqB4+qxZ4g H+NB7fdxxEGRqJtZ9CaaIpsm1Ivee45pXppL/K9Z03L9NVYOQ5p2j2T8CYbkGDnMZu/a BRImhfXqj0CdSLrf+e7J72yDfzIdt7OMaOlBu5/mIUw80Al3u7ly1wBig6MA4m60yXP2 93SsZlmOYSKQ9qLACVlEPB57MkWW30W0n/H5XpReCWxTRlEWK0NojdVaVQ893KgAvkGD LEwg== X-Forwarded-Encrypted: i=1; AJvYcCX8bZeBfmB6tZPS0FcHOQjSCSF1yAhAo3oXrs5je2fS6BbuTZ0fMahpEA6pmXnxCcF8LfdN36IFVGsZlFg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2oxCXD3/dnnZwiN0o1SBqnxT6SmUGPRsIkIOKL7fgvXw3LHDv jPkiOwDUqE+qbm/y33EZEVlwCn5niNcIRuqDF2ExXk/MNF1AIRkpmzU9PpNNx9JgLmChOSR0QAw = X-Gm-Gg: ASbGncseV0XZPysjU0ZPyfiT+zOva1lKIsvU9VbfMhheiHiAPyTdB6O1BT4UCbc2z7N d2kIcFBZMMNEOcpXSE0Ymdfr7dTFe6UtE3zGASjpx+Laz2l8iR/KSWW1H5uX9PQ+hfnUoO0qxOX srL9YmRWGdRw1ULnBJTf5CS39Khw564H3lGW8AD3isdrAtQ3ea1I6dwCr4Qokk8f9VgkI0x5rwq Cu+32wFH0HTbGU1NWzhsIxDsBi/VCe+LorQe+z74yDpFmjGn3pcn3YHuM8oElIlfDW4EtVqHhAS JBa6YxiTtalrkJ6jo5JNKQ9F1Xt4 X-Google-Smtp-Source: AGHT+IEpXBKk19SHbSOiApwPW0gT/JlWHme806+0gknSxKLl1xCL+FuacjL88fnx4daEmXHOHQZArA== X-Received: by 2002:a17:903:41c8:b0:223:47b4:aaf8 with SMTP id d9443c01a7336-22347b4ac28mr36091275ad.52.1740631095639; Wed, 26 Feb 2025 20:38:15 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223504e2291sm4941155ad.187.2025.02.26.20.38.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:38:15 -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 19/19] zram: add might_sleep to zcomp API Date: Thu, 27 Feb 2025 13:35:37 +0900 Message-ID: <20250227043618.88380-20-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Explicitly state that zcomp compress/decompress must be called from non-atomic context. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zcomp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index a1d627054bb1..d26a58c67e95 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -146,6 +146,7 @@ int zcomp_compress(struct zcomp *comp, struct zcomp_str= m *zstrm, }; int ret; =20 + might_sleep(); ret =3D comp->ops->compress(comp->params, &zstrm->ctx, &req); if (!ret) *dst_len =3D req.dst_len; @@ -162,6 +163,7 @@ int zcomp_decompress(struct zcomp *comp, struct zcomp_s= trm *zstrm, .dst_len =3D PAGE_SIZE, }; =20 + might_sleep(); return comp->ops->decompress(comp->params, &zstrm->ctx, &req); } =20 --=20 2.48.1.658.g4767266eb4-goog