From patchwork Fri Feb 21 22:25:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13986390 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 EA6E3C021B3 for ; Fri, 21 Feb 2025 22:31:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 822C428000D; Fri, 21 Feb 2025 17:31:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D16B280004; Fri, 21 Feb 2025 17:31:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67EA328000D; Fri, 21 Feb 2025 17:31:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 48AD2280004 for ; Fri, 21 Feb 2025 17:31:24 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id F2CDDA156B for ; Fri, 21 Feb 2025 22:31:23 +0000 (UTC) X-FDA: 83145399246.12.E01E0A3 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf05.hostedemail.com (Postfix) with ESMTP id 1015A100004 for ; Fri, 21 Feb 2025 22:31:21 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="DsMS/qY1"; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf05.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740177082; a=rsa-sha256; cv=none; b=OgnSZ5RVzqXOYIgjb33nPDoXUGlVaojEFrpq0VUFPksJttCG0Q9SCbK5A6t8cRixbG67OC muKuTvCaTXgYlxxzH1gqX2hveSw9gxEihk+a3TEfUrjxLTGEXDHE/ifOg8Z+iURnSX7FwF 7ZuPaG7RUAVyZZBMnIbq7A7Q9WGi/NY= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="DsMS/qY1"; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf05.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740177082; 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=+ywFL0qx8JBQIO9VI8pgvX03IYGXOc8sRHANyYI8RpE=; b=tPKpFXG6XCH6ITkei2Sr7WJqJO5EGqOhZDKbYiChgNMBR20+DeNP0SSlx8cSFudrBuRz2d m7hGLdwq6lq7jFfYqbry87ka2p46QfK5stCZbi1XEvWewFGqc4EHKRG7LXPS2UkuOhjZSt F0xLO12CM6IX6UAiMRmwTMx+VUxvxtQ= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22114b800f7so51900735ad.2 for ; Fri, 21 Feb 2025 14:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740177081; x=1740781881; 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=+ywFL0qx8JBQIO9VI8pgvX03IYGXOc8sRHANyYI8RpE=; b=DsMS/qY1jI34ipVw8vqg/0qt30WJMKI4LR8Y1nB8j7tVUU9m0s6bCF4dxMTF4w6/Kb YHliYyFGLkmyD6gej+sdhB0myV7T1I8H/8DciwkL5mN1hbsAveoQE2sHvmpD71rVkjZX FCXEUo4F+1+EkOEgyJRzmbAaciof+G4+O6ONY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740177081; x=1740781881; 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=+ywFL0qx8JBQIO9VI8pgvX03IYGXOc8sRHANyYI8RpE=; b=pUlo3GEKQa40TzjUb42QKZq1mEr6EoIkEQGXW8895buniSEX9r2LqW114maD3Q/pU8 2lmVehn0vRsaLXcQQ2CBIo59nPWrhglCIb/kS4Xchygssqi4mZME7lEvIqIQkT7MKw/T +wnrbW/HXYrJYLuFTUzUZQSqqKiw6CwFTkI/GGSY3gtuC5b2ZgfPaRYYdrX4VvXFixED h4C01+9RP+9bM1ERxUu1L019kdMyMGagdlLbr7ILeprhUllJpxa/d3Ovmpv0nrmR6SmM 9e36+7MiUYmHYZqWF4/rQ1uhF8kexJrYbmYhpONe7ewgpL3pnhACQQ2hphjs4GQHXcu/ 8HEw== X-Forwarded-Encrypted: i=1; AJvYcCVUU4MDORIk0obIzouDUk3V+i+/L0AwOHPWswROcWwZOCa5l5Kj0p4XZ5MSiD++iuj5i7VsXdNWTA==@kvack.org X-Gm-Message-State: AOJu0YxCCNT76oMrCdS0EwWbb8MVEoHIw5T90zVzLK5VySqAjUBZ2dcR fw1njKt4Qw3mqAiZYhUf5J6AqX6wDfUmj+stTtDhj4UF1cfxge+QhtMISlSxqA== X-Gm-Gg: ASbGncss/HOMTlyo3RgI3iRc86CHgB7OynuZqTiIG6hTD9gRfLYO+s1TU7DQ5lSZ8dF e+1I4Zf4+ItUYjE2hsA3xiUNBDniuXlWvteIOsfCWPak7kzp09Icu5XV7VcrJPrOsn+hW7SuD/R SqO8G60nbwfz3RLN8r1Ir95UbIZ0aQUtdINSx29QQfrtJZkJI0V0+Lrc85Id3pc+fYIDN1oeCnO J9Rycy5LDasq6eMXVr4qvnCQcDLC2BOHn/3bXRMuEzbQ/12VWxarv2VaMTMfUDfPz+Y39SCV++g iZMxFAYkaDKD07oAwM6MoMjl2bI= X-Google-Smtp-Source: AGHT+IHKsKKftwTwJ0CiusP95+2mkUFfAjHaiXoSZhqOL+gmM2fD2wdcoOjiL2xiqFP6/U7Mmpfp4g== X-Received: by 2002:a17:902:cf10:b0:21a:8300:b9d5 with SMTP id d9443c01a7336-2219ff5f65emr84680315ad.23.1740177080968; Fri, 21 Feb 2025 14:31:20 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d55963d7sm143272675ad.257.2025.02.21.14.31.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 14:31:20 -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 v8 13/17] zram: switch to new zsmalloc object mapping API Date: Sat, 22 Feb 2025 07:25:44 +0900 Message-ID: <20250221222958.2225035-14-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221222958.2225035-1-senozhatsky@chromium.org> References: <20250221222958.2225035-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 1015A100004 X-Rspamd-Server: rspam12 X-Stat-Signature: 311kdtjsba41f3d9fbp64enhu1bmi56b X-HE-Tag: 1740177081-532422 X-HE-Meta: U2FsdGVkX19iGnQL9UD2kW7aVM2cIqAVdWpDBsFMIbWEmEWhy9R/7ot75sYSeTbMUrNANFRkjdi0ebKtqr/iPLVddP5cnCNZ2fWftL/vOUVtc+DBVpQoSq87rl+4pe3zMO7j4fg6LnG6+wUHoNaaHGUJPMkyzPgBOXYkODyMrwyh5Hkv2FKCCC1Ur4wv7/aIPkI9BagrwIvnNYEjiWadEftuPbhoxseB/zXhtycWRKIMmjgaqrI0TQW7JI0eKnsnjeyP29Ajrk1y+V2g7QNVfirIzIQ7kAmstv/5J0Ni//ZFx2MCiABCfs0YOR2nL7hA8MzDzgQE9plnjPQuJdQrJc3yPYnwBamtvvfHqw2GKBfPPCzJCkFGGFGSVkRCvazmQpH6N3/xl4SEb2GrE4KICK+wg6m564DV5o0wRSwtnq7k1f/pNL2vsTzGIPxCjUFcuo1qTDR1aF6WyfARdOLy5nmdj2ENqt74LFuPMz4Xy0gvb6cnIIPZyJb5scAVfsmlNth3gZTq2RYODaNApdYlTdhkETsh6Qiz4REJeglOeTlNelpGhun+es4hDlMTIHXjtEZH/EraR4/4Hx7sKCZ+z0MS94xjAIUr3T0/DtMti6jRC6B1uo/1XbkAlQKc62lG9ZYtsw9xUkopYohF7IOKs9xngvPTMrLrnwGVBn2tJOiP2S0wj8xc14gmYuGOuaIZzY1hcjwrBQDo8q9pNmkQJnHcesnbbY8oIfmxTGiwxp8W51pM+kEzpIamKwpOBI9xTH7rYe94+Tx68QvS7sgB7nAl5rXDbj7QKAoPy9Y3tp/t9b044z4hMeIqd9nv89D4Hh7+/C7lPaDjeygvTp+ghr1pOMNpKIY9o110AKQSsH8fSK8cHrW77eP5LlfxKZjcV/HKNnrXFbFbn9N+Fx+8+Kp5d9W0UkmSshuSaQKhMa0VDzQe6smOkb4dd5haH/r2iQFVkWv4S0amZnKq2eA zXSQU1h7 hR+mAMkdC7yoliP1mYMG7w2pWkE5A0yv+je9Y7OIWDcHF4Vr/DMqE6sR+mxtBTAlb6JyMjwTSm3ex/g91EC6cvDPwwzTIUoo36Y/b5nzke98Q72A68U+UbN0iBFqPWwdSRXoUVr6pSULVw0UEtZoQjgNBFNowL2Nh69SZtivE+dc5z+xeM81ioj71npf+ZZMCAZ4wNGvXFvNNBVXNFXT0VXEC20pCEng2at4yenPaXffTSSs0CdP7UcuUgvV6eq3l8v8yQj/L/UWbCW07b+Tw1RSO9+tDFPAHb0ODtwBVvP7RYxjscvNn5jTKnA== 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 b96be8576cbc..1ce981ce6f48 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1566,11 +1566,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; } @@ -1588,11 +1588,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; @@ -1688,7 +1688,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 @@ -1705,11 +1705,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); @@ -1730,7 +1728,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; @@ -1776,11 +1774,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); @@ -1892,7 +1887,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); @@ -2002,12 +1997,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);