From patchwork Fri Feb 14 04:50:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13974475 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 ABC67C021A4 for ; Fri, 14 Feb 2025 04:53:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42BFF6B00A6; Thu, 13 Feb 2025 23:53:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B49A6B00A7; Thu, 13 Feb 2025 23:53:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22E30280001; Thu, 13 Feb 2025 23:53:42 -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 F2F666B00A6 for ; Thu, 13 Feb 2025 23:53:41 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B0436161D40 for ; Fri, 14 Feb 2025 04:53:41 +0000 (UTC) X-FDA: 83117332242.07.3CD8AF2 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf12.hostedemail.com (Postfix) with ESMTP id CD6204000C for ; Fri, 14 Feb 2025 04:53:39 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Hmwjhs9O; spf=pass (imf12.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.169 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=1739508819; a=rsa-sha256; cv=none; b=zJ5OPQSW++1rAilf6mQUNq6KZpJREhq7+Ig5VNcKvKkOgdtUob+P2CiDpUUToS3LcmGG1x hdXbz1fA2+RkpYfTK7/d8jzRKZttU84EKIAnxLcWLJonqfqqJEj36EQqmCtWE5OrmMG5qh LsfvtdOGP6kKAfFHu41rrYBy96ETjgU= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Hmwjhs9O; spf=pass (imf12.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.169 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=1739508819; 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=g8MSYx1r6vOiRHwxjnCDNpKvIAk9Qp1UAjAoAUDj4z4=; b=pHxeS86xC1DiTtxwJyFjGAbQ3xQEYDva6cF2cPrnXLuietGUt+IMcZEjcuozgobU2o6utW Jz5SR7rVCE3SMNAe4R10q0O/hhEd3h3gtLwHgLH3qEoOChNhVtDbm4fskPi2aokyng4VYv 07DD9g5NCBUUMwR1PvfMPiBE3BrhcW8= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-220c92c857aso25951675ad.0 for ; Thu, 13 Feb 2025 20:53:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739508819; x=1740113619; 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=g8MSYx1r6vOiRHwxjnCDNpKvIAk9Qp1UAjAoAUDj4z4=; b=Hmwjhs9OzIxaQbWczXCQIKsah/syruFEeZmVBclYvQ9nKvRzFa2Y1ORbqVJbfpBicq ku1K9HavjrLQODeeL23LNajNE6ryc3j8sIxW9d22hi54+pfK7cXG1ojkrZY5xxF5MZYR llajou0tHTmWYEb2/m+gVXPoUPIkSkQOaCyZQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739508819; x=1740113619; 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=g8MSYx1r6vOiRHwxjnCDNpKvIAk9Qp1UAjAoAUDj4z4=; b=D2tfUVO6IuqdYyeLhGyVIGQrBnwSP3Lafo/cQXslEeadK8sDjOcExdDUtU/lixGm8R JKAqo7f6TIp8TaZXGTVQxsTLSLdy5GGxNZyaDhW+UNLTZE5A4Pf1no5+6vKPZTgTrj9Y m7kJ/9O1wqlJrlIV2Tms+TkO5lxDzKZzsysdOygdZrKQtjza4yQ6DbsJnALA8m7mf+qT h9EOB2t3PrCS6vtgUyufQn79XfebEkdRveY2C2xiJoGF8I1+azbdq3/LZhrhhGVWHzn/ tznb+bl0Ud9AU6w5EWyB5hKyLmlZYqvwx684i2p1UdME8M0uJtKIa7Q5jzUMDfNRF3KQ zDXg== X-Forwarded-Encrypted: i=1; AJvYcCWBcdtXGw3Qe6/55giGjRrcORUfcYtUI1q2KPDEcTeTNDb1tWbgVSRg9jQ/mwuAp8EI+wu/Qfht4Q==@kvack.org X-Gm-Message-State: AOJu0Yxo242DSm4Lh6Tlb9+fCY9cmByIiqQBZAvhDG+yyuZZDKmbuWUS Al3YGWIvXAFpS8klMVPhLWG8tvNHyfe6pZIXc23GRkWmlY84Otpf+IKu4jVa3g== X-Gm-Gg: ASbGncu6t13getje4nFGH0P5dK+SfOIP8I3K3ie3J7T3lbS3IH2lsykFPVf/Z8yJely n1/+TwFEetZzPS5YcuzTc3WUQv2KDpiS+Ds0i8s4gMBvzysSatAkB+yqRNNiKbndCcZQGgoZEC9 0p/YIfvWuylfSsKIAdcO/Wck+jx/HcrQ/pfrWWkVN7Ta/5sfzAyMc/Whcg6fSoWKaFkHBJ6Dc6y BvvZhmU5wial0Ar3dsjDEoKZSYBHTCl1D9wFiL4loGdzkFRZB8CezVldSAybgpWfSTq02XA6kjZ Ai7RFlN+d2/aMLexfw== X-Google-Smtp-Source: AGHT+IFj0J84blWWRorX7QC5QTsPm4yxqb/UskRAxNtWaOKmY3i/R9l8RGftlk8+B1lrXJZdO59P7Q== X-Received: by 2002:a17:903:18a:b0:220:e98e:4f1b with SMTP id d9443c01a7336-220e98e52b9mr44389295ad.0.1739508818756; Thu, 13 Feb 2025 20:53:38 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:942d:9291:22aa:8126]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d53492d0sm20895595ad.35.2025.02.13.20.53.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Feb 2025 20:53:38 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v6 13/17] zram: switch to new zsmalloc object mapping API Date: Fri, 14 Feb 2025 13:50:25 +0900 Message-ID: <20250214045208.1388854-14-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250214045208.1388854-1-senozhatsky@chromium.org> References: <20250214045208.1388854-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Stat-Signature: 7kbdge1ccatz5yu4fwtucn63p7hh8a7n X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CD6204000C X-Rspam-User: X-HE-Tag: 1739508819-597541 X-HE-Meta: U2FsdGVkX1+5VPC6vaEyASmDFCZej8flF++CRhlW/J4rVY8bu6TKPply903VG5fUInnFnNE9gwPGgRmO/IakiPrxSb6EQixLbXoRwkWBK6h2Gell2I2vwLsDkfv50LLKSyp9Pq5G4YQhD7gSSxjGd4+2aifN/gRT0+e1W87+C1qN748cTW28Ux8hgzVlj6GNcDeo4R//kjZsDURZDYriSyYzgP6g/XzgZGkHpTJ5rLjBNCxGpu0QCwpe2gIZoDrmr4/ytYGz6f8mGYRocLqK7hKyZv/eIAeKc9tjwwiAffLYQc5xK6Ikad4NBEDCObQ9mH+vsvjAy4/zvpV0gN2UIh/bGIaLjDbZ6Y93iB3Kj0klaYi2LZDOCOKco99y2lLxJ7iRFgUchpZiO3ioB4l/Zw80YdwyD+cjGaPaPdJqnnSJkLqGY/aeXpQq3zQEX8TMpE564/PDjc9bYV8Hv7xLkt2hT3bABb1H8YCdDIX/ECnMSnLgSCix4RD/33yKHA9J2bMRzqpW0fM8kEBTrG9GlrhXC3pzDSJGl3s7YfDVAPW5i/lP745gTyEOf+Vvdf5CgBwL6lQXs1cxyPC2mbR/Ha/0eIh0akl4aOakkuO7bgs+pbMGCa0lPDMgmsgtNlrrkdbRNHZtbZMOgrX5MzCdXkn+eEy3XSdPlfCwcWpQv49KSr8n07xcd3yO/Amd7aiUw6BIEch/x6Mp40qwsuD4jbD5Gcc/4JqJWbpDkkILaMOKZ+0XWCJwuUzqB06Tw1DqvJ3MeE1l7b4+Gkfhkd7vkaxee2lFjeE0bZhppSvMh9YowA4u77fF2NlizUbzP4TvnTlAzCKfPFIfYzvaw+voMcxQUjGtj8itiUb26YPn59rHrrfRzdo6J3nBFCe1yCOwbfFUyJ/50YEcgepc5TnDTjNCIZhfgrdp89LD73fgvCMV1Zit7RPJoekr/D48K91yVuGLKZkVf2+S5d7FAbZ 8V0iWghW PMlzRHE3E2Kbo3+54250PpHgnFUqKSXWcBY2QTzVJCA7yZUIV06ulvzrHk2Ej89vZ94W6XMrZjUtPtCUCjbCz86cDoNaS+rpeKLYRhHIH4BRdfD4nLw7DAswCQ+EbH/tuCkjFAU/vsKt8bgdU3KLKLlGvBRnavqGHh5BuCX6ggBqzfBwzCqN2/3DJKqzetZ9WstOpqMUbdj0EZvx3emKHn/nEfGcFtC/FemYDEgLwJQMK/CG4q6Nf1CWypA28wIZOj05LEpv54jX73T+nwhrfMkXdf4oxyjj/XGtsJr4Nu/uA6jL6iC5JgZJPUA== 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 2e46ea542ecd..87ce304a60aa 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1603,11 +1603,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; } @@ -1625,11 +1625,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; @@ -1725,7 +1725,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 @@ -1742,11 +1742,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); @@ -1767,7 +1765,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; @@ -1813,11 +1811,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); @@ -1929,7 +1924,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); @@ -2039,12 +2034,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);