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: 11547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp23829wru; Wed, 26 Oct 2022 21:31:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6yCUmsZjvisC/aPY59zA0fp0NztolMb1lJBcDGhJVzTyIeCsdbO1oBXGjSuysWAYa6lML5 X-Received: by 2002:a17:906:8473:b0:77b:efa8:50e4 with SMTP id hx19-20020a170906847300b0077befa850e4mr39951172ejc.250.1666845064637; Wed, 26 Oct 2022 21:31:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666845064; cv=none; d=google.com; s=arc-20160816; b=oGllC+Gx5riXSzmixtQFC/8sDf08mwLVIC/o/y48hl0VfcAhA3m8/93I7VQYo6PBV6 ca0iCUuWvqe16QV6xd7XqXQcxYP47x0PPWHXJshroYU6+ltpzr9JWxwRYG1pm/JcC4WO qjHNFqOrq0R+Znq89DXm0xTgbmk/9lkG5HIi/UKF6Vz7xYZwsgtb4ghldhNkExdEUt4G 9/trN+l8Za9krJrv9b9Z65k+D21PHSGYbUwrW50UFFgtaVNBk9vhVp1t579wHLKgYxE+ uDL5vM7I80WCC1GsF5XNVY1tUJAAcnLPmCiC6DdEydcQQCBYV7fN4SWuj3bAripBW5zU vBAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=J+4diO4tSVOFVgnXFSt8zIWx9H1y7/ENZOnwMcOSb2Q=; b=nv4FUrk+xMy6DAk2ggCfwcdE+G8EC2NswE4VO7NKtKu6Hy5AHhn4jrvXLH1/ny6kov W8kDYPI6lGrp7Zk9W4dpKpGUsS316t7dOpXBkTTTvPN4HAprBJy7mrB7G3/ZHIAlgzuW r6vYt/e3jrwHsYt2UZ3V27uijadePCow8ZDRwu2RXM+Xu2XdzObeBLeVdlgqyiQ+UV9q OxtL4IF3r8bwFYOs5l7C+TT9kPl5cwCXfe/RXoDUzqirLM2WG8xQBtniYPkOaqSDEBFq D8HdI+Uh/1ZRQy7eJURiBeh7WBKmCr9sSbxWBwCXWW9cvilohD1f2PwxZKctDlUw26gv dWzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cn9fO+L4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sh12-20020a1709076e8c00b007a7d37e4681si367594ejc.845.2022.10.26.21.30.40; Wed, 26 Oct 2022 21:31:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cn9fO+L4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234350AbiJ0E10 (ORCPT + 99 others); Thu, 27 Oct 2022 00:27:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234187AbiJ0E1Q (ORCPT ); Thu, 27 Oct 2022 00:27:16 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2282140E5F for ; Wed, 26 Oct 2022 21:27:09 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id l22-20020a17090a3f1600b00212fbbcfb78so5088118pjc.3 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=Fi3K0M0GAxGrqWwpCX/HEV0E0cTpRQ1Xoo+e44qfOIqTowgg+LqlyWwYhe+sbiRvtj Q5bjbRZDRoK8SVCNZ4r2tqMUB3Wr1EFfuBENV6ESi/OmtOwCeOlObh4s8V9usxT6xGbu f9klD52ISJpXa5sJy59ddqehJjqZxp+3VPeF/fAHww4g3Z0WDLc93mSzpb4UpeQkuZK6 v3vW/yy6YSdD0Yuq9kG4aQpXEem5Zbs2+vUqhJ9ixLiCFQRNkjHu3oZ7T8/w9WPJPlDO 5JW7e4pzU+cQ5+LVR4TMSm5zeM7SoW+aHRoc5KfEpLVTCy1BDk5AdCEFRQcrZmFkn4Bw SKVA== X-Gm-Message-State: ACrzQf2ss4YY0WT9VTBArd0IcRaojXAQnaObCQbl2/aknGpjlQVnZuIF QBMs2m0bhsz3ggUC/bytI+2H2Q== 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 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747813730331385038?= X-GMAIL-MSGID: =?utf-8?q?1747813730331385038?= 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 */