From patchwork Thu Oct 27 04:26:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13021576 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 69DD5FA3740 for ; Thu, 27 Oct 2022 04:27:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BE948E0008; Thu, 27 Oct 2022 00:27:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0700D8E0001; Thu, 27 Oct 2022 00:27:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2A5E8E0008; Thu, 27 Oct 2022 00:27:10 -0400 (EDT) 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 C95188E0001 for ; Thu, 27 Oct 2022 00:27:10 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7A03F81015 for ; Thu, 27 Oct 2022 04:27:10 +0000 (UTC) X-FDA: 80065444620.03.411244F Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf07.hostedemail.com (Postfix) with ESMTP id 2A7BD40009 for ; Thu, 27 Oct 2022 04:27:09 +0000 (UTC) Received: by mail-pl1-f175.google.com with SMTP id c24so212940pls.9 for ; Wed, 26 Oct 2022 21:27:09 -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=J+4diO4tSVOFVgnXFSt8zIWx9H1y7/ENZOnwMcOSb2Q=; b=cn9fO+L4ylQungziAbx0awEs0vb/rKJImh058JzWlfF+li8hh8QOCkIy7ev44qIVZl k59U8YOl63gc23DdX2UTbPMidbjb9WxTXcI/kNjWCc7ayygy6Erb5iJfC4lOgp4O1d0O /G3x/L16VlMAa5SzTaoytD/pyczoCa/jU8X3g= 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=J+4diO4tSVOFVgnXFSt8zIWx9H1y7/ENZOnwMcOSb2Q=; b=fcQG2AJjWiiR2OYS79DfkoFrcjuYE1CIkbirVwi0OvdbnUIYio1qVTXr9i64gD9sw7 BqbdXrgKsneVaDfLYT+B/RnIdsR0ssKlqS9QDe02LH08W2qU5oPohgGqMpUIHopgqRZ7 cEhuZ/GT8NAMnAiAVomZmCFSxuzj+kTrpL/pzHXwcDw1YkR5WFAUrQMuW5ZYE8DBKEeB 82o3lxl6Qdmdsu44DK6F8udhYUECoFq6u9ybOx1gq2RAlKRKZM9LM61FGgqgqjZgeERb 4X7MBTawXEER6PRyTzO564zcnwGusJsgwahzndMJqAayUj8ZWWn7UgfuxYhJPV4Qmg71 wP7A== X-Gm-Message-State: ACrzQf14KBZ4HgmlYJxtZcUqUxA6c7WQha5NEmofqxlJs67NRnRLpWN8 ffy5tRwhuv8/PEHivtsKvBWZPQ== X-Google-Smtp-Source: AMsMyM7v1jym/Cfi8DjTcdl/L23EwROOmnJ6NDSPAaf1P/bpFyCsr1yAR0pZjfjcTePtikPBXXdinQ== X-Received: by 2002:a17:90b:3b4c:b0:213:f05:6a8 with SMTP id ot12-20020a17090b3b4c00b002130f0506a8mr7907854pjb.108.1666844829155; Wed, 26 Oct 2022 21:27:09 -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.27.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 21:27:08 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCHv3 5/9] zram: huge size watermark cannot be global Date: Thu, 27 Oct 2022 13:26:47 +0900 Message-Id: <20221027042651.234524-6-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=1666844830; a=rsa-sha256; cv=none; b=19C4jo8muzB28vrgWWSCjIJZM6eX0ScV+LnEo+6l5pNndw4SH5rJsG+36Y8KBRWYiCXy1N QcbVnI+ql+F7kutC+fgqOeeQVNJuaU7nQZJfdWWql7il3UjGrxUx0+mG4gfpSMLB6lTNQe k3UV1JSgO+nFzw4yoteY+apepmDH9Gk= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=cn9fO+L4; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf07.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.175 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=1666844830; 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=J+4diO4tSVOFVgnXFSt8zIWx9H1y7/ENZOnwMcOSb2Q=; b=yZ7sN4XpE0gE6HvQaL5pLu1Lyg0wH92hoeM+s3J9INzX1EjHKxqWVUNroSkpiU/0s2YAie 3tlQTm7hHLfH+rDAddwbX+aDp5FyBf1WY3LzH+e53tVO+ZUBId3IXkNw3Tl7/ExFbsKBIc oDzcl9LCmg+co1uw+kqj6SM5V/KFhAY= X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 2A7BD40009 X-Rspam-User: Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=cn9fO+L4; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf07.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.175 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org X-Stat-Signature: xxeoiy8xx8r1p59d17cxynups6dd4ggf X-HE-Tag: 1666844829-407380 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: ZRAM will pass pool specific limit on number of pages per-zspages which will affect pool's characteristics. Namely huge size class watermark value. Move huge_class_size to struct zram, because this value now can be unique to the pool (zram device). Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 13 +++---------- drivers/block/zram/zram_drv.h | 5 +++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index fd31beb6491a..90b0c66bbd5b 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -50,12 +50,6 @@ static const char *default_comp_algs[ZRAM_MAX_ZCOMPS] = { /* Module params (documentation at end) */ static unsigned int num_devices = 1; -/* - * Pages that compress to sizes equals or greater than this are stored - * uncompressed in memory. - */ -static size_t huge_class_size; - static const struct block_device_operations zram_devops; static void zram_free_page(struct zram *zram, size_t index); @@ -1259,8 +1253,7 @@ static bool zram_meta_alloc(struct zram *zram, u64 disksize) return false; } - if (!huge_class_size) - huge_class_size = zs_huge_class_size(zram->mem_pool); + zram->huge_class_size = zs_huge_class_size(zram->mem_pool); return true; } @@ -1488,7 +1481,7 @@ static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec, return ret; } - if (comp_len >= huge_class_size) + if (comp_len >= zram->huge_class_size) comp_len = PAGE_SIZE; /* * handle allocation has 2 paths: @@ -1665,7 +1658,7 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, * in a way that will save us memory. Mark the object so that we * don't attempt to re-compress it again (RECOMP_SKIP). */ - if (comp_len_next >= huge_class_size || + if (comp_len_next >= zram->huge_class_size || comp_len_next >= comp_len_prev || class_index_next >= class_index_prev || ret) { diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 09b9ceb5dfa3..9d6fcfdf7aa7 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -120,6 +120,11 @@ struct zram { */ u64 disksize; /* bytes */ const char *comp_algs[ZRAM_MAX_ZCOMPS]; + /* + * Pages that compress to sizes equal or greater than this are stored + * uncompressed in memory. + */ + size_t huge_class_size; /* * zram is claimed so open request will be failed */