From patchwork Wed Oct 26 11:29:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13020476 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 32F0EFA3741 for ; Wed, 26 Oct 2022 11:30:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0CAE8E0006; Wed, 26 Oct 2022 07:30:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A46648E0001; Wed, 26 Oct 2022 07:30:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 712FD8E0006; Wed, 26 Oct 2022 07:30:19 -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 5DDEE8E0001 for ; Wed, 26 Oct 2022 07:30:19 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 339B5AB666 for ; Wed, 26 Oct 2022 11:30:19 +0000 (UTC) X-FDA: 80062882158.14.94E138E Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by imf25.hostedemail.com (Postfix) with ESMTP id C3AFEA0020 for ; Wed, 26 Oct 2022 11:30:18 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id 128so14498759pga.1 for ; Wed, 26 Oct 2022 04:30:18 -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=GHzCyKbWb+aU+sZGmdZ8m8JVMN9OaN+P/JFQjaIcOqo=; b=CLe/xD6MM8eGCn9K4ey1Id/4Y+RMm1UdxlSXb3Af8TSUSccKm0tWe/dZMBkT5nF2IM A+QXB7pCZKWwzYs63P+o//k4SjonuoD+Fp7NpqTPITOrM+7tz5g8IEUOkFgA5jS1wFCh 9VyRUexk961XMuPn8A2B9UzeZWIYfAFCwoFTY= 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=GHzCyKbWb+aU+sZGmdZ8m8JVMN9OaN+P/JFQjaIcOqo=; b=rTaSAIGYwp3yotdXXEwsV1GG5wLsXH/Glfx0w8ikHHtVFSYIHLvhmPN9Lb+GlAzJer M+o2K7q1BD2w4+c5a7HiHYrriKDbXFQ8xhc8Ff02bIEIKC6QNmt5eLXLwagSxDwi13Xc QvhefaB6mqR7WrsYgBy4y2clvbhXhUBFLBU0r5ev1sCWQVbd9giVPtwJ4tPEG0Y/1+QL iZxwh6NrjZpPKRS8L9ICxB+wxOJPTBiXAOy63L4DbMHzWdhbjjP1sN/DdkMO+alk6q5D ViOcZI0z8dGx6ujwSubKEvUcD41dos7ZyvEXZNIpgnlhHFYd3eYnfIhUm0Nloy3RZhNh QhLQ== X-Gm-Message-State: ACrzQf1ShtMrDdTVJ0eSCQ/oP9NxjS66gET0bSvpSd+AElXFb5tJiDgP ZnwAdx6v8wUIvoMrzBZeSVsrYw== X-Google-Smtp-Source: AMsMyM4BWeM8jHJpkgsFmswC5yJ7118tu3F2MKu7Jf8wLzddpHW/5TBtizge9YhVHpepNv2F+HCBiw== X-Received: by 2002:a63:454d:0:b0:43c:e834:ec0 with SMTP id u13-20020a63454d000000b0043ce8340ec0mr38246206pgk.270.1666783817832; Wed, 26 Oct 2022 04:30:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 04:30:17 -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 3/9] zsmalloc: move away from page order defines Date: Wed, 26 Oct 2022 20:29:27 +0900 Message-Id: <20221026112933.4122957-4-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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666783818; a=rsa-sha256; cv=none; b=npSk5KIIELyDksaug226RAAYk/5J4AWumUG2os35hhpTiSDbgfx/3LDG1EcCIgGuvqSZzH jR59XyOy4+88T//knH1Dw8i9PYYHaNzLA+leCfFatAVJs/I0kixb20u+VkXtEcoIGdAyV5 GLay4jmdSkyvkRpPzUcl7C5swaA8lH4= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="CLe/xD6M"; spf=pass (imf25.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.215.172 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=1666783818; 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=GHzCyKbWb+aU+sZGmdZ8m8JVMN9OaN+P/JFQjaIcOqo=; b=cqQiq7evV3tkNMs2/6ZZwia6kEzmLl8JrgGwFpI93bcuaiNAz3fpIGFEVH/obntRh5ddV3 Sk91JnxAGpkUgrLPGHVyifc7QoAV+cLVdm9pc+XzOsC6igFHtE7pge/RAzeOQKYSpFxf4w 2KIp/M3mvtsISiBOBppyQJRGwoaSqI0= X-Rspamd-Queue-Id: C3AFEA0020 X-Rspam-User: Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="CLe/xD6M"; spf=pass (imf25.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.215.172 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam04 X-Stat-Signature: jo3tx3p8pxbasad3j9psjs86qu863axf X-HE-Tag: 1666783818-785651 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: There is no reason for us to require pages per-zspage to be a power of two. Rename macros and use plain limit numbers there instead of 2 ^ N values. This will let us to have more tunable limits. Signed-off-by: Sergey Senozhatsky --- include/linux/zsmalloc.h | 16 +++++++--------- mm/zsmalloc.c | 4 +--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index 6cd1d95b928a..b6b8654a2d45 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -33,17 +33,15 @@ enum zs_mapmode { */ }; -#define ZS_PAGE_ORDER_2 2 -#define ZS_PAGE_ORDER_4 4 - /* - * A single 'zspage' is composed of up to 2^N discontiguous 0-order (single) - * pages. ZS_MAX_PAGE_ORDER defines upper limit on N, ZS_MIN_PAGE_ORDER - * defines lower limit on N. ZS_DEFAULT_PAGE_ORDER is recommended value. + * A single 'zspage' is composed of up to N discontiguous 0-order + * (single) pages. ZS_MAX_PAGES_PER_ZSPAGE defines upper limit on N, + * ZS_MIN_PAGES_PER_ZSPAGE defines lower limit on N. + * ZS_DEFAULT_PAGES_PER_ZSPAGE is a recommended value. */ -#define ZS_MIN_PAGE_ORDER ZS_PAGE_ORDER_2 -#define ZS_MAX_PAGE_ORDER ZS_PAGE_ORDER_4 -#define ZS_DEFAULT_PAGE_ORDER ZS_PAGE_ORDER_2 +#define ZS_MIN_PAGES_PER_ZSPAGE 1 +#define ZS_MAX_PAGES_PER_ZSPAGE 16 +#define ZS_DEFAULT_PAGES_PER_ZSPAGE 4 struct zs_pool_stats { /* How many pages were migrated (freed) */ diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index bc377e5d3417..d4f68fba746b 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -74,8 +74,6 @@ */ #define ZS_ALIGN 8 -#define ZS_MAX_PAGES_PER_ZSPAGE (_AC(1, UL) << ZS_MAX_PAGE_ORDER) - #define ZS_HANDLE_SIZE (sizeof(unsigned long)) /* @@ -2215,7 +2213,7 @@ struct zs_pool *zs_create_pool(const char *name) if (!pool) return NULL; - max_pages_per_zspage = 1U << ZS_DEFAULT_PAGE_ORDER; + 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;