From patchwork Sat Mar 25 07:14:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 74833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp243827vqo; Fri, 24 Mar 2023 23:57:45 -0700 (PDT) X-Google-Smtp-Source: AKy350a/wLrs9wxXM/iYlvS0BlxwsuduxRhsNSDOnaaVZfQ2g4HEU48OjPiMvD3n+HjVHL12uy+3 X-Received: by 2002:a62:1b85:0:b0:62a:4fbd:60fe with SMTP id b127-20020a621b85000000b0062a4fbd60femr5296876pfb.12.1679727465420; Fri, 24 Mar 2023 23:57:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679727465; cv=none; d=google.com; s=arc-20160816; b=cvlS6N8EYTs9jX30Rb3zwFogzLL8zSIVkPrhWMlT7JApapyQ4mnyQACdnFHb7vKZEl vTjW0cHsiE6S4zE7+vf11RA0J8qKZo44dS1dxSCY02FkWRNL4UIVdMCcsXLuSLkUGeau FOToUF8d0uZeXkMOVx/LMhLxSBusMZxB30dZNYbsGN+ZpLN/vpTXIVu44kEugvAtCfJU Pn86fT9swNFVZJS+Xy6NLn4OxUGOzEK87uD3A2Naa0vQHnDYMkgLNqP7vlvWF9gEtpTe rKxoo/Wsxo0C5sPMFwxsEQlMIRhMrUpjjvChyLIedNNTTBvQYG/ZIyqFN8PWgWq0WF3V Mr1w== 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; bh=URgX+Q5L1x4pDLOmz0xPXrHJ48HPro6M5y2A0Xr3JOQ=; b=XUHi7+JnVt7GOfRocIlfbllJmpLyh5VnItYSwGU2Uv998GsPI5b1fCh1eGsoUpH5Tq OUZ0luB1DI0LEJjj+3H0Nv807/JaXHK8zdIJetzA7KBZXbwXcKC2DcGLHcpQZmmOimEB TfLcDy9lMF2BW/jUkC5yuXHAayABTY4keANZIxBF5OqvxtOOdtxUqYsSFVq9lCZaWZbn 48h/sx+ByTPpQbHb2GkIm4/Sc76+oZviarm/gld/hXGho6DhOI0aZFDdyxUoiagoQ/pU 1LTn7zyc6nn8pfH02ICXs6YmNsNvESwBRW7eB9xjFpXtSy07iGE6JgXPLCxYORA+Z8/H tZGg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v63-20020a638942000000b0050bef4fcb58si23427199pgd.320.2023.03.24.23.57.33; Fri, 24 Mar 2023 23:57:45 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232130AbjCYGYe (ORCPT + 99 others); Sat, 25 Mar 2023 02:24:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbjCYGYa (ORCPT ); Sat, 25 Mar 2023 02:24:30 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5648415173 for ; Fri, 24 Mar 2023 23:24:25 -0700 (PDT) Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Pk88j12lTzSncZ; Sat, 25 Mar 2023 14:20:53 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpemm100009.china.huawei.com (7.185.36.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sat, 25 Mar 2023 14:24:22 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v7 1/4] mm/zswap: remove zswap_entry_cache_{create,destroy} helper function Date: Sat, 25 Mar 2023 15:14:17 +0800 Message-ID: <20230325071420.2246461-2-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230325071420.2246461-1-liushixin2@huawei.com> References: <20230325071420.2246461-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761321906495920358?= X-GMAIL-MSGID: =?utf-8?q?1761321906495920358?= Remove zswap_entry_cache_create and zswap_entry_cache_destroy and use kmem_cache_* function directly. Signed-off-by: Liu Shixin Reviewed-by: Christoph Hellwig --- mm/zswap.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 2f0ebd8bc620..6d2b879f091e 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -272,17 +272,6 @@ static void zswap_update_total_size(void) **********************************/ static struct kmem_cache *zswap_entry_cache; -static int __init zswap_entry_cache_create(void) -{ - zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); - return zswap_entry_cache == NULL; -} - -static void __init zswap_entry_cache_destroy(void) -{ - kmem_cache_destroy(zswap_entry_cache); -} - static struct zswap_entry *zswap_entry_cache_alloc(gfp_t gfp) { struct zswap_entry *entry; @@ -1489,7 +1478,8 @@ static int __init init_zswap(void) zswap_init_started = true; - if (zswap_entry_cache_create()) { + zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); + if (!zswap_entry_cache) { pr_err("entry cache creation failed\n"); goto cache_fail; } @@ -1538,7 +1528,7 @@ static int __init init_zswap(void) hp_fail: cpuhp_remove_state(CPUHP_MM_ZSWP_MEM_PREPARE); dstmem_fail: - zswap_entry_cache_destroy(); + kmem_cache_destroy(zswap_entry_cache); cache_fail: /* if built-in, we aren't unloaded on failure; don't allow use */ zswap_init_failed = true; From patchwork Sat Mar 25 07:14:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 74830 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp237438vqo; Fri, 24 Mar 2023 23:36:08 -0700 (PDT) X-Google-Smtp-Source: AK7set9k55PjmGa77kSo6GGx7WQ4X5EE5GBa0zsTsJE1Bv6RB99HAEiSUA8oF5oO48Og83mRIW09 X-Received: by 2002:a05:6a20:7a92:b0:dd:b941:5d99 with SMTP id u18-20020a056a207a9200b000ddb9415d99mr5080979pzh.51.1679726168462; Fri, 24 Mar 2023 23:36:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679726168; cv=none; d=google.com; s=arc-20160816; b=cUR8iSeQYmaPYBcqUCvUB9sMhSD3Ny4y9NCdaQqEUIsYfQZ8tjVvd99G9N6IxBunB1 DQZlzc6kFDW/pTjAQe+WChD3GAUanyZ8B/jqgfcV/7UGs0XaPt0aI4O7M6dbnBa9mAFd DEELoLyM26LPtunLX599l3mD6HdK2lvcN3lItOWxYUQORjordJC1c8vH1nZqErCNlVLz ivRpkUC+jWGsjjLBNOTdVzhCB3KBGiP3FqpMDaS8fcru/pfff327GKrkRij9CHf38Qqe +Hpy02EZuD2a+4XhpklBybEtK1Ux5Ny7QH6ym9xmA1Fn6U+C8xTf+K3fATEpZn1mbQa+ T2zA== 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; bh=OS250J6TXvkToKRxclBAM04Jr9676l/aHHCd5o+9dwY=; b=YUgnGZlSCzFG7F7aXjnhl0Aegka972N8ZgcT23klMOIFhVR0WLUp2vJjeQ/Wu+CXnA qhRligJjPeyVVGc74CuMJBA8vpqBj/DLkzX2OFjdXAYHRJq5H7wCE61Qswr3NuSlhbQz 6ayjw8EM+7obZ8qqNBWso60Ya2jDVUZ3WGqOe0gU4vaA7l7GpTMWePUY3qDWFvCT6m3h yrEDRY5VQcg5i3Ce+wCtZXsjB41h6m9+eAlyvx3xs9eR54so9e5pXuGAXcxB6KTtGRm1 E+JuRjGBJS8kmVQ2/Aus9g+wuIJ0nbFXjb3mbWBSI7FlVzrLPQp2B5/5co5EYYBewS+C N9Ew== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f204-20020a6238d5000000b0062a4fb857easi5360053pfa.366.2023.03.24.23.35.56; Fri, 24 Mar 2023 23:36:08 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232240AbjCYGYn (ORCPT + 99 others); Sat, 25 Mar 2023 02:24:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232021AbjCYGYb (ORCPT ); Sat, 25 Mar 2023 02:24:31 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D1FA1517B for ; Fri, 24 Mar 2023 23:24:26 -0700 (PDT) Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Pk8941xq1znY0n; Sat, 25 Mar 2023 14:21:12 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpemm100009.china.huawei.com (7.185.36.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sat, 25 Mar 2023 14:24:22 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v7 2/4] mm/zswap: skip invalid or unchanged parameter Date: Sat, 25 Mar 2023 15:14:18 +0800 Message-ID: <20230325071420.2246461-3-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230325071420.2246461-1-liushixin2@huawei.com> References: <20230325071420.2246461-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761320546652496667?= X-GMAIL-MSGID: =?utf-8?q?1761320546652496667?= If parameter is invalid or no change required, return directly. This can reduces unnecessary printing. Signed-off-by: Liu Shixin --- mm/zswap.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 6d2b879f091e..d2adc1ffe47d 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -761,15 +761,15 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, char *s = strstrip((char *)val); int ret; + /* no change required */ + if (!strcmp(s, *(char **)kp->arg) && zswap_has_pool) + return 0; + if (zswap_init_failed) { pr_err("can't set param, initialization failed\n"); return -ENODEV; } - /* no change required */ - if (!strcmp(s, *(char **)kp->arg) && zswap_has_pool) - return 0; - /* if this is load-time (pre-init) param setting, * don't create a pool; that's done during init. */ @@ -864,6 +864,15 @@ static int zswap_zpool_param_set(const char *val, static int zswap_enabled_param_set(const char *val, const struct kernel_param *kp) { + bool res; + + if (kstrtobool(val, &res)) + return -EINVAL; + + /* no change required */ + if (res == *(bool *)kp->arg) + return 0; + if (zswap_init_failed) { pr_err("can't enable, initialization failed\n"); return -ENODEV; From patchwork Sat Mar 25 07:14:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 74835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp243941vqo; Fri, 24 Mar 2023 23:58:10 -0700 (PDT) X-Google-Smtp-Source: AKy350ZUOCA1skAm40Wy+CmIZFTJ2a2Max/12FQF/696gurLeeWiaUrBVjv7Rq3JrJKdOlLNUxXT X-Received: by 2002:a17:902:eecc:b0:1a0:6bd4:ea78 with SMTP id h12-20020a170902eecc00b001a06bd4ea78mr4630386plb.31.1679727489812; Fri, 24 Mar 2023 23:58:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679727489; cv=none; d=google.com; s=arc-20160816; b=m2OKRR5SiBf1JKVIdgfaqEz7UxlIn0FSF13OPRYV75htaxObSVAjZJB4Xlbel7LWGs GuQAJBhBGiM/GdMYc6vVNwpHKpb5kA7RcmtVmtUcB7aXfWVXTbVuj0y3NtEumfM9uWlN LESyajKTG2Ij5iOda7omUlLMsYxhsGI3GSHRcFhxMVTCDBs1l7ixzp+ChMKg/PmAauD4 MaRmZUTz1vEmkpW5STqgebB9ak39yKJiIQhVFQq+JwJSyU+kGK5flNHtU9vtfl174Feo RtbzdBT5N14/ENRVOWlwHjiZorG16/NS5EbTUYEBnwsY5M4dx6W7sDKrcruKTULzIDac u/Nw== 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; bh=U7CqCTNQHay2aKHt+sTOdDg19RKnNNYVYFzk04pG8XQ=; b=ZJZjMaHKIXHQYBQKBPcSizGskuYDD5pfk9vxCs5BLoAM6M5QxkVpiVdZ9yE95HPcDU 97nuL6QRxfY/OC6G/5sGUuqkdwJ5EWH8vA50gsDYiviZ8ykFJL1HLx6AM9MVB8K4rm+P s9pD0Z9NMrd2fonUbVcZIaP+rzO30QFBBuXkyf1mh/3N7A/+ZvwVG10/PZKqbooJMpJA ilVL14nqm/ffCD4eNdappDIJvYy21M62rR2NPsWgzQtnM/PHkNzY8TiOhA+cxiwWqy2K ln+Z0r7hj/AMPPLJQa2OhfhBKwj1nD3KJZJlrq5TL70aGC4f4PZvEZhY9yTAaV4Yc8iv 7vcQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v63-20020a638942000000b0050bef4fcb58si23427199pgd.320.2023.03.24.23.57.57; Fri, 24 Mar 2023 23:58:09 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232154AbjCYGYi (ORCPT + 99 others); Sat, 25 Mar 2023 02:24:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231473AbjCYGYb (ORCPT ); Sat, 25 Mar 2023 02:24:31 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C865115541 for ; Fri, 24 Mar 2023 23:24:26 -0700 (PDT) Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Pk8CW3lQwzrVts; Sat, 25 Mar 2023 14:23:19 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpemm100009.china.huawei.com (7.185.36.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sat, 25 Mar 2023 14:24:23 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v7 3/4] mm/zswap: replace zswap_init_{started/failed} with zswap_init_state Date: Sat, 25 Mar 2023 15:14:19 +0800 Message-ID: <20230325071420.2246461-4-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230325071420.2246461-1-liushixin2@huawei.com> References: <20230325071420.2246461-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761321932342267266?= X-GMAIL-MSGID: =?utf-8?q?1761321932342267266?= The zswap_init_started variable name has a bit confusing. Actually, there are three state: uninitialized, initial failed and initial succeed. Add a new variable zswap_init_state to replace zswap_init_{started/failed}. Signed-off-by: Liu Shixin --- mm/zswap.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index d2adc1ffe47d..9eda48c8b8dc 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -214,11 +214,11 @@ static DEFINE_SPINLOCK(zswap_pools_lock); /* pool counter to provide unique names to zpool */ static atomic_t zswap_pools_count = ATOMIC_INIT(0); -/* used by param callback function */ -static bool zswap_init_started; +#define ZSWAP_UNINIT 0x0 +#define ZSWAP_INIT_SUCCEED 0x1 +#define ZSWAP_INIT_FAILED 0x2 -/* fatal error during init */ -static bool zswap_init_failed; +static int zswap_init_state; /* init completed, but couldn't create the initial pool */ static bool zswap_has_pool; @@ -765,7 +765,7 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, if (!strcmp(s, *(char **)kp->arg) && zswap_has_pool) return 0; - if (zswap_init_failed) { + if (zswap_init_state == ZSWAP_INIT_FAILED) { pr_err("can't set param, initialization failed\n"); return -ENODEV; } @@ -773,7 +773,7 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, /* if this is load-time (pre-init) param setting, * don't create a pool; that's done during init. */ - if (!zswap_init_started) + if (zswap_init_state == ZSWAP_UNINIT) return param_set_charp(s, kp); if (!type) { @@ -873,11 +873,11 @@ static int zswap_enabled_param_set(const char *val, if (res == *(bool *)kp->arg) return 0; - if (zswap_init_failed) { + if (zswap_init_state == ZSWAP_INIT_FAILED) { pr_err("can't enable, initialization failed\n"); return -ENODEV; } - if (!zswap_has_pool && zswap_init_started) { + if (!zswap_has_pool && (zswap_init_state == ZSWAP_INIT_SUCCEED)) { pr_err("can't enable, no pool configured\n"); return -ENODEV; } @@ -1485,8 +1485,6 @@ static int __init init_zswap(void) struct zswap_pool *pool; int ret; - zswap_init_started = true; - zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); if (!zswap_entry_cache) { pr_err("entry cache creation failed\n"); @@ -1527,6 +1525,7 @@ static int __init init_zswap(void) goto destroy_wq; if (zswap_debugfs_init()) pr_warn("debugfs initialization failed\n"); + zswap_init_state = ZSWAP_INIT_SUCCEED; return 0; destroy_wq: @@ -1540,7 +1539,7 @@ static int __init init_zswap(void) kmem_cache_destroy(zswap_entry_cache); cache_fail: /* if built-in, we aren't unloaded on failure; don't allow use */ - zswap_init_failed = true; + zswap_init_state = ZSWAP_INIT_FAILED; zswap_enabled = false; return -ENOMEM; } From patchwork Sat Mar 25 07:14:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 74829 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp236713vqo; Fri, 24 Mar 2023 23:34:02 -0700 (PDT) X-Google-Smtp-Source: AKy350YXuDY0DJzubKYZxOmaxlfVvYJh8BM98jSUgXG7Y1ni4zc1dARRiHujLCk3e2qM4lMuTgZS X-Received: by 2002:aa7:96b0:0:b0:626:24b2:cd6c with SMTP id g16-20020aa796b0000000b0062624b2cd6cmr5770585pfk.7.1679726041998; Fri, 24 Mar 2023 23:34:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679726041; cv=none; d=google.com; s=arc-20160816; b=zSrnrJ4OLDy5ADsUKrLi5/GXksJe9X1r1Esz9XOTAVGHSn57qfhIZagPI2D4groPZi QMHFgvnYyQmsHJ9j/YdlkDnXGfQ2CZBUAo5WRLrss+dWYG0dtdyS9z9jkSg6O0haQBji bUe4F7UTy4km8/RhLOSHdA/vGDJlAviwGfSrgtujCHJQnpPOXW4erd0JavJQDQ/BdfU8 oBm4GD8DHePaK9CUBWjxRotJfC0zfE9YLwH/wrnyk80LXqCxvZeUiuYoBpIhnXW/gtYg 0cjwvR5JTkVTr+wX5XACKnVqypAONRrVUgvdFVX2WOwZX0thpu7Tc31vpHzG14/wDJtq bMVQ== 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; bh=uZrLSQ+dlYXGdfXxFGzfu38Xy78bR4XTsSHXkxqHFuc=; b=SVx4KR+Yd7CQtm2Y3Q+fI52xJo9wP8TVDef+5xQSUY309dMIYzpQ1LU0cInw2mCNcr 3dufWb1qXnJgLXyZTIFUzT7HZjNtOQ7yBFIsrmz/QtVvi3ySNQWKx8dzZFhtn9kZc/k1 COlyLTcnrBZINWnmfkGHt0aKRaw1h+sTqKGUOPUdBfEHoCTnAfk77nUPZD+RPsiFyrhw 2M3puwF+r2SuZZ31d6sSGESFx2edoGtjatUhMq11h52VTBVUvEqyCzijgXYPIJ6HNhEo rqukEFV2iATp9/60gRYhTr3ZrXv0HTAuz8Zl8nVH8VZaVOZFjxgZy4TGeQUFitx1uFf7 WAeA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f204-20020a6238d5000000b0062a4fb857easi5360053pfa.366.2023.03.24.23.33.49; Fri, 24 Mar 2023 23:34:01 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232183AbjCYGYk (ORCPT + 99 others); Sat, 25 Mar 2023 02:24:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231659AbjCYGYb (ORCPT ); Sat, 25 Mar 2023 02:24:31 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 756C41517A for ; Fri, 24 Mar 2023 23:24:26 -0700 (PDT) Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Pk8CX0DgNzrVx1; Sat, 25 Mar 2023 14:23:20 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpemm100009.china.huawei.com (7.185.36.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sat, 25 Mar 2023 14:24:23 +0800 From: Liu Shixin To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , Nathan Chancellor , Christoph Hellwig CC: , , Liu Shixin Subject: [PATCH -next v7 4/4] mm/zswap: delay the initializaton of zswap Date: Sat, 25 Mar 2023 15:14:20 +0800 Message-ID: <20230325071420.2246461-5-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230325071420.2246461-1-liushixin2@huawei.com> References: <20230325071420.2246461-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761320414089872758?= X-GMAIL-MSGID: =?utf-8?q?1761320414089872758?= Since some users may not use zswap, the zswap_pool is wasted. Save memory by delaying the initialization of zswap until enabled. Signed-off-by: Liu Shixin --- mm/zswap.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 9eda48c8b8dc..af98bd8d4b79 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -81,6 +81,8 @@ static bool zswap_pool_reached_full; #define ZSWAP_PARAM_UNSET "" +static int zswap_setup(void); + /* Enable/disable zswap */ static bool zswap_enabled = IS_ENABLED(CONFIG_ZSWAP_DEFAULT_ON); static int zswap_enabled_param_set(const char *, @@ -220,6 +222,9 @@ static atomic_t zswap_pools_count = ATOMIC_INIT(0); static int zswap_init_state; +/* used to ensure the integrity of initialization */ +static DEFINE_MUTEX(zswap_init_lock); + /* init completed, but couldn't create the initial pool */ static bool zswap_has_pool; @@ -652,7 +657,7 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) return NULL; } -static __init struct zswap_pool *__zswap_pool_create_fallback(void) +static struct zswap_pool *__zswap_pool_create_fallback(void) { bool has_comp, has_zpool; @@ -765,16 +770,22 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp, if (!strcmp(s, *(char **)kp->arg) && zswap_has_pool) return 0; + mutex_lock(&zswap_init_lock); if (zswap_init_state == ZSWAP_INIT_FAILED) { pr_err("can't set param, initialization failed\n"); + mutex_unlock(&zswap_init_lock); return -ENODEV; } /* if this is load-time (pre-init) param setting, * don't create a pool; that's done during init. */ - if (zswap_init_state == ZSWAP_UNINIT) - return param_set_charp(s, kp); + if (zswap_init_state == ZSWAP_UNINIT) { + ret = param_set_charp(s, kp); + mutex_unlock(&zswap_init_lock); + return ret; + } + mutex_unlock(&zswap_init_lock); if (!type) { if (!zpool_has_pool(s)) { @@ -873,14 +884,23 @@ static int zswap_enabled_param_set(const char *val, if (res == *(bool *)kp->arg) return 0; + mutex_lock(&zswap_init_lock); + if (system_state == SYSTEM_RUNNING && zswap_setup()) { + mutex_unlock(&zswap_init_lock); + return -ENODEV; + } + if (zswap_init_state == ZSWAP_INIT_FAILED) { pr_err("can't enable, initialization failed\n"); + mutex_unlock(&zswap_init_lock); return -ENODEV; } if (!zswap_has_pool && (zswap_init_state == ZSWAP_INIT_SUCCEED)) { pr_err("can't enable, no pool configured\n"); + mutex_unlock(&zswap_init_lock); return -ENODEV; } + mutex_unlock(&zswap_init_lock); return param_set_bool(val, kp); } @@ -1440,7 +1460,7 @@ static const struct frontswap_ops zswap_frontswap_ops = { static struct dentry *zswap_debugfs_root; -static int __init zswap_debugfs_init(void) +static int zswap_debugfs_init(void) { if (!debugfs_initialized()) return -ENODEV; @@ -1471,7 +1491,7 @@ static int __init zswap_debugfs_init(void) return 0; } #else -static int __init zswap_debugfs_init(void) +static int zswap_debugfs_init(void) { return 0; } @@ -1480,11 +1500,14 @@ static int __init zswap_debugfs_init(void) /********************************* * module init and exit **********************************/ -static int __init init_zswap(void) +static int zswap_setup(void) { struct zswap_pool *pool; int ret; + if (zswap_init_state != ZSWAP_UNINIT) + return 0; + zswap_entry_cache = KMEM_CACHE(zswap_entry, 0); if (!zswap_entry_cache) { pr_err("entry cache creation failed\n"); @@ -1543,8 +1566,15 @@ static int __init init_zswap(void) zswap_enabled = false; return -ENOMEM; } + +static int __init zswap_init(void) +{ + if (!zswap_enabled) + return 0; + return zswap_setup(); +} /* must be late so crypto has time to come up */ -late_initcall(init_zswap); +late_initcall(zswap_init); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Seth Jennings ");