From nobody Mon Dec 1 22:05:41 2025 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.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 BA52F302CB0 for ; Mon, 1 Dec 2025 09:48:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764582501; cv=none; b=cAQ23YX9qcfn1CsCM2PF0jV79ShvDE99GNwmsxZzzT8AMxq5gRQywRjeb9e2NyvLE5z/QDOuUH2hTggF7NOaT5CP0f4lGM2BJMBYfl0qzd2d7Io4TbMXHlqmbmi6nzyKkI9PbGC2rV3wwqUKrSJAJ+sPXv7ujYmJEu9zQgvnx4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764582501; c=relaxed/simple; bh=xlsl7fcFBFTHsBmJdkpI7L599I938927GYF6kB/g+60=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tH9oGstPbmEc9pl+nvkOet1KQb6tGk0555RtFLnBoh5OpzHlTio98tdrtIgGidL3HHw41sxgM96vLqGReMCA4PzuVw4lSBsUfLdcxFnMSXwW8CaYnIf5z80NPFACoeB5KFjCSd0iVCyM50AahWe318JZKYn1PpbDV68bz+gwucM= 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=KCSo5w5p; arc=none smtp.client-ip=209.85.210.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="KCSo5w5p" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-7aab061e7cbso4553023b3a.1 for ; Mon, 01 Dec 2025 01:48:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1764582499; x=1765187299; 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=906KZFo6t+2ci7ZTeYqhBL02BUrFYEeLcrZCiOSXlDQ=; b=KCSo5w5p2+5E3ePWRmV71XYVhEewvQuAx/iLkMdWYQNSUz4aNScRPUTkxAWUikgybT Fh9Jftr1BNnWJJctiNkIbJEJMedKjLviwz8Yhuq62nTAmdvevwin3DIYFZgwQdsfZore 2nol+eiPeGBUzAUFF5SRgBcj++wXVlqe60YWQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764582499; x=1765187299; 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=906KZFo6t+2ci7ZTeYqhBL02BUrFYEeLcrZCiOSXlDQ=; b=EQ4X/2NXl4ZOtBVUgIpFdGy+dYRJmR55A4WnTf3tHJHOPtswuI0ueTCp+WxnRJO+Vr RkpuHWc85uhVIEj/5jZ1M+ZgNA16e1n/R6hT4ni71OKRtL2rqaVwGSrWWtW8czc15EcF 2fY+f1hxqivULLdasiwtor+Gsjjq0S4uzQ69mma+V9mGNjS0LY72N0Ilz/R4EDl4oLpC tdRZJdA483o5gixcwihvPf7Jmbc6iZx0laqN9e9/D9hAy9WcrgYMM1mbEUvGuq2H/ZUX mpD5nWiUBfSt0diedywZTjcYqUrwDcwurFhQ58mnTpS6EYwrQGGmwjimI6cMK5Rv7yQz R0jQ== X-Forwarded-Encrypted: i=1; AJvYcCW93pWayDPf5JW7tdPZ2H6id9TqE0Nya/YXR7wXOmy23wbhR8zRBolfo9itvHcNLCRzFymq5kwizmCu/ys=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9S6buFEjpqrdB3IhQEvI2KfXYD3aXAkrl8qboP9LU0VfkSV6G ZB8XC9/y/0R5yyT3peENrnAkMutQ+9mRopiT9tM+CpGjcUXTHIq9eSTHOfJvHOUvMA== X-Gm-Gg: ASbGnctVAb3hqR/B2g7aejSIjXa91ilkLsHXNwt6k6iE2UQ74Lhc+tyzJ2frNYse610 l+6pVaUGqv+JgHh5lezPxJP27607V2w2qZutsw2zyzSprysDTn7LKWAxZT1wMOY9OQdKz3H7ZcP 3NkfThubZohnZpxg/r/v9TngThRE/+MutOM//+pQaINO+zv9wdGpl/PTT57cOhxqmBFppyYsTMk bpsz1hlvHm4ScFDWiu+dmU/dP1YyZP6Thl2r6keoNYCa/1kSAUZfuSUblRF28uh5B8GMh+xDkUg 4DaZ4dh6vAJcu56gNckLt/gft4J5GRVSlU15Zm8eNCJn/VyocNwF84+SmtlT/o34gyZj+uE7vn8 IC8r3iXTnLsu6Erd+3iOZtR1TQrasDGRPWq6zyhfLJaqPfjJCAfNEbkDB4aj/r4Mngolb1grRYy NFjdhOPuLQFnDp8CywlGq82da8XqyjLQMu+uJWO8ELQoo3GxWL9wHdYbJc1sOFVYXsvAAm5aKb2 Q== X-Google-Smtp-Source: AGHT+IG5hlJsokfKmtpNDiN4BN25b26b4ht4eT8qU8v1pYMGVVntb+93khKGuBzf5xFszcfk+RGLmg== X-Received: by 2002:a05:6a00:9508:b0:7aa:9ca5:da9c with SMTP id d2e1a72fcca58-7c58e50cc8dmr37751171b3a.22.1764582499116; Mon, 01 Dec 2025 01:48:19 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2a00:79e0:2031:6:943c:f651:f00f:2459]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7d15e7db577sm12882074b3a.31.2025.12.01.01.48.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 01:48:18 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton , Richard Chang , Minchan Kim Cc: Brian Geffon , David Stevens , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv2 5/7] zram: rename zram_free_page() Date: Mon, 1 Dec 2025 18:47:52 +0900 Message-ID: <20251201094754.4149975-6-senozhatsky@chromium.org> X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog In-Reply-To: <20251201094754.4149975-1-senozhatsky@chromium.org> References: <20251201094754.4149975-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 1a0f550219b1..615756d5d05d 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); #define slot_dep_map(zram, index) (&(zram)->table[(index)].dep_map) =20 static void zram_slot_lock_init(struct zram *zram, u32 index) @@ -984,7 +984,7 @@ static int zram_writeback_complete(struct zram *zram, s= truct zram_wb_req *req) 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); zram_set_handle(zram, index, req->blk_idx); =20 @@ -2025,7 +2025,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); @@ -2057,7 +2057,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 @@ -2256,7 +2256,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); @@ -2294,7 +2294,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); @@ -2359,7 +2359,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); @@ -2581,7 +2581,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); @@ -2784,7 +2784,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++; @@ -2892,7 +2892,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