Received: by 2002:ab2:1347:0:b0:1f4:ac9d:b246 with SMTP id g7csp206411lqg; Wed, 10 Apr 2024 23:15:51 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXr/i6Cpf68fl8trFP/CbsI0bpC7VWgkB/9LnvS4Q96jzt4GlUoOepvBPlZOUv6Hvm+WnnYI8M7KXOd6+zCvpvvL0J3XbCJCTjq2G4/jQ== X-Google-Smtp-Source: AGHT+IHDL0zxHfkxVlnhHSXkbmuPcszZodgV1heeqR/cMFzTrDuWR32j3bbK6Ax4Bf0LZn5Cz5xj X-Received: by 2002:a05:6102:2ad6:b0:47a:3cfb:1580 with SMTP id eh22-20020a0561022ad600b0047a3cfb1580mr7980vsb.7.1712816150927; Wed, 10 Apr 2024 23:15:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712816150; cv=pass; d=google.com; s=arc-20160816; b=YEAEkMMVdOAt0H2Ana4bu8STkTNDnbe0Ec49mVRcHvKvHADx17s9iDlSszSeRrtdHU FPh7UQpNAsmLx2/X62Fk1KHPJv89eBj5fybnjAlWWVCeZvZAjKyeIIblV7q0+lkUEmoN 8EfMbnmrHiv1v8VhlzbGSxqFZLYsdxYuW0Q4x6rVw8dZDaEE0gt6JuO5+OhRunnbgX0V O/j1CTLFABbIPzZSkGqZgMrqidVnJtvkM6nyB8XEenarI2HLdDlOGXB1ZImfsdPHSjuL LRhxXRIcM2KprTIrPECXw1pn1J/WFjGMHSJuO63Tf43hFufSp3nsAE4UgPo+1Y8yAp/z qF8A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=MsTQMsgVxf0dLcXEf4xqqAMX2k3L86zSBL7Zs51WxIM=; fh=WEMOZDYzhROtJ53Nx6fHy9wYEqwkxnRo6fKhqlB4aEM=; b=Dux+2IP98Ls43rUUvftWhDb/hrqfPMt+x4nhxSLNxsIrp9/6vDy4BhZf7mh5bU1vUc aiE22cwVATgVSFkQWY1kteXCEBc9EaXMb+V4mDsJs4Br82PBE/TSfA0lHlVcgAoVRb+H Ml5RUlhbUsItenRUB/El1U6yMyQWXxkLiwQIOCBrthBtbtweU04/eRC9z7gBC8gkSrog pDE+qZ0lFyHAxyc5n3mhZ0rRix7yQ53o0Z0OT1rDOxjf8gLBr2ZN9urwTsUyIhlOvilX V0WNJHdwcJUII8l38cXGsG6xQWldxZAGtxwu+9nyiwOe6ZfRTxGtek6/GF3iWQkd4a98 ZDig==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qrF2rdtE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-139829-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-139829-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id v8-20020a0ccd88000000b0069b49166778si759295qvm.61.2024.04.10.23.15.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 23:15:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-139829-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qrF2rdtE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-139829-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-139829-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4F0411C2248F for ; Thu, 11 Apr 2024 06:15:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 69F9E13D8AF; Thu, 11 Apr 2024 06:14:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qrF2rdtE" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F51613D887 for ; Thu, 11 Apr 2024 06:14:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712816071; cv=none; b=nAj7PwlkjQxUnS02nqvB4NF9hVMCjEqJjMCEwPyYg5TRePUIBfcYZhpZeC7e6ELGCKHx15NoNEpfPunNOkI9a8FJMf2goJIzOIfvmKv8L3kdw6sdJ+YCWV6hoGroNnT39Gbde4utH1/V4FoNHhmRnVOlfbUQNEDQuH5ptVqrEVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712816071; c=relaxed/simple; bh=AGS71Z17Hu5djhgaE9FvKpI+lMFnYwLUHMLt7uG9UW0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RG3QL+/9Yd8ZdAoDM7hUs8TCwERKNOmQ/5mX7P4mDcQeYWXn0wmDq6NXsFbXAy8H0bxOpyHUoFTYcYZXKE/oaY2lqEearFBFNgnxDwXCla4pgrjD8ezS4Wd2S/xF27KdcZOxCqTdsHTSvdBwDPvOgDXd9N5w9zj8xpSMCfHmmUo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qrF2rdtE; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED760C4166A; Thu, 11 Apr 2024 06:14:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712816071; bh=AGS71Z17Hu5djhgaE9FvKpI+lMFnYwLUHMLt7uG9UW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qrF2rdtEXCaBbJxjV8S9drLU01OLf5ihIeBBhb8Xl/1R3u2e1+jNFOQHsgdzdnX/c /9dnAtjbA06xzJ7rdG4i6UHkCzg4bXFPhC5813GaUDWCrEDUDslsnKoU5MDzlxVJhe bQCIBihwPd2Yf6WqwLk7a/krz164Iyqhl7cguWbc+gN2CSIdqycaiZ3uvV4syIwWR+ OXLmzBAXdeJ7ihn/uRbrBCamUfBPTBOKUJhPH4u9x3jsuvLltT9DtBOtQqh6LWg+y1 SRxVpNTshHI8KEdoIV06pJfSrWMH/GZw+buDUlIu4gRdDDu7bDH4uAd9mjSAUmXkgq x2DLn4gkEPyOg== From: alexs@kernel.org To: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, zik.eidus@ravellosystems.com, willy@infradead.org, aarcange@redhat.com, hughd@google.com, chrisw@sous-sol.org, david@redhat.com Cc: "Alex Shi (tencent)" , Izik Eidus Subject: [PATCH v5 06/10] mm/ksm: use ksm_get_folio in scan_get_next_rmap_item Date: Thu, 11 Apr 2024 14:17:07 +0800 Message-ID: <20240411061713.1847574-7-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240411061713.1847574-1-alexs@kernel.org> References: <20240411061713.1847574-1-alexs@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Alex Shi (tencent)" Save a compound calls. Cc: Izik Eidus Cc: Matthew Wilcox Cc: Andrea Arcangeli Cc: Hugh Dickins Cc: Chris Wright Signed-off-by: Alex Shi (tencent) Reviewed-by: David Hildenbrand --- mm/ksm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 654400f993fc..b127d39c9af0 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2611,14 +2611,14 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) */ if (!ksm_merge_across_nodes) { struct ksm_stable_node *stable_node, *next; - struct page *page; + struct folio *folio; list_for_each_entry_safe(stable_node, next, &migrate_nodes, list) { - page = get_ksm_page(stable_node, - GET_KSM_PAGE_NOLOCK); - if (page) - put_page(page); + folio = ksm_get_folio(stable_node, + GET_KSM_PAGE_NOLOCK); + if (folio) + folio_put(folio); cond_resched(); } } -- 2.43.0