From patchwork Sat Jun 24 05:12:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 112410 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6215080vqr; Fri, 23 Jun 2023 22:35:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5h8eY2XpX45tJuMMAAWAOqOA8dGNxYYqUMZ0YVhk3eL59gij1xVzx232BG0bY6pqu6Z8Zq X-Received: by 2002:a05:6a20:3215:b0:125:c3f7:f85b with SMTP id hl21-20020a056a20321500b00125c3f7f85bmr3506397pzc.51.1687584928623; Fri, 23 Jun 2023 22:35:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687584928; cv=none; d=google.com; s=arc-20160816; b=Rp5wREXXOUGlRIVtKuzYI9UPLG1t4oE8ITBL0KctanBMaJBDGOLjg1CRJoxN6Z3a1p pGnQfyc509+WODzwRgQKON1FCMaHv6yt+BUcMNfX2BJB6Oek1QUDKtqiLx/6T97PS9P+ hr8Onz4MXMEc6DWkvBHxRB/8NH5edCzSjCEboLirGrfyk7CSLYbn0XC/iAYYWhZQFlIQ IBqRatMn+Q4NBXzUTnPzdiQGLqoFTAK9nuK5dhwBrA6Ze7oITz3uG+huirs77MHHMGCY dPkTP0zKc1TxfDcEGR1WXGCDR6Y346KMA2nDZJqZsHPeX0tipUkWTcYMLfU/oQC4kJgC T0Lw== 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=A39gdokmxlm4U38P/Zql/B/dp1bRrgyGGMBd2ncXVBo=; fh=MZNKlIBxhe6pBi83RurjUQhN2u766FnvBUFw+0Wf0N0=; b=rOPo5tqkEu2nmbtBWu4cdaJyG0QPcMotpBxuXbWY5inQup5v+dInoRBrJFRCfaeizp CVTl/mtsB0lJnG+la+ppRWcbDSW8/YFwBG9DOl8scFUGgA525kR1+ERpSa/KRL1qW8CC NPFo2B3tLSt+VYs+4m8lpFIpFOocyiXAMK9tFsm0IBIkHPtHk/KO4yWjJTH3efRtxHFK a28nBDDJ2jS9m4lTfmZBiZNN3DPONgj+pZjOzPw6upPu+njDlZieBh7v3B5oOYwJzeHX iiHF0UtSCooZipwpncpb+fJpeBcTXcW0YMnrVqG+yWqYS0jIvx4LX4aoFEcOiTEWs2xQ pDnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=LANh1sDQ; 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 bv6-20020a056a00414600b00666b7377d65si610614pfb.389.2023.06.23.22.35.14; Fri, 23 Jun 2023 22:35:28 -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=LANh1sDQ; 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 S231199AbjFXFbf (ORCPT + 99 others); Sat, 24 Jun 2023 01:31:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229667AbjFXFba (ORCPT ); Sat, 24 Jun 2023 01:31:30 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 668CB272C for ; Fri, 23 Jun 2023 22:31:29 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-25df7944f60so931541a91.2 for ; Fri, 23 Jun 2023 22:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687584689; x=1690176689; 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=A39gdokmxlm4U38P/Zql/B/dp1bRrgyGGMBd2ncXVBo=; b=LANh1sDQ0Cqew/nk2fWgtBz4HwaykMfnm7u6tguZ9kC8E+QeXfexEIVbVk2ZI1cxKA iQQ1M/FSjdcMGc/TD9zjcogPnBiT5Dm3/lo/jXUz2HCzhl0UochpEpS3Afhg5MXLPkzb UbOHYYKYV/58KxdqAgSLYHZjfLyRODgzI9/7s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687584689; x=1690176689; 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=A39gdokmxlm4U38P/Zql/B/dp1bRrgyGGMBd2ncXVBo=; b=WowbCru6yAG/A3YI7Oo4YssiUTrFS7hTgpNjv7aOYSfBwsWkX00xdZBHC56PIBJp+c o/tRisSg/bPKIyQ7EfpmsEoanwosys2fkAPV418UBiC/1GmVNkPffbOd20DZ344HO9lf +lPWCh07QIlMibvRJE1A1pvRi9vUpdfv5Cq/6QVNRXt9tpmJ6hZRNb1LzJWkr4/GmXhl iihi3PrKYbUNX80bc6jHcj307wqvhTFYd70GWxsHFdrP0tyf7PjgOygnBgB+QmgzqcUF oAOz2vRmWVroLzPkr6ClN7UqRXZ/oPN6RNjD2BooEm3xAAWdo5SGjdidOmeawrm+E1OC um4g== X-Gm-Message-State: AC+VfDw1e4jS2FVUOEJPuppXtmkX78Mh4BmdXOrSuk7LWDo2jasfBPbc HVEH7bySyz9/0qqd90bfH3zhtA== X-Received: by 2002:a17:90b:147:b0:25c:571:8670 with SMTP id em7-20020a17090b014700b0025c05718670mr22087582pjb.46.1687584688858; Fri, 23 Jun 2023 22:31:28 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:d7fc:8a97:4a18:6a18]) by smtp.gmail.com with ESMTPSA id 16-20020a17090a0c1000b002563e8a0225sm567069pjs.48.2023.06.23.22.31.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 22:31:28 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky , Alexey Romanov Subject: [PATCHv2 1/3] zsmalloc: do not scan for allocated objects in empty zspage Date: Sat, 24 Jun 2023 14:12:14 +0900 Message-ID: <20230624053120.643409-2-senozhatsky@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230624053120.643409-1-senozhatsky@chromium.org> References: <20230624053120.643409-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1769561053919048359?= X-GMAIL-MSGID: =?utf-8?q?1769561053919048359?= zspage migration can terminate as soon as it moves the last allocated object from the source zspage. Add a simple helper zspage_empty() that tests zspage ->inuse on each migration iteration. Suggested-by: Alexey Romanov Signed-off-by: Sergey Senozhatsky Reviewed-by: Alexey Romanov Acked-by: Minchan Kim --- mm/zsmalloc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 3f057970504e..5d60eaedc3b7 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1147,6 +1147,11 @@ static bool zspage_full(struct size_class *class, struct zspage *zspage) return get_zspage_inuse(zspage) == class->objs_per_zspage; } +static bool zspage_empty(struct zspage *zspage) +{ + return get_zspage_inuse(zspage) == 0; +} + /** * zs_lookup_class_index() - Returns index of the zsmalloc &size_class * that hold objects of the provided size. @@ -1625,6 +1630,10 @@ static void migrate_zspage(struct zs_pool *pool, struct size_class *class, obj_idx++; record_obj(handle, free_obj); obj_free(class->size, used_obj); + + /* Stop if there are no more objects to migrate */ + if (zspage_empty(get_zspage(s_page))) + break; } /* Remember last position in this iteration */ From patchwork Sat Jun 24 05:12:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 112414 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6229335vqr; Fri, 23 Jun 2023 23:18:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5qDdVOIvS1q/ePm3GbsfTcnenRQuehIlBFuBXtuAl6kylHIbRVWbue4cbN28nzNAb02bvM X-Received: by 2002:a92:d6d2:0:b0:341:c8db:c8d6 with SMTP id z18-20020a92d6d2000000b00341c8dbc8d6mr12569352ilp.22.1687587518840; Fri, 23 Jun 2023 23:18:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687587518; cv=none; d=google.com; s=arc-20160816; b=Tu/oEUzaDenV9EhCqX5JIhVhLU3IYFsIjDI6azXGyme+M7cfDDYtfv7M/2TR3oD2P/ JnjrrIFnTEqhduyFPQvjWzBkfoDEscwnyjNOD++UowOiN6BRgkacsHPyBhQFnBYZl6ZL Gub10peCj1cfllU32FvR22IBfzYFAKHZvkXegZGtQ14uerIZfaMtzWb2bg4u+y5wXU/T wizEK5y8hRWc6vTtCW5NxASWIl2vobQ25OAcGLa6PLh6yTN2UPthGXYVhRMqDCgEExau E6eg3tRM7p82xPnn0Oh2XQW8Imazv8RdcNmXZPpqJOrvYQ9sevHvIXpEXRGhf9CJU+MM fe+g== 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=JXozlQ7AGAAc+Nx/NUdVZ9+4KpO/wevqL//8Wl3bnA8=; fh=P133Y9g7Tn7h5nZ3sRbktjmxBfSwq4h947lDRKnjDeg=; b=HE5XoI2Psk0Fkwne/QqO6v8qsBvc00lZ+yPWq/rKB/ETyawJC5n+4b971R9RgzBk2m UGmG/FN5CO2WHrVww5WdU4QfAEWe/l4+sU4QNL8MXSoXZji9vvcaHwR/pi3qHpXwzsJb f7sZY+aHDsrVck3v5+nnwWDKl5EV5NMI8oUpgtp7NGxe2iQLbsiHMJVzEtB6cktRsQhx HoozmzcIcZamCYhbb0DOVjXInvGMOi2N+wrxw8hWxRKAa8lKQhm1mEGTnt5QugvCtZU3 Kp/jtzaHDORG1xJy2X5eSANOS6j9mneMBio4ob0wLfQNaXFk23fnu6gaWhIPMiNuquWm 0reQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=hEVV1PKn; 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 b6-20020a056a000cc600b0066879af7571si746671pfv.130.2023.06.23.23.18.16; Fri, 23 Jun 2023 23:18:38 -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=hEVV1PKn; 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 S231258AbjFXFbi (ORCPT + 99 others); Sat, 24 Jun 2023 01:31:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230516AbjFXFbc (ORCPT ); Sat, 24 Jun 2023 01:31:32 -0400 Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EA53272C for ; Fri, 23 Jun 2023 22:31:31 -0700 (PDT) Received: by mail-oi1-x22b.google.com with SMTP id 5614622812f47-38c35975545so1123520b6e.1 for ; Fri, 23 Jun 2023 22:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687584690; x=1690176690; 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=JXozlQ7AGAAc+Nx/NUdVZ9+4KpO/wevqL//8Wl3bnA8=; b=hEVV1PKnoqRDlkdskPail3UwTi3zNM443LUxpwYsTN8oCAj3XIMmoMXFJnsnxbV+DF wzOj3dtWSlkKaMPk+9t+QowWS3A47K6hiYh9dpNM6u2Wfey5nHSVhk3Ym5ox5sYyZzes K0dyi1ixw9OexMvrCK8P+ImImK/L+xRxsbVYI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687584690; x=1690176690; 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=JXozlQ7AGAAc+Nx/NUdVZ9+4KpO/wevqL//8Wl3bnA8=; b=KaGdV4zt/2+uH50VPwk65i0F93uGfBHVyeyKpgcrIgED5ixT/uq4AbjT0zGQPlZcxu O1oMcRcwq0iglQ57n6+p9hirlpjTguozG9HZvI2OmDqxHQjQtecwdQ0JA+r3H2xGOFsR JgWg0Ie+TTyBhduy5mO2v41yhTGEY6NP21jq/dIMcdD85uVNz/ECdUBusfn7w2hYv+Sz ZD9Q9wb16DoBiwcvtczwQzrI0xC22fQV2eZiWYPRgQW5yd+mdVHZpy0u2f1NP46fKZY4 VQX2MxfdpxZFB47dlhNHMkEt10e0W5Wy7RS6ppPDMytwhYnlRZyVDqsU/pZkDDScAokR EAlQ== X-Gm-Message-State: AC+VfDwD4zKzUdbwR8QIK/Q1cqVkjNGv55ha0L4MY391t0fmiGStC3++ vSmxcXktdC7lD+10lt9UjuiCgA== X-Received: by 2002:a05:6808:1524:b0:3a1:c0bd:c51f with SMTP id u36-20020a056808152400b003a1c0bdc51fmr270508oiw.28.1687584690736; Fri, 23 Jun 2023 22:31:30 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:d7fc:8a97:4a18:6a18]) by smtp.gmail.com with ESMTPSA id 16-20020a17090a0c1000b002563e8a0225sm567069pjs.48.2023.06.23.22.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 22:31:30 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv2 2/3] zsmalloc: move migration destination zspage inuse check Date: Sat, 24 Jun 2023 14:12:15 +0900 Message-ID: <20230624053120.643409-3-senozhatsky@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230624053120.643409-1-senozhatsky@chromium.org> References: <20230624053120.643409-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1769563769804146129?= X-GMAIL-MSGID: =?utf-8?q?1769563769804146129?= Destination zspage fullness check need to be done after zs_object_copy() because that's where source and destination zspages fullness change. Checking destination zspage fullness before zs_object_copy() may cause migration to loop through source zspage sub-pages scanning for allocate objects just to find out at the end that the destination zspage is full. Signed-off-by: Sergey Senozhatsky Acked-by: Minchan Kim --- mm/zsmalloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 5d60eaedc3b7..4a84f7877669 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1620,10 +1620,6 @@ static void migrate_zspage(struct zs_pool *pool, struct size_class *class, continue; } - /* Stop if there is no more space */ - if (zspage_full(class, get_zspage(d_page))) - break; - used_obj = handle_to_obj(handle); free_obj = obj_malloc(pool, get_zspage(d_page), handle); zs_object_copy(class, free_obj, used_obj); @@ -1631,6 +1627,10 @@ static void migrate_zspage(struct zs_pool *pool, struct size_class *class, record_obj(handle, free_obj); obj_free(class->size, used_obj); + /* Stop if there is no more space */ + if (zspage_full(class, get_zspage(d_page))) + break; + /* Stop if there are no more objects to migrate */ if (zspage_empty(get_zspage(s_page))) break; From patchwork Sat Jun 24 05:12:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 112411 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6224235vqr; Fri, 23 Jun 2023 23:04:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ65hJsEc+1pOipQgCkfyrUQPHPNOw7ouNituSyX4ucsal9g2pBPKmKBleRYVohIqYZZOfW3 X-Received: by 2002:a05:6808:8f1:b0:3a1:a5c0:6acb with SMTP id d17-20020a05680808f100b003a1a5c06acbmr3676573oic.43.1687586646770; Fri, 23 Jun 2023 23:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687586646; cv=none; d=google.com; s=arc-20160816; b=XXLDOd4Jdz04RLFwmmoh+PUEe5A6RoI5nzwhsr5SxHgR+p0wtpL3K7oyZ8yD9cumPc vlk8OAgJuEwOL+2R+FlQX3moxc9lJbZA0sv6+6z5EWZOP4dSckYlnH40b0Qdmw9XCl01 ahY+IQv5+XS+Gjx4d/NaLETgjnfuAPcvfClykqJ7/4pc+87QSzydUjj+eZ+V0QRUn6zH A4wkoV8hUB6PYzdkvvX+QZkgBaw0KQO3Io8bt30wkWwYkZMfrrkRuB+r7S4JZ3deIIuF CtPF+Xf8pnVe9QnHMnyRA2b3RZj/Qz6ko1clnX/cQ81dTApPIdyhZP33v5CnkKdsztJs 1tjw== 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=DWxKMGlhVIOcwxYZSkni1ma+NCE3p+LmC8CwV158uoQ=; fh=S61JZgf25Xc8qqB0cq8ZCuBU/2oSZqts0f/gOQPflFc=; b=JAhWa3Kp/cZhjRnjuo6tlOmOb5524k5hOMWyJVnfJxhGGguWQKbVnl44+sT3xwGemX xGWGGEovPWIzoGQvHwDwfOoZdQsu9UI0yXyRPYovsRN2hTCTOTFFC0V900WbI17Dqk0j 4O1W+ydvwfmZUnD+26UgJXQSPLTXmziGujpOL2zYcrejsbbpAUZE5lDYFqLvnKG97ZS+ cw9KKvC9Dd4T9NmmGX7V+U9BfxwjRbwHslot62Qx2xjONKg+6HyuugyR6DM0fpm6U0KZ jMGZX4USv6NI+zC6YLdRtH81e1VXTssWtglp8J2hClvb3DuDAbvuSLOl3DjEgqi1dA33 hhyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="Tkj6/aDL"; 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 139-20020a630291000000b00553b9b18877si915163pgc.677.2023.06.23.23.03.45; Fri, 23 Jun 2023 23:04:06 -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="Tkj6/aDL"; 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 S229741AbjFXFbm (ORCPT + 99 others); Sat, 24 Jun 2023 01:31:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231169AbjFXFbe (ORCPT ); Sat, 24 Jun 2023 01:31:34 -0400 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29D0326AB for ; Fri, 23 Jun 2023 22:31:33 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-7624af57b21so124706385a.1 for ; Fri, 23 Jun 2023 22:31:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687584692; x=1690176692; 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=DWxKMGlhVIOcwxYZSkni1ma+NCE3p+LmC8CwV158uoQ=; b=Tkj6/aDLrxhyMZp9C0Bu7YwtXXituRwejp04Q9FvaCfS63ZOBmOGbRv0zf+BfnHFn3 Dm3Y+hAKYvuBGfNyxiguJGE5Drz60p9JekBkkqhLQ2R6o3wYXZ5geKHjrtuZ9xwR6qDB 5A84oWan6OPS9WS8PXeYJtB6IXqRpOLT3EcjY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687584692; x=1690176692; 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=DWxKMGlhVIOcwxYZSkni1ma+NCE3p+LmC8CwV158uoQ=; b=F2tamE+g276Mp0qZKiCzE0g0EHGZA40c9zqmXp5CCTRJQp7OgtS7+zWAm2ejC37VOe 5Ey7w1f4chulEf7qqwuBoWR4jJT4cyn/B1AjPxZ/aS4q5HstrX43UN5dwDYLEBexv19J J/rs6BTf6Wbb1pzR70mNExcoBJ2UlzCbue9KGjf+WNmSfMXY+Tu0y5yAnxClHxnPwkZ9 tzkxjMDkXw7iUk76KtLP8VY+1l5hsX721osgVR7XaThH02AwFYvvPsJrGx5Wntey3Q9h qKlN4jvQCA5te9TQrVpokQzarYJbNm64o8ivi49fXMhDby6q8HY+75lKzObI7hOqLPYW EjPA== X-Gm-Message-State: AC+VfDx3fYn1p6bn6ltboSjKHz63N2/emZWH4fm/xZXuV1RJTPkFJfVj TafERVXL+A4SZ3FRcmQQMB5gkQ== X-Received: by 2002:a05:620a:4451:b0:763:dfe8:7be6 with SMTP id w17-20020a05620a445100b00763dfe87be6mr12050561qkp.20.1687584692322; Fri, 23 Jun 2023 22:31:32 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:d7fc:8a97:4a18:6a18]) by smtp.gmail.com with ESMTPSA id 16-20020a17090a0c1000b002563e8a0225sm567069pjs.48.2023.06.23.22.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 22:31:32 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCHv2 3/3] zsmalloc: remove zs_compact_control Date: Sat, 24 Jun 2023 14:12:16 +0900 Message-ID: <20230624053120.643409-4-senozhatsky@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230624053120.643409-1-senozhatsky@chromium.org> References: <20230624053120.643409-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1769562855549544986?= X-GMAIL-MSGID: =?utf-8?q?1769562855549544986?= From: Minchan Kim __zs_compact always putback src_zspage into class list after migrate_zspage. Thus, we don't need to keep last position of src_zspage any more. Let's remove it. Signed-off-by: Minchan Kim Acked-by: Sergey Senozhatsky --- mm/zsmalloc.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 4a84f7877669..84beadc088b8 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1590,25 +1590,14 @@ static unsigned long find_alloced_obj(struct size_class *class, return find_tagged_obj(class, page, obj_idx, OBJ_ALLOCATED_TAG); } -struct zs_compact_control { - /* Source spage for migration which could be a subpage of zspage */ - struct page *s_page; - /* Destination page for migration which should be a first page - * of zspage. */ - struct page *d_page; - /* Starting object index within @s_page which used for live object - * in the subpage. */ - int obj_idx; -}; - -static void migrate_zspage(struct zs_pool *pool, struct size_class *class, - struct zs_compact_control *cc) +static void migrate_zspage(struct zs_pool *pool, struct zspage *src_zspage, + struct zspage *dst_zspage) { unsigned long used_obj, free_obj; unsigned long handle; - struct page *s_page = cc->s_page; - struct page *d_page = cc->d_page; - int obj_idx = cc->obj_idx; + int obj_idx = 0; + struct page *s_page = get_first_page(src_zspage); + struct size_class *class = pool->size_class[src_zspage->class]; while (1) { handle = find_alloced_obj(class, s_page, &obj_idx); @@ -1621,24 +1610,20 @@ static void migrate_zspage(struct zs_pool *pool, struct size_class *class, } used_obj = handle_to_obj(handle); - free_obj = obj_malloc(pool, get_zspage(d_page), handle); + free_obj = obj_malloc(pool, dst_zspage, handle); zs_object_copy(class, free_obj, used_obj); obj_idx++; record_obj(handle, free_obj); obj_free(class->size, used_obj); /* Stop if there is no more space */ - if (zspage_full(class, get_zspage(d_page))) + if (zspage_full(class, dst_zspage)) break; /* Stop if there are no more objects to migrate */ - if (zspage_empty(get_zspage(s_page))) + if (zspage_empty(src_zspage)) break; } - - /* Remember last position in this iteration */ - cc->s_page = s_page; - cc->obj_idx = obj_idx; } static struct zspage *isolate_src_zspage(struct size_class *class) @@ -2013,7 +1998,6 @@ static unsigned long zs_can_compact(struct size_class *class) static unsigned long __zs_compact(struct zs_pool *pool, struct size_class *class) { - struct zs_compact_control cc; struct zspage *src_zspage = NULL; struct zspage *dst_zspage = NULL; unsigned long pages_freed = 0; @@ -2031,7 +2015,6 @@ static unsigned long __zs_compact(struct zs_pool *pool, if (!dst_zspage) break; migrate_write_lock(dst_zspage); - cc.d_page = get_first_page(dst_zspage); } src_zspage = isolate_src_zspage(class); @@ -2040,9 +2023,7 @@ static unsigned long __zs_compact(struct zs_pool *pool, migrate_write_lock_nested(src_zspage); - cc.obj_idx = 0; - cc.s_page = get_first_page(src_zspage); - migrate_zspage(pool, class, &cc); + migrate_zspage(pool, src_zspage, dst_zspage); fg = putback_zspage(class, src_zspage); migrate_write_unlock(src_zspage);