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;