From nobody Sun Dec 14 21:54:17 2025 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.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 7984615C13F for ; Wed, 18 Dec 2024 06:35:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734503742; cv=none; b=bFh4Pd1bjug6uBqa7pjVbMLjHuad+kVaVv9BvdpUO8nvLcAtOKqn/HkAd6cv4SKSJ4Br32UhZdhq4Y6hHMoSSMzjohop5AHVqraz6mEKaggkItFrZKoPXJlIJ8dH08kZPdJ2Ik6RapcStusPygK9+nMDwvCCcCCrd5knwWUnYcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734503742; c=relaxed/simple; bh=ueT58dOzzmPY8vm9egfT8Vk1XXLTgehj6PW0oAzS6OQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BWvtkeTIksxXXL+be9X5olE5ub3x5p8K6ysMj5u/1phTnytLFRW6rtL97w4frJo1E632SfOKrMEnNpeG3T438CROSaAM6fOVhOpu0QRMTD0k0WxlYCKtbjOgsCyjmAWUc5Dn5X+9EuNvgBbdFhbTnVae+ywWRntspYWtbhk7Ye8= 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=SaiEO/bv; arc=none smtp.client-ip=209.85.210.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="SaiEO/bv" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-725d9f57d90so4574331b3a.1 for ; Tue, 17 Dec 2024 22:35:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1734503739; x=1735108539; 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=8UlIfnWhj8akIUQw35UgTdzrn/T1WzL/Vbski8Obleg=; b=SaiEO/bvSHHpeecwC+CoXgSkErOzmoK8Mh1oGRaWwf9ZoDH317aL01KhAvFaagNm+w pD4brEHcIk+1seP8HjnhGZN57XRdHdsRIrw6v+5tePV7NDLhiAprwy5vnFYDqvRjf77k +Ww2kT4YyjruACjYt32TUFl7JFemIYG7CnhjY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734503739; x=1735108539; 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=8UlIfnWhj8akIUQw35UgTdzrn/T1WzL/Vbski8Obleg=; b=CMnkByFi/CTDg6AgzFwXgOmuOg2uCd5TR2V8vipxWaAk/DNE9EQWAtLCSDA0oPXpo3 9Ldw/qGKQb5KXQrwMwEz85et+6/xhWMh0CKXyutOfbsDzmDSUcxlRVJZVDxrx9xQfxay RCQcqk2fIN2tAuQSpXsmsL1P2/5z/SguMIji1WWQSe8vY7OMF0t7TfwhCHiiX9Z1k60S 83cQ9v8U9jNQL8Zq7bbn/ae/L8FjnpqBGn73NjgGCYUx+NdkHW2mLsIK1YreQJ0G7mmM WFx4lgHP+Mf4udYCGknQl7T5SfZe4dXAn/nsMrXp0y/rej6O4S538Xsf8Va5IpykiHQS jIMg== X-Forwarded-Encrypted: i=1; AJvYcCX06ISBXdOo38EHGKzAPBV97mDAKYrhjQal0xdGPamAWxgnr/jH1E8PI/wCdueC8qX7IYn0AFYA+FIjwfc=@vger.kernel.org X-Gm-Message-State: AOJu0Yyy1WYNdF+EOFVNjTufTzeHw1+aefzOICDw6jTQ+TdWx9Tfblac oAdSx/DkrY3aa9mOG3QsBCR1Vv6b6rD/nnbwq2DbBp+A9FeMWfLc2ojE01CAJlvKqjROWAcn9ac = X-Gm-Gg: ASbGncs2qjPH95ta6JfB6UTh0xIWQo0Fz8IGUqImtBjOqTXOQK4APok+73Hl3CJ6xzJ nL1Tc/Hf+uR3tmMjNhxg6AtjzUSvd6Yk3RuFHWQmXID8V0y4iLX7cAnGuH+FW0Dofg5P1qxq5t6 DANz+ylEXH+eZa9sVhZ9onoZbRe5N8B2OE7myCXECOAs7C5W8/RpRu4ktI/TdzZ0hqAf04gnkb3 6R0vu352WF04aCEEz8wucNf2lyOID7b5TE6WXKlq5X4Un07DqNgisunAeI= X-Google-Smtp-Source: AGHT+IGwQ0wQAXBUGI22Q3J+XJvZdIgvdCXo+/PUjQeIZFjzJ+5utt6loeABpMh/C7JssxnEtaeHvw== X-Received: by 2002:a05:6a20:3948:b0:1e1:aef4:9ce8 with SMTP id adf61e73a8af0-1e5b48a15a5mr2391517637.28.1734503739653; Tue, 17 Dec 2024 22:35:39 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:3bcc:36cc:b9fe:9379]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72918bad760sm7760879b3a.152.2024.12.17.22.35.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Dec 2024 22:35:39 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv2 5/7] zram: factor out different page types read Date: Wed, 18 Dec 2024 15:34:22 +0900 Message-ID: <20241218063513.297475-6-senozhatsky@chromium.org> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog In-Reply-To: <20241218063513.297475-1-senozhatsky@chromium.org> References: <20241218063513.297475-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" Similarly to write, split the page read code into ZRAM_HUGE read, ZRAM_SAME read and compressed page read to simplify the code. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 85 +++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 33 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 1339776bc6c5..465297d31bdf 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1530,54 +1530,73 @@ static void zram_free_page(struct zram *zram, size_= t index) zram_set_obj_size(zram, index, 0); } =20 -/* - * Reads (decompresses if needed) a page from zspool (zsmalloc). - * Corresponding ZRAM slot should be locked. - */ -static int zram_read_from_zspool(struct zram *zram, struct page *page, +static int read_same_filled_page(struct zram *zram, struct page *page, u32 index) { - struct zcomp_strm *zstrm; + void *mem; + + mem =3D kmap_local_page(page); + zram_fill_page(mem, PAGE_SIZE, zram_get_handle(zram, index)); + kunmap_local(mem); + return 0; +} + +static int read_incompressible_page(struct zram *zram, struct page *page, + u32 index) +{ unsigned long handle; - unsigned int size; void *src, *dst; - u32 prio; - int ret; =20 handle =3D zram_get_handle(zram, index); - if (!handle || zram_test_flag(zram, index, ZRAM_SAME)) { - void *mem; + src =3D zs_map_object(zram->mem_pool, handle, ZS_MM_RO); + dst =3D kmap_local_page(page); + copy_page(dst, src); + kunmap_local(dst); + zs_unmap_object(zram->mem_pool, handle); =20 - mem =3D kmap_local_page(page); - zram_fill_page(mem, PAGE_SIZE, handle); - kunmap_local(mem); - return 0; - } + return 0; +} =20 - size =3D zram_get_obj_size(zram, index); +static int read_compressed_page(struct zram *zram, struct page *page, u32 = index) +{ + struct zcomp_strm *zstrm; + unsigned long handle; + unsigned int size; + void *src, *dst; + int ret, prio; =20 - if (size !=3D PAGE_SIZE) { - prio =3D zram_get_priority(zram, index); - zstrm =3D zcomp_stream_get(zram->comps[prio]); - } + handle =3D zram_get_handle(zram, index); + size =3D zram_get_obj_size(zram, 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); - if (size =3D=3D PAGE_SIZE) { - dst =3D kmap_local_page(page); - copy_page(dst, src); - kunmap_local(dst); - ret =3D 0; - } else { - dst =3D kmap_local_page(page); - ret =3D zcomp_decompress(zram->comps[prio], zstrm, - src, size, dst); - kunmap_local(dst); - zcomp_stream_put(zram->comps[prio]); - } + 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); + zcomp_stream_put(zram->comps[prio]); + return ret; } =20 +/* + * Reads (decompresses if needed) a page from zspool (zsmalloc). + * Corresponding ZRAM slot should be locked. + */ +static int zram_read_from_zspool(struct zram *zram, struct page *page, + u32 index) +{ + if (zram_test_flag(zram, index, ZRAM_SAME) || + !zram_get_handle(zram, index)) + return read_same_filled_page(zram, page, index); + + if (!zram_test_flag(zram, index, ZRAM_HUGE)) + return read_compressed_page(zram, page, index); + else + return read_incompressible_page(zram, page, index); +} + static int zram_read_page(struct zram *zram, struct page *page, u32 index, struct bio *parent) { --=20 2.47.1.613.gc27f4b7a9f-goog