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 478A0C25B0C for ; Mon, 8 Aug 2022 19:36:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 56F7A94001D; Mon, 8 Aug 2022 15:36:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CEB194000C; Mon, 8 Aug 2022 15:36:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D5F594001B; Mon, 8 Aug 2022 15:36:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0A4FD94000C for ; Mon, 8 Aug 2022 15:36:04 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D2141AB342 for ; Mon, 8 Aug 2022 19:36:03 +0000 (UTC) X-FDA: 79777431006.23.C3B8D74 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 7A6512017B for ; Mon, 8 Aug 2022 19:35:58 +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=OLpZzsA000SaHs8Mq1xkTy2luxKoWvALbfqtapq3Q7E=; b=grVSQRA32OAFZdUIELht4WgN9O T3sdE+VqH+4j88dUp/VhMR3Fbp4ZFuDYQrQfpz8p95CsuLh2YPpd3JHOMwqC6wphAy2js9kvQzfWf y2SrB5IV7gNevozFrGQBnnQgl8/TjXYtYLqBIXEW/kp5mNJvqN4+ERnkQ41qSxowLayCiduyOKvXx Ru5Vu6D1dfj6c9F6yqmxx+57W/ZR+87DXfUYxTUw/T9w8GZjNQYQSClA6oeQipMlIICAClGc2DHT7 D0djr6+TO5cFPZcaaBT6ogHlDqkqMgMzsaSRTM4xNNf68KyMTEwHY/eBbXC98RFKq06q8efv4Eiiu Vh69OQHQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8Xc-00EB4J-Sg; Mon, 08 Aug 2022 19:35:57 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 59/59] uprobes: Use new_folio in __replace_page() Date: Mon, 8 Aug 2022 20:34:27 +0100 Message-Id: <20220808193430.3378317-60-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=1659987358; a=rsa-sha256; cv=none; b=1+YO+zr9efjSBypkaD23M8oIAlFX5DflHy76E6J7ji1yiNowf6Fxd8hzQa5nVw07RO0OBG 3MdaP92jqk/02HZMso7dRk7KKeEBXV9A4XMaYnrr+5NbVdj+S7d8fxn2W0GLoi96RokU3C hGLf7ePfMfKtRT2Cq3MMS4mMYsB9bcw= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=grVSQRA3; spf=none (imf13.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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987358; 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=OLpZzsA000SaHs8Mq1xkTy2luxKoWvALbfqtapq3Q7E=; b=1W0+aELxaRNLbPrfjvc5AmhaqiagNHlzAE04KL7Nxfg1f6lhNsKDceguGB4ClEEva2OHKn l1w+4d4bJAUcnoOf2eDg2yjx137TubWh/hicxTZQP6lNezreHUOZ5hmPMdd1HdL5g2dZdh rEj4Z1xtNvKrWPKkd7oXDFMO3NsPs8E= X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: oyj1h1e5rdez69frx6itprafyupyzsm8 X-Rspamd-Queue-Id: 7A6512017B Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=grVSQRA3; spf=none (imf13.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: 1659987358-894022 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: Saves several calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- kernel/events/uprobes.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 9722c4587c48..7179298808c2 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -155,6 +155,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, struct page *old_page, struct page *new_page) { struct folio *old_folio = page_folio(old_page); + struct folio *new_folio; struct mm_struct *mm = vma->vm_mm; DEFINE_FOLIO_VMA_WALK(pvmw, old_folio, vma, addr, 0); int err; @@ -164,8 +165,8 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, addr + PAGE_SIZE); if (new_page) { - err = mem_cgroup_charge(page_folio(new_page), vma->vm_mm, - GFP_KERNEL); + new_folio = page_folio(new_page); + err = mem_cgroup_charge(new_folio, vma->vm_mm, GFP_KERNEL); if (err) return err; } @@ -180,9 +181,9 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, VM_BUG_ON_PAGE(addr != pvmw.address, old_page); if (new_page) { - get_page(new_page); + folio_get(new_folio); page_add_new_anon_rmap(new_page, vma, addr); - lru_cache_add_inactive_or_unevictable(new_page, vma); + folio_add_lru_vma(new_folio, vma); } else /* no new page, just dec_mm_counter for old_page */ dec_mm_counter(mm, MM_ANONPAGES); -- 2.35.1