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 96D5FC00140 for ; Mon, 8 Aug 2022 19:36:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0BEE8E000D; Mon, 8 Aug 2022 15:36:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E94948E000B; Mon, 8 Aug 2022 15:36:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE6D48E000D; Mon, 8 Aug 2022 15:36:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B93DB8E000A for ; Mon, 8 Aug 2022 15:36:17 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8CB32120114 for ; Mon, 8 Aug 2022 19:36:17 +0000 (UTC) X-FDA: 79777431594.29.48262BA Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 4B5FE8016F for ; Mon, 8 Aug 2022 19:36:17 +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=tmCCUT9YbVZ+85cH89OGN/1JHg PU5Pp8iCiz0NhcWlH3MMtCpoDhXVEPaM16dvP+dI7QIGL3XoyAZPDuiNj2YfWHLjtN3RfFqBLs/wE 1kLVv0FmULIB3Xjns9wMMe7NQEnAwDPYhthmS9FsDeJZCfnBs+hsfGLi5O7LGYFR4PTHOmM4xo0d0 gXq5nlY+O4th0tTWqlgtyUeMOPwxUmyGT6LZipt/gvDthbCiOaRLTsjH0Uq33ilosskTPPnMa++C8 zAvN1Lj5M7TSM36+Q9nJnKrloRipTjVWyRW/l497SxJyzTlYDJb41Y/BcNwuaINDXWB2OhTaG5fMx 6HLWcYkA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XK-00EB0a-Fh; Mon, 08 Aug 2022 19:35:41 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 48/59] ksm: Use a folio in replace_page() Date: Mon, 8 Aug 2022 20:34:16 +0100 Message-Id: <20220808193430.3378317-49-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987377; a=rsa-sha256; cv=none; b=WTfBJUGWaRhNUdCfu1y/h6GC7qJvldupF5HzRJaVK7yuIzNhfoaFNVJnwDq6ONkwf7tql+ X5DZHH5mnbAve5/qkDrr+vS1Kl2L96Eq6xDeiAzjm+UYagVz6gSN2ZvpTDJIQyRW8y+/us 4OK7K90eIBNEkDIeuM6F7JZ3SYf4wng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987377; 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=clxDKaOl3OW0frAxpAky3hF77ePHRnOJybCWu4KbqUsPyovwX1RNS2UGaD1qHz/8jnWOkj UCykfj0obtZroQhYn+aXW+ezYxMxTBeQ8LvzcP6rRzfT62V3s1Cy9RyL5Tk9fooLsqgMrV /oR10Fnv8l/8nw+elgunRGa3UoFamws= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=tmCCUT9Y; spf=none (imf02.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-Stat-Signature: becbk85figsed179d9u14bige3ifyxym X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 4B5FE8016F Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=tmCCUT9Y; spf=none (imf02.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-HE-Tag: 1659987377-672992 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