From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C86DBECAAD5 for ; Fri, 2 Sep 2022 19:47:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CF7880116; Fri, 2 Sep 2022 15:47:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 513C2800FE; Fri, 2 Sep 2022 15:47:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0F6C78010E; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A7C46800F4 for ; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8998A407BA for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) X-FDA: 79868178726.24.DE664D2 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 1FAE018007B for ; Fri, 2 Sep 2022 19:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=YMk9TEVmL8q7WxjorjEAwIc7bPZKGMaknIib7W5PcUw=; b=gKZiybOdSZrgi7QYB7GzwgeIGq 0YPNvyRD+NGGPb+UZIxg3mGxQ1TI6Dcg8oAICeND9fYoswizmGYbJEHCm3A5CFTKOB0lN/2M+um25 6ApZ97FsS8Vy62YaY3pkaDtiVrfhgzvPc8OikAx6VIAuPpQYxIMDTwAXY/SdQ32P3wWbqdxOV/EgB ZQNzydO/uV5kei4l7/23MmtYd1sq3wECxuGZHCHTqgjugQEG2TpTTxv2Y4Wd0Do2Yay4F3Vk5YI/d 2BLq+HvKWJ415tfEFrWVc88wTvo0plObbYZ6v3bBSKEuwm3I6E4m87hMEQI3RztfNBgGeO/Y1JMHZ oqDT8fZw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd5-007IgM-5N; Fri, 02 Sep 2022 19:47:03 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 45/57] ksm: Use a folio in replace_page() Date: Fri, 2 Sep 2022 20:46:41 +0100 Message-Id: <20220902194653.1739778-46-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=gKZiybOd; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148023; a=rsa-sha256; cv=none; b=EcfvhJCWG6mL0Qz6GZOKTEmgIrl6vrXjb6NnFfdIxvpuT1RMvP2iM1WVK5ZL5VgPXYrBnS S8elCVmfzVZ6MfMvXossWi/zfE45O3VL9kBPu8Pl+xEPh2StUlZhiaYIYhBxfoto7njOlx q6VPk3/K9jWd8dRHTcjU/8EEVma7zwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148023; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YMk9TEVmL8q7WxjorjEAwIc7bPZKGMaknIib7W5PcUw=; b=TOSWw52sbO4wMxHG7nKhlMxZmckxMBLWHmAjr2eLglIEQRPKg+u01CUSe05eo7WaTLUurf 4EtKKgo3Uh8dhmDohWY43V4s278SnrohA/3dzbNKrZ0JPbIFtM3e2Y+hcIcQZ804Stvt71 4HEKsAc8IlbTUwZwk4xPHSb1uMQIMvs= X-Rspamd-Queue-Id: 1FAE018007B X-Rspam-User: Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=gKZiybOd; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam09 X-Stat-Signature: 8r7ncdfsk4osqos31g7i9mrtx86rfpxc X-HE-Tag: 1662148022-814822 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Replace three calls to compound_head() with one. Signed-off-by: Matthew Wilcox (Oracle) --- mm/ksm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 42ab153335a2..322652e7e6fe 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1133,6 +1133,7 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, struct page *kpage, pte_t orig_pte) { struct mm_struct *mm = vma->vm_mm; + struct folio *folio; pmd_t *pmd; pte_t *ptep; pte_t newpte; @@ -1191,10 +1192,11 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, ptep_clear_flush(vma, addr, ptep); set_pte_at_notify(mm, addr, ptep, newpte); + folio = page_folio(page); page_remove_rmap(page, vma, false); - if (!page_mapped(page)) - try_to_free_swap(page); - put_page(page); + if (!folio_mapped(folio)) + folio_free_swap(folio); + folio_put(folio); pte_unmap_unlock(ptep, ptl); err = 0; -- 2.35.1