From patchwork Wed Feb 12 06:27:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13971042 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 BC1A9C02198 for ; Wed, 12 Feb 2025 06:33:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F97A28000D; Wed, 12 Feb 2025 01:33:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 481F5280009; Wed, 12 Feb 2025 01:33:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2AF4428000D; Wed, 12 Feb 2025 01:33:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0614A280009 for ; Wed, 12 Feb 2025 01:33:15 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 85D02C0E60 for ; Wed, 12 Feb 2025 06:33:15 +0000 (UTC) X-FDA: 83110325550.25.F7F8C99 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf05.hostedemail.com (Postfix) with ESMTP id AE25D100006 for ; Wed, 12 Feb 2025 06:33:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=BQ9pWKXf; spf=pass (imf05.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.174 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=1739341993; 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=G+0Z+4xYmRhftKTrRiF3jNVLaBZmv0cRLATopAZYYvQ=; b=IT8erpC02LBBYbao4tPEcBxlCgvTOCdvDlnNYId+CIAs3OkpYWLR5almR6bzWry53VCT9r XVcbh2nEQFnZBOvQbMnbMK3xvCTv5guRNvqnW+mXw0JgcfBQg6otfSjCILFCNrpGp5F7Sd aKs8tY1LZoBtYE5zNupSQqsbmCeOA20= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=BQ9pWKXf; spf=pass (imf05.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.174 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=1739341993; a=rsa-sha256; cv=none; b=6+OiWq4b/c3K+OmW4ztRXLpWDO+gn8aWzPESMl/7MZHV2iz8LntIHJZ/8Sml9RZozzO/89 QljQjUqIC8NZXoSwLfsLXntycPlPap0cy7pSVCaXruS4uuhI4Fe7XroMRr4nFtmk7yD9A1 YBhZ/SEyX38/P9pYRf477D8qbIS1nfE= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21f6022c2c3so8183695ad.0 for ; Tue, 11 Feb 2025 22:33:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739341992; x=1739946792; 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=G+0Z+4xYmRhftKTrRiF3jNVLaBZmv0cRLATopAZYYvQ=; b=BQ9pWKXfqh79c06BQPRyRZWi0TXVHxypXjOFqfXMUaW+HApPTtNl9hPC6Iud1tO91O 7V36A3u7C4igt3lW8WoCyLSkKDna2a3PGTiFEq0ZRv1lQ7+iORXzup+3dyJsWF4pgaz5 YrjzTlU6Nn1wC+IbV8Q7EjZZrqPD9cXdQvS0w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739341992; x=1739946792; 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=G+0Z+4xYmRhftKTrRiF3jNVLaBZmv0cRLATopAZYYvQ=; b=ahpm6yUuQyLDAU2YcFG0HIU8zehpdCcyOEzVSW1XTX4Sbsd96nowQ4ipEB6mgdg4TY 0gU92gj17ABKNrtgdc7+Ea9Y+pl7E7z3pxJbcT+Hjk9qyKqImqGjFZagfOjULVIh1bSJ cuhzJLhvLKMK0wiq2E3OUXuqe6MjjfJ5s+2KadKW6BIlbUmGGq9pueN5ujqEujCRW2yF H0s9bMb8WEqJWLL6ecFlEhkweRbWFf8A4WSxObjcHXNpveKcffT1ST7PO86o+y/rYwgy aozxdrHrx/oNnxgSaQ7netMTtL9ByVEvCDrV/zBsiVHSraVWaQT6PgC2FHtii02lXdjb 338g== X-Forwarded-Encrypted: i=1; AJvYcCVUGXT87IPRVFsooKNt6YiYvfZMl1at66JC3gQFGRow58YG5SwohvCARTAcXgIR2ZOkdTiLWTZiBQ==@kvack.org X-Gm-Message-State: AOJu0YxXdIqUwtHzpv6rqbKfzAc4cG7prL+/La1MpGv9AfXfypcTYHUR /WEWWC9PVq1BCLQx2ov765rcES604zNpO3S72tmcK6c4Qa963Gbdme5cXA81tqS/CshGaQW+Wng = X-Gm-Gg: ASbGnct6ihisPYPAm/0ssvADaVX8tMEjACnoJj+3h1bToVrGdhvVGir9cb6ACCrt1G/ 00/eChsWkh9zjnV/rekuTT5/1Oe2JFek8tAsJrEHB2J14DdQEa/DuKpnKlSh9WBEdQ2KQ+JDE6K uGsx0i9fhh14Ly+iL/Miht0vKOjGJkK0y5pl2+r+KaA6cbQ5bKBfzLJh05PoTpsuVsxv+RHBGzF OCTZi47mQ5heHN2vTCVBA+wfN+oqa9pHsDygbJbB/xduQXL4UbgEdn5jhvU0vw9NnzmPHBjIo7n mQMH9H4EaeNxXMEkZQ== X-Google-Smtp-Source: AGHT+IEhnNCxLoE2CNoFgq8/HUot/UmlliKB3Yg2LwQwc2F/d9hoWw6hVmqWymhRbVtPXN7CHslIlw== X-Received: by 2002:a05:6a21:9101:b0:1e0:d3e9:1f8 with SMTP id adf61e73a8af0-1ee5cedffe2mr2971435637.10.1739341992642; Tue, 11 Feb 2025 22:33:12 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:69f5:6852:451e:8142]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73093ab315csm4424643b3a.143.2025.02.11.22.33.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Feb 2025 22:33:12 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Kairui Song , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v5 14/18] zram: switch to new zsmalloc object mapping API Date: Wed, 12 Feb 2025 15:27:12 +0900 Message-ID: <20250212063153.179231-15-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog In-Reply-To: <20250212063153.179231-1-senozhatsky@chromium.org> References: <20250212063153.179231-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: AE25D100006 X-Stat-Signature: ibe61qeoew8xe8ttucdnpq96z9ktm8om X-HE-Tag: 1739341993-741337 X-HE-Meta: U2FsdGVkX1+yk4Lge7XGJ5iC2qGo8x+AoJ1EMNOfjX4hQ0ChVsIyYZpoudFKEi7hKitcN6PYUrSYpCGEUeCUyD0PhjpqZXUxFSvTPH0IqKUR319ehL4CgJWERrrcKiv1Vu1LadbkCPBswaKOx1sodLQemUqCB6VsguMrrrYUDazH6rxYcnfskM61XHus4vYihPqJU4/2KMQBZwCDEijF9FrzNBA57s/linXAVwseKA7eJjQGT2mRyav03LMH5fcNTuE7J7AdszqRApFKkjOYPyk4NHig8g/Zp6avThs/OMweTD1q9LWeeG6Y566cYgSLDRcPH+xcezEdF+k8/APAX1P3SdTv+0B5vpbrPtuavNk/Rx2aMNbBfzl8+yS0AbmUgc7gkMc+tkLY8yTYBf+WJf6TvrsICLPraHVrsDERLSF9ZmZp3BES84pWsGrX4BHVdZaTIbCij4SpodPOVBXVP9JdSClF3J8xSNQzG4MUc+b3fw8UcpPu4bEVg40hFtZOccEhybe8/cN+SXdjUhXNgmy7UZXRpQbyLkYNotyRmbygugyT4OASdY9T5QLrR8MhNQd2+d+WvOOUwvgN2EK6ol3bi1cCs3La5TutYZkt+vtXHrFN6CFqPdDyYORrvrUZkK5ym2dx1wh8T5mpGhOOgEqXmjixi8WvQHMM2WifY4YLbJTYggc6fN3c4xOja6WT0bV/v8Gwwkiy1kHIYXcPHZuL41fhjGKgujRnimXuuIK/Un+HXPZGlklYAXPNuY+2HcGYQtFaHe/JUys7e6SblV0y0uARy4uZfMtvQ07B8X/R1fmgNUjZi3hqx6sVWvhmvxVXs8d14wj0FEjNN/kyHhoRqQaP4hxZh3VRwbZaDELxtorQ5PScu3wWMjcr2d7JLwmcPf64EYZC/KBJsfSx2Tdtc7ZWkEHgcHydaJJPCMehy7Z6ZNCjWbZXQonHUa3m5Vfzt4pN2hyAF0kgOoY kORcJn5M ESGXCT49PLL3mC4u+dlbOQyi4jATCgday+oWSrmoGJWGZB+FkqQ4UqCH68o35FwP8S0khCH4fkDLdWIfkhKp7kNr7f+HuVPQSIY8FlYJ6V+tDdoIx56IcuDEmLZTH/XZ934ZADxsPFQO9jc0uvhwyv/vsWVR0GPpbcEseIyzmwD7obT5JPZP5uHqJsgDVqL4NDxcmY8vPk6g5714N+EGewFIqkJix2phs2XfN3HwbVhmCqEOL3JV0RbjbZYeW7e4sdi5fnfOVWC8g7TG+d5aSk/1CpWteyvAn9qcgiGzg598uQgwCwgFJ54k/TQ== 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: Use new read/write zsmalloc object API. For cases when RO mapped object spans two physical pages (requires temp buffer) compression streams now carry around one extra physical page. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zcomp.c | 4 +++- drivers/block/zram/zcomp.h | 2 ++ drivers/block/zram/zram_drv.c | 28 ++++++++++------------------ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index c393243eeb5c..61a9c3ed6f7a 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -46,6 +46,7 @@ static const struct zcomp_ops *backends[] = { static void zcomp_strm_free(struct zcomp *comp, struct zcomp_strm *zstrm) { comp->ops->destroy_ctx(&zstrm->ctx); + vfree(zstrm->local_copy); vfree(zstrm->buffer); zstrm->buffer = NULL; } @@ -59,12 +60,13 @@ static int zcomp_strm_init(struct zcomp *comp, struct zcomp_strm *zstrm) if (ret) return ret; + zstrm->local_copy = vzalloc(PAGE_SIZE); /* * allocate 2 pages. 1 for compressed data, plus 1 extra for the * case when compressed size is larger than the original one */ zstrm->buffer = vzalloc(2 * PAGE_SIZE); - if (!zstrm->buffer) { + if (!zstrm->buffer || !zstrm->local_copy) { zcomp_strm_free(comp, zstrm); return -ENOMEM; } diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h index 23b8236b9090..25339ed1e07e 100644 --- a/drivers/block/zram/zcomp.h +++ b/drivers/block/zram/zcomp.h @@ -34,6 +34,8 @@ struct zcomp_strm { struct mutex lock; /* compression buffer */ void *buffer; + /* local copy of handle memory */ + void *local_copy; struct zcomp_ctx ctx; }; diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 7c4c296181a8..c6310077c221 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1561,11 +1561,11 @@ static int read_incompressible_page(struct zram *zram, struct page *page, void *src, *dst; handle = zram_get_handle(zram, index); - src = zs_map_object(zram->mem_pool, handle, ZS_MM_RO); + src = zs_obj_read_begin(zram->mem_pool, handle, NULL); dst = kmap_local_page(page); copy_page(dst, src); kunmap_local(dst); - zs_unmap_object(zram->mem_pool, handle); + zs_obj_read_end(zram->mem_pool, handle, src); return 0; } @@ -1583,11 +1583,11 @@ static int read_compressed_page(struct zram *zram, struct page *page, u32 index) prio = zram_get_priority(zram, index); zstrm = zcomp_stream_get(zram->comps[prio]); - src = zs_map_object(zram->mem_pool, handle, ZS_MM_RO); + src = zs_obj_read_begin(zram->mem_pool, handle, zstrm->local_copy); dst = kmap_local_page(page); ret = zcomp_decompress(zram->comps[prio], zstrm, src, size, dst); kunmap_local(dst); - zs_unmap_object(zram->mem_pool, handle); + zs_obj_read_end(zram->mem_pool, handle, src); zcomp_stream_put(zstrm); return ret; @@ -1683,7 +1683,7 @@ static int write_incompressible_page(struct zram *zram, struct page *page, u32 index) { unsigned long handle; - void *src, *dst; + void *src; /* * This function is called from preemptible context so we don't need @@ -1700,11 +1700,9 @@ static int write_incompressible_page(struct zram *zram, struct page *page, return -ENOMEM; } - dst = zs_map_object(zram->mem_pool, handle, ZS_MM_WO); src = kmap_local_page(page); - memcpy(dst, src, PAGE_SIZE); + zs_obj_write(zram->mem_pool, handle, src, PAGE_SIZE); kunmap_local(src); - zs_unmap_object(zram->mem_pool, handle); zram_slot_lock(zram, index); zram_set_flag(zram, index, ZRAM_HUGE); @@ -1725,7 +1723,7 @@ static int zram_write_page(struct zram *zram, struct page *page, u32 index) int ret = 0; unsigned long handle; unsigned int comp_len; - void *dst, *mem; + void *mem; struct zcomp_strm *zstrm; unsigned long element; bool same_filled; @@ -1771,11 +1769,8 @@ static int zram_write_page(struct zram *zram, struct page *page, u32 index) return -ENOMEM; } - dst = zs_map_object(zram->mem_pool, handle, ZS_MM_WO); - - memcpy(dst, zstrm->buffer, comp_len); + zs_obj_write(zram->mem_pool, handle, zstrm->buffer, comp_len); zcomp_stream_put(zstrm); - zs_unmap_object(zram->mem_pool, handle); zram_slot_lock(zram, index); zram_set_handle(zram, index, handle); @@ -1887,7 +1882,7 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, unsigned int comp_len_new; unsigned int class_index_old; unsigned int class_index_new; - void *src, *dst; + void *src; int ret = 0; handle_old = zram_get_handle(zram, index); @@ -1997,12 +1992,9 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, 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); + zs_obj_write(zram->mem_pool, handle_new, zstrm->buffer, comp_len_new); zcomp_stream_put(zstrm); - zs_unmap_object(zram->mem_pool, handle_new); - zram_free_page(zram, index); zram_set_handle(zram, index, handle_new); zram_set_obj_size(zram, index, comp_len_new);