From nobody Tue Dec 16 19:24:31 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 12A252036E3 for ; Fri, 21 Feb 2025 09:38:48 +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=1740130730; cv=none; b=q7XYKfD+WzbypRT1rhc6gMSyy11AnZZlej4eNzhNmkiOQSEjTPWwsh6Na28XJFGcDORw1KTqo09W/PPVIVrz+Ttishbh0SqVQAqkYDi1K95ToNACrMrq/WvKhkE4HaidINj0aCLWOjcJOdbPTJhx7+LZxVao7rppV5XVtz87Gpo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130730; c=relaxed/simple; bh=2PHeV8nT/CIs0wVCCrZiQbqt2KzPBiFqKqwqGxUlrRY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZyUbgfGKT6Izbr8rhFGxDpvzWXhxDoxPcdeahYPzy/vjaQnTxsJc715mQfELmM9p0nvNbr2yC8noHgwUuuBAR4r7LAOBzqopJ6VhvrybzeGASJZieCOs9xKOizc45ZWlUQ5wbo1ivz+1uby25GhD/nk4alwjBGJDHqbJhmWrAuQ= 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=UQzPHBQN; 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="UQzPHBQN" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-220c4159f87so25834195ad.0 for ; Fri, 21 Feb 2025 01:38:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130728; x=1740735528; 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=tEamf86sHM0Ptusd1ivjV+FzA+4m9NR9VbFHQMTSZrc=; b=UQzPHBQNiMxVvSgPDxEzVYSdYIRAOzIG30SyOO/8ilTW8Mz6U15c57V2VTNMUuBH1V lUR53fwlbw5nkA1bg3tmtuhkAb/DUc3lZ59V2okMdmDHA1LLSp1ETY6RTTLqhE3MfklS GJHvar3Xic033RMPRXx/Xt98NM3KfdQCeeoUE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130728; x=1740735528; 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=tEamf86sHM0Ptusd1ivjV+FzA+4m9NR9VbFHQMTSZrc=; b=Jd/UE4ReB/Nuxxvqa70eljM7ggLiOp+36tdGV93TwRIYpOYs2ZEoBBf2Xu+cQjMJnP Ax1YP6K3fvVSH+oKtGet8qMjFfsVEAqtLpG86oSSTRvl0mKgXsH/WFzG+DfuQfs5p8dS cDne9HQxWR7IoRAnAq9VGXEVswSQMgC9Fx3597J044lPMiLOALfPn4N46Tpckxdn7i5R eRFn3jL9FT5Pqk8yK4CduJ6uO90FzDMMcW8Xor+KyQTufHBL05dSyGZ+XQi7lCXpp57E t1He9mkja78E34nrIDVqQvYD1tnxtzlqk7BIE6D/UJp7jqkDia3bnnIxMuqSo7s9aNUs LV4w== X-Forwarded-Encrypted: i=1; AJvYcCUDeVs9GdTJLUw/62qYCXMOTVFb9OWHuXtFU/zUjcWO+BhrhT+CMYwljG1xJlCC7f8w8u6sNoODrDJcT5Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxxBFrTjeuNWOLxXbnH8dSh5OiXezDxngtsUsDu8uMYxDN9WE8+ lK4KMzoJK1vMowwR9o0MRE7oevwXK42yItPRs6rq/gspTyTOgxQ8rrTz0URIFA== X-Gm-Gg: ASbGncs2F/iHx9dIv/bYJHhzKh+jHMcfaQfJIutJdeYawKq9xoDQbtbNpfU8nmpV/Ua fxV0gDLwiPf6yN+PCF2WuK5qRzYkCm2xDsNUd4LnPWHfNrOoVN1tSXACuiSmYONTSqxSmaqRw3G w1G40QK77lFrNBNLPspak4fRNy6ZwEJPZi7joT9+WlTfxhkeHyHjwQ5dWdJTQyHQcwhMtWlObnX VkQLonqT/56C/pZGQwHUNtQ0S/u2J8lUbnx06DXkep1neOpygH0LhOdr2hCTB3SjPZwAMIC5xTB 8IB6j3+2yAiUxcx2ZalSyEWEaQs= X-Google-Smtp-Source: AGHT+IF6XPk6PTdI7TGgSavL9+4vaZz+bvaqDiLmdjUKVz/91xc480zPlBnpKvLh5Q/90+8Bn/sTSA== X-Received: by 2002:a17:903:2350:b0:21f:515:d61 with SMTP id d9443c01a7336-2219ff4e78emr42043375ad.21.1740130728316; Fri, 21 Feb 2025 01:38:48 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d556fb40sm132682925ad.193.2025.02.21.01.38.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:38: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 v7 01/17] zram: sleepable entry locking Date: Fri, 21 Feb 2025 18:37:54 +0900 Message-ID: <20250221093832.1949691-2-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 | 68 +++++++++++++++++++++++++++++------ drivers/block/zram/zram_drv.h | 20 +++++++---- 2 files changed, 71 insertions(+), 17 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 9f5020b077c5..31bce7c3ce8b 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -58,19 +58,62 @@ 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) +static void zram_slot_lock_init(struct zram *zram, u32 index) { - return spin_trylock(&zram->table[index].lock); +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_init_map(&zram->table[index].dep_map, + "zram->table[index].lock", + &zram->lock_class, 0); +#endif +} + +#ifdef CONFIG_DEBUG_LOCK_ALLOC +#define slot_dep_map(zram, index) (&(zram)->table[(index)].dep_map) +#else +#define slot_dep_map(zram, index) NULL +#endif + +/* + * 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 +136,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 +1515,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 +2663,10 @@ static int zram_add(void) if (ret) goto out_cleanup_disk; =20 +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_register_key(&zram->lock_class); +#endif + zram_debugfs_register(zram); pr_info("Added device: %s\n", zram->disk->disk_name); return device_id; @@ -2681,6 +2723,10 @@ static int zram_remove(struct zram *zram) */ zram_reset_device(zram); =20 +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_unregister_key(&zram->lock_class); +#endif + put_disk(zram->disk); kfree(zram); return 0; diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index db78d7c01b9a..794c9234e627 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,13 +58,18 @@ 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_DEBUG_LOCK_ALLOC + struct lockdep_map dep_map; +#endif #ifdef CONFIG_ZRAM_TRACK_ENTRY_ACTIME ktime_t ac_time; #endif @@ -137,5 +142,8 @@ struct zram { struct dentry *debugfs_dir; #endif atomic_t pp_in_progress; +#ifdef CONFIG_DEBUG_LOCK_ALLOC + struct lock_class_key lock_class; +#endif }; #endif --=20 2.48.1.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 2025 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 3CA9F204683 for ; Fri, 21 Feb 2025 09:38:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130736; cv=none; b=q2kn7QDsLRKQg4WskEIspOksbUcekkbuSX9UwaAOba9bs9ohfTbYDhGc3lJ728XEAwdgI+YsiK+M6WFujZ7T20oe7r2C7Lb+fEnBkgHzYGxzBBvXgihh4EN6R7G1KfAr7n9BWKiEdx46GG+/AYZ8xK5EmjFU/SDIRZ8ZSV4ExEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130736; c=relaxed/simple; bh=mL5i1Sa1wg6lxiB1S0NhoHqUEh/joJin7q7jPEtON9Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s7ROVp/Jt+iPVgfZCQva5kNvsSmKo1uB7x4dfyPY+WkejxlyftR1rRNbf/Sevw9C2xQjjSEjm4PUCaT+Db5wS0halLm6wCiOLE19XJfTrRvCTH1tdh/+BtXpViCj5ni52Lm+rRfGV4X3NNcawUWvglhFax7kw7PyAbyjcyFhySU= 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=MJfpWWve; arc=none smtp.client-ip=209.85.214.169 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="MJfpWWve" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-220c2a87378so31242325ad.1 for ; Fri, 21 Feb 2025 01:38:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130733; x=1740735533; 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=3J2F96AB7zgvGtDzJY4571zbkjr+U9L0eHeRaKN2Txw=; b=MJfpWWveGIOibjM+yHAEfAn9UW6130qjvE7mPXPEV2i9KwyLiSOZD4/6moqMhSqlWV hq05YKovidkdlra6iezBYO1NEKzdvsZCXrMYfUwBfRlLJK+uZdQlzn8dc+2YmzZfrWpa rB66u88h83FXqLektLeEFZmCQxd3hB7RGvxFA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130733; x=1740735533; 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=3J2F96AB7zgvGtDzJY4571zbkjr+U9L0eHeRaKN2Txw=; b=o3Vdo2Fb32pMoPK/+PUBJPafWZt/X7zO0JQzB9x/3kOXmpIbJ8s51HjbIwdxvlKDsq btXIoS/zZQp/J6pxekxYOiLragtiiycnzeztbArzxfpYdIlwgGZSMty4JkbIy86JNS2+ zq5SKFDLgvcJomz3SHx8wx8yQZnOh/7KeoWKVAwQATLPzxI7j2ArFBzDF9/bXa+qspdj c/BkO6wXUEOZdRbtHmlCe6Qo5NfIfeTnYimihhs1k5LaM4gfcDfcLeApSYWfr/IdN4WU 6lSQQqvcWflWAf4p8TNIfCP6Ru5+uc3ufDOxGzMI4/3nSYGgWEnss4aoUzWwsrOQiIwc CmFw== X-Forwarded-Encrypted: i=1; AJvYcCX+jcPuj29lGSgBzVV33dMtvZ+SrjPyVktnnrKrbhBq6nYKnmJe9jCpPANb79RiJ0caqCMNaiVc/K23SoM=@vger.kernel.org X-Gm-Message-State: AOJu0YxgkO5KnSWHQAxGDNIvXH1gL7jOzsWaRiVN5YwU3xmwQXp9lqs7 CAJO572XDM38lFd2Nz4WYMc54Szmm0NqrhTs2ntchVSuRu73hQYNiF5ZtsdRhQ== X-Gm-Gg: ASbGncskjc6RXdgd5wfI0HlHCV88H+ZGUrnI6HZW1lwceRG6vsb9eVlWtfByPi9+scg ojVms/C7jPKbhTrx9A9j+7X3fYDY2sR4ZIwDn/6wn8ONoPjGP5LpKZa99umOaWfuDc6Q7XZd3iX RzQa9v9RLBuaA92FIlcaOtlwovGstmS+aYn9DY7up1SMF7f9J2S8wZmw4XSY4VrcSHRtlWJUFMQ SFrej65UPKE0OM0hRED7JQpXt0iWKWt4qTwKAwheO76zXIB8e/cePQBZ8wOJN39ercoVaxHM2Ej iCaHISfaPiBolzTJjsZBEBW3D3Q= X-Google-Smtp-Source: AGHT+IGOi6SPciorjNACJD3sIjQHlvMRrWmIILFhO0P0XVNPDa2JYcssns8HG8BXkS0LFd21ZLAyMA== X-Received: by 2002:a05:6a21:3288:b0:1ee:e655:97ea with SMTP id adf61e73a8af0-1eef55b505cmr3612717637.41.1740130733499; Fri, 21 Feb 2025 01:38:53 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73242546867sm15269312b3a.24.2025.02.21.01.38.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:38:53 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 02/17] zram: permit preemption with active compression stream Date: Fri, 21 Feb 2025 18:37:55 +0900 Message-ID: <20250221093832.1949691-3-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 31bce7c3ce8b..3fd1608bbe9e 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1613,7 +1613,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; } @@ -1774,14 +1774,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 @@ -1805,7 +1805,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 | @@ -1817,7 +1817,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; } @@ -1825,7 +1825,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); @@ -1984,7 +1984,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 @@ -1994,7 +1994,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 @@ -2052,13 +2052,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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 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 E7604204683 for ; Fri, 21 Feb 2025 09:39:01 +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=1740130743; cv=none; b=cYq0oh7LS75wsrU25KejuUV5dpFbzk5KSjX136ZLTdTXHih2kkfjrTOPM4FI1DEC4CPZvqjnnNAYc4T1TntVey5goIvaiP9s8tpO1HwwXqMhP/49hwLSB7MRTuPLcb3WHb0xdvPJWUvmcl0O/LZXFKjZZnrb9dAjZcq6jHjnujg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130743; c=relaxed/simple; bh=iHYDRTGSEmzyXdPtUbJDrKvAXv3M7Oc7UQJqSinxIVQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VwW9unUuhGH5zE2jmfMfAjWkEqq3M4siiLv2AKmljRBEGdWgR6cSXUAgCOnCtJ5zCQa4xAFLsnuWTEu2LR7SgZlGWDPXglbvA6wh6PO78bN7mcNieiNa21XI/iBOc51JL6dbD/Rb6lrorwGdx/Ck7jzeNEDLFhpp2mRnVtWGlh8= 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=E8dni/rU; 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="E8dni/rU" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2211cd4463cso37181975ad.2 for ; Fri, 21 Feb 2025 01:39:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130741; x=1740735541; 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=F1Fr47oZvnwPkNkfXAk51rgR9W9ztXQBGqxFE9BRxTc=; b=E8dni/rUkEccZgrFWHVHtuS7o5o2Kwl5a2ukBkdpJZKYBHlx2Zn/AtzRCtsUhgo43c bnTxnfyNBalURtGprP/w6pnmM3aZleAM5nM/hPBHT3FCmSQnUH1Kz1z+DBqt1+zBrVZQ 7tdJHri8Vqp09namveyjWSfww1wVbVTs9TlPg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130741; x=1740735541; 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=F1Fr47oZvnwPkNkfXAk51rgR9W9ztXQBGqxFE9BRxTc=; b=FKT98pTqtXiLqlIZcTgl5zMhyUv5/udoaVg9mR5oT4znaTFdNfzCH5mT5KdQu266P1 Va7vokydEsPvGZtyPQX8JxByA1CKZKhNfmmphln/7Or7vV+PQNvMQlVz6sAapfJSqgGe 42Ir9F8258Za3sgrL8dx19JwqDi32g6BfyowCGcALO89jJgA7FTbjJ3UkQusbUtRUWzy cw04kz887IEBB24eepEdIlTArrV83gr2ZIUiq8d3QIx8IQHBZ0nmnIJCTegfeRZgZ9T9 ZKd4nugmpqt+D4Zqonww62u409X4I3aPIjOBJjAh7F9Yry2aR0uXpYx2LD95qifMqRdZ RWYQ== X-Forwarded-Encrypted: i=1; AJvYcCXbkE78+JzpPHaDTvFg1tVlqsPVDOgLyd3kJ9cG+2yk7iieTyIAAdjbYjzaXHk1wMtcyTZAcRJc6dx4uTY=@vger.kernel.org X-Gm-Message-State: AOJu0YyGB/4C74+FnJxjnDKXwn/jd/RWi2BtXqDQaooLkepWDyOHWVCe O7TsSk5eMBTh/cIsjwGgasKWgCJVuJ2eoR/BMnrGQQBu6H9PFrDhwuRKA2VlTg== X-Gm-Gg: ASbGncuQfjOdmdHgfzs8m6I1K7EyOJd7CLs7m5Q5hacVal8kiiKCxI270cAjULaEFr0 ucJeCjHUTI4Wo/BrjWFLalCetu/pdK94YOoVinEiy3QZCvnZx9Yp1BeTk5bnrVzkh+aJ+gT/W8d gqAPFOrbwgjXNaw1jp5ROnIcwpXJB6U2XxelDN7ELBDY93PypK4EqGz6ALvK+Wdy9yUfvmT4OBs LcFWc40W0OeWZ+A7zbutqSdAQiL0HuoO+JM559ya30d6QXyOPtX4vmGsjgI1LED47wMe5dopDMV hvxAQU+NuCJ7hB915dXeilpQ4XE= X-Google-Smtp-Source: AGHT+IFRUnCZlCQ55FhwarcrVaKRWTrZj4RkPpnwVEGcDwDMY39AagQltM3YaVXCI6t8ZJ/r6pw83w== X-Received: by 2002:a05:6a00:4fd3:b0:732:5b10:572b with SMTP id d2e1a72fcca58-73426cb2b0bmr3161816b3a.10.1740130741168; Fri, 21 Feb 2025 01:39:01 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-adb5813a687sm11978723a12.20.2025.02.21.01.38.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:00 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 03/17] zram: remove unused crypto include Date: Fri, 21 Feb 2025 18:37:56 +0900 Message-ID: <20250221093832.1949691-4-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 3fd1608bbe9e..424ed1128fb3 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; /* @@ -1154,7 +1156,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 794c9234e627..2c380ea9a816 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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 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 1E7A6204F64 for ; Fri, 21 Feb 2025 09:39:06 +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=1740130748; cv=none; b=KrCr1Mio+yaUHphA8bwu5hn6Fk1NK/IKS8790+bcjnbhz/SVWHJW3I0VI4w9zk1RWNaYRK8OA0CsIqlv2AYnJgZX5C8RJ0oINyrSOabk9QDTmrnub3wSLLLsnP3mOnb6ILtYgycYsCIPnAL6vdTyCwBf4+iZFbXZdMQX/ywtI58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130748; c=relaxed/simple; bh=NM0Mwtz66MpPm3L6SQxCvGbK6fY+DqlCy7/lxKNXPjs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SJQE8V6COTpDdr5AUARsyvgpFaQL+I32TkqlRoammQzJuf/kUhCTp3cclXgZ1sHxq0lp2g7U2Dr0B9oS6P11hE9V2ktXz1Xz3WeWO0o/lFG4235i0JtKPSDpWdJhjiuUdtZMM99Gl3kcJa1jUzCUS65IUqCQm5svoCC63syHAqw= 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=KZ11zuZV; 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="KZ11zuZV" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-220dc3831e3so46243775ad.0 for ; Fri, 21 Feb 2025 01:39:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130746; x=1740735546; 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=gNAdjSZPdBAH3LrqV88ZZwXLFy97UrlICUdu5mXaygY=; b=KZ11zuZVBFRSRNFGoIQLLykbtwSDYAlLzSplfjjAiKFwF4JYuQrXjfqlQBrzKwlymV 1EZBzmR5JAWUd1F1HbKWtKovrAXei/ryW+8jLwuBcf1RzC9+abV2rjrCp/maRSYvTxxY p5HbDk3Rv2n/1zLCW9Y1QKwsMMrUKh6Bf5qXE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130746; x=1740735546; 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=gNAdjSZPdBAH3LrqV88ZZwXLFy97UrlICUdu5mXaygY=; b=Jrv+kO5+ZrxsPxFVegJheODVdagzRLjv4mJMmUbzUzvZTr7pjr5fp0oiIon71emDP3 afDkNSG3rMi3tkXDJJoU8WfjMqukl4hnqfaXziZPLDROON2Ie7EOS/1uAH1jY3SOQA8F xFoNhvz5rELgY2qMn9WqDubuFknTCTOdAm59xhWfEzY4y07WHaOdXhYOhj135rzbJUWb ix5yvNQnUI+YdORkPQJseNlEauRRzTGuEQiF8Hf2MUIap1Y96p6NzU2/4ZuxKTbVtoBA cIBjLUKI6ZZLlf+rk+v9RyIIM94ws2aulmp3KMlXcQBtZnmc9xRAqx4OvPYISERg+kYR 3mYw== X-Forwarded-Encrypted: i=1; AJvYcCXHtCkJwTeuZ4fiRyIfBX2rZa3qMWA5LXuueTVc5ZHRTgEtfK5BfBaU+NKQp+l8j4tmN74l0GcgkUsjSGI=@vger.kernel.org X-Gm-Message-State: AOJu0Yzyd3RYZdREQM+pQuUKAqvnbv0Rksa5G5zCu8UFmXqSUK9MlVad PvMCNvyYtom7GorxjLRdVvNqXgW7Nqu+7KXIikXuhQ/dgEMZHl363ZduQ2VfGQ== X-Gm-Gg: ASbGncuTeuE0ahnu+iSD4vYx/AbT5KVrzCv8pakYBFJvXuOoRrBWBEmsRSDJdeYQIqL IuWcOtTb7Vq7pvqCOhh+lfqLjIgSuiKGMqSk9CEKh0WHsIN5ohfH+UkPyZ3z6yVkuQb81107CNc ZfjJd1pLkEpCLZPg1Kypa47WjK9EZqNX9imD0EjS/emS6Wvj+zg8aVohs2/LV0Qd6PlKfZBSchv 2ORVOrvRT2B1VpJEDlSU1nmPE1e+MmuIviGMGOGi2KaMyHtvEjI4x5XYD2/f3cFgMOqgulNbDlM R7zGXOD/r/7ZJjbbA3wQ9qgYXH8= X-Google-Smtp-Source: AGHT+IFV3Kv4elyYdLzHIwLUKC2Z7+Or+dH9Vd4/YSg3c0Jz7xi+JB7UxI+JSjhGhix3fONvjyLTTw== X-Received: by 2002:a05:6a00:2e14:b0:730:9637:b2ff with SMTP id d2e1a72fcca58-73425ca201fmr3949487b3a.7.1740130746241; Fri, 21 Feb 2025 01:39:06 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-7326b5ef448sm11220174b3a.173.2025.02.21.01.39.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:05 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 04/17] zram: remove max_comp_streams device attr Date: Fri, 21 Feb 2025 18:37:57 +0900 Message-ID: <20250221093832.1949691-5-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 424ed1128fb3..d3b70aae2660 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1109,27 +1109,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 */ @@ -2546,7 +2525,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); @@ -2568,7 +2546,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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 2025 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 1EE832054EB for ; Fri, 21 Feb 2025 09:39:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130753; cv=none; b=lGNrA+RvYLzxWng5FXuj7tnH8rgROTP2NiWmzC2wKkXlkt/t+0jieBpuO8G421kkLPJjUc2WxFo6nbGE086f9v1AHEbwr08ChpSi+PrlsRHaRvCqdEp10zMVq2jtTCOSB3m4nfF98Bqkn/9HkopFYueCA3hr5uqFLdsPfzG+IuM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130753; c=relaxed/simple; bh=YNxl44SVgFTxhmVX0z+tp2pbKpo9Qn15mQunNlHOXpg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aXjlm2/y1TmhnRZ2jpJL8jaRWDlXuxKcEHJAQz81SROV8sjwzS+VqG1xKsTjxllmg0dEnYGUBklXpGF59CCWFp8fLxtPq1+lj0FgCk87z2eAo5fiQA7eAdk/0WPQGXKphryiW5LpUrhYbp3iLE7Vx/YpOzqOVdZBk4b+qKKWTOY= 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=IvqTspUP; arc=none smtp.client-ip=209.85.214.179 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="IvqTspUP" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-219f8263ae0so39322255ad.0 for ; Fri, 21 Feb 2025 01:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130751; x=1740735551; 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=owpeQWEBy2AJNnuQaGP0HmEMVbn5ZGw0EqTWg3icB+A=; b=IvqTspUPoAnpWBblZTIZAhNEKdsHFq5zyViuubXH4/hQZg8CDj4rD3i973VklK0PjM NhBgkrvrSiBEMD0ABhr12eBOlaze8IgPbqA+6KCPcUuZXVBiQ22+2nbtK3Twa8uvQn2L rgZ4B0qcZWoyQYsvYK3olnT3HdNYo8FoPVaV0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130751; x=1740735551; 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=owpeQWEBy2AJNnuQaGP0HmEMVbn5ZGw0EqTWg3icB+A=; b=wcWR4rBOn2S80VX2wuXHduuQRfXBxLHfHka4WEFBfol18rp81hLRiRi6HKlBwkIt6l zVFRWWGkgGQmNihZu09Fpxg1Rnp8VBMYgiSIk90dB2If+Fo0S/GKqPz+Nc4SdUiVAF2u akax883Qy4ALbLOFZOjETFBwyb/7gd3QLkXRstK+kfGBGcrNAUVxRbd7JuY1X6lAnoLj SIpJtViCYwVPBKqe1ajCaUelSqs1HZ9Noe1qKVzZlDszYB5vbbwaoAyHTmAVL+GO1hXO csP0R8hkNhzkZGWD551DY4Q+s5r1iGoTo4niHa6ByUsAlHAW2pErXi2zkcYP8MBj+ZbJ vDoA== X-Forwarded-Encrypted: i=1; AJvYcCVla4J0Yh/v6/Yej0Og3yyK9byFAnl7jlQdGsTH8usi9jF0220jZGmTusKR6sbfcS++CWiRTjLrK9rAvzk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw46NTrMHz1hhDb2Sda7G1JGeAUu27nDDj1SaROg/vlsGmtqxMh zck6vhPvOrGw07IVOutIWhn6ncuZS2eaH4K2DL+AbDrfe14CQukAt4WTjAmk4A== X-Gm-Gg: ASbGncvTxrkG5At/Kgn7H/s3P0v4iqFD31evrngQZm0cmaSHRohASqwOiZd3rDhXPMU LrbQNfjKb43gPHEuLLT+kUorAkpSNG41KS6ZZhqLZCDVHXOnsU8di5rPlBqnrxDaVc2Ba2jASXy G1vew1QGXYJkm8mh9WVJ8QIJVrHtMxHRccc5tpD4qHsAM1i9HmzGej7+UxOsd0dYOAFB1G9KzZt nucaEbiHncwgWX9JLRkuQOSScsya/NsCDisLLkiVvVepocCwHLibCfJgjQUM9B0hK5Ob426L30q vL2SReLQhfi8Lt3d0+83t7fmq/E= X-Google-Smtp-Source: AGHT+IEr9op50ypLXHrxjr4hZ7IvQcDqM446lcCXIuVBN0RImmgqBI3rJCeE1hqij4hU017n9SwtSg== X-Received: by 2002:a17:903:2309:b0:220:eaaf:f6ec with SMTP id d9443c01a7336-221a0ec9501mr37135415ad.5.1740130751439; Fri, 21 Feb 2025 01:39:11 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d5367e97sm132666595ad.61.2025.02.21.01.39.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:11 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 05/17] zram: remove two-staged handle allocation Date: Fri, 21 Feb 2025 18:37:58 +0900 Message-ID: <20250221093832.1949691-6-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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) when the fast path failed. Since it's not atomic anymore we can permit direct reclaim during allocation, and remove fast allocation path and, also, drop the recompression path (which should reduce CPU/battery usage). Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 38 ++++++----------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index d3b70aae2660..b805a3661101 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1729,11 +1729,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) */ @@ -1747,7 +1747,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, @@ -1757,7 +1756,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 @@ -1766,35 +1764,11 @@ 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_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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 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 5A907205AB7 for ; Fri, 21 Feb 2025 09:39:17 +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=1740130758; cv=none; b=RKeWutf9el4spqEB18r2+KkhXpqRHpF/xGk2iJ68VR0+UhKM94btMFMZ/lRK8viGIsKDRhOFzrI8Zoi0bbL8puUVMYMIYBotUzUq1I/sxMWNsLq1lVejbsPcG6CZtEf4AeGP0YS+pyhAHX0eBtP2XXbCI2AbkDoeMi92fv1rHu8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130758; c=relaxed/simple; bh=D2RXmiMQ7nvS8i/c65PWOhhdODZX0+hRDUtMrs8HH3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pOhGCl29/jVEDsaludWDkAoCqum4HTJHv19CY3vrnSnbtYqNI2otp6gwcafS7UTeGPx8kgO/QsB8wQ9mg9RXxgm1yH8yNWbNu0bzlOwDAPh7rYbKB2Rf7s6Gmt03S8zL68ajsuChGmCerKNnhp2Puqoet+nhRfJOP/VQiNsArhs= 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=ax9S6Egt; 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="ax9S6Egt" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-22104c4de96so31185515ad.3 for ; Fri, 21 Feb 2025 01:39:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130756; x=1740735556; 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=dWUXn5zzM3sEuYVHsX5O+HQ9Km/ronw7RO7r8BNsmmQ=; b=ax9S6EgtqWCoysktg9LvTcDqZMBwfx1tVn4CooAZ9h8zJ8IqGJ+vlwedHPXENGgCuL dtwQ1bUb13CEG4BVVNmEsqUPRwLHoQrvYAHMHsZ+W+Z8YkrnxCh1kjrOIwVn7kBVper6 SFS681Fn4eJw3qPYQWWLqH+gE2mzkBAFSRpA0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130756; x=1740735556; 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=dWUXn5zzM3sEuYVHsX5O+HQ9Km/ronw7RO7r8BNsmmQ=; b=nHr0DYwPIaI25dyks/Q8UIRCOOZNMnyqVurkKretxT9MZhrdqu9rqyknY4UCc75oUE fR8L3Y4fcdMygYJMm9AevFhWiRLbnCP4L4Vw3gz9COEF73hI43S4gfZbbw7K8+tCzQ4c z5scTRRVJhzaQBHrDrTzRDFZOLe9PK5ceCkxk+yph0jY6hCC/BdoDaFZg22YK/StXZy+ Ev2Aj4yIg0H1w/oBC2MrU8fJpu6ly/U86wnaG6cjIIjLGJlZBHiJhBxDfOJXKeRGUyLW FsdI58iRQa4h+Qmx85cibl3O3+EbdKEFvPbQjrEcr2OLIGJfqVoqw2QjHLGIs9FFwvfD lfxA== X-Forwarded-Encrypted: i=1; AJvYcCW3TrK7wW678Cf3ZvdvhnCycoqh4ze9SnkmqT+wOY/KyaBTd1IsFGLEZbWh3Zgj6x7YVBTd+z0Mq620ze8=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2KqV1d0mzsOiORufcRoVuUuuKQc+rC0MvLsvFhlPy4N37Wfqh 1AfRQl5gzqLgIvjf2YJnU7PMRWJjyextskQLuMutNZosV9m+OCkX0DKjM+gTfw== X-Gm-Gg: ASbGncumToJ6lOdHiCQS8/yj+fxdKFIG4cnI64bWsOCEhlmsv2miEp4I2ZKkEtWsoaJ VZarrXRqC+IBrZRbzS2NFjwXmHPAUPVlPXUDXgLBxWwaIKTZJpG5WujkL4pRjmYgggzMz+6P65T mOrvK3bs987rZ0jYBjyPaKrEg4RfXNRs2H8kfQZBzwW7Nsvjg2FMnpB8TLyYAM4eShpZG5dWzpn eeQHlkxg/WbbZvjf1VPDRIm/jA29tMwn7h0SFpswZ+hZEaiCXDpWDbOz5Pji9Sf0k6H1BZqe2ZU u2u19Hftb5WQuOln9DuFW/5y7Wk= X-Google-Smtp-Source: AGHT+IHVbAaNiCZXUdV+FymTI/dwqaElFp7dSQG1wMJdlZh6amw8nQFYdiY2vLz0zNb+VFzK/PfYdg== X-Received: by 2002:a05:6a20:9144:b0:1ee:db10:a4cd with SMTP id adf61e73a8af0-1eef3c889b0mr4622607637.13.1740130756632; Fri, 21 Feb 2025 01:39:16 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73287ac0ea9sm7967823b3a.152.2025.02.21.01.39.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:16 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 06/17] zram: remove writestall zram_stats member Date: Fri, 21 Feb 2025 18:37:59 +0900 Message-ID: <20250221093832.1949691-7-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 b805a3661101..f59fea0f04ec 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1443,9 +1443,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 2c380ea9a816..59c75154524f 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -84,7 +84,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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 2025 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 866F4204864 for ; Fri, 21 Feb 2025 09:39:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130764; cv=none; b=ANO0/g0ODqh2mclv/Il+H7LBN7WU9I4L23939vM0m65MnxSxAWDtoOc8K0Kcgqm0RQdu7N5+SYNOfqQn44h5nxlNL4UyIqKqz+29dMT1nbD6fEdefiuiOrREuzSboLnXYjT5ZXH99OMt7FNqYheziJ66nmihLZgjDcDlzWWJI9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130764; c=relaxed/simple; bh=yCknETG4UrQFty2aOKd7lsFQUmsaITxNXvRW1H8it88=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ks2BEvMMq+qXfgcGnvUBOWuh5eBuBq8l4+eKt7ipbYH2D/JQsead8A7pN9l9SnYJyIqeVSJzCe847f+n3pWWe+tFwTiVoM7xmDMtVCYttPMFymX2c0oXJZik6yHK5BWpR1dPzu4TFnfrxVSALbhjzKbgcxANLhKvblpU5gAxAU0= 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=mohBH/a6; arc=none smtp.client-ip=209.85.216.51 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="mohBH/a6" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2fbfc9ff0b9so3039892a91.2 for ; Fri, 21 Feb 2025 01:39:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130762; x=1740735562; 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=YiO1FosDR2lrWYSluoJ0c1MfeSV2ozE15nkpwKYw8aM=; b=mohBH/a6WIGFXPVoeEPML6pqJA6k8s/ysuWV/Nip77IXP+N9uUtp65Y818kjRyZlpJ k3zdqaaX2IDzCywgej3Tq7GlOXPADR7DfeXVHCGsdX5vDorTevNIufkdB2EwXWB15V+h mr4FZNsUlgRCi62DueLQiCjf5+g6ltTYK1YHQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130762; x=1740735562; 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=YiO1FosDR2lrWYSluoJ0c1MfeSV2ozE15nkpwKYw8aM=; b=pSzenP4EkmHgh6LY0fXlzZ/xb8XNpa2BJYamyxKLvWeCVB8tZSxJXWWaEBtr/cC/Zu U3pgrVh+aHdwYkeiAD+ZbQqTCMEgiGp6pJW6OMnVaF4fCw8M6ffElzooRp+NH2lhhU7M UBJ6M9X7eWciGyb9DkL+RYx2vrTfz2HFnoAm5GyC9Z3seb8P+TJeLAVCZRFKHMbUWTxf 4k4zmWh+FoECVkMCdp4oTXtI5tdT0bvYFuP5GnL0Gl6o1KzPFND6aZUvQG12l0OWlGQ3 oySBbJtTAzZmQLtzxtWZKMP/pdoADntDwDPML4Nx0bdPVux3bcKUjpJ+A4xy6Sd6oI4P Mltg== X-Forwarded-Encrypted: i=1; AJvYcCUUIhKkj1QFD5aV6LdQA09rdY5mWGsgST183lPDWCRZDyRP1vDdowaQwHBSGVas1QR3ftcc/HBS5hCkG70=@vger.kernel.org X-Gm-Message-State: AOJu0YwAauglc5vBa4VjhzrqH1XS9HefzHO7zf+gQoZG+vC2dg+OVhah rQHM2GENgNzvqUqf+M8Ek63imbRpkg1nt91Ip/jE/cjqxX5DPeSeG1ocGhL6LA== X-Gm-Gg: ASbGncsUpSqo0qjO6v7cOsy3B07MWujVFtiUMiI7mgjkwY6xfwRJaebOpKI3Xgjl2XB 3IgV4mWS0I9x8FD79aj427oa685ZUBP7xm9srDBt3TgXSgGwPxPxQKAzn/6YyfwiWuBfi9czY0S CmMNr97YDqaNzDt2zPALIKeEQN5Jf7g2k5Bny20Op7h63D19RCK98J+vp2UQmLYJ2ojqDzeb02I AJBGUo7AZDMwnqKsoXdVaV4qAR7rNnG0uOpWkwrhdlM7iSkWweHNRme+RDxd6LhV239RdH+1K3w hjW6OEltBprURrxZ/uQGJT5Uvbw= X-Google-Smtp-Source: AGHT+IFFEglapRmDrpRV77iwnKxQ9APz+Jgfl7/ScCUUMY+lOfpVb4pqyKKGcqHkCqH1z6i+q1OeRw== X-Received: by 2002:a17:90b:3d0e:b0:2ea:37b4:5373 with SMTP id 98e67ed59e1d1-2fce78aec58mr4681268a91.10.1740130761841; Fri, 21 Feb 2025 01:39:21 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fceb065299sm981337a91.29.2025.02.21.01.39.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:21 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 07/17] zram: limit max recompress prio to num_active_comps Date: Fri, 21 Feb 2025 18:38:00 +0900 Message-ID: <20250221093832.1949691-8-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 f59fea0f04ec..a886827f0b3c 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2031,16 +2031,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); @@ -2093,7 +2096,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; } } @@ -2121,7 +2124,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; } @@ -2133,6 +2136,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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 2025 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 AA506204C28 for ; Fri, 21 Feb 2025 09:39:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130772; cv=none; b=I89CCXEK3SDwjZaXR2fwcwTyX75TfKk2FYiGB8IqYwP0xODRz8tdPsIOuMm4ZrVebinz9ZjOP0gxXlizL6eTUzhE1p7AHbk+ecb4aMZzEuJCkiOFUatzv/BbUumVbtPq0MXePJm2wdusSCTPBCKWTgZ05DcjJueJcB6Y0Yi91l0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130772; c=relaxed/simple; bh=jnOJzYCzgxpKde1HZP0K8E1XsiPZuvUciCdLehqUngw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sr/UOYTONeOy9jHGz9pwQOS2r4KdgZmW5FOURinwQ0rJYiIC82/jgYOiys7LR2TiFNjvANudWVXHNUrw5CGW8XLepQJZLaZFK3tB5yc2OlDG949iaso1K5g9+7Yw2gZalXKsdOvYN+ZS7cAURYQbHqcWM0Y5WyD8r7AC7l5dOmA= 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=OucQOtz7; arc=none smtp.client-ip=209.85.216.52 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="OucQOtz7" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2f42992f608so3075169a91.0 for ; Fri, 21 Feb 2025 01:39:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130767; x=1740735567; 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=6Ti7CmEaorHMBg5DWvmUEjK7cf0LUhuuwHacW6S7Q+w=; b=OucQOtz7VG9XLq3rWVThwLf7oJCX+ip5cQoPvu3dt77VRt1Wq1RWqPRuHsXTTlhcZs ShVtoKMa5h1hq0h3Cf+/fhlphlw41digLyEFtis7U/H2sBcRzIBuwCBXYDkYw8QGP5DQ M3kKKl0zuiVsnvpaXIlmOZq1gg5MVTvJYzN3E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130767; x=1740735567; 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=6Ti7CmEaorHMBg5DWvmUEjK7cf0LUhuuwHacW6S7Q+w=; b=ey9RaX59IgNQ6hd6ffx+4y1aKJS8b/vTEApIOvTMSIji3gXyfAyPxRVePU6xMaEgQ9 lLlcaX/DleoumCCNV/WVBJeA4/g3KpRO+01zO8H9jfrDThRoQynAP3taEUdU7YOmTUyh vDYItoAti8J7BZMAvmJdQJ0OtPVMQE3SvQrdq6P/b0FrSQu1x2M4HxYkcmOTRgwanN3S FsAKTDL4/1W6S3S7rUOZhkto8EnoRKKxnhgVBhW/N1k/1HsH0WirJvCXII+Rbyk/1v9z kDK8Dvg8B4N88FTgc/NmaLeOjZi5srMM/O3f3Q9oJW87BUxsSsDF3zqSkeCy7dnyN0Bi JYOg== X-Forwarded-Encrypted: i=1; AJvYcCWgHwiblfMCjV51EXiQzIwcHI3MCTzFbVFqlTyv6vXLLa7KC6M6GXRlYG8G29egKhUBiwDPzguz6n2I4LI=@vger.kernel.org X-Gm-Message-State: AOJu0YwdqgVhZSsNLREykYzeSKEwxUSfcgrQ+vVFCX2k8I317p0tyRAT 1Hw+qkJzUf2SnOVSN79GA6DU7velkP+BmA6pDpinDNB7K8LGEiqQma2bSaqC4Q== X-Gm-Gg: ASbGnctqQlQfDPP8GpDOZy1P2oSGdVlvWGg1ifSayjwr48XvTMMzeKhcSIACZs3XbGw IOoTAgo0/DGM4g7cilg46IZ49C2SdYQ3l9xF8BzApWDDPK8/87jSan47/AWhnH7KFHczxtlVuzH kw4kSkMpLDtbQ98iyoHE7sW3aKGf19RRKau59bzQAA/kgw3gYB7ack0xR2AxFh1xKa4RKKOznqH fCQGv45CU5qTol0BJOrXDoR0SFjBHeYtqYaWsMYTm65VbjRgSGn6AH4KUul1afAMoAkbM3Jam1n r45PwrLEOsP4WB/6uwY5h57KzOw= X-Google-Smtp-Source: AGHT+IFkEw5rhjwVGmuiSJO9ZqK4LoqieklxjbVlzdvGmp36x+X05fC+JwKkd7RRpGwQHuo2CguWWw== X-Received: by 2002:a17:90b:5303:b0:2fa:1a8a:cfe8 with SMTP id 98e67ed59e1d1-2fce7b3ad90mr4368050a91.29.1740130767623; Fri, 21 Feb 2025 01:39:27 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fceb05f715sm900785a91.24.2025.02.21.01.39.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:27 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 08/17] zram: filter out recomp targets based on priority Date: Fri, 21 Feb 2025 18:38:01 +0900 Message-ID: <20250221093832.1949691-9-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 a886827f0b3c..a1880e621895 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1827,7 +1827,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; @@ -1859,6 +1859,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; @@ -1915,6 +1919,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. @@ -1923,13 +1937,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); @@ -2154,7 +2161,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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 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 1AB1020896A for ; Fri, 21 Feb 2025 09:39:33 +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=1740130775; cv=none; b=XAJfzO0ajc70o8xPKaAWAK+pL4T//fn7bBt50yPJK9E9G/wm7d/aEclXUHHzGeUEn/IFRVqLFnCliPqeiEFNIV6PpxcZ0MS5sfgEeZHbx3T6tBmTicpey9VorsliqDWbmVrAeG3PS9jo1UnRKkCkKZqAvhLKKuFybjp2gl9wQ20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130775; c=relaxed/simple; bh=he0JJ1tlAzKmHMaVFR336aPCxcQkLP9FrAuZmoitajg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vDcYljfJz+kaBOaJ76nHPq9ARpgZSlNfdHvTT5GmzdnFDcGQN4/2i2jVc4/l9crsvclCHbCFzOjg9cb+KtlDTSnsgljPYHtnz1KlsoRYdHGQ9WfYuY9v2Um83twxJkITjkCiBZZRY6vJEKf/eTmQiArYQRv0PRXmaAsZe78CKHQ= 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=lSmDuB/K; 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="lSmDuB/K" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21f2339dcfdso32869635ad.1 for ; Fri, 21 Feb 2025 01:39:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130773; x=1740735573; 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=ooRAT30N+1IineDWVp9J6MTWf65J1t58JBJO7W1ETBg=; b=lSmDuB/KcrfIgeFrqI3zL1fKI2yxrnmqtPKa44iF7tA3VPN1Ui/bgEaENvwfv7T0Xv nCHy2UKChL/gVXxxm+E7EMtwmIw6VAdVd88c4M2E32Gnhb/txMvMHr/TllAlzjjDVK/e KBUEhXAFiE3N2SXtB5eZh+ZS8K7croTssp06g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130773; x=1740735573; 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=ooRAT30N+1IineDWVp9J6MTWf65J1t58JBJO7W1ETBg=; b=WM6zpQExFVcHKs/h7C8f7ZRh1neDWI/RBIWbxS4utipPiSkJHi9GzYWbsOsU8hegkD 9ZbyDgjO1FUgtJdpWNAB7y2jIcWqyAt30vnl70YhgFdSewvBe211oe06mEhfbZ7TEf3u xQgIrOBIfeMhaLGeB/zIRjqnIV3iwHToif0eTkvNQDnpUjI++kgQHgoSuKJQgrSEVKIP itBnllz/NaLMUnydWutYjO/v6YN3daxsqdG/VN3A7kq2joWxLoDNsp3CJq9FqnfyYaVg jx0lt+Cp12HZZRX+NesPGpN0z8NgaBxaM4pmMBpocYidB0kvDqfJzye4A6xlkoq4PfOn 4mdg== X-Forwarded-Encrypted: i=1; AJvYcCWRUmLEwJL8UM1sSidIwfOvwWXGzm0HJTp15nKIUs993hXXgAC69mrWc+ZWhxNMQEdSr5TxVLgowtxnAQs=@vger.kernel.org X-Gm-Message-State: AOJu0YwE4vUmWW8gAb2YBKG8RVosPLBr5mL15eVS00Yax/058IcC/OjO 30oAtHDMhuhs86TTxFshE3hrMQnN5Vw7mY9uexgIAR4XzAEL3F9eFlwSbW6yIQ== X-Gm-Gg: ASbGncvMwfKSZ8a/9qObqzlgPCBvwZJVNKheWzy3unxQ262Idc5Xv6QgM6E2vjdglGF npeoNAmHYkhyl/ek5V/FsgAwrX9ENUiHFVWvhX/Zd189tWPntjcsluc0uPGn3piOTlJZkUDtKgG VsN/mIG7/vGrZHZEQmmftNFvzZv90rjFH27JL6JjGtfLsewOfcdBRFfocon4E+Ct/nqvoK10Bbz y+AsaDIGNzykq1yiMFX3IeOBIh7VQNBCKt8DJI7eo/76sRbW25HJFNpm/16PnHFkLrFVdiO91ka Mm4X1QvjUxoj6Rbr0vnYml/V9LQ= X-Google-Smtp-Source: AGHT+IGRF3A51Ju1CJymIu4QEKwvzsIx5m8/kDSMhapHrOeLOdsD4MZEno2i5dRKAI8Yq2xbHCHWYA== X-Received: by 2002:a17:903:2311:b0:21f:5063:d3ca with SMTP id d9443c01a7336-2218c5575dbmr109218605ad.16.1740130773425; Fri, 21 Feb 2025 01:39:33 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73242761538sm15686426b3a.139.2025.02.21.01.39.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:33 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 09/17] zram: rework recompression loop Date: Fri, 21 Feb 2025 18:38:02 +0900 Message-ID: <20250221093832.1949691-10-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 successfull 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 | 53 +++++++++++++---------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index a1880e621895..814e64f4ee38 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1892,9 +1892,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) @@ -1937,7 +1936,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, @@ -1946,7 +1944,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, @@ -1956,6 +1955,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 @@ -1963,14 +1963,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 @@ -1980,38 +1972,31 @@ 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_NOWAIT | __GFP_HIGHMEM | __GFP_MOVABLE); if (IS_ERR_VALUE(handle_new)) { zcomp_stream_put(zstrm); return PTR_ERR((void *)handle_new); --=20 2.48.1.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 2025 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 66DE1204C28 for ; Fri, 21 Feb 2025 09:39:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130780; cv=none; b=fEXgQyfVT2jk3JfmWOcTbW1v5BIqDL12H/+CSBhVYznnVKiQYOdovF47xpvcNK6Z9xfe4uueKTkLytXA3yEdPNlmJRwdomO1WMTxjaC21U4EOCOEJ2Y0BKO3cP4bvcYI4AbsywmNA1c6qqxK15D4PAP3aDu0WjxaNwNpuaN/Oo0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130780; c=relaxed/simple; bh=OmQqpQdAdpFq4en3WutiCoYviYGMtxAOkzqQFIWZZ2k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oUsNtu0hqudxi8H7gYcZVW1tdywBoKOP/dxRGMznfrvKj9s+7qZTu63lPZlm9kSc9/veYVieVZsxlxg2hGHrqWmpK44jcthqbGpfigNRXqYgaQg0t5TyCTD+vcnwX0L2bFLFS22bmUptJKVAqBFsfX7kMLW0z9yNI/+inp7AUuk= 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=MqvAihRp; arc=none smtp.client-ip=209.85.214.171 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="MqvAihRp" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-220bff984a0so36176235ad.3 for ; Fri, 21 Feb 2025 01:39:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130778; x=1740735578; darn=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=5HvQEcjJeXsHC85jXzgvN7MoOE9VPDedZeSd2dLCsl4=; b=MqvAihRp3RiUjewoeT2jIxxlIRAyrgc1G3Igzi0qjeuQla7QvWEudvGkyfZpB0kaNq Dysel4wWmedKsYMJoc6905gJQzZvojNCylEuQbMKfxzP4xd5HtFF03xYrXfyYkO58zCH FK2l18ZwcZCgYUzcAqzGcaU9rKyyvfSkRLqnA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130778; x=1740735578; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5HvQEcjJeXsHC85jXzgvN7MoOE9VPDedZeSd2dLCsl4=; b=Cv2enNozugM7hbx3J3yh2Q2kPXtC3AOCgwJhOojlFQkpCoOlb9YqjaL2VOYWeWusZS E+fuP0WGoNk8I5O4K2r3j/o1TgqMmOkg7TdeW73Oiwip2LoDxs4DIu0Lc0TXv6/ECuED dc1g3xmJs1cpRmA6fmTTsdkX8ANTXqDN3BsN7HeQ/TNzSBQ38obJmQcp/LkmaVUkcRuH AQwOPFyNT+YkBVl+SolBZwxd++4gGhwFxmz3MKYBohHPZZzv8cxbX4hjO+TIGqNvDXvR zqmbrDPe2SfGRfHbUC07BZhkWTzoOB9Kz5HSmGyM9uQ1Fkx76K3pnmRfRKCQHqnBa1lB MiYw== X-Forwarded-Encrypted: i=1; AJvYcCVuHfsXwO9Vwzh7yA81J0lyNgk+R1ubVjjvFZGMTPq/qvWiLCpDntsdVPlC645q+1rpNqNfM+oKIiht9uU=@vger.kernel.org X-Gm-Message-State: AOJu0YzzmIs4jGGguz6QQTg2ApIpcL9khZRHRpW4lKiwspUlj8sjS5I0 qhlLMGivU9WcdaqLzzexMi0W0nL1oKTcdnQ/cql7qDQBb6tennrsq4JsZRggkQ== X-Gm-Gg: ASbGncu5d71RTCeNQqundHsVEgx5VbQi/lg/yM9k7Hh+y8scxhj3eBBEvrTXT0Ds+kX XVWP5qe831SOMHBUw21sVyz1flfyK5692QN1uOoQQSe60bPe+4sbnMRI8FVDAHvTI7tAQkYWOnw QpGIJNYq6sWJfz4qzcpRsmqwYY38knRCYxrdTG9p6pw4t5r+AZ3kpElwulwE+5VPi2sh5AguG4j aMTtKD2VbFo/KEEAdS3VUaOL6kIDzML6EF+hUkqGxz5iTH6jDwiKmT6Pf1vo1vS1jtCs91wx891 7S4TLUggaMh01ugsG8gQ7TDhfx4= X-Google-Smtp-Source: AGHT+IFJSxFh0kIH2ZWbOryRmu8nKtsDecZCxDfSknljeAwZwRajmYNb6qKYJjX34w+hU0iVAuRclw== X-Received: by 2002:a05:6a21:6004:b0:1ee:c6bf:7c59 with SMTP id adf61e73a8af0-1eef3cdcb24mr4527195637.23.1740130778665; Fri, 21 Feb 2025 01:39:38 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73274bdf0aasm9692864b3a.125.2025.02.21.01.39.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:38 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 10/17] zsmalloc: rename pool lock Date: Fri, 21 Feb 2025 18:38:03 +0900 Message-ID: <20250221093832.1949691-11-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 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 A0AC320A5DE for ; Fri, 21 Feb 2025 09:39:44 +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=1740130786; cv=none; b=fUOuvKzO35sVzduniFQhaPBEDXJM4ATawQhsU2VhOQrzyhrzRYf01PtoXLu33xbvALtaauV39Phhoi3gbJ+KM1N+9c/BgkGGUN9NVKEmIOt0PHvdD7iMay1felBZUDI3DvGD56Q+8xYr+uRLF9LIZwOAVsJsUgKHIGbsj2ZXgw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130786; c=relaxed/simple; bh=cAo/HQW5zQAU3/uebP+gQe6IvkUZ/gcH7MVwdPPmoxY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mnf2eLPjfBqE64OpJJ3Yo7nPs6PL5/qLlYMy2za282dxJfAdlMC+Y161W1qRVaN69lWlOk9I0QUo696SNmyjoowoZ9o9/2pyNYJteXs4EEQk72NtWbusSTsdVaYAnAWTumEgxOo7jTeB5i1dM/cVRrPEaBRDGDiO/6dfrdDzsfM= 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=eZPY08Vj; 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="eZPY08Vj" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-220c8f38febso39303505ad.2 for ; Fri, 21 Feb 2025 01:39:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130784; x=1740735584; 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=c43sUKc+c1340lwZZrmUjsY+PbdZGHYK9fwL3MZ7pbk=; b=eZPY08VjcSW/+n+ANd+csEvSIRm7cfVnHtL3Xjpy6Rzqul+NYM508Fr8rURI/7LwNV SMTahfovPfKU15nXc+v4J2LCCyJxjxiVYzM/IT8rDdUUDQrccMZovTwZwZTPzpaSnt4e ahlislT5QvB2ebba/hU61wiR6TJT1y8I62M2o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130784; x=1740735584; 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=c43sUKc+c1340lwZZrmUjsY+PbdZGHYK9fwL3MZ7pbk=; b=kjgtHYs13Q+s+ak0tWxjkq6RVQ8Nr/3uHf63q4AJySnkI/BtFu/rrW8cvPVNG63+KF DRmSGmGXQyJZGmbVHKR4BcD7Snbw/cgVK0SKX6oMQXpBrAnmc3CtmAjcXs6Pf+mq/qUj Hgl8rs2BpuSnsUkeJJdq11fsqHEZ6WPgvJ0e9Df1oJVrtgqR4LuAO3TNqHzJjEMfAzIc Al57iaAeIm2uinpav55lW4HXQ6JOBbZQXlu3kAjYBdk6mOIdZvvA+axXfCAadGB+EJta 2cjSWW1XW2mDWbhcuXtgxmy51UStDHqQUCTN899zx/sPQcQEMqzqjAt6Ojwe0rQ4SGxV badQ== X-Forwarded-Encrypted: i=1; AJvYcCWrYxDBoqkEARhFz13ljYPQbEiD8LbWkuJ6pmZR+ECKoLYbw4CcQ9sgoYMeBXUHeHWCsJsq88BH7szHwww=@vger.kernel.org X-Gm-Message-State: AOJu0YwOvqWChSbYWzmcjts88xbtSF62YLK0TLB2V5MFJnroq4VFmYz9 YkwaRV/BfKSXCdMJ5lvBn1OKFZfgbU4wMO1qEdPEAf/S8ridEh1I/wa/T9EIFg== X-Gm-Gg: ASbGncspCBRxCJPS6Y82cFNl7i10zry18m5qAP/GoMsDWSyLRWhr9nBQhpM1Jr5tCxM nW80OjlurQNYqFOtFe7hxUSEojjZwMZIaviAL7K8ga1c/9MK6CA/YlZxiCngaWh0OBNmQwVyin4 JNzkgB1hfk2cXWTu5z3QfJyyumeA9CeRkyzPktuL+ITn3rGT//3gAaI0uLz+opOa4vJtQ0Wt0jI pupr1i5vYTCjyCLBc7PcWzE/vSX/bnZiJKfNgByBDG6el9lnHxYxVAoBAcu+AT5tr5dV22dqY5b j/UJBrJWOLuNbAvIzWxfpuGe5Fo= X-Google-Smtp-Source: AGHT+IGQLO+1U1vS6Lct91u4p8i4NavSONuQ6g0x/XphxsfnVjWvF85vBjeEIzZsrJ0hPSWktsRKtw== X-Received: by 2002:a17:902:e783:b0:219:e4b0:4286 with SMTP id d9443c01a7336-2219ffc00d7mr41532145ad.29.1740130783941; Fri, 21 Feb 2025 01:39:43 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d545d4bcsm132919005ad.144.2025.02.21.01.39.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:43 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 11/17] zsmalloc: make zspage lock preemptible Date: Fri, 21 Feb 2025 18:38:04 +0900 Message-ID: <20250221093832.1949691-12-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 | 189 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 135 insertions(+), 54 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 1424ee73cbb5..250f1fddaf34 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -226,6 +226,9 @@ struct zs_pool { /* protect zspage migration/compaction */ rwlock_t lock; atomic_t compaction_in_progress; +#ifdef CONFIG_DEBUG_LOCK_ALLOC + struct lock_class_key lock_class; +#endif }; =20 static inline void zpdesc_set_first(struct zpdesc *zpdesc) @@ -257,6 +260,18 @@ 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; + +#ifdef CONFIG_DEBUG_LOCK_ALLOC + struct lockdep_map dep_map; +#endif +}; + struct zspage { struct { unsigned int huge:HUGE_BITS; @@ -269,7 +284,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 +294,91 @@ struct mapping_area { enum zs_mapmode vm_mm; /* mapping mode */ }; =20 +#ifdef CONFIG_DEBUG_LOCK_ALLOC +#define zsl_dep_map(zsl) (&(zsl)->dep_map) +#else +#define zsl_dep_map(zsl) NULL +#endif + +static void zspage_lock_init(struct zspage *zspage) +{ +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_init_map(&zspage->zsl.dep_map, "zspage->lock", + &zspage->pool->lock_class, 0); +#endif + spin_lock_init(&zspage->zsl.lock); + zspage->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(zsl), 0, 0, _RET_IP_); + + spin_lock(&zsl->lock); + zsl->cnt++; + spin_unlock(&zsl->lock); + + lock_acquired(zsl_dep_map(zsl), _RET_IP_); +} + +static void zspage_read_unlock(struct zspage *zspage) +{ + struct zspage_lock *zsl =3D &zspage->zsl; + + rwsem_release(zsl_dep_map(zsl), _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(zsl), 0, 1, _RET_IP_); + lock_acquired(zsl_dep_map(zsl), _RET_IP_); + return true; + } + + lock_contended(zsl_dep_map(zsl), _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(zsl), _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 +390,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 +1086,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 +1111,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 +1311,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 +1371,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 +1765,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 +1787,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; @@ -1769,7 +1838,7 @@ static bool zs_page_isolate(struct page *page, isolat= e_mode_t mode) } =20 static int zs_page_migrate(struct page *newpage, struct page *page, - enum migrate_mode mode) + enum migrate_mode mode) { struct zs_pool *pool; struct size_class *class; @@ -1785,9 +1854,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 +1869,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 +1908,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 +2044,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) { @@ -2233,7 +2308,9 @@ struct zs_pool *zs_create_pool(const char *name) * trigger compaction manually. Thus, ignore return code. */ zs_register_shrinker(pool); - +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_register_key(&pool->lock_class); +#endif return pool; =20 err: @@ -2270,6 +2347,10 @@ void zs_destroy_pool(struct zs_pool *pool) kfree(class); } =20 +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_unregister_key(&pool->lock_class); +#endif + destroy_cache(pool); kfree(pool->name); kfree(pool); --=20 2.48.1.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 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 22AA420A5EB for ; Fri, 21 Feb 2025 09:39:49 +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=1740130791; cv=none; b=PScEJJHt/OC3fztzYkfta3z6M/2/Jaf8HNXJ7SO2QHnXfhJkg9shtl5EveYhIv8wHrr3BoawB+l4TLb91fDGhIQxyOwYUWOAXVlS5P+xWNCZ+lq715J0GGdUOZPfVdOtbJrlbOeecjT4o9JvHyqNNGEp5tMWKkEy4/67yJCpvRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130791; c=relaxed/simple; bh=JDoqXNYQELkBLVu3WwbJbHbWt8UbkNHlQgytAqPAzUE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pfnlvNuXepcRSt9EmSeaL/5M6fgCaCkX2u0OTDShAWKOtaKqeoXJpXOnG59mkWfnFjPKVDyk5kTIyx+IfIu8iHYZEIR00nest8qCfQOsKnAoJ7Ve42BvOockU6SRNRH6sIXTAFeL+Uf0HaRjQuyLHaSMBPHnv1mTPM1qiN9rKzA= 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=JIplYl58; 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="JIplYl58" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22114b800f7so35341865ad.2 for ; Fri, 21 Feb 2025 01:39:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130789; x=1740735589; 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=r+V102a8CvzSvRQ+sxK0ffvIfOAyV8bBQDBTXVAo23s=; b=JIplYl58bj9xLn/3ti4+BKtonrKCBPLoqh9/Fd+bLPRd0V7wXmWekAffYVx75sHhZd +rRwQQGJLNSvmzaRzhd65Es7B7LVMqRO67BY2manVDZ3i1w+OCdEP5WyFZgqfzvbX9U7 KFZSMiA4cpBMnlrmAcpCokabgjV0lw/tgHLtA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130789; x=1740735589; 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=r+V102a8CvzSvRQ+sxK0ffvIfOAyV8bBQDBTXVAo23s=; b=HnkOq0U8PpDM33jfDDZXLp0OHZ0uMYAz295mvvM6K7SQwl6tYKarUTEbfAzM1zJuxk nPIj1Y219JWyTRKVk5pwHKIE5nt+ERGjmBdH9GUrR0lbyay4t1sxr2DyqoJQrj2Dghz7 Qa+h2KUz8o4scLNSHFChtc4Nh3Txow27RCt9px1CakFVjSEvoOGj/XdY5WnS80x8EW20 luYt9U/QghpDugDDOdj39Jw6A4QLqXHKwLStuLg1zVmnbcLkAQ7eNoqCh48mawxIgU8J qrV2pHulUqwRoI0BhrKv++Pw3k/kDweajpBtgJTQo3ZcBkmWbqBz8N+wsdbCp0B00yeB nCUg== X-Forwarded-Encrypted: i=1; AJvYcCW2l2fHcEjgzDk5j8oMAvhJokOaB71O+fwqc45pbj8NvSHEg5GGY3PmVKYF/dStwQm5CO5+yYFFUlNcMkY=@vger.kernel.org X-Gm-Message-State: AOJu0YywGsziKSNeLQ4iZCQZ3luUuWgqsQ3QDACb9PoCVod5iEfdqHWX zWx1NED/1+vkxHrKX6f/rthka4nNabpnKPtntmZ5EbHQ/0p3XS9SGQ1UHSQO+g== X-Gm-Gg: ASbGnctXBYxDIY3edO7HUSKrZBWbMlieOhDf3PuG5SWYuEcwxjrDLdFVhicD1Iclv3h 253wHnOc7BrSAe7rvEPGRzIKlwv9gImKwSDxIKm08pV4UgHhM284iozfae4SZvZyKIG3ub+zw8u 1PjrfE7CWKrO7ERLm7T5fqo6CgsxE6AwaX1kEmRGEjC3830NFabDqlAmj5NtgdjH4XeS87201dX EzpI07sh1ZdnXbIz1FU5R3/Tk7M01VESmn+5Bqn9fPL0A69CK/e9ywG9hKVd+tK7iUOAR03OYzM ir/f1Ihxdbwau4OEKtrNa8KQvA8= X-Google-Smtp-Source: AGHT+IFJYSryWZFsvikewIDDOjJ5biVq7e7y/3wvbBGO0tIKWvvm6+aR0zFU9xY7HWK8MXDKvHfkow== X-Received: by 2002:a17:902:f712:b0:221:7e36:b13e with SMTP id d9443c01a7336-2219ff50d62mr52630715ad.12.1740130789480; Fri, 21 Feb 2025 01:39:49 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d55866ecsm133407275ad.212.2025.02.21.01.39.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39: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 v7 12/17] zsmalloc: introduce new object mapping API Date: Fri, 21 Feb 2025 18:38:05 +0900 Message-ID: <20250221093832.1949691-13-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 | 129 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 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 250f1fddaf34..71d030500d2b 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1375,6 +1375,135 @@ 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; + + WARN_ON(in_interrupt()); + + /* 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; + + WARN_ON(in_interrupt()); + + /* 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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 2025 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 861BC20ADF4 for ; Fri, 21 Feb 2025 09:39:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130797; cv=none; b=KhL/D8THH5kKED1TT0tiUarNfWSJz1ICqhY8S/+RUjj8MYPJeXTmW67yRAj5uyuKtH8kgZ8yDkrjrbO2GrLLFSmd3+NptCgrz+v//lMysmE62nHrkO5rWWT6y74RZQYhipQJ+lv6dYznPlrgEFIoLjMhTaH/y33KTomMmFVQHXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130797; c=relaxed/simple; bh=AYg9ttBwU3Iy/VBQie+4ekcZ79IcjostZ8tRZp0eDfs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oojio4MOkQ4FwCzvpFrlhu+nKF2jt3Ypw3OufTBqZ7+J0QSOUDGqxatRI4mVArzRnSebZ9bG9g8yMLAkvRKSV9+bzgnflzwWJzlRHuQnDM6KfOeBluj5/j4xciusP070SHYJi8Y2Yuu87ycamxdKwTUC5eaA6bWwbgtTtmUxV/E= 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=HLQXdT4b; arc=none smtp.client-ip=209.85.214.174 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="HLQXdT4b" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-220e989edb6so51504325ad.1 for ; Fri, 21 Feb 2025 01:39:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130795; x=1740735595; 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=+7nX2BQHP+jBaMIBfki0Sibf1caPlu6CBS1i9yoAT5c=; b=HLQXdT4bvOG0xCG9iGEKW88c8FO1ww+4dAGB1En2+G9FkGI+Y4UEQsyv0y2+bwHRxl vWbLYRPdg9zyLNAJ9FUs/KsKchbNuMXV2l5BRs5+b9fnTeZBfQKJ27Lb0f5XI0lOqGMA bfLcuo7Eb5sSKJgl8qJrGyfAnJ6iE43bVMmUA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130795; x=1740735595; 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=+7nX2BQHP+jBaMIBfki0Sibf1caPlu6CBS1i9yoAT5c=; b=WkZ2RqS40drQiyW47cFz8g9tVtDOrTaSnOtiXecoHYGOObLmQmw6Uu/KcOiMTysLFD yMET4UzCQUKAwYbw9d+2W/qBsnPpsDMO0jwSr8leHaMN3/WKa+yqRiFnLw6CmOoK3mBI zBxQNXMKhApIuOTUYI8vUm/NCp4CeFxGOn5lpqxxHFtQzW66srILVjcFKesVgYWL4Z1y lYCLGZTu7xYaelQhzYWtJNBWmtJsuyjuMe+4qQ97oPBcMRopGvOEqRGy9anQKU4Zz+2N 3SuOPra2kDEqIhfstzJoSzEov7nVssXl87wU8PXicscWsHC0JLiON71NEuUQKvTbC90B DHPg== X-Forwarded-Encrypted: i=1; AJvYcCVnnNt46b6mTDX9Y8o19uTBtokaWzHDlJw7H/pNNjuuB2VEpdb3g+wQgVWJjwVkQJIL0+eZXx/KErVx7/s=@vger.kernel.org X-Gm-Message-State: AOJu0YxeajR/w6HHiqR/QQFnZjXTPAtG4IKV6oQ0ljSF/UtMTH7ZkQ5m chfXyR7/Fp7OwVfjvLZ5j2VhVMa8uxJYXRbi8FiqQg24vBMZ5I2ZTOC5qn/xCA== X-Gm-Gg: ASbGnctvQnkBG5MHTfiG1d6HVGDRXIcZWq1f1sUf4UPKUnLLtk2k1tNvI988f7EQAe0 p01LKQZN0mTNfphMDVV75I4mQy4TXtL/Fe/vn9TsJYV+CFXz5tXizC0rdNb9v0pFe7hi0zsg62T oXDJWGOUXaOdwNAKwvGmUfm1XaFbguFrKH0bu9kAGNgsccEASwE0sphJnPpXbkub4pJjwKlE17a Jyf9zJfpi9MDJ8Rf/5EfbGnVj0bHH6dFvY8gmAwwQZTCwL2AWqOfjpfb/m60Kx/+lluBucSfdRU VupYf3829KXV3HZTx3vzfJM/MhM= X-Google-Smtp-Source: AGHT+IHnX9TtZ5+pJhaRuJdP+fitjuJuk97DulMxTJbwpxnruxJEAlVkN6hwAldQgSdlVmFyU1l8KA== X-Received: by 2002:a05:6a20:9184:b0:1ee:c093:e24c with SMTP id adf61e73a8af0-1eef3dc4dfemr5404148637.30.1740130794756; Fri, 21 Feb 2025 01:39:54 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-adbf21517eesm12895632a12.13.2025.02.21.01.39.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39: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 v7 13/17] zram: switch to new zsmalloc object mapping API Date: Fri, 21 Feb 2025 18:38:06 +0900 Message-ID: <20250221093832.1949691-14-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 814e64f4ee38..47ccda207bf3 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1566,11 +1566,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; } @@ -1588,11 +1588,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; @@ -1688,7 +1688,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 @@ -1705,11 +1705,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); @@ -1730,7 +1728,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; @@ -1776,11 +1774,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); @@ -1892,7 +1887,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); @@ -2002,12 +1997,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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 2025 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 3984220AF93 for ; Fri, 21 Feb 2025 09:40:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130802; cv=none; b=MvYIM8bo70UsWvXBdtplz8csqMUXilWNjeoMYvUl9L/1KUiYt/88KVZeGJV+XGHken5YjvT2jP0k1jA2wJhQybGOqtCexQ7XUW9TQOuci/IrEdKUq3BR+x9yTEri3SjdmPhGi5OpQNYgynWh69UgO0Wauk0gOSQLQKeZUTZ/Tak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130802; c=relaxed/simple; bh=3bl4FZa1Jj9/SryddhJVpujsF+YKBcOIbQtdPgtbXnI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fz88DGxiEA0Hu3++ijldE24x0AHU/BV9SPhe70PfD1FPHoP095uxgB40YVoNfw1HSE1EFvcwpiZzM9AStJ58UkxMX9qCwqRF/RWHPQV1nNEAK3t3uNDvAELBGBKPPGKsuFZFhZtOEckSkh+Rus9AYvr/VO3JTmoRnk97IpIyMNY= 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=P4OCPx79; arc=none smtp.client-ip=209.85.216.52 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="P4OCPx79" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2fc11834404so3034543a91.0 for ; Fri, 21 Feb 2025 01:40:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130800; x=1740735600; 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=cvgHEnC+lRfOrRLv2RIVOYlOBk4EIx2tIzOwTFt2Qag=; b=P4OCPx79NjnXbDXCIgmjUgADksFo3ZYka96NcPhnag9ikTfrAnhjXjUHTnBhjYoxcr mrkMYIyparPSbWyuIgiFKHrmJl9gMc88VggKK8RTavnOba4TFAkywVcwGh1FjIG+r/hw T94rAV8Xe9i8N/eQH4YiALe34u32c3tpwU0Ig= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130800; x=1740735600; 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=cvgHEnC+lRfOrRLv2RIVOYlOBk4EIx2tIzOwTFt2Qag=; b=QsH28ocQlnNUn19ieEe3rcdRk3A8Hms+s9VHVd9lRX5WWoRXp4eUeVwNsrzQulW++3 NAknrmsNE718fFgBXnpSgm6hYXKNG1rToSUc5ZEbv5JQYF0wUQ/lgwGa0Mk5uvhOh0m/ XnkvMPQ/AYwsbNVY23QpHsAHTG+KkpdIXHaMRY4EX1eFXB3Vhyh3kX7yKwDJ8hwxFtt7 R6YegR4bbXsBYUyy64Jrv439uP+XGx60Emr/yfpMK71DpEdRUTMfF4dZW46PbeJqLqM0 bYqcgFlzWvpvN6tLm6RXR2KqX7VCNbHrCST6ibQMomfrc4pFLgejQX+cmamSHgVyeQUh FKlw== X-Forwarded-Encrypted: i=1; AJvYcCVFcKpBjQ2jMUflcEbWJqefNyxr8McPGzkr9/u9VjwG/dj3ePD/x6zIw2rBZwQEyI394MHwYBK50LHI4PQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzhoFlu1pY0dwjm6GHQC9VnEdJBVKoEa8h9FfpwsT70SSnV9PP4 eyZY28XjzUkGCp4dVtKVexUcl7EcDqNHADqYE/ablhj5vR4XjIp146gYomh++A== X-Gm-Gg: ASbGnctPjoqaXHA2NbrBp0kLNsdrgY5VuLoVd5Gg2+jK2a95HJN4ZCuOK7dG9CqZw5e IrssIdjXYxM/S8V8gT7DkudEaYNthKAld7G4s9eywhXRnE57fCAJ5KPhIBOv42+PDzrlTtEWsCd TRkox+1opfZMMDW5RlxtQMBIE17V6nsDNzWwcw6qGWI714wAoNmuH0LBNUC/trL5Ut8kqzAie/o NOp+9+Pn9dRi8ItSA3/jVvhi/k0fpbbHiYAjuYIgfhXWloysZ6X4AzpWYGaq+5c5zmTqP5YrDsE RnhHv1DJKqJWA4LrZU084NaIja8= X-Google-Smtp-Source: AGHT+IEeaNCIbiqEVAo1RmizyW1uxrb4z6DMOQbzYKHkv/Y97ooxMJdlMx5xw1SmW1HKoPKFG7FKUw== X-Received: by 2002:a17:90b:1811:b0:2ee:aed2:c15c with SMTP id 98e67ed59e1d1-2fce873aeffmr3562067a91.28.1740130800521; Fri, 21 Feb 2025 01:40:00 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fceb12dc27sm898120a91.45.2025.02.21.01.39.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:40:00 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 14/17] zram: permit reclaim in zstd custom allocator Date: Fri, 21 Feb 2025 18:38:07 +0900 Message-ID: <20250221093832.1949691-15-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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, 3 insertions(+), 8 deletions(-) diff --git a/drivers/block/zram/backend_zstd.c b/drivers/block/zram/backend= _zstd.c index 1184c0036f44..53431251ea62 100644 --- a/drivers/block/zram/backend_zstd.c +++ b/drivers/block/zram/backend_zstd.c @@ -24,19 +24,14 @@ 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()) + /* Technically this should not happen */ + if (WARN_ON_ONCE(!preemptible())) return kvzalloc(size, GFP_ATOMIC); =20 - 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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 333C92054E9 for ; Fri, 21 Feb 2025 09:40:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130808; cv=none; b=C3LVvW3dZoXGLNy/rrUcpwElb/u4iN2Ag9gsqyyHdYiD3EzbWXeJdJdwd08RcFJYTwM+kNgiOQL7q2vHE+5bArQVzmN9dfi4MjwWtm1lxX+aI00IccvjqogyD6NGHE8Jz1FykV7UShOf4gvPAYrQYvRHGjwgkbRI801wZrIwJgc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130808; c=relaxed/simple; bh=aCg3ZHdCI8MVwshZm6i0nWyuXLOfe87XpUBdrYVXXFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qPFOWUWG0VUOnounI+X30qlRakFuLYJiyx18GmFNXRGeuhWdf2sxv0IZzluVAKWyHPAwmt/2RjzJUDpTvxcQpNPfL59hvFVZc+s8AHeiQLA1iukA5DzFdChYlcnAKyfv6naWERO9dsGxFFIi/Fz6SdIMzrLVyGIEc/o0FI9vcWc= 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=MUibJIx4; arc=none smtp.client-ip=209.85.214.176 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="MUibJIx4" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-220bff984a0so36182505ad.3 for ; Fri, 21 Feb 2025 01:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130806; x=1740735606; 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=X/8bmw52gxKP9HlvW7ud00ppVmPtFMCISSlcsi1PIXo=; b=MUibJIx4FpsKCytg7GSXiEnPivH0oZ6RMcW6Tken9Nrkm9gJnrayCO1lgQlQVUdFwI XZvnzKylwTwagap2sZS9IOejaO7CT45CYI92k/b+GPrC72VK90xvoQoailgnQdfZLosm rUBBe6/WJ5lzS+BUsA+MJPi3OIU0F3+7KgCgk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130806; x=1740735606; 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=X/8bmw52gxKP9HlvW7ud00ppVmPtFMCISSlcsi1PIXo=; b=D4Cbvi2CPttwIQtXUdL/zfCqrvfk1/xV5llpNWcMFK0C59EC3BXyrig14FJsYwVIRR UYlUbnQc0MrTtV7jYHWJb7T8T+qYaqxq2h88BSC/BWPhBU5OdQYlB5Y5DmuezRl7e5vD oPkKfsHnqUXpwt2QfneYnmLZY06C+H9C10QWwSgwRVCgpHxRargHFJ3g/tC/ByhAHkGT 3+85mXYw2PdNR7B6v05bEql7WN48sMsuMUSvEuPJK9DJRn5O1lZdbIBFiSoNqsnv+lrj oeYHpHAt3TEP/vMqceaurtDbYQnvv3kS8WQ0aoZ3IQuLFPBUpZF4zT2PGS6f13SxBW3R edcw== X-Forwarded-Encrypted: i=1; AJvYcCW6seP6Wo02EC2NX8P2QRMopDRw94PuXeVyQaLo3Swv/seuoCHAK95SHxCoP8zJ4jdP5Qrwg3ZFZ9S3rKA=@vger.kernel.org X-Gm-Message-State: AOJu0YxElcGLk4Ts1Mk8wXJfsRG3N7U3vz+MdHFj+D1kXD/4gBDqrUP3 rndNvr4FqqLBoJkQsVLtB7M13Eq5EEwaFYHPjKOsepWyGKawM7cmcu82Wyonuw== X-Gm-Gg: ASbGncuZGokbjAtEniIHO4OXIS90xiujwVSmy3oY/qv3ROyqO1zTgIVrGhLrn82imvj 4HmuSxC9vMlenamaE9c4054w5YGP1uIVQSHg57s4EmHJMJsyqFlLyF3yKPIgRM62PWUVHZw3+xg LVVFEHZYn4FkULEKg5PjlH21OG7lrvBjAMvMNEJo/dC0ygN189NBrzjf3KyFrlDaDeesvZEnsse H6u29lsdEvYNcxlBuonra8Uf3w9q4Q8JWQjJYKzbtDn08MG06KWEej/39Nxwh8FP51m3+06vUFj 1nFrKxX07Ha98yJCCpPxm8iUkY4= X-Google-Smtp-Source: AGHT+IFiDsUOFrogVCXhwG7jE5UhzUG2HXzmhm8iuLxdnK1gwrZ2PnYz7hKVVRLeqXubsVEuTmgEmg== X-Received: by 2002:a05:6a00:c89:b0:730:91fc:f9c9 with SMTP id d2e1a72fcca58-73426d6b971mr4177006b3a.16.1740130806309; Fri, 21 Feb 2025 01:40:06 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73242568aaasm15111670b3a.41.2025.02.21.01.40.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:40:06 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 15/17] zram: do not leak page on recompress_store error path Date: Fri, 21 Feb 2025 18:38:08 +0900 Message-ID: <20250221093832.1949691-16-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 47ccda207bf3..48639a48ddb8 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2022,7 +2022,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; @@ -2166,9 +2166,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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 2025 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 6B95C202F96 for ; Fri, 21 Feb 2025 09:40:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130815; cv=none; b=Bsd/Vzdp1vairMDZLPAlRjahRVZarjbZ1H7RNlURddROUV45poiOAxhrAeIc/74I3QYCF0e0XNfYvYdP1zWotQSIaPNL1eSQxxoMmjxvzHMAEET60mMbg5wCUio4tyTSmkAAqDBZPuOn5R0mKDZh8/Y2BvxA9d5/jFs0MEsgNvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130815; c=relaxed/simple; bh=4ECjkVJZGjCWtN7ZuQfyB0BeUv4fd6cOc0FBKhTa2+0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TXt3LpuhsakOJC+3HhPn3G04ODfl81ERuYVcuViUWT2+qqxLZfqeJJItT/xw/I8IMNWg5kiVPRk7GhIh9i8hVnslXC/EmoHbFFZd0R8Jp+tWlVnOCXu7CE8TzD5oD+9nwiN/xd59pTHG5W9GjyQPsxbFosWgQ6M+Qx1URjAPdwY= 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=Zd1gDhsf; arc=none smtp.client-ip=209.85.214.179 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="Zd1gDhsf" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-220bfdfb3f4so41200795ad.2 for ; Fri, 21 Feb 2025 01:40:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130814; x=1740735614; 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=0hGRfBbi2fKBhcLL3toY8LXz3XIHS2H2SZvxy9aDrUM=; b=Zd1gDhsfe/LCUDCr8ess941Es/4yq0VhSr3dFY5L7CtOcRIyXNijhq32mZH9D3bCVz dxgVtkPRibT9eLFmp0S9l9lJiGkuXrljAxnCUA4fSrpalPR6bEp7oMLH0q4s1nGYqGu7 1k4PjlYTsze3GUMW3byN1DQUDcNMKldRJ3InE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130814; x=1740735614; 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=0hGRfBbi2fKBhcLL3toY8LXz3XIHS2H2SZvxy9aDrUM=; b=gaPi9jsev+ZACUF94+5JATL0S5f16wZsWCiPkldv0xK/noRhAd21Tw8TJrugJU4SEg fk9cSwJhWraetpgV/S0UlGxvaP5NBe60fqQEcoOZ0t+eou985f3cyrPblrn1tsoicHrb xdqrk4TCT70qQENZrTddNk+7ZcC1pJ8XEPE5m7H2XtoxlV4EU8almjSdmwaY7/n11s8n iZdHRymHhTFPINXK1ECc5Te9dDiK4Q/DPzbsg8Q87hGIwu2O7fpOecenNGP+PZx6Yhwi K87A6QPOnJRHgl8ZQvSqii5ayoyJqXlYe23N+q8C9NgTi2Rm8FG0mO15QFkyArGg0mSF PnCQ== X-Forwarded-Encrypted: i=1; AJvYcCUk7BhvVF3XU+hlXZmRaZoAW+u8VZFL4OVFprbASAJ/IA5WOhqZrUf1EIrHjbSMGBXy5/TebQxignHheGE=@vger.kernel.org X-Gm-Message-State: AOJu0YwITNZpXW9Z4Q7G1K63nSROP02onOq8IIietHGPEEsVhgS40YWn A9nEUoNfeegRFbPvo6M3DNpZQdGlH7HJSDlgw5OXlKEDOzAiZwaqq22Rl1h8Dg== X-Gm-Gg: ASbGncvftcbkXjqNeXMmc5D3Rkp3+JFtyAzqFLV0GoUWEggTl7SkrXRbADKUQl1r9H6 IjKM3/FHRpz+i6oHbfMBFqw0AD3CkrtawnTVfdbtzykYNwh99g0altFmHogEgpVe7Ew6SOkkvgI sf8OOC1hJa+a4RqI9B+hoHVjaQBJXbUAy4BzFJ0pLY7g92kSFlle3kzgNY2x9bOFc+RF9YRI+KC 0hdE3hCsoUeg6JTSUFr2U2RrDP880JPH0qXJ6KI+wtEMiDVgDAoMUsQGqdmKGj++wJCuq5Y3Guf gHbBi+9pX75hy581yo8mIk/x/Gs= X-Google-Smtp-Source: AGHT+IHnD4WYtByveH7o9SWK4ZPshLs+PqzDTaY7xc5G/UiEwzsRQaEFLwJdetxPgoe922xVEvOq1g== X-Received: by 2002:a17:902:e892:b0:220:fae9:8a6 with SMTP id d9443c01a7336-2219ff3127emr51606815ad.4.1740130813846; Fri, 21 Feb 2025 01:40:13 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d545d051sm131952525ad.108.2025.02.21.01.40.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:40:13 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 16/17] zram: do not leak page on writeback_store error path Date: Fri, 21 Feb 2025 18:38:09 +0900 Message-ID: <20250221093832.1949691-17-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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 48639a48ddb8..7a5c5b861fe5 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -792,7 +792,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; @@ -934,8 +934,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.601.g30ceb7b040-goog From nobody Tue Dec 16 19:24:31 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 E5D1C202F96 for ; Fri, 21 Feb 2025 09:40:19 +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=1740130821; cv=none; b=pts7XC2xf35d4bYvU0YJicg+tzTx2Zfk2lLgEJCwlZhyfHy5kz/A0Lue8TrxCqyQLzJ+SEZ7Sc4R0lJIxCakeHRBGNgItKo4uZPHsx0QxhQW620DDNyS8JywZoGojYJwK+HGoV3y+7e86mMiFpkOXD+AcWSzamXHHSGw3CJP+4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740130821; c=relaxed/simple; bh=/fYuZtpqwtnnGkN/fr/wmgCPg2VCEfWFjvPSN5XmwhA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZGbYH9iyOyYw9rzCd2VFjIj1Ye5S1CO3md/o10uZ1sQX0yMtJNUyNQTmWOGrPp/1082o0JnzpxK31Vtrc6f7cMXLeOjjH7LDEA7CRZ/sPFDFbLDgX4LmNwLRA0DM2OKfE+CV2wRODaoKDUS44fq0wDnMR+9j5h3ZekVqV0j2haM= 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=nNMVdpmq; 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="nNMVdpmq" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22185cddbffso45291455ad.1 for ; Fri, 21 Feb 2025 01:40:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130819; x=1740735619; 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=sFE2Vkh4W4kK9IrN6erQ+4Og/P/7Lb06X2GD4vSsp54=; b=nNMVdpmqFm3Jm4UREWBbyoGBDwA9+Y6jTMvr0C7AeCoqkkSQqqDrKJ/1kD9Oq9Il5p sokb3b28FTJDFjB2YA6Eij8LyxoYPWDax8GbaCqYOO2CyFX4o3YZCscn4HLljf3DRg+e 6OJBPTTzDBZ9rYMQxNI8z71Tcbp8Meg8Njr2Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130819; x=1740735619; 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=sFE2Vkh4W4kK9IrN6erQ+4Og/P/7Lb06X2GD4vSsp54=; b=Gc2j1gfXjdTfO0mNtHSj3aryylHSZh9N8gVnQQ21UZxqeUg2LBA1EqASW7VZazWKtS pQWu0Y8P2OtNH/ZX0p6wf61xqRgMwM4NIFVUJ4J809vGrooTCJRu8Rd+J7TpWu57uVWp UYzcl7gL0qbl2fCsS8yvFP+EB7dNj5MqulyR90XYbJfKkvDTKBjw1xiyJnQslt9zG+JH aALLLw3ewJBXEQaRXj6/VqOPL+t2o78zK9G/L4IgPOrgdZpJR0i5wRXS19mx31eKMx9i Rjv2RFN4ceThopJ9VWIYFl/pVa4yI19OYFpIanhAdO5RD91wVpXcNAMDxQ02ngFWyY2S mbEw== X-Forwarded-Encrypted: i=1; AJvYcCVSAfwCmY85eE6jvqAM0EvTXSzk7eW8oSrv2rL2Er102RwDfMBl/GeoWjT4epYMMKWpEMlx9Ln0sThOD9U=@vger.kernel.org X-Gm-Message-State: AOJu0YyxpS8Iu9SFPu8G062DUBSCmrfQadY0czyoerYOUT/rdP2zNFBa H3hBjYAfd8mFt9R78fl5wLMbWg9u2gXcCANx6Fgs72mPveWYFHeMMdrGDiwY9g== X-Gm-Gg: ASbGncsgmC45/WfP2z6yu6w7rSiMkabRmMhX/VcHxmFFUROFe9p+s1sy9YIhCwsq79b 72rq84XpmkfJe31g/fGxMG44rXL8V4kaKjIiHrUf4GOw6jJ7CZN9KIj0OLnX/IwQWuaHuUvQEG0 rK6HrpvVsKvB9vy/hjkoWej3165a5+TPFuxPapomlH7PPpgZOFFKKhewBCki1e1t9qrVW7ljmV0 gj3kOHO2B89stpiYekZ71Tcj/E1p1VOwfIbS3BNqqCbU3wWxGBkfdmgxa+Hmy9P23TILm+9pnbx MvFEv2y3iqmOL+oDRqRF85zDemk= X-Google-Smtp-Source: AGHT+IHaMrwpRWXBtbqLfO7E9WJyzm0Z3N+2WmGGSFh+bCgjQ+uCawv48dxk9E1SSvQ/nXFDOCUNQA== X-Received: by 2002:a05:6a00:3a1e:b0:732:5875:eb95 with SMTP id d2e1a72fcca58-734140898f3mr13714952b3a.4.1740130819336; Fri, 21 Feb 2025 01:40:19 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-732425463ebsm15677215b3a.19.2025.02.21.01.40.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:40:19 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v7 17/17] zram: add might_sleep to zcomp API Date: Fri, 21 Feb 2025 18:38:10 +0900 Message-ID: <20250221093832.1949691-18-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> 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.601.g30ceb7b040-goog