From patchwork Fri Feb 21 09:37:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13985078 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81D82C021B3 for ; Fri, 21 Feb 2025 09:38:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17B306B00A0; Fri, 21 Feb 2025 04:38:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 12C04280003; Fri, 21 Feb 2025 04:38:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F0F32280001; Fri, 21 Feb 2025 04:38:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CF7386B00A0 for ; Fri, 21 Feb 2025 04:38:56 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8EF651C840E for ; Fri, 21 Feb 2025 09:38:56 +0000 (UTC) X-FDA: 83143452672.24.DF1ECFD Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf08.hostedemail.com (Postfix) with ESMTP id 92E16160005 for ; Fri, 21 Feb 2025 09:38:54 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=eTHZutQD; spf=pass (imf08.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.180 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740130734; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3J2F96AB7zgvGtDzJY4571zbkjr+U9L0eHeRaKN2Txw=; b=5Sc3MP9Ql76LWZgomsdi29Ry/YJPPskBQR0KoSvlgOIHHgO5wiMQTZbOJfRulh2Sxp6XK8 o8JyTm+1qGO4zm3iCOHoL2gOS5AhEQNrz6X+gURGjEWOdPY3AJqLNzomI5jUb7XwCDC+V9 NSxINA+tU5skTFqDb414g5nNihrWQD8= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=eTHZutQD; spf=pass (imf08.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.180 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740130734; a=rsa-sha256; cv=none; b=0K0qa8zWADrmmaAu7wN6y9/Fe4MWs/BGeY22g0K5qbCBhXSKzZgbEjqW609tQz+4juIZmo nsFPEv9zrSY6BxPixnKJO1KQWFTHXXZnp2YJD/7bW2SpIfSDmfQwxbQLbbWX5b39mbsVfD 62erRYXt2qERvF3Oe0MM2WFR5sbW/CU= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-219f8263ae0so39317275ad.0 for ; Fri, 21 Feb 2025 01:38:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130733; x=1740735533; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3J2F96AB7zgvGtDzJY4571zbkjr+U9L0eHeRaKN2Txw=; b=eTHZutQDk59mQJI3CuDMga0W0IzX9iRrd4K1Z97ENkqJVKB+kx1JRTc8eGKmChha4N DRvyHM8Cm9kqZAMUCtd+a4a2QhQI7BpfhRjzFVLn6a2JS+bMH90yLay29CLrZJQ1h81q NGxHqCT6c72eztTchiLYu7C3YwLoQpCcmo1Wc= 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=YuLkJEXehApNsVvbWQDSTxVHWKJH/NUWIhadWxh/Pvd+kedhuigrvs/TQGiLW9pYRQ 9k61Ru3pp+3tAjX5FoTB/lOB8YB7XV89fqtCQ2bL/Hset1Wwp3ztpAlFswAcf4X8sM5y 3QKzhUvWKPHR5ZAlWWeTUI+tLyUCyBcbFnNlKj3qZc1XZUjg5RcNTepC0r+eq1TgbV/3 z32rS+ZQ2e/6XaKkJ1KFVnyXyN7yX4Flc3vMNLcRJKb8uUqVj83C29wU3vw1fVuDmVDr oNIZ9Qd4u1h9RiM8SQ09jQSpkcGdBjm0TQ3FaHMgw9MSXDKdUt7F2byofFG8jp94GOOF Cl7Q== X-Forwarded-Encrypted: i=1; AJvYcCWcVP+95gExCnoi4NvoNytkw6OMP7QA5M6nRyaQRGWmxAankigUXbZrUQdk8AIlV/dF9LQXxIp36Q==@kvack.org X-Gm-Message-State: AOJu0YytjJMxqz9T2cw144PkoNdsjgJesx0No9PoJyXG8vSeKOj+xX8w XIbLHD2qPX43PwXEtgGCSmz/C00nZwELozlSGVMOzzIKaLocBrTbtrISqlTn0Q== X-Gm-Gg: ASbGnctB/LL3yBvbRTM1jidb3+tP6/adqt6rUrEUG/HGBVtxB/9V3Upu2rQJ8hLlkCv d1/8HbXhQb/ctZYU7RVlQSrThbDS5/BaVmwnMuGVv+3y+wEQB5hhhVpTMPVKnqhUqQhF1vu3MVL C13kQp9MX00mt9flTt4nUST3Sl21p4eHXDZAHBv3auJPlsBTEMAVNy6KpJTM8uaCzxvN6nZwtJY 0TjpvaKV8I0boYC5GC3ofUIQ1qeh6l7dqpgCXYOtk1aDAD6eGjSc83D+Nvoz0lDADGPZrsBvo8A cN4e3KzKbUwXITTOrpgMiJ2mr8o= 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> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 92E16160005 X-Stat-Signature: bci9eq5491xzo4er1itdk356bwatd6k8 X-HE-Tag: 1740130734-384930 X-HE-Meta: U2FsdGVkX19L9a1dEbzVs6jnRSZvEAehdJEnOUre5+06keDrT2QM9Knvso9Hvmh0X4VdEw1BqnqZkNMdvb6vGVF5sDRDNbZibqec8Wn/fazIhc6Ie1Ayuh2vP+aXDvNV7LAqlBuVwfQ9mHssFeconR0qcspePczSdUTYMtcb/XKi9MLHd0lXg3eF2Qa4U1FVVa/FXsj6qH7FcSlRH344YVJhe/KmRLzj68zPKdswI2TDHJ85hQIL3kN8u0oF7et/ypaPbj1TA2L1KBlTnKJD/2xLNgWWSXh5jllTbd62vf8xONIl5Ug2lV5R7QwtUwpSz4nYlaJ/QA2QnhqBuO0QTmnvShbtruvSbXAuxYkhWsITYp7d2Pue4/bDysZqy6uZln6IgDsTe+NHoAAMJ1J0GEtqHkOc7HMvXE98cpgANmb40B9HekTL05VC9HGvp1kFYx8N9+le1TsRzOoQw4HuOVci9aPhqJectLK6MDhQcT8l45DspQypjp0VyXRJNm3MEsPn4YTtu+w03rjpcppSpXBFhw8NuPEjbL7b1h0Dq0S7nRvHsODDiZYhnOpdHWOAoV5ykPy5EV4fJ1+M5xno+FBH7t8lZXRxXk8r6hHBYXi/ToTGbeA4b2YkIKaPFyBXBhB5jJvbMjJkULinnkLC1DKYIZ6L7QfEXMoX2DgDOtwJx9xVTWZsb+x/jm4NBwyOzauq5krg2VwLpJZlM/hKKOWhJJnaXy2Lj8s+PbOq19/IzbJmdzkSuankZUjeeh/LIxAMQyn88KZQ97Y7tWYNUdsTbutU/F9ayLgO5OJ9PDtSMvlk65MO/W4M/RApZfr1gASDSVyYHsMSKzBv20dTlYpkuLIvH5S9eT4/14j5NvRwEs/xu5yw4BE1y/27TwhlwgklTvIzToVjBvrvw0FRCSKs6oNq3/jMZfnEeJKEC+Xk25m5CSXzXLkp27JF1H6PFQAs+2zgYY/j/iCn3ne WGXv5WyL obbN/eRm9dKyu48/JuBULGnOTW7HPPN+eAFMbERduUyC5thmiyV46BSYjBN794aOTgj4Ll0qh+PO1GKqcN7dlCNZReFNu/CMtPuMqYPt/lptsqPPUdWV8INxTWj92OjrRZ++kNN/FB5HeKfNHdEnFqqzSKDSsuKUNB/nVwiQlOY2kbA8fqHiWuuouSAROW7ETnZ5uBiPrQR44PkjEBuK6yoajvZhBEuT8C/rF3GRnbZ4cqwjq4e7QI2FSPDt+AQ1Jp/v//6/3k0imOiSxadnHji82Lhn0jPQss9jidB6OJ7smZve5ERSI0dHzjQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 @@ -109,13 +109,29 @@ ssize_t zcomp_available_show(const char *comp, char *buf) 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 = 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); + } } -void zcomp_stream_put(struct zcomp *comp) +void zcomp_stream_put(struct zcomp_strm *zstrm) { - local_unlock(&comp->stream->lock); + mutex_unlock(&zstrm->lock); } 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 = hlist_entry(node, struct zcomp, node); - struct zcomp_strm *zstrm; + struct zcomp_strm *zstrm = per_cpu_ptr(comp->stream, cpu); int ret; - zstrm = per_cpu_ptr(comp->stream, cpu); - local_lock_init(&zstrm->lock); - ret = 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 hlist_node *node) int zcomp_cpu_dead(unsigned int cpu, struct hlist_node *node) { struct zcomp *comp = hlist_entry(node, struct zcomp, node); - struct zcomp_strm *zstrm; + struct zcomp_strm *zstrm = per_cpu_ptr(comp->stream, cpu); - zstrm = per_cpu_ptr(comp->stream, cpu); + mutex_lock(&zstrm->lock); zcomp_strm_free(comp, zstrm); + mutex_unlock(&zstrm->lock); return 0; } static int zcomp_init(struct zcomp *comp, struct zcomp_params *params) { - int ret; + int ret, cpu; comp->stream = 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; + for_each_possible_cpu(cpu) + mutex_init(&per_cpu_ptr(comp->stream, cpu)->lock); + ret = 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_ -#include +#include #define ZCOMP_PARAM_NO_LEVEL INT_MIN @@ -31,7 +31,7 @@ struct zcomp_ctx { }; 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); struct zcomp_strm *zcomp_stream_get(struct zcomp *comp); -void zcomp_stream_put(struct zcomp *comp); +void zcomp_stream_put(struct zcomp_strm *zstrm); 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, struct page *page, u32 index) ret = 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); return ret; } @@ -1774,14 +1774,14 @@ static int zram_write_page(struct zram *zram, struct page *page, u32 index) kunmap_local(mem); if (unlikely(ret)) { - zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]); + zcomp_stream_put(zstrm); pr_err("Compression failed! err=%d\n", ret); zs_free(zram->mem_pool, handle); return ret; } if (comp_len >= huge_class_size) { - zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]); + zcomp_stream_put(zstrm); return write_incompressible_page(zram, page, index); } @@ -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 = 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) } 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 = zs_map_object(zram->mem_pool, handle, ZS_MM_WO); 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); zram_slot_lock(zram, index); @@ -1984,7 +1984,7 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, kunmap_local(src); if (ret) { - zcomp_stream_put(zram->comps[prio]); + zcomp_stream_put(zstrm); return ret; } @@ -1994,7 +1994,7 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, /* Continue until we make progress */ if (class_index_new >= class_index_old || (threshold && comp_len_new >= threshold)) { - zcomp_stream_put(zram->comps[prio]); + zcomp_stream_put(zstrm); continue; } @@ -2052,13 +2052,13 @@ static int recompress_slot(struct zram *zram, u32 index, 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); } dst = 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); zs_unmap_object(zram->mem_pool, handle_new);