From patchwork Thu Oct 27 04:26:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13021575 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 1009EC38A2D for ; Thu, 27 Oct 2022 04:27:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0CF18E0007; Thu, 27 Oct 2022 00:27:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 995A78E0001; Thu, 27 Oct 2022 00:27:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 85F498E0007; Thu, 27 Oct 2022 00:27:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 77EE98E0001 for ; Thu, 27 Oct 2022 00:27:09 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4D1D040FF6 for ; Thu, 27 Oct 2022 04:27:09 +0000 (UTC) X-FDA: 80065444578.10.E35A503 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf02.hostedemail.com (Postfix) with ESMTP id DAA648003D for ; Thu, 27 Oct 2022 04:27:07 +0000 (UTC) Received: by mail-pl1-f170.google.com with SMTP id c2so207034plz.11 for ; Wed, 26 Oct 2022 21:27:07 -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=ZXAqqjDk6mAz2KU4pc8JUXu1b5D+3y6f+8lsfEOMErU=; b=WngvKc8vcBYMk1kZ5arHHYitYLIPzMf9lvgsPMzCnmgpIOkw/9/8hqJ7boohJPjK84 1/GpQJvSc9hWAZAbj89XueIUHcvodWbahm+jty7rdLIhluMQy7c2Agh3CZZ8EztEsHT5 xkqhhdRhVa3ztF3+mmlNK9my9cEQZaqSq6j54= 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=ZXAqqjDk6mAz2KU4pc8JUXu1b5D+3y6f+8lsfEOMErU=; b=EzNFLsaatV9BK4aO6GaMv6JML/3hdvVGem/ykwsaSbdhckWszBzXewHfKtXucUaFvR 6hV9j7Yc9zuy2LkV/zyOsPMPz2gJcsx4oWsPdplx+D0Gb0fkRks7XypIXNLZgpsv3VtW UZnrWa1PDOMS4K2rY++UQ0tfl9biNF+txbZKJImQSFJwPkv46HYoAcvPz5OTULIK0GWZ G4YkgRXuQE9bMIDefGtFEtf99psV3D780m89cIJ8KJ8+Ae76D8p+WSGO2ZDGU0F9To9Q LhGoDHsVQ9qnQiwqMsGyOKoRnJUCTdDuwo5Hfe9vWl9AbxyanrixOKJI0boUm9MwAXjV /roA== X-Gm-Message-State: ACrzQf3N9cT2i0WkdLcjp5ag4q/fu00Uzc187dyzGWandy5cb9WUcOn2 rjNZ8bEoS2XTqqgBhwfcrN8AEnkfetTITw== X-Google-Smtp-Source: AMsMyM7PNp0OP2QcmW90+E2XrzDzR0wbvfLWMoR4FKeUYoOPqf84Z//D7HEkMOLtbVS2Ygqpvg0hAA== X-Received: by 2002:a17:90b:1b0b:b0:20d:7c31:e75d with SMTP id nu11-20020a17090b1b0b00b0020d7c31e75dmr7711106pjb.101.1666844826902; Wed, 26 Oct 2022 21:27:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 21:27:06 -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 4/9] zsmalloc: make huge class watermark zs_pool member Date: Thu, 27 Oct 2022 13:26:46 +0900 Message-Id: <20221027042651.234524-5-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=1666844827; a=rsa-sha256; cv=none; b=4wy7z6BtRmaCWi6I+aWfLHiFss6YUlPJIB373482RCtvjX7+4rcwemw9aDv0330VAiWZRh v0VjvFGcl5ehip6T7WqYCwOhZRDh/EnqlJSLYNypre67UyDXC0HvznOOAcMDiQMBiXUWC5 aB4y5zG+sLzooWaCrw2OqtJem+eW91Q= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=WngvKc8v; spf=pass (imf02.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.170 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=1666844827; 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=ZXAqqjDk6mAz2KU4pc8JUXu1b5D+3y6f+8lsfEOMErU=; b=kIVikWZ6l1Wogjc97eIzLy+jj5w6U8eQV3/gAIXt3RPvf+Frw5p3rqCMiCimntQJlL421M edRLreVU76rOSi88iHacROLfuqzClSBy/lzx1XboQPrflXr5Rdbq7DYbRR4pP1WbxIW0Td Mn2oAD7Q50slX2sA6Wy5rl3fqIgR+bw= X-Rspamd-Queue-Id: DAA648003D X-Rspam-User: Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=WngvKc8v; spf=pass (imf02.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.170 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam04 X-Stat-Signature: qm3puh5oanpxb5efhayu8akbsuu1yxih X-HE-Tag: 1666844827-392557 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000012, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: We will permit per-pool configuration of pages per-zspage value, which changes characteristics of the classes and moves around huge class size watermark. Thus huge class size needs to be a per-pool variable. Signed-off-by: Sergey Senozhatsky --- mm/zsmalloc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index d4f68fba746b..cab8080e2fc6 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -178,7 +178,6 @@ static struct dentry *zs_stat_root; * (see: fix_fullness_group()) */ static const int fullness_threshold_frac = 4; -static size_t huge_class_size; struct size_class { spinlock_t lock; @@ -227,6 +226,7 @@ struct zs_pool { u32 num_size_classes; u32 min_alloc_size; + size_t huge_class_size; struct zs_pool_stats stats; @@ -1350,7 +1350,7 @@ EXPORT_SYMBOL_GPL(zs_unmap_object); */ size_t zs_huge_class_size(struct zs_pool *pool) { - return huge_class_size; + return pool->huge_class_size; } EXPORT_SYMBOL_GPL(zs_huge_class_size); @@ -2264,8 +2264,8 @@ struct zs_pool *zs_create_pool(const char *name) * endup in the huge class. */ if (pages_per_zspage != 1 && objs_per_zspage != 1 && - !huge_class_size) { - huge_class_size = size; + !pool->huge_class_size) { + pool->huge_class_size = size; /* * The object uses ZS_HANDLE_SIZE bytes to store the * handle. We need to subtract it, because zs_malloc() @@ -2275,7 +2275,7 @@ struct zs_pool *zs_create_pool(const char *name) * class because it grows by ZS_HANDLE_SIZE extra bytes * right before class lookup. */ - huge_class_size -= (ZS_HANDLE_SIZE - 1); + pool->huge_class_size -= (ZS_HANDLE_SIZE - 1); } /*