From patchwork Thu Oct 27 04:26:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13021572 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 CD7D1C67871 for ; Thu, 27 Oct 2022 04:27:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B5A48E0003; Thu, 27 Oct 2022 00:27:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 43F468E0001; Thu, 27 Oct 2022 00:27:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 307838E0003; Thu, 27 Oct 2022 00:27:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2400D8E0001 for ; Thu, 27 Oct 2022 00:27:01 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EB43A80459 for ; Thu, 27 Oct 2022 04:27:00 +0000 (UTC) X-FDA: 80065444200.13.167EB5F Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf02.hostedemail.com (Postfix) with ESMTP id 9B5C08003D for ; Thu, 27 Oct 2022 04:27:00 +0000 (UTC) Received: by mail-pl1-f180.google.com with SMTP id 4so263024pli.0 for ; Wed, 26 Oct 2022 21:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=57/g83Q1A5B+7wYv3+Gd1tLG4FTDJnhj+xIMySGShWo=; b=LZs2JMXZj7KI645ET3ePzlYTovXfQcMuYjwdrOg5BaYkxa+fijxsky6kZpjuSMeQBJ BGkN2zAjC2aEEU+sHnEyYaqBqEMT2fIAi2bNnzs5itLbkhK39LWk6qQJg3L+YKJT1DY1 q0wrekK8aRmyK+zz13YXy8QchBMVywGgfKGjc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=57/g83Q1A5B+7wYv3+Gd1tLG4FTDJnhj+xIMySGShWo=; b=OkUwWcR90QHTNVklOnDmZN81ba9r361WaoST9/5qdMIqA6SQHSWvUvdx0effkDnzkm X3m/D0fdOs8IqaBGJnIwUifoX8ArC7/wXyGkvaAKw1TWVCnh6dz7ykjrcoDp0vtl0p+P 4EK4r7NeF7devMpx0JFs73A/+xY1yuvtKp0ZHCesR+gqCH+0/SV6Uhg4JOEoMMC2DiSQ NwZOat9sgouCsK4AMYIWUNo5CtaoqMTjho8zVCAhKFMwzXVFYEt2jOV6ILtgxFWF8XR/ GnWO2QUuk5juOHRI5wJOg1XH16MgA4bdNjzv3+fhYHXr+NDuJUmmRrZ6+4yiP5AptUgZ k53w== X-Gm-Message-State: ACrzQf34eX8uCNTiZUWeWN2fdHmRWUavYsx10vZb9WbTEfv8B/by2sdo F57MVVrIJ/LPw1/nPgMAC59q8A== X-Google-Smtp-Source: AMsMyM5PObH8+UVD6/TXg62DaefgWJnjzeH/HC6fFf1zxc0vCIYe8Ts+HBK8eTrV8813vgGH6x6wAg== X-Received: by 2002:a17:90a:bf11:b0:211:84c5:42d7 with SMTP id c17-20020a17090abf1100b0021184c542d7mr7800117pjs.122.1666844819541; Wed, 26 Oct 2022 21:26:59 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:30f2:4501:65fa:df12]) by smtp.gmail.com with ESMTPSA id w23-20020aa79557000000b00565c8634e55sm203140pfq.135.2022.10.26.21.26.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 21:26:59 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexey Romanov Subject: [PATCHv3 1/9] zram: add size class equals check into recompression Date: Thu, 27 Oct 2022 13:26:43 +0900 Message-Id: <20221027042651.234524-2-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.0.135.g90850a2211-goog In-Reply-To: <20221027042651.234524-1-senozhatsky@chromium.org> References: <20221027042651.234524-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666844820; a=rsa-sha256; cv=none; b=Y0XGa1D66bEXWI0uWOLN3NuYF0ryWSSx+/HwJvRcC0PITpB6FFWYxhIv+ewMIQJ0jekwzd M2uCG13n2gvLeQYCpNTk7zOdzflalnU3GjdXSHFkj/d5MtODRbEYdp8hvQdFnOoGKjVzRB TOY7jRS8z/1YaZMg7zxycW15fAec36U= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=LZs2JMXZ; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf02.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.180 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=1666844820; 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=57/g83Q1A5B+7wYv3+Gd1tLG4FTDJnhj+xIMySGShWo=; b=Qc9965hSjxWx0u+kf+KCss7/Ke+vmwh4D2Ci5DplMcAirL5cBoMK4ZdDvgevv0Omr5y9Qq SY/3aXo4DIUkfdiKuWj3q4S53jJ/fvDiVgmTfR6BrJtlO/bRjfje+i5RKEV7FRY3B/DFjA a935Y7LQpl3zhUJHcdTpvbYTgq7nihA= X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9B5C08003D X-Rspam-User: Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=LZs2JMXZ; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf02.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.180 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org X-Stat-Signature: q8bx4k5k5h41jtayjwm17uzqdufsgfi1 X-HE-Tag: 1666844820-272124 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: From: Alexey Romanov It makes no sense for us to recompress the object if it will be in the same size class. We anyway don't get any memory gain. But, at the same time, we get a CPU time overhead when inserting this object into zspage and decompressing it afterwards. Signed-off-by: Alexey Romanov --- drivers/block/zram/zram_drv.c | 5 +++++ include/linux/zsmalloc.h | 2 ++ mm/zsmalloc.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 364323713393..fd31beb6491a 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1632,6 +1632,8 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, unsigned long handle_next; unsigned int comp_len_next; unsigned int comp_len_prev; + unsigned int class_index_prev; + unsigned int class_index_next; struct zcomp_strm *zstrm; void *src, *dst; int ret; @@ -1656,6 +1658,8 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, ret = zcomp_compress(zstrm, src, &comp_len_next); kunmap_atomic(src); + class_index_prev = zs_lookup_class_index(zram->mem_pool, comp_len_prev); + class_index_next = zs_lookup_class_index(zram->mem_pool, comp_len_next); /* * Either a compression error or we failed to compressed the object * in a way that will save us memory. Mark the object so that we @@ -1663,6 +1667,7 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, */ if (comp_len_next >= huge_class_size || comp_len_next >= comp_len_prev || + class_index_next >= class_index_prev || ret) { zram_set_flag(zram, index, ZRAM_RECOMP_SKIP); zram_clear_flag(zram, index, ZRAM_IDLE); diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index 2a430e713ce5..a48cd0ffe57d 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -55,5 +55,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle); unsigned long zs_get_total_pages(struct zs_pool *pool); unsigned long zs_compact(struct zs_pool *pool); +unsigned int zs_lookup_class_index(struct zs_pool *pool, unsigned int size); + void zs_pool_stats(struct zs_pool *pool, struct zs_pool_stats *stats); #endif diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index d03941cace2c..065744b7e9d8 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1205,6 +1205,27 @@ static bool zspage_full(struct size_class *class, struct zspage *zspage) return get_zspage_inuse(zspage) == class->objs_per_zspage; } +/** + * zs_lookup_class_index() - Returns index of the zsmalloc &size_class + * that hold objects of the provided size. + * @pool: zsmalloc pool to use + * @size: object size + * + * Context: Any context. + * + * Return: the index of the zsmalloc &size_class that hold objects of the + * provided size. + */ +unsigned int zs_lookup_class_index(struct zs_pool *pool, unsigned int size) +{ + struct size_class *class; + + class = pool->size_class[get_size_class_index(size)]; + + return class->index; +} +EXPORT_SYMBOL_GPL(zs_lookup_class_index); + unsigned long zs_get_total_pages(struct zs_pool *pool) { return atomic_long_read(&pool->pages_allocated);