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 B2192C6FA83 for ; Fri, 2 Sep 2022 19:47:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4E6480115; Fri, 2 Sep 2022 15:47:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BFD0F800FF; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F24680101; Fri, 2 Sep 2022 15:47:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 82A7280102 for ; Fri, 2 Sep 2022 15:47:03 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 66EF8120F71 for ; Fri, 2 Sep 2022 19:47:03 +0000 (UTC) X-FDA: 79868178726.12.468E923 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id E0F354004F 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=cDP+DNYsXXA+kb85wo7Nrqn0aeI4BRiMp8pyQ5b78Q0=; b=ThjhD8mBX3Pa2r2cz/OysqgC3D 71gcuLxPzfDYWlx98/+VZ0eUYAkYMqdmVRyAzibXNHVpveohUG1p3Ol7zteJKmGzPmple0rQcxf9m o5isgoe+TktVq3rCoGSb2iYDbUtb+NpbqYR7w0J2V2Eskojm6SibaUaQ9VquP8RxnFbC3rPzeRCUG F/a1FBlHG4M/DM48zi1mJ0+ohOzLWGQX2g7BHfKoMdJFPQc1i3OD/ZWBWQ0b2udgslmTqaQVYQdc+ q2XaKHG3V7VNDgpzS7lBK8tkZ7mqEi3xDISkwg2JBB1GxocaEEdMHmfqxummjqOhj2CKEomYtFhYD 2OIOYLyQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd4-007Ifz-Ua; 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 44/57] uprobes: Use folios more widely in __replace_page() Date: Fri, 2 Sep 2022 20:46:40 +0100 Message-Id: <20220902194653.1739778-45-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-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=cDP+DNYsXXA+kb85wo7Nrqn0aeI4BRiMp8pyQ5b78Q0=; b=uTdIOU8l0qCUW97pnuzWnJDRKLa6NG+DiKN/oo1cmvjwTMi944/oES/cAfExV6dgI0B+ke ec30l1MWbJJFj/vk3TIyXbv6t7UhKv9AU9R09nwZUa7MgCJQYxpe59uhZTKA/LASLX5cap DVg1LIeW9b0nx6GCENkJ8r+mjm9HND4= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ThjhD8mB; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148023; a=rsa-sha256; cv=none; b=R+YYzrucCIb0O5MbwQo9dSgGmIv+aqE8xoY0DWHve/h7JNhNhECsrJcLp6/0PKM+fbYnlZ nXLjy0SFY6Gw3urVz+VUVn69hTFbIKZk6DoKvfB3pL7PEpXWpuxUXAcxVW6lzIGZ/dw0c8 fydw6FFWrGYK7PCfniXZN2Gf5c99S6k= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E0F354004F Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ThjhD8mB; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Stat-Signature: dj1hs1de959y3ribyrzfczra6bozdwgo X-HE-Tag: 1662148022-82009 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: Remove a few hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- kernel/events/uprobes.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 2eaa327f8158..9722c4587c48 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -19,7 +19,7 @@ #include #include /* anon_vma_prepare */ #include /* set_pte_at_notify */ -#include /* try_to_free_swap */ +#include /* folio_free_swap */ #include /* user_enable_single_step */ #include /* notifier mechanism */ #include "../../mm/internal.h" /* munlock_vma_page */ @@ -154,8 +154,9 @@ static loff_t vaddr_to_offset(struct vm_area_struct *vma, unsigned long vaddr) 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 mm_struct *mm = vma->vm_mm; - DEFINE_FOLIO_VMA_WALK(pvmw, page_folio(old_page), vma, addr, 0); + DEFINE_FOLIO_VMA_WALK(pvmw, old_folio, vma, addr, 0); int err; struct mmu_notifier_range range; @@ -169,8 +170,8 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, return err; } - /* For try_to_free_swap() below */ - lock_page(old_page); + /* For folio_free_swap() below */ + folio_lock(old_folio); mmu_notifier_invalidate_range_start(&range); err = -EAGAIN; @@ -186,7 +187,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, /* no new page, just dec_mm_counter for old_page */ dec_mm_counter(mm, MM_ANONPAGES); - if (!PageAnon(old_page)) { + if (!folio_test_anon(old_folio)) { dec_mm_counter(mm, mm_counter_file(old_page)); inc_mm_counter(mm, MM_ANONPAGES); } @@ -198,15 +199,15 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, mk_pte(new_page, vma->vm_page_prot)); page_remove_rmap(old_page, vma, false); - if (!page_mapped(old_page)) - try_to_free_swap(old_page); + if (!folio_mapped(old_folio)) + folio_free_swap(old_folio); page_vma_mapped_walk_done(&pvmw); - put_page(old_page); + folio_put(old_folio); err = 0; unlock: mmu_notifier_invalidate_range_end(&range); - unlock_page(old_page); + folio_unlock(old_folio); return err; } -- 2.35.1