From nobody Mon Dec 1 22:07:30 2025 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.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 0BC4B26FD86 for ; Fri, 28 Nov 2025 17:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764349518; cv=none; b=SsFrDNU+NDGwLNcmIyLjeheLn4+UvPhbcZ5J76NiTP14hOhWLROg+vx4He+VwIPQkzbyIBeBTPiR+4qLtVc1VDVOdPU+77PnoCs2toVC1ay2GSP5It1LI+i90K6BOvIn7DbGm+ME/Lm44pcQ4+m6v6HLyEqU3yUFxe1qK6koCvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764349518; c=relaxed/simple; bh=tjtNKjHFACpjoxSJpUor60yVv8ajM/HPAU18nvdLOME=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cNBKHYHdhCXBqd6w7OiOq5WyoIUieUKLozmq6Dv3PpOfsxo0HXgWdIPFT4hrSRGzDqTX0iEd8NoJKHHtOtaDaGeIQsZnU2K2QXsMoXuuqrqqPBVjb5bYvMoxC6pE7gJVUv41IsC0zZ+KvVZcR+YBcTZ6n44+qJkPIB0IiXipmTg= 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=LVu/plq+; arc=none smtp.client-ip=209.85.210.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="LVu/plq+" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7aace33b75bso2007956b3a.1 for ; Fri, 28 Nov 2025 09:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1764349516; x=1764954316; 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=wLXj0jbz9Wuo33iBrbj/6+Wb1xjJkFIW5VwB+h6O148=; b=LVu/plq+oNwN4HvCkawuFHtZZ/H2YZlJEyjxtVsyKK/pgc8WTSOks51Pv6pOFKJXaE gW7kVnANLNYbq2w8ukv7I4vjqnIUm+YjnFo2BETefp30XNtz9Tn3AyuBKjiMgknQeYJL /2EqxHhc6/cUgc2RXcjkilcFnjyUoGU8r2Wi0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764349516; x=1764954316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wLXj0jbz9Wuo33iBrbj/6+Wb1xjJkFIW5VwB+h6O148=; b=XdO8IlNx5/3LU+9NkvvpOQpAZyPkKILW7Qq7rq6e+RUoliSlLDVfSjnfMtQVhRo90q QAnNESboeXup1o0QtaXKvR+nPZFNqcSHmgOfJeDnsCi1j6MKD3GTeAd+ukc3V/ZoEaa4 OPvBhGXRmM0KG3MwNFovNON0iDTPAqcOTEragtj1khCHP6UzSP0oQHAU8vyzijGF9mC/ WPPgqbSU8lblbU5kDDRhwg7hsQJw2m2/2TJMQcQRtDouS1QSL9yBVGm2ENegQ9GaOhfF 6c0jGF4U+78HmNu8JTBxFe1ahIjIfeA4Bth2aqc/r3YQQQDhzURzsVe0Mu6skyzv3RIC ciag== X-Forwarded-Encrypted: i=1; AJvYcCV7Z741gstfF9yfaBpUPbJLkONm6z8VyVXZIrANgZm7RZKs2kgrHGSeajuLyHsliD6/aZRcYF/FPVGieX4=@vger.kernel.org X-Gm-Message-State: AOJu0YzOdnyVtaE/Y8y6sv6RHXKdWE3oSVYP4tNgXYYAXL9UKssOMTSi 3/aUtoWKwWW5NtAVUMt9QWW7gizubabS8Lv6AoABySY78EFW0r/rBnq7pZoZwP/40g== X-Gm-Gg: ASbGncsU7HxAqgGGjG7UCHTspm5hGaG2CVeykJpLWHxgeBpGRAwWfxNTs0ACJm2ohwn iCmjMH17ZfLz4HxUleW+xEKbsMeXgrM+CVYYzAqHXpqjttF/JQCxmm0EFkm1bet8Xg0XdOWdqSA DETnOh4nwv4BA/rtt893MGU1OCoh47Yne2eKmTfhXwfPMmmPnktdzHXrtOZCRRafDyp07i0vYsY qP5FxFywc52x+dW3elNR629WVHJl+uxCKaAR2ItP3Z4Nc6uCA48fcNdz0BstcaDlo8u08rv6SDs WOUaZg/0yd8c/rqJQYxPSr9JOyDhN7go61zKm1aOEzOEIP/XCqzedSJOArmuEYA84bHk6q19hPz CuZVWmDO4hlQvnJotgdV+AcpdEkLBclw0ybG3yqy+2TYuaX56Hz6Ci8wK+p1jXawR/8PpBjPE5C 25OyNRq4OKQWXs+XHTe3Fxn9/HRbBYLQ1Lc0fu8e3PiPenrAvY0c9/bnVgZeHhGvWDRxF8FseDi A== X-Google-Smtp-Source: AGHT+IE3jdJ6BIGqZ/LrNySLI1gtSZu3kZ9H40LQzsOxlINAJwUkQtChjQ8P16I/r4Kq7vGDlsgVJw== X-Received: by 2002:a05:6a21:3285:b0:35d:35a1:95d1 with SMTP id adf61e73a8af0-36150e27992mr26945189637.9.1764349515420; Fri, 28 Nov 2025 09:05:15 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2a00:79e0:2031:6:5b9f:6c7b:4d09:6126]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7d150c5e611sm5568242b3a.6.2025.11.28.09.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 09:05:15 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton , Richard Chang Cc: Brian Geffon , Minchan Kim , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, Sergey Senozhatsky , Minchan Kim Subject: [PATCH 1/2] zram: introduce compressed data writeback Date: Sat, 29 Nov 2025 02:04:41 +0900 Message-ID: <20251128170442.2988502-2-senozhatsky@chromium.org> X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog In-Reply-To: <20251128170442.2988502-1-senozhatsky@chromium.org> References: <20251128170442.2988502-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" From: Richard Chang zram stores all written back slots raw, which implies that during writeback zram first has to decompress slots (except for ZRAM_HUGE slots, which are raw already). The problem with this approach is that not every written back page gets read back (either via read() or via page-fault), which means that zram basically wastes CPU cycles and battery decompressing such slots. This changes with introduction of decompression on demand, in other words decompression on read()/page-fault. One caveat of decompression on demand is that async read is completed in IRQ context, while zram decompression is sleepable. To workaround this, read-back decompression is offloaded to a preemptible context - system high-prio work-queue. Signed-off-by: Richard Chang Co-developed-by: Sergey Senozhatsky Suggested-by: Minchan Kim Suggested-by: Brian Geffon --- drivers/block/zram/zram_drv.c | 240 +++++++++++++++++++++++++++------- 1 file changed, 192 insertions(+), 48 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 5759823d6314..eef6c0a675b5 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -57,8 +57,8 @@ static size_t huge_class_size; static const struct block_device_operations zram_devops; =20 static void zram_free_page(struct zram *zram, size_t index); -static int zram_read_from_zspool(struct zram *zram, struct page *page, - u32 index); +static int zram_read_from_zspool_raw(struct zram *zram, struct page *page, + u32 index); =20 #define slot_dep_map(zram, index) (&(zram)->table[(index)].dep_map) =20 @@ -522,6 +522,22 @@ struct zram_wb_req { struct list_head entry; }; =20 +struct zram_rb_req { + struct work_struct work; + struct zram *zram; + struct page *page; + /* The read bio for backing device */ + struct bio *bio; + unsigned long blk_idx; + union { + /* The original bio to complete (async read) */ + struct bio *parent; + /* error status (sync read) */ + int error; + }; + u32 index; +}; + static ssize_t writeback_limit_enable_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) @@ -780,18 +796,6 @@ static void zram_release_bdev_block(struct zram *zram,= unsigned long blk_idx) atomic64_dec(&zram->stats.bd_count); } =20 -static void read_from_bdev_async(struct zram *zram, struct page *page, - unsigned long entry, struct bio *parent) -{ - struct bio *bio; - - bio =3D bio_alloc(zram->bdev, 1, parent->bi_opf, GFP_NOIO); - bio->bi_iter.bi_sector =3D entry * (PAGE_SIZE >> 9); - __bio_add_page(bio, page, PAGE_SIZE, 0); - bio_chain(bio, parent); - submit_bio(bio); -} - static void release_wb_req(struct zram_wb_req *req) { __free_page(req->page); @@ -886,8 +890,9 @@ static void zram_account_writeback_submit(struct zram *= zram) =20 static int zram_writeback_complete(struct zram *zram, struct zram_wb_req *= req) { - u32 index =3D req->pps->index; - int err; + u32 size, index =3D req->pps->index; + int err, prio; + bool huge; =20 err =3D blk_status_to_errno(req->bio.bi_status); if (err) { @@ -914,9 +919,22 @@ static int zram_writeback_complete(struct zram *zram, = struct zram_wb_req *req) goto out; } =20 + /* + * ZRAM_WB slots get freed, we need to preserve data required for + * read decompression. + */ + size =3D zram_get_obj_size(zram, index); + prio =3D zram_get_priority(zram, index); + huge =3D zram_test_flag(zram, index, ZRAM_HUGE); + zram_free_page(zram, index); zram_set_flag(zram, index, ZRAM_WB); + if (huge) + zram_set_flag(zram, index, ZRAM_HUGE); zram_set_handle(zram, index, req->blk_idx); + zram_set_obj_size(zram, index, size); + zram_set_priority(zram, index, prio); + atomic64_inc(&zram->stats.pages_stored); =20 out: @@ -1050,7 +1068,7 @@ static int zram_writeback_slots(struct zram *zram, */ if (!zram_test_flag(zram, index, ZRAM_PP_SLOT)) goto next; - if (zram_read_from_zspool(zram, req->page, index)) + if (zram_read_from_zspool_raw(zram, req->page, index)) goto next; zram_slot_unlock(zram, index); =20 @@ -1313,24 +1331,123 @@ static ssize_t writeback_store(struct device *dev, return ret; } =20 -struct zram_work { - struct work_struct work; - struct zram *zram; - unsigned long entry; - struct page *page; - int error; -}; +static int decompress_bdev_page(struct zram *zram, struct page *page, u32 = index) +{ + struct zcomp_strm *zstrm; + unsigned int size; + int ret, prio; + void *src; + + zram_slot_lock(zram, index); + /* Since slot was unlocked we need to make sure it's still ZRAM_WB */ + if (!zram_test_flag(zram, index, ZRAM_WB)) { + zram_slot_unlock(zram, index); + /* We read some stale data, zero it out */ + memset_page(page, 0, 0, PAGE_SIZE); + return -EIO; + } + + if (zram_test_flag(zram, index, ZRAM_HUGE)) { + zram_slot_unlock(zram, index); + return 0; + } + + size =3D zram_get_obj_size(zram, index); + prio =3D zram_get_priority(zram, index); + + zstrm =3D zcomp_stream_get(zram->comps[prio]); + src =3D kmap_local_page(page); + ret =3D zcomp_decompress(zram->comps[prio], zstrm, src, size, + zstrm->local_copy); + if (!ret) + copy_page(src, zstrm->local_copy); + kunmap_local(src); + zcomp_stream_put(zstrm); + zram_slot_unlock(zram, index); + + return ret; +} + +static void zram_deferred_decompress(struct work_struct *w) +{ + struct zram_rb_req *req =3D container_of(w, struct zram_rb_req, work); + struct page *page =3D bio_first_page_all(req->bio); + struct zram *zram =3D req->zram; + u32 index =3D req->index; + int ret; + + ret =3D decompress_bdev_page(zram, page, index); + if (ret) + req->parent->bi_status =3D BLK_STS_IOERR; + + /* Decrement parent's ->remaining */ + bio_endio(req->parent); + bio_put(req->bio); + kfree(req); +} + +static void zram_async_read_endio(struct bio *bio) +{ + struct zram_rb_req *req =3D bio->bi_private; + + if (bio->bi_status) { + req->parent->bi_status =3D bio->bi_status; + bio_endio(req->parent); + bio_put(bio); + kfree(req); + return; + } =20 -static void zram_sync_read(struct work_struct *work) + /* + * zram decompression is sleepable, so we need to deffer it to + * a preemptible context. + */ + INIT_WORK(&req->work, zram_deferred_decompress); + queue_work(system_highpri_wq, &req->work); +} + +static void read_from_bdev_async(struct zram *zram, struct page *page, + u32 index, unsigned long blk_idx, + struct bio *parent) { - struct zram_work *zw =3D container_of(work, struct zram_work, work); + struct zram_rb_req *req; + struct bio *bio; + + req =3D kmalloc(sizeof(*req), GFP_NOIO); + if (!req) + return; + + bio =3D bio_alloc(zram->bdev, 1, parent->bi_opf, GFP_NOIO); + if (!bio) { + kfree(req); + return; + } + + req->zram =3D zram; + req->index =3D index; + req->blk_idx =3D blk_idx; + req->bio =3D bio; + req->parent =3D parent; + + bio->bi_iter.bi_sector =3D blk_idx * (PAGE_SIZE >> 9); + bio->bi_private =3D req; + bio->bi_end_io =3D zram_async_read_endio; + + __bio_add_page(bio, page, PAGE_SIZE, 0); + bio_inc_remaining(parent); + submit_bio(bio); +} + +static void zram_sync_read(struct work_struct *w) +{ + struct zram_rb_req *req =3D container_of(w, struct zram_rb_req, work); struct bio_vec bv; struct bio bio; =20 - bio_init(&bio, zw->zram->bdev, &bv, 1, REQ_OP_READ); - bio.bi_iter.bi_sector =3D zw->entry * (PAGE_SIZE >> 9); - __bio_add_page(&bio, zw->page, PAGE_SIZE, 0); - zw->error =3D submit_bio_wait(&bio); + bio_init(&bio, req->zram->bdev, &bv, 1, REQ_OP_READ); + bio.bi_iter.bi_sector =3D req->blk_idx * (PAGE_SIZE >> 9); + __bio_add_page(&bio, req->page, PAGE_SIZE, 0); + req->error =3D submit_bio_wait(&bio); } =20 /* @@ -1338,39 +1455,41 @@ static void zram_sync_read(struct work_struct *work) * chained IO with parent IO in same context, it's a deadlock. To avoid th= at, * use a worker thread context. */ -static int read_from_bdev_sync(struct zram *zram, struct page *page, - unsigned long entry) +static int read_from_bdev_sync(struct zram *zram, struct page *page, u32 i= ndex, + unsigned long blk_idx) { - struct zram_work work; + struct zram_rb_req req; =20 - work.page =3D page; - work.zram =3D zram; - work.entry =3D entry; + req.page =3D page; + req.zram =3D zram; + req.blk_idx =3D blk_idx; =20 - INIT_WORK_ONSTACK(&work.work, zram_sync_read); - queue_work(system_dfl_wq, &work.work); - flush_work(&work.work); - destroy_work_on_stack(&work.work); + INIT_WORK_ONSTACK(&req.work, zram_sync_read); + queue_work(system_dfl_wq, &req.work); + flush_work(&req.work); + destroy_work_on_stack(&req.work); =20 - return work.error; + if (!req.error) + return decompress_bdev_page(zram, page, index); + return req.error; } =20 -static int read_from_bdev(struct zram *zram, struct page *page, - unsigned long entry, struct bio *parent) +static int read_from_bdev(struct zram *zram, struct page *page, u32 index, + unsigned long blk_idx, struct bio *parent) { atomic64_inc(&zram->stats.bd_reads); if (!parent) { if (WARN_ON_ONCE(!IS_ENABLED(ZRAM_PARTIAL_IO))) return -EIO; - return read_from_bdev_sync(zram, page, entry); + return read_from_bdev_sync(zram, page, index, blk_idx); } - read_from_bdev_async(zram, page, entry, parent); + read_from_bdev_async(zram, page, index, blk_idx, parent); return 0; } #else static inline void reset_bdev(struct zram *zram) {}; -static int read_from_bdev(struct zram *zram, struct page *page, - unsigned long entry, struct bio *parent) +static int read_from_bdev(struct zram *zram, struct page *page, u32 index, + unsigned long blk_idx, struct bio *parent) { return -EIO; } @@ -1977,6 +2096,31 @@ static int read_compressed_page(struct zram *zram, s= truct page *page, u32 index) return ret; } =20 +static int zram_read_from_zspool_raw(struct zram *zram, struct page *page, + u32 index) +{ + struct zcomp_strm *zstrm; + unsigned long handle; + unsigned int size; + void *src; + + handle =3D zram_get_handle(zram, index); + size =3D zram_get_obj_size(zram, index); + + /* + * We need to get stream just for ->local_copy buffer, in + * case if object spans two physical pages. No decompression + * takes place here, as we read raw compressed data. + */ + zstrm =3D zcomp_stream_get(zram->comps[ZRAM_PRIMARY_COMP]); + src =3D zs_obj_read_begin(zram->mem_pool, handle, zstrm->local_copy); + memcpy_to_page(page, 0, src, size); + zs_obj_read_end(zram->mem_pool, handle, src); + zcomp_stream_put(zstrm); + + return 0; +} + /* * Reads (decompresses if needed) a page from zspool (zsmalloc). * Corresponding ZRAM slot should be locked. @@ -2012,7 +2156,7 @@ static int zram_read_page(struct zram *zram, struct p= age *page, u32 index, * device. */ zram_slot_unlock(zram, index); - ret =3D read_from_bdev(zram, page, blk_idx, parent); + ret =3D read_from_bdev(zram, page, index, blk_idx, parent); } =20 /* Should NEVER happen. Return bio error if it does. */ --=20 2.52.0.487.g5c8c507ade-goog From nobody Mon Dec 1 22:07:30 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF6052BEFE5 for ; Fri, 28 Nov 2025 17:05:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764349520; cv=none; b=hLYqlQC+NTPU+/WecWKwB8kypeUqJr1fxJWFByNtdDEZgv3wbrvqIxmFt7Hepvnt6eCqNj5ydRbUnrsPVRFB/4tYuoSDuFH4bKzHt6+F1tmyYMeluLeLCcb83lLhyNmXLDqOctJk9DpJm3JfE6peIsVf5e8+oDmPh0eo3F2xxeo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764349520; c=relaxed/simple; bh=jIuVKnMI5f+KBNBr3xFJ3AQA8W3E14UBBUW+/pHhV5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BO8KVWpUURPDz0Al8R3Tam0zFVIx7xHIy1NNhNWs1iTtW/zKC91oYKNcamsUaapsrVdE+WoZChAk8GsfQueMrqBBOgSC3IpwhMPgND7CosN7XDQOA+ejQDjWbeBEdfFHfxpORlzB5Di53WW0TULmMDzibtxkY12xTZ+gUizlYJs= 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=JQZtF1rl; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="JQZtF1rl" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7ad1cd0db3bso1740016b3a.1 for ; Fri, 28 Nov 2025 09:05:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1764349518; x=1764954318; 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=v4R9Zx2dBq+xNldpFByBb2oFsVP5vQZDFMwFExGQQ4E=; b=JQZtF1rl0HbCxpICCyH/DFlhoGJB//GOf/n93QMQkU3EWrzeBgpIWTM1LywbbkEjvt kVacDJTKTAD+19HQbejPQL2AmH4oTGRLqd3oflCJlSDHHe1Fi2T1oyHDYKmBiuJv+Kok SXSoRP4gV3Xw0EzhNCT6uNuGfW2lzAj+IkY2w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764349518; x=1764954318; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=v4R9Zx2dBq+xNldpFByBb2oFsVP5vQZDFMwFExGQQ4E=; b=rbKPfL7W4zLHpeiuvKhVRSwmiw3NAf0J79uuJUtUlHrEw6sOwxPA5j0Q7RNqzaB/HW +LZqq/eDKP3TffPxl4vFGeDt1k8AYAqgb403yFNYRX1dHa055tK4V4Xy1CjE/mPa5Am1 JvhT2Ub5Bu1CBEemqNP4PIan3cxCbfGXqxH8jgJc2MksiEMaKCzgu/mzeveBqKUb2vPn /p2RlOY6AJvGFeKqCk/tSDhphLIJmSNzhQt1sRmy7mJcFC7xElI5IheGT7nNE1b18zfK Cjc64qROXRipIoLaruu7917ADTjmvggvu1bOQx37omniyZXc9TOVG+RAKh9pRUH4ylTU kB1A== X-Forwarded-Encrypted: i=1; AJvYcCVbMCrySBhZlF1wSmNGwp6wXp9d6nC2xoWYsmrfn9DMgypvvhjoDvB9HIYhYPudOLrD8znLa4lqPYSaeFQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4PdxoHeSsdg27qziwv9H/6ezJh+7IV8bgz38fmBG34GL4YM9+ slNQq+d8POpCXT5GfOhuQTuj4EgXXRKMfOK8bCXadIbnUXZndfxHfH9d4hapTFNLkQ== X-Gm-Gg: ASbGncsWXjMUyyyf7/xWgiv/rznSF/Zk+G0+FTieFXit6Kq04mBcpPejmRz8uXrFW6c tIzxkr/4CvDP2RgVvGV1Gthm3ihtxYGHmMo5EMRyXH36oGTcBpYYgv5O6y4g1KSHRtaASRFp+C1 z6Lz2fl4ZHuLoK0EDoa+Ad1nVzYy1HR8GYU7h89GXF3Nhzvo0Kdw6kIAiJq9gFg1KEk8p8EL6JP p6r+V+IaJgueysdivcB58wTyZ+2NN6UnSoAB03psYhSBd37cSazWTqkwCl7txXc0lcOZZXSn2VS KOLJpAsukb5IWINxC4ipm0lZ1LRvQejB00JkwoAcmG2KrD69FCtHgulttfq0i9u8HN8/Z6tzqoc uuyElcDY2rUWVcCX5xS1y9MQbbrDVavLeCivAEM+7Ug/P0eX5LuCn1DJaerQMC58WIjcHslKpgy EtNgX/29fIX2r5m1YXN2MmkgMrIor/2qc2IsD5q86VX6qMBNAva/CUrEHy6hdHoRwKXDMHhNROq BsXytTaXAGj X-Google-Smtp-Source: AGHT+IGdVsnWm7yn6FnlL/WMYyZNJHjQgbCSuAYTrw9LhC4iG3CiNM48M8ucj2AnGiKhtxjrJAli3g== X-Received: by 2002:a05:6a00:2d9b:b0:7a9:e786:bdaf with SMTP id d2e1a72fcca58-7ca879f2d5emr17491122b3a.14.1764349517859; Fri, 28 Nov 2025 09:05:17 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2a00:79e0:2031:6:5b9f:6c7b:4d09:6126]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7d150c5e611sm5568242b3a.6.2025.11.28.09.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 09:05:17 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton , Richard Chang Cc: Brian Geffon , Minchan Kim , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH 2/2] zram: rename zram_free_page() Date: Sat, 29 Nov 2025 02:04:42 +0900 Message-ID: <20251128170442.2988502-3-senozhatsky@chromium.org> X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog In-Reply-To: <20251128170442.2988502-1-senozhatsky@chromium.org> References: <20251128170442.2988502-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 don't free page in zram_free_page(), not all slots even have any memory associated with them (e.g. ZRAM_SAME). We free the slot (or reset it), rename the function accordingly. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index eef6c0a675b5..d8054b3cafaa 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -56,7 +56,7 @@ static size_t huge_class_size; =20 static const struct block_device_operations zram_devops; =20 -static void zram_free_page(struct zram *zram, size_t index); +static void zram_slot_free(struct zram *zram, u32 index); static int zram_read_from_zspool_raw(struct zram *zram, struct page *page, u32 index); =20 @@ -927,7 +927,7 @@ static int zram_writeback_complete(struct zram *zram, s= truct zram_wb_req *req) prio =3D zram_get_priority(zram, index); huge =3D zram_test_flag(zram, index, ZRAM_HUGE); =20 - zram_free_page(zram, index); + zram_slot_free(zram, index); zram_set_flag(zram, index, ZRAM_WB); if (huge) zram_set_flag(zram, index, ZRAM_HUGE); @@ -1966,7 +1966,7 @@ static void zram_meta_free(struct zram *zram, u64 dis= ksize) =20 /* Free all pages that are still in this zram device */ for (index =3D 0; index < num_pages; index++) - zram_free_page(zram, index); + zram_slot_free(zram, index); =20 zs_destroy_pool(zram->mem_pool); vfree(zram->table); @@ -1998,7 +1998,7 @@ static bool zram_meta_alloc(struct zram *zram, u64 di= sksize) return true; } =20 -static void zram_free_page(struct zram *zram, size_t index) +static void zram_slot_free(struct zram *zram, u32 index) { unsigned long handle; =20 @@ -2197,7 +2197,7 @@ static int write_same_filled_page(struct zram *zram, = unsigned long fill, u32 index) { zram_slot_lock(zram, index); - zram_free_page(zram, index); + zram_slot_free(zram, index); zram_set_flag(zram, index, ZRAM_SAME); zram_set_handle(zram, index, fill); zram_slot_unlock(zram, index); @@ -2235,7 +2235,7 @@ static int write_incompressible_page(struct zram *zra= m, struct page *page, kunmap_local(src); =20 zram_slot_lock(zram, index); - zram_free_page(zram, index); + zram_slot_free(zram, index); zram_set_flag(zram, index, ZRAM_HUGE); zram_set_handle(zram, index, handle); zram_set_obj_size(zram, index, PAGE_SIZE); @@ -2300,7 +2300,7 @@ static int zram_write_page(struct zram *zram, struct = page *page, u32 index) zcomp_stream_put(zstrm); =20 zram_slot_lock(zram, index); - zram_free_page(zram, index); + zram_slot_free(zram, index); zram_set_handle(zram, index, handle); zram_set_obj_size(zram, index, comp_len); zram_slot_unlock(zram, index); @@ -2522,7 +2522,7 @@ static int recompress_slot(struct zram *zram, u32 ind= ex, struct page *page, zs_obj_write(zram->mem_pool, handle_new, zstrm->buffer, comp_len_new); zcomp_stream_put(zstrm); =20 - zram_free_page(zram, index); + zram_slot_free(zram, index); zram_set_handle(zram, index, handle_new); zram_set_obj_size(zram, index, comp_len_new); zram_set_priority(zram, index, prio); @@ -2725,7 +2725,7 @@ static void zram_bio_discard(struct zram *zram, struc= t bio *bio) =20 while (n >=3D PAGE_SIZE) { zram_slot_lock(zram, index); - zram_free_page(zram, index); + zram_slot_free(zram, index); zram_slot_unlock(zram, index); atomic64_inc(&zram->stats.notify_free); index++; @@ -2833,7 +2833,7 @@ static void zram_slot_free_notify(struct block_device= *bdev, return; } =20 - zram_free_page(zram, index); + zram_slot_free(zram, index); zram_slot_unlock(zram, index); } =20 --=20 2.52.0.487.g5c8c507ade-goog