From patchwork Fri Jan 31 09:06:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13955142 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 74242C02193 for ; Fri, 31 Jan 2025 09:08:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C40B2802A2; Fri, 31 Jan 2025 04:08:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 074CC280299; Fri, 31 Jan 2025 04:08:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E57942802A2; Fri, 31 Jan 2025 04:08:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C35A4280299 for ; Fri, 31 Jan 2025 04:08:14 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6FE388098C for ; Fri, 31 Jan 2025 09:08:14 +0000 (UTC) X-FDA: 83067170508.21.BB321D8 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf18.hostedemail.com (Postfix) with ESMTP id 8BBE61C0014 for ; Fri, 31 Jan 2025 09:08:12 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=AvOVwnVZ; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf18.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.173 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738314492; a=rsa-sha256; cv=none; b=UEt3lU77mkCwp4S7j+Y1k9EkeOEbppBFegY5LQXIYGm1pqeuVaGTwM/MwYpegtS8+HduyT Siel8Eh6PKDAk4PwJnFZ1NZ9eKOGy9KFwix0YQZGwrw3EDK4ksIiRHy3PC2lcSHzFyIF0Y k7IYMIu/2IbIsoM36mxduqAXh9xwGlM= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=AvOVwnVZ; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf18.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.173 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=1738314492; 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=YsBQiXFOiDXEVopox/DL4fBI7MjKngkv74+OC5sfCK8=; b=AZWJxnm/p7e6loIkA5JQkomNgn2/DlzCzEqX6KqVKwXmKCs71Hq3ucXJ5RWV1WOwAiKuuS +6UD1dzekMPu/gkOAS+fT3fdvh3c6Gls4Kcpv5Fx2IsTwSSz+VMVIeLtBqX2hTS2lS0OY0 CnMyuyvnK3KIPkUeLwiDfrZnkwTIGCk= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2164b1f05caso30026115ad.3 for ; Fri, 31 Jan 2025 01:08:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1738314491; x=1738919291; 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=YsBQiXFOiDXEVopox/DL4fBI7MjKngkv74+OC5sfCK8=; b=AvOVwnVZsiCbKZPp4vnAXQs3Aq1hvlVla79J0Mc6csu8nZX4WO5zcEBZUE30g0rEeP jULULugHlgMHmPtIUvGvXe+Y4yLKulN/5y2PFqE1U2OcBBn5hA+BN5ybbpnzskNat8nn 8osbSkHmZq5aWL5MppL6JrkNo7S9BeGpTLQnk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738314491; x=1738919291; 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=YsBQiXFOiDXEVopox/DL4fBI7MjKngkv74+OC5sfCK8=; b=vb2iUSnSnc5iPFSEeRYL1KoPYxa3gFwQnVzR3/SwPRWuVYY8x9pvN85Rvkp8NSL3T1 67dmzAfUPnQMISXUpkedjAg3jfis28zTMYwkxDYvR/YARv+wzSNThl5O01TRpye8x4Gp Kuweh/sU9XmIs47dlVfwXizMdudNSI8sqynrwAQhLTbWYXNQj1bBAsfzMlpW42L+Mv6E bjxlosr63brkBvLan+PaJvVM1gviMPqJqBvidm2CoDtHMtqoerMPHVsOGh2aT/rtbO+K IB5bgg/ida0Ktv9tmHbAM7BPXhU+DLpDDb8w7f4hxiDag5owc7oya3lqGUBdiNgapI1w qZLQ== X-Forwarded-Encrypted: i=1; AJvYcCWvlfB45RK05zxZYKk4cR+5B7FL6bmCrp6XvOlDfFFseJcxPKPvcgURG7lygF5txxtG+sJVI7Irvw==@kvack.org X-Gm-Message-State: AOJu0YyqhuJ7v9ErN6RmO+CPMfbNqdYdm9We6LmLiUldn9eVS2oUgzLv o94D27/9r93pxdjSpU/feNmZ/tyxPF6tNjqADdVVVa+A/rIqMqc+h8tNVhjuNGFF028/BlXbYBo = X-Gm-Gg: ASbGncup/DcVnA4nYwExEb03ctTYFFRtwaOMgvaQsZYB+CQTOxZYSUs7JdjtzDnZxlg TimLzlVqSDCY/WpOpKpeFSKo1okF7TNCqvc808DARqF2XyjycAYBPRVj5FInamisH3irN4hfbJ/ eyqM3+K0n3Bo2apMAVGJs93+vnxL4azu6uS759iProDfwkNxAuBiKR2WADCSZ5dXEh2vZVWxsHs Q722ECaOUm4vNIRk6gLnZ/Qn7ulTkANtc6cahj+eVTnGAgYyMgsTDzYYXlhFYV4eW0SWSIuBMSY UGZwZJs0k53hKTOvUw== X-Google-Smtp-Source: AGHT+IENlfyVLhUqijJuU7j/zhaZph0w7819UX7xL0oXUri1pMuVzz1XrUZpnmESTer0aRPTpzNpUQ== X-Received: by 2002:a17:902:dacd:b0:216:50fb:5dfc with SMTP id d9443c01a7336-21dd7c3cddemr135410395ad.9.1738314491281; Fri, 31 Jan 2025 01:08:11 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:c752:be9d:3368:16fa]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21de33032dbsm25983505ad.191.2025.01.31.01.08.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 31 Jan 2025 01:08:10 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv4 16/17] zram: switch to new zsmalloc object mapping API Date: Fri, 31 Jan 2025 18:06:15 +0900 Message-ID: <20250131090658.3386285-17-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.362.g079036d154-goog In-Reply-To: <20250131090658.3386285-1-senozhatsky@chromium.org> References: <20250131090658.3386285-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 8BBE61C0014 X-Stat-Signature: 9nu94f3q6kei1pa3adq9r5co5jxjibg3 X-HE-Tag: 1738314492-237157 X-HE-Meta: U2FsdGVkX188qZPVN8ALxP8l5p52Yrs2sOffies52I+oDs4XKiTVLcD4bwwi9BRqj1Y14C2IweT1BzSYil5aqdR7wo3Cp/5Fo9Vm9hdBRsFX7Hx7ZwuUZjfgbESdxf/ZO2ovIpOMm3WYP5ez9nzBup8wFZiqArJ1ZqpdveUrvzEy5zzjIZOEVRnoF0cDZ6gRUSgtoYrbTCPgnBtYi5/SLCSSpCiQFhRrZgNAtlBDsUhEgz6gmaRtiRyrp7LgEdgqHEVZ/44KME/35a13wA8IGdle+yYAStey6G6247DyLrKmPWvi0zSe9bdxQHimoZD1mCiK0O1lL7yQHgP2/jGDBrOWc7rJUuknAbv50jmDwHDyNWX6cxSCp3aOItGiCop1mNlxvovID/Fapb4os+gep3UHe1fxoGG+SVIvrA7n0FEijiXSQ+UYkKzXw8FlraJepmoX9jDeD5wiRd+7sm03aKl/M6ZXw6Y6X7gyuYxjn8vNlVN0b2Pxe7A3bt07n9I/qOmR7QAih8550WbiGEgpR9mQNZMOfc+v4h0V/zCMl2OI5eteOiHzhDeP6WxbwMTVwPNrsdMGAaXk1rV8m9hwUcMiCnr2SUZ2nZn9OC5D3IcM6GsDV6LjocpA41/OHbCbVSZlXNeDUFfmuChai2JO9qPHv2gp017XxYTzlISyWrCdBpcwoZ99Kk5DWKr10jIQ83fq9Z9pl1hJMLclOurw9WCgAmnhZuz1Br7L95c0F5Sz9EsKGsqggm2ztTmd1Sxjnp8tSaZ2feSmtWj89ixeAgHpS1nsb9KbnrTKFZUnQZVGIfPU1UZbBDJlcuJLoHoScJ1W4CFve7Rs6vHwToy4t1eW8HL7BOvGKqXFehtxvt8y1bqt7LBrqHER5/M7aBVvbGrn6LOk/r2/6FTK6/YiDHWoYAVPcKeslXtQhhs9KOCj1OsqrBYKi9DCLIXTFk8lHH6LC27/73C7+FVt7ke wB5bwA2M UFNk/LMM8c9W9BK9Hedn/xaccJY0Ex7HhccQGVmmJLBiTyXq8MqMfN2L34vepgzpLkrJ1sT9UD5LWzSC9KZp+NyNwxD0UO99bq5AHwej+0EGd+Rku/yh6frCF6rxAgRu1NP+EKbpQoUvlZqnvG8u+4L2xH4QZ7nJ0WmUacCn9ObeVKYEjGeeDVMCydFnkjFxnSmwS9whz9GcHtb98unLdcSEi+zgdE5jxTojLtOwxjAL6V1KkOK30Djj9QtDYLI0kFXT5UihK3uPwm04chcAPQfEwkyhorQz5tgfmMtJXgZEizqPBGLTcIawkCQ== 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 efd5919808d9..675f2a51ad5f 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 *strm) { comp->ops->destroy_ctx(&strm->ctx); + vfree(strm->local_copy); vfree(strm->buffer); kfree(strm); } @@ -66,12 +67,13 @@ static struct zcomp_strm *zcomp_strm_alloc(struct zcomp *comp) return NULL; } + strm->local_copy = vzalloc(PAGE_SIZE); /* * allocate 2 pages. 1 for compressed data, plus 1 extra in case if * compressed data is larger than the original one. */ strm->buffer = vzalloc(2 * PAGE_SIZE); - if (!strm->buffer) { + if (!strm->buffer || !strm->local_copy) { zcomp_strm_free(comp, strm); return NULL; } diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h index 62330829db3f..9683d4aa822d 100644 --- a/drivers/block/zram/zcomp.h +++ b/drivers/block/zram/zcomp.h @@ -34,6 +34,8 @@ struct zcomp_strm { struct list_head entry; /* 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 cfbb3072ee9e..f85502ae7dce 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1553,11 +1553,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; } @@ -1575,11 +1575,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(zram->comps[prio], zstrm); return ret; @@ -1675,7 +1675,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 @@ -1692,11 +1692,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_write_lock(zram, index); zram_set_flag(zram, index, ZRAM_HUGE); @@ -1717,7 +1715,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; @@ -1760,11 +1758,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(zram->comps[ZRAM_PRIMARY_COMP], zstrm); - zs_unmap_object(zram->mem_pool, handle); zram_slot_write_lock(zram, index); zram_set_handle(zram, index, handle); @@ -1876,7 +1871,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; handle_old = zram_get_handle(zram, index); @@ -2000,12 +1995,9 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, return 0; } - 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(zram->comps[prio], 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);