From patchwork Fri Feb 21 09:38:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13985089 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 B86DFC021AA for ; Fri, 21 Feb 2025 09:39:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4899328000A; Fri, 21 Feb 2025 04:39:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 43A04280008; Fri, 21 Feb 2025 04:39:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B33628000A; Fri, 21 Feb 2025 04:39:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0B7EE280008 for ; Fri, 21 Feb 2025 04:39:58 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C1352160CC0 for ; Fri, 21 Feb 2025 09:39:57 +0000 (UTC) X-FDA: 83143455234.15.FE16228 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf15.hostedemail.com (Postfix) with ESMTP id CB5A5A0009 for ; Fri, 21 Feb 2025 09:39:55 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=juPO7tpq; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.181 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=1740130795; 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=+7nX2BQHP+jBaMIBfki0Sibf1caPlu6CBS1i9yoAT5c=; b=MX5VirKIuSnI1YOLksDyHeO7a/d5GV/63htc15qAbp6GI4Re/1e8mCBUMZwNSOwo5qbQw8 67GL9RM2laqtYchhLiX90eo8e93Yn5ABWmymYbrjeYL9l0IRvlN6kZNrx/a2wC/Qi45I/Y etIAQFb6IU/lJv4El/f8wRFmujJymYw= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=juPO7tpq; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.181 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=1740130795; a=rsa-sha256; cv=none; b=7F85nZrVgYj889S5loEj/SsTOx0AE5nMsXuR433KJQNOFT8kNF0qg9lKrUsZ8yhWBs5UWQ N3XsyvOS8mUNjA2ZPxSvgqORsCiRoz+FEYMn+DK0FTqdQVykwtSqCgcegzy2208x8l5sCy BomWReFiz7ifxV1dRz59ypsfyCfnTbw= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-220f048c038so34297995ad.2 for ; Fri, 21 Feb 2025 01:39:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130795; x=1740735595; 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=+7nX2BQHP+jBaMIBfki0Sibf1caPlu6CBS1i9yoAT5c=; b=juPO7tpqxhHJ24gpgMkcH4t77rVhiK1/mC3EE1Zq6MN8QLxgDg7KvtNv33iNh66xJ4 t6wmzac7yRFqFS6J0JARs1vpkA3h0Vm/RO0syz2gg39/kPAwZAhp/rdH6Jmo7q51G6x9 SbuB/XGpcaW3CxijQZe18GjazNIdI2wmE8fRY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130795; x=1740735595; 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=+7nX2BQHP+jBaMIBfki0Sibf1caPlu6CBS1i9yoAT5c=; b=LyjImZnY1Q+xwTFgHOTISh/9IDuGOyc7nRGziVEuLoDM3yvQlt42hcBQWOS8yek6/1 UkSSJ0vvMAaYT+SQVtrSUhbyLKq2fZNKaDhfnIhuiQu3q0EdxyWbnZMzgFjIwCju4Jxr 8mIp8Mib/2zp7cLiDXVpjO9ljlYdzuCbtJ7x5N+8qa26iQ9Ct4lqjUjxGI530+JAgjxr Ai+wmsLAxU7+QViHoXVif1bouHqdNrlzANG08/cS1RKLlJcSnRd3ebb+VCk4vdh/8KOv SPFju7j+c3YONm4wXLrPlri+rdlO7zt+gbn2IM/kD8NTpq0cn0MVGlZNbZM95g2z9VB6 fgaw== X-Forwarded-Encrypted: i=1; AJvYcCUljAqMflPilTgcRMdJwB5coH2wHAwwEGuRpnE8d9f4LqyJXKr3qw+nGgT749Ie4/NabH8W28TCBQ==@kvack.org X-Gm-Message-State: AOJu0YyMle1h1yjBhgDqIp2B4cDjqB+gZSVAGJQwzdM1/muh+dIFIn6P YBASFnqOf8aKaXAl2eedqqcM9F5+37G/epk/ihAxvReDtmNtkOIl5E2Vcj0Iow== X-Gm-Gg: ASbGncs5qqXUq/cNXXEgkM/Uaah4vZXcb/+bf5ALDHbuQHcAp5D9RIWb02UtQvx05R+ JPIX1tYwWyarS0PXiwSzMRY4qQV1RXEqV69Gb8Y3oUBzodQYSpbSfGH+BzSHuiplptbBOF6d+S4 iYDQ+cE5pvTomF1OEpvUhXH133Y/CgwSgpcXXiUeyw4g6Fei01VY2Q7jcmHNBZfn8Q8cpNQp9gm mGxGCe9BGIOVNNjmcPIa16ztaEjZURA5GZ0qMR2G/FsvZiyUAQ8yDi+EcjjNt5CjjoZhXCqBgcG UU76tSrpNzFrVsRSN8G7KBiiPkQ= X-Google-Smtp-Source: AGHT+IHnX9TtZ5+pJhaRuJdP+fitjuJuk97DulMxTJbwpxnruxJEAlVkN6hwAldQgSdlVmFyU1l8KA== X-Received: by 2002:a05:6a20:9184:b0:1ee:c093:e24c with SMTP id adf61e73a8af0-1eef3dc4dfemr5404148637.30.1740130794756; Fri, 21 Feb 2025 01:39:54 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-adbf21517eesm12895632a12.13.2025.02.21.01.39.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39: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 v7 13/17] zram: switch to new zsmalloc object mapping API Date: Fri, 21 Feb 2025 18:38:06 +0900 Message-ID: <20250221093832.1949691-14-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: w17ehzr6o15skc8am4iy1o84tn6sdnbq X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: CB5A5A0009 X-HE-Tag: 1740130795-559775 X-HE-Meta: U2FsdGVkX1+xCVb5gmzEwRhWeu7OrkQttGDOOa4GdwQFnijxWhThdfPWVhMQL7Z6SMA/MNqMRiBbjSsoxXHGOaALIjpd2uoT7O7cFoq2vcxMJ8+P0P8/1PrZZ8ZWBgfIdELLsnTE5q2adwMBRUG4vlh5roVp4ARq3CXVSg6Ph+bDUk7WmnJcrd+EA7mVQjRoj5CrMUYZTtBAm5jYa8UiwTF/cWmy6shalk1I4CQiEOOuDiHbJuujKH38avZNuzVH4OEXpeHfw80iZOBaSkc3VJzLZDNJhMVPAcSF57RiaLVqmKmWmC6gVyJGPJqdeitT2HV6zTbrN2Nbv/+fUhX5XN+5SIT4nMLIT7g7mTFAEJxGbnxqDZOeQXlPS3HhcTLNMbNQ32uSD2GpOPVlFdS24K6cvDGjNBTOrG+BYcg9GNEFddwcp5cMSl3n9lRX/2LlDK0v28yOH3PaNoTSDMci1iBRahdGRhKNjsJYoKEtd7WOCjSaQ554ptiWnGnCs8GBEpHYc3zNMibuKf45hAS0L7NSrKRjvWxVNKifFgDf+FbWmP9rA3n90gBYuQ9fonO0ZKRG3aTXLuwkZQveYABqUoZr7ru5JHAtsSkxwzIhLHYNV2nq+oXjeP1uXQxTzGROztRhFPSLHemEDCfJP3ME6TbeWil274YD/4HXyxZT8coJXTQyadN4JMWBWbc8dkvOneRxm/2QGeB3YCvJV3bdOd9wN9/SPPZcqKexHYnGYOPA436Clr6HReCb9K0Pk0SRPOsFiKP5LFeYNyBfsLkbIDeQGPQhofMBzbzoydYcs3cH10EqXzAuZHWUdJbGBWJVGph8W+/jZr6W5hj85HjX3sP7zmPeZnL16oOgIb5ZfaFcAK6bIHOkrrLDy3kYFca0GZB/NyaFBZAMExUy9L+0eMqdMliX5Hm8BwY6OjmUb1cUetm0c7VOByW6Co3CiTqIggXFhe1qMmzsdYEn9lo aJ+97ykt G7ilgrSjwYqdN0aZ6tQAHFYz5P/CpTynUE67JHDdFVdaGZjRYjU7jn/KG6eLDYq04hyP+Df+dfRcjj0x0eU4OrpAe9VQGnGTZ8nYw6t5ryjJFJFNHOZlo9BIaTfANw9CGIodbgAVgqhyRaYkKhpPIuhbPwP5p8T9AxVW2Z8pP6/4Xlah8AGTJKITlr6mlTFxfeGy5cUZpWVcKUM3WTEU2igFESPPQUsMgopPUv069Q2Qr0G7IqMof45eQzCjVuHCFxjk952EGgobPHs8XMKmcfw1eqNQYCcpmhdrgZ+f2d7BDv4TRwhUsuZnkQg== 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 814e64f4ee38..47ccda207bf3 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);