From nobody Mon Dec 1 22:37:43 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