From patchwork Thu Feb 27 04:35:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13993745 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 84F4AC021BE for ; Thu, 27 Feb 2025 04:37:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B3CE280011; Wed, 26 Feb 2025 23:37:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 16340280005; Wed, 26 Feb 2025 23:37:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 002BB280011; Wed, 26 Feb 2025 23:37:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id CD5D3280005 for ; Wed, 26 Feb 2025 23:37:57 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 94D838022A for ; Thu, 27 Feb 2025 04:37:57 +0000 (UTC) X-FDA: 83164466994.17.E33ADD8 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf17.hostedemail.com (Postfix) with ESMTP id B51D24000F for ; Thu, 27 Feb 2025 04:37:55 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=jmCYQCR4; spf=pass (imf17.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.171 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=1740631075; 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=HzxKzH19wN3flX6Re4AXRoS/RZlbQkKv5ZSRzF7j4DA=; b=S6ijobUb6C3NkoJvQnecjV9Stscf2z975Y+U6UoRAFJLSHbF5GoT+e0DI8ByTJk104LaEO fQot4VEJWwq1FR72L6Qs6U4DY1y0B1rlfpy0IWAZKoIwa74sCuXdLu1ZxoevPS09GAxWVi hNSpa8vW2LJ90/iynOuXT6CkEgwEFfI= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=jmCYQCR4; spf=pass (imf17.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.171 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=1740631075; a=rsa-sha256; cv=none; b=5eLSQfdAsPxbfmDFzJA4tQGbEDHOi14RiBMRHBpXxOmGj7ZuzjEDRXL10O2LVw09Gw+SYn Qj+9IwcfCi9LpAp5o0Y28CdO2EDcR4ZlbaqVqBflnTXbcJ4t3lKOqPuZhQhsSO4uYJ1RDJ pBlae4T3XCxXaz4A0iBgo5JjfvK4pBE= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2234bec7192so12476545ad.2 for ; Wed, 26 Feb 2025 20:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631074; x=1741235874; 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=HzxKzH19wN3flX6Re4AXRoS/RZlbQkKv5ZSRzF7j4DA=; b=jmCYQCR4I8Yq9f/xyCNhWUZlbRT843VnLBUseVtmA45/atWG+KX2Kjw/RU93jjvGsE HopvIUaaRSCqvGMK1djkxZnRClNPhZAU5WDxWS+MviClX+X2nJuHcS5E0uLyR/jxD1O9 H1/J8eSc3zL9tgkK7zameK2hKgCwtxe2DtFhA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631074; x=1741235874; 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=HzxKzH19wN3flX6Re4AXRoS/RZlbQkKv5ZSRzF7j4DA=; b=iMC9bbARmjH9cgHO9cdw2sq3DaDthnl2lKztFpyKPVAq00Vdt/WiW0oFDtacYnF8A1 UJRAAjDZMS8tlLi4YXS/ClylVHVvfs3KAD7rknQV6mtZ8KhFxBnjz5V2QKxoHo0feIuD nARmgyLTtijI9eT5j3aXjIz3iIuUbbZDuueRhjKuzyn1e/xCRdJXpRtOzjBPO2l5OEWr ycjwW3oH+cDc4FljH8cJapgQsC7MSxJIsqaj5JJ41VLMAxTiIBlO59T91bnWpoM9FSB/ 8CvxA5PGs9x+Wqt3CrBzn1MKZDHnx0/psQ8ZpddFdc4ZbBNjzOLqjyypq2z1SxI5kb6W efnA== X-Forwarded-Encrypted: i=1; AJvYcCWWIdQ91L2UR8VU90JrG+PuQg3e77aqLYMirvp4CIdRBTjlaf2QzYP/jaFbd3lRutFtcXyRSpKwzQ==@kvack.org X-Gm-Message-State: AOJu0YzAjGQL2rqt59X/UgNRiWDqfeo3IYViEsIiPGMV3MKMl5cZtUVY acfFIK+r3oIx2Aa7rMaVH0zyyElqYMXg7BvZM51BVOSNizasiCgVpNdNrTNhOA== X-Gm-Gg: ASbGncubEO/FRJQ0ilFxpaZOc18kyxIVrokoxqvY+f9RM8peLchJ0pYnfaukwkv7u4f sVa/H/p6yQpNVgJ8gXxb3zyDpaXWOf9Ne+EUA+wr7m/G/2tfX9i/pL5viCe+BOW7hyVBr09eU6R oGZpf3mdP6s6FxEnwUwRjfmY2aAcPO5CyZ0JH7oULE/wDfIQWtqvLt5KNzERkKMARxBuSnUclOE M2ByQ4BQuTAEOMYv9H5tGYv7+Nf+AHpT4yeW2LukEcugRSRHk/+eOVk6MHi3m7Fj/acBQr+YsF+ xVJyUWCyJkkHwhYj9hdMni8HhAcL X-Google-Smtp-Source: AGHT+IFihPm3YLRz0ki1R3h8+MO8xOX0re37Dk+wIL69kSAnv/pKGoOrc8itNvxpjLwlfq4K2/CuWw== X-Received: by 2002:a17:902:f541:b0:223:26da:4b6f with SMTP id d9443c01a7336-22326da4d3emr76424375ad.14.1740631074685; Wed, 26 Feb 2025 20:37:54 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501d5247sm4996945ad.26.2025.02.26.20.37.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:54 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v9 15/19] zram: switch to new zsmalloc object mapping API Date: Thu, 27 Feb 2025 13:35:33 +0900 Message-ID: <20250227043618.88380-16-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog In-Reply-To: <20250227043618.88380-1-senozhatsky@chromium.org> References: <20250227043618.88380-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: B51D24000F X-Stat-Signature: wdzfh3wjiufwj4ep8monkhw1677songu X-Rspam-User: X-HE-Tag: 1740631075-540023 X-HE-Meta: U2FsdGVkX1/gFd93e72jhTPYQwmkcTjMBZL3eTzKT0EzMKnqQZ8KJ9MichlgG9ufwD4pZErS+mD1LlvXiHn5g4/b5/2g3kDe3uC9GXa1I3oFB9H+GVqjn7Ms3yHaLycSsuUG23DXKukUEVjpMgmulVbNBmvOqYj/jI3ieBEfZ4QD8yZDtK0Lmnmb+P6LBLe3l0ednKDIxqnFUfugL1Tu1LD80KrupsgBQVzKYyGj3H8XfJ6zTOPADgNhElY26zDO2OwiCfdmBXiUqqw1W3hB/SMH29AViGRZ81g7izPB5Xjhiosh+UkjE12jFOVOM96/y8p8R4PLrvR9E+h4tcUIdw+5bFPGVo1eGs3Q3gcSiqAue0sMoh4ucsgcm3pyC9sM3JLJybMHGj7FR18UcsNdehoTIDCSaaMRWr5smJLK5I36LkLXPBdAYFhtzIG6W9MXuw2pBIV+aGhLc942rPduee/vhyt2C/WeuhHguRBFnnRPU54O0HWW3a/qu4qB5Xxc7USSX0GuLLgIbECafJa/gNqIa6aVvfBruLxr7gqdyzYGAzCEIpehuJu7m41Uhs6yWRs6/WFaCRZFhowQmvmuuEdo5MQVU7efzIYOR7xQrzzlDH9W7/wUXcODjxcisVBUNqHc6/t1pUUEZy7d69qCTRRP8l1xl26IqSae82wPyR5q8m9Eecxers1HmyoWBFVXliIKxiJY/GFNAiEc/8U42l6xhKDEyyJUi8yvd9FkOdohKaXv/OASr27VqisSNceeRIZl624wulVKSl+8vu0Pa18e9aL4toX+SVAGJ8CRgJCTjGdtppQAB2gnm7tkMcKaXHIkZCIYgguxcwFg8vtbp550sd/jMkhcnd9PapVLJ6l8sTCdlY3Dc5GnxdVrzcuuub52iLotTX0Mo4l0S0/2TWT2Bfwuei6fcnrIOk3d/3YuEVbs0CUOxCz+UWC36v5BrDrRFsqILJOtyYhdwu+ ffgnTTx6 zx46TXINBh/3dfZSZkMRBlR8WnzF3nAJHJiH6QPH84XoDUrYIaaZr12jvwbb+VmhU2vq7mCdtEscdrOM15qj09W/j/M3eLyLx2PRjDZlvCvpRIwJbr4H07kg1j8ygzy6VO/Iva+z8HOEYxV84jY8ptXBsaLBUvkRR8BmM2Wp376lM98Y0ZfezmC3yBhJ3EseGKKv7Tyrb0zkQPhVvHOBfcwiwtjL/GpjYGHm09giu6CAs5ysW5kMG6AVDNITXWPQyel6ygbQYPhtT0C7407yoN5Tg4vZK3kOVZEmxtoe35pdP5FYEP2+ATXESIqYkjfsBesfY 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 cfdde2e0748a..a1d627054bb1 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -45,6 +45,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; } @@ -57,12 +58,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 7ad89df9a304..1e2ba3590a39 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 @@ -1701,11 +1701,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); @@ -1726,7 +1724,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; @@ -1773,11 +1771,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); @@ -1882,7 +1877,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); @@ -1993,12 +1988,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);