From patchwork Wed Oct 26 11:29:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13020480 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 9E04AC38A2D for ; Wed, 26 Oct 2022 11:30:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 36A4C8E0009; Wed, 26 Oct 2022 07:30:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F3E28E0001; Wed, 26 Oct 2022 07:30:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 146AD8E0009; Wed, 26 Oct 2022 07:30:27 -0400 (EDT) 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 022C38E0001 for ; Wed, 26 Oct 2022 07:30:26 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C7CE480EF5 for ; Wed, 26 Oct 2022 11:30:26 +0000 (UTC) X-FDA: 80062882452.19.5F325E7 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf10.hostedemail.com (Postfix) with ESMTP id 67072C0037 for ; Wed, 26 Oct 2022 11:30:26 +0000 (UTC) Received: by mail-pj1-f52.google.com with SMTP id v4-20020a17090a088400b00212cb0ed97eso1817024pjc.5 for ; Wed, 26 Oct 2022 04:30:26 -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=/LEdREXOiedl6vGVYMbQ82TGs+PZXFhY4wbRwwr21TI=; b=Diy7j3zktq4e7C7/lyeuqCeK7BfLCaiBNFf2nJojM3QB89B7f5aq+y1t1VA20KUzOY yeKlCET8FKVMHH3kBYSAGSjnQftjzXKWAbPtt2+8V3gnuK5deEjzkSyb0ltFbhK6FVVi 3wYMvNtD34QgEmWLWPgsTpRLVUJpfnNaQLHvU= 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=/LEdREXOiedl6vGVYMbQ82TGs+PZXFhY4wbRwwr21TI=; b=euWjPAY5ZYhgK5dr54hSdcXGaVkx4a94wqPbHGbF66PkoKAMjbtyyrdltB01k8rk/Y N6M25QRJAKP9VKM79dgy/x7Fz8mnk6LltqRyl3Kw0iRKEnCt+Dn0YqrVGAODWPeRC316 wm/yXjAr1+VsnjgYamtOL3E1iycgvxAJAgJAivMl6+1JkWZ9XMcV+hAASFqBwjMMBtWv 88/B/mou/TXtBC1PmJ/wMNSpYM9pCNd2TAMeT9sEYy8rYK/LkTbBnmscyT3JLdGL3veN o3nJknGT6foTE8gk3ykSOR21Yp8nJ9SJPOec7qXCmUW6p8Vz97aY6YkF0FXgZD16UfKq vn4w== X-Gm-Message-State: ACrzQf1cXX177M9JSsQd21G6OPh3K2JCgNALzV8KURKAY/WozpGPevud 3lQ7brdG9Cic2lVuY4iSE0R8HevVKIVB7g== X-Google-Smtp-Source: AMsMyM5XykL394b/cMRoH8PiC+zYAvFHEs2rAXP3rffUv7No/GN7zNGte3+h61TZM+ydy0TLZK8q6Q== X-Received: by 2002:a17:903:124c:b0:184:cb7e:67c5 with SMTP id u12-20020a170903124c00b00184cb7e67c5mr44025630plh.117.1666783825473; Wed, 26 Oct 2022 04:30:25 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:749c:f7f5:1a8e:d0be]) by smtp.gmail.com with ESMTPSA id x127-20020a626385000000b005627868e27esm2814919pfb.127.2022.10.26.04.30.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 04:30:24 -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: [PATCHv2 6/9] zsmalloc: pass limit on pages per-zspage to zs_create_pool() Date: Wed, 26 Oct 2022 20:29:30 +0900 Message-Id: <20221026112933.4122957-7-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.0.135.g90850a2211-goog In-Reply-To: <20221026112933.4122957-1-senozhatsky@chromium.org> References: <20221026112933.4122957-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Diy7j3zk; spf=pass (imf10.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.52 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=1666783826; a=rsa-sha256; cv=none; b=JH0Ad5B/C3fWUim7KP1nbJofcXfrHwD5ypuezjDAP2aEDMidcrTefk8D1M1QcXLaUdXNJ/ 76OESNVgJs+QXhb+VxQPpVVrZYX1Gr5flKLgC/jsX9p8QoJeomG+o4U+UmmyvvnOuhcYHT lW6POfAX9pmgsAAsPvYokPmHwOGtuWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666783826; 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=/LEdREXOiedl6vGVYMbQ82TGs+PZXFhY4wbRwwr21TI=; b=eGdwt1KpDxv21UMxgXtDUDlzI9D49wU9omuVAOxqvNYbTjeBq5CpkkgdYXeH6u9Gk3+5xp ircy1rr2ZEBDg5J18ldTPjtSFZcN3DJika0V8bLTMMHNGLDaTFydG7qYrLZqTbR0NmGF4Y rgEVvPFywoOcEYva6mGGJhS/AolbCN0= X-Rspamd-Queue-Id: 67072C0037 Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Diy7j3zk; spf=pass (imf10.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.52 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam02 X-Rspam-User: X-Stat-Signature: 9wx9ux7qh4pfujhcj6a9765m9k9o7dsw X-HE-Tag: 1666783826-648096 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: Allow zsmalloc pool owner to specify max number of pages per-zspage (during pool creation), so that different pools can have different characteristics. By default we pass ZS_DEFAULT_PAGES_PER_ZSPAGE which is 4 (matches the current order 2 zspages limit). Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 3 ++- include/linux/zsmalloc.h | 2 +- mm/zsmalloc.c | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 90b0c66bbd5b..bec02f636bce 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1247,7 +1247,8 @@ static bool zram_meta_alloc(struct zram *zram, u64 disksize) if (!zram->table) return false; - zram->mem_pool = zs_create_pool(zram->disk->disk_name); + zram->mem_pool = zs_create_pool(zram->disk->disk_name, + ZS_DEFAULT_PAGES_PER_ZSPAGE); if (!zram->mem_pool) { vfree(zram->table); return false; diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index b6b8654a2d45..ebd1ff3e8115 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -50,7 +50,7 @@ struct zs_pool_stats { struct zs_pool; -struct zs_pool *zs_create_pool(const char *name); +struct zs_pool *zs_create_pool(const char *name, u32 max_pages_per_zspage); void zs_destroy_pool(struct zs_pool *pool); unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t flags); diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index cab8080e2fc6..7465a45495bf 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -366,7 +366,7 @@ static void *zs_zpool_create(const char *name, gfp_t gfp, * different contexts and its caller must provide a valid * gfp mask. */ - return zs_create_pool(name); + return zs_create_pool(name, ZS_DEFAULT_PAGES_PER_ZSPAGE); } static void zs_zpool_destroy(void *pool) @@ -2195,6 +2195,7 @@ static int zs_register_shrinker(struct zs_pool *pool) /** * zs_create_pool - Creates an allocation pool to work from. * @name: pool name to be created + * @max_pages_per_zspage: maximum number of pages per-zspage * * This function must be called before anything when using * the zsmalloc allocator. @@ -2202,18 +2203,20 @@ static int zs_register_shrinker(struct zs_pool *pool) * On success, a pointer to the newly created pool is returned, * otherwise NULL. */ -struct zs_pool *zs_create_pool(const char *name) +struct zs_pool *zs_create_pool(const char *name, u32 max_pages_per_zspage) { int i; struct zs_pool *pool; struct size_class *prev_class = NULL; - u32 max_pages_per_zspage; + + if (WARN_ON(max_pages_per_zspage < ZS_MIN_PAGES_PER_ZSPAGE || + max_pages_per_zspage > ZS_MAX_PAGES_PER_ZSPAGE)) + return NULL; pool = kzalloc(sizeof(*pool), GFP_KERNEL); if (!pool) return NULL; - max_pages_per_zspage = ZS_DEFAULT_PAGES_PER_ZSPAGE; /* min_alloc_size must be multiple of ZS_ALIGN */ pool->min_alloc_size = (max_pages_per_zspage << PAGE_SHIFT) >> OBJ_INDEX_BITS;