Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp979040lqp; Fri, 22 Mar 2024 01:36:10 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUqgJgC8xpwyv2hKyq9/K4Blg5mB4DfhTj0ahzKGm+J5bS9BztaWGrGkthdsP+1EXDLfxEBo6diG65sADOwEzi7/nEnodntOkzcScvGhw== X-Google-Smtp-Source: AGHT+IGTcnd3xe2Uvdcx7lGA5GXMo2FRLc4w6S4MRoqzHtGtQgjn72ateT8v6AvOrGx2OBdtH8KZ X-Received: by 2002:a17:902:f646:b0:1dd:90ce:4e43 with SMTP id m6-20020a170902f64600b001dd90ce4e43mr2271002plg.11.1711096570354; Fri, 22 Mar 2024 01:36:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711096570; cv=pass; d=google.com; s=arc-20160816; b=f904Yipleulw8kbW+y1vRNgfSQ5/WxunWbBFqK76y32uiENSMG67kKgFDsAprs3eKi 1IumNHb5ATPW7IsrQKP5RLLtcYRN5ugr2r+IWl10Av4HEam+ZKS0FiqZfmSbu4KA/fWX nU1IrO8AcGPVD4KZ0fOclqrqzhUaadKK7bxtRQi7OvWCzMt5OUQ6LUH46FfvagKSJHCA Llo7vneZq6zlGhw/Uqvt3liBvOQ9gxihn40q6945ZUHfUa9hOVm/xbUn46hhQ25KZjzZ 8xPDAn/AmgQakkwsCelA9m7AkIhSUHi/GfN/q3mr8o4W03TVZLZ7fo4qyPi7B9eL+tr7 ytIA== 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=35bf36rVzZCfy8oUlmgzrKLRW5lsRT/GT0/CEZQ4A3g=; fh=CTFdFrbtP7Z7TCdMbqsgkrQi425Yz+qx6YS+cHHF8Sc=; b=V4/r6L7uWXCDgBInFr1cRwCQBySW4RIZUl+7feR4wQTIyds5aPrEaGDRhwpqosCKvX bl9oGMS8wPccZN8NPxXBSL5k417YlDHAQ47MlxpcWOdAnVmsml6F2BJP2b6wmpAV9S61 rZO5rQhD4oKswpWrtnguleKoXAGRVpbel/IxdVJOawX2yIG99BjVKw7J4FiKmQn5LEyz UyEEmTOviLKyxbjpVbs9jL7t2raYrAhZHiW5sb1hfLSEpPtHEJPLGw1wx/xswb4j3ctr c05y4MjQr5747BKgUTN8OarQsudtiHNnw6n3MGc2MK6GQuAGbrRb74jMaez/x1t49q0p XX7Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AaBhc3oW; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-111131-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111131-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id n14-20020a170902f60e00b001ddc7e87bf3si227325plg.306.2024.03.22.01.36.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 01:36:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-111131-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AaBhc3oW; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-111131-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111131-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 0E8CCB22466 for ; Fri, 22 Mar 2024 08:35:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 70538200CD; Fri, 22 Mar 2024 08:34:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AaBhc3oW" 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 9914C1CAA9 for ; Fri, 22 Mar 2024 08:34:37 +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=1711096477; cv=none; b=Ud8+2DRwvGrq9tnb0pj39vKIFx9rcoGWZS25uMH0ISb0yA9Y/IwNPs/WWdIZyV5OQ0fVGhiOdcrstNDOKZ63pY6lJYBQioeY8ECE4VRCAKAi6NuwW1TAv9uo1AOpJuMdp/prPwvbNuJUeHO2QppMfshRT4hUvSZC2Y5xkGj+YeM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711096477; c=relaxed/simple; bh=u2CpON+ylVsyq590GuxgPX8aACtNcQ54tsZFdjhyaWs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JfiFO3fakYSj8x5p5z87/fPbpwJ5MzmpAyv/GafkgeAsNGNJVbazt+8KZ82UQJyqRswhAji58UltSVvv97479s7toIjMGpDPNkVfokFcWCr3+0g7QeWPW6DvwVPHS0icQY4iOYneRJ2FMSo/ADBoe4QIbzLH/BpaQAyP5mxkdyI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AaBhc3oW; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4E41C433C7; Fri, 22 Mar 2024 08:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711096477; bh=u2CpON+ylVsyq590GuxgPX8aACtNcQ54tsZFdjhyaWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AaBhc3oW54M2fVP4zko3bI7wwqPbKFrZpITxoE8zMB09nSGioEQ8ciGrhyoNVw9dl 5YrCQpT1pseBVwA33cgDlGFOx4FQlanhgK2UjNScC+SZBglLPfDqK1UofWxdr47roq 6GMyA8MaGGHVqiCCLVMQRL+VqScXIDmuLZrG9NMJ66kWpS40p0Zaj/cm+2GbhOMhTu e0ethnI0isP9gkZHmiQAYCHBVOZaM2T/frovkexYNf6fSyJbKzLJGhv/JOGivKU3Zb RCqpiaOpNDTHCBh4+Tx8KnVwnrqI1pqgWU499eH8OT7ssfyiP0MU1lfCoLJ1RBaMHz M4RaK8HjY2+1A== From: alexs@kernel.org To: Matthew Wilcox , Andrea Arcangeli , Izik Eidus , david@redhat.com, Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: "Alex Shi (tencent)" , Hugh Dickins , Chris Wright Subject: [PATCH v2 02/14] mm/ksm: use folio in remove_rmap_item_from_tree Date: Fri, 22 Mar 2024 16:36:49 +0800 Message-ID: <20240322083703.232364-3-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240322083703.232364-1-alexs@kernel.org> References: <20240322083703.232364-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)" To save 2 compound_head calls. Signed-off-by: Alex Shi (tencent) Cc: Izik Eidus Cc: Matthew Wilcox Cc: Andrea Arcangeli Cc: Hugh Dickins Cc: Chris Wright --- mm/ksm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index ac080235b002..ea3dabf71e47 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1006,16 +1006,16 @@ static void remove_rmap_item_from_tree(struct ksm_rmap_item *rmap_item) { if (rmap_item->address & STABLE_FLAG) { struct ksm_stable_node *stable_node; - struct page *page; + struct folio *folio; stable_node = rmap_item->head; - page = get_ksm_page(stable_node, GET_KSM_PAGE_LOCK); - if (!page) + folio = ksm_get_folio(stable_node, GET_KSM_PAGE_LOCK); + if (!folio) goto out; hlist_del(&rmap_item->hlist); - unlock_page(page); - put_page(page); + folio_unlock(folio); + folio_put(folio); if (!hlist_empty(&stable_node->hlist)) ksm_pages_sharing--; -- 2.43.0