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 7D43AC25B08 for ; Mon, 8 Aug 2022 19:35:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4DB66B0071; Mon, 8 Aug 2022 15:35:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BDB5C940020; Mon, 8 Aug 2022 15:35:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8A1B7940018; Mon, 8 Aug 2022 15:35:43 -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 6DDC46B0071 for ; Mon, 8 Aug 2022 15:35:43 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 32B10A0C08 for ; Mon, 8 Aug 2022 19:35:43 +0000 (UTC) X-FDA: 79777430166.07.D834104 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id AEA1A40174 for ; Mon, 8 Aug 2022 19:35:42 +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=nYRW3KJ1Oxn4+Dx/WPEAhmgGK9 ReSZ6tsOYiI5pbwD3OWnD8EiCD8hwUcV9tkALmTMz6hJbk25z3Eyf9egXIc2MsxSBhir8+6v9Bvez QZHyMcpluDVdN6EBWtLPxD0Cv4DX4PK4CU/ioPomBduccgv8IKs3PT3ylHyXR21+1N++AOyEg7cQu QQJBgHbf+ndtwANduak3v3GvxAWXHCaDMrcfhwtfs0gex27Hn8PKJn+6OikiebTUcHrwRzmF2+uXo 7vfuwOMs+pXSDaZ18uD6igmYE4xABB1DdztbIu4vb+NoBO1X5EbyeDaxDHfjAbL22ETjss8bGnwxD DfrJJnWg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XK-00EB0S-84; Mon, 08 Aug 2022 19:35:38 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 47/59] uprobes: Use folios more widely in __replace_page() Date: Mon, 8 Aug 2022 20:34:15 +0100 Message-Id: <20220808193430.3378317-48-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=1659987342; a=rsa-sha256; cv=none; b=ApB4oAxS224u0AaXBILaOfBD1DfecZLQMu8MzoSKfL7L2pgggLbDlmNaKq0i1lmSnpxA3w 77x7FOKwiDRl0/FeWwD/+lrvyNLCw/TioHpX1t8M94HoC58qnPyVRMveYvQYlhz8mJfm+/ Zlj4PvdsvrRDn9ODWivHF4b2dYPGKyM= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=nYRW3KJ1; spf=none (imf04.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=1659987342; 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=L1FmjzmfHpfVgvYTOhoAMZwzzUNpgiDPMXz25qoUPVX8eQbC4ydXX5Bsz3QhbsRI6Z8oYT t/jcdTxo+o5TfnrNwUEbGUe4QTZrMaM4/VnKKZclL//vCy2zpN9Rty5tSJPPe6k6a7DQxq JlebZc67cOEIe8EvjuVpbWWns1BDtqA= X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: xrs8ufwayt1as6i6h47irpqd8g1hqaix X-Rspamd-Queue-Id: AEA1A40174 Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=nYRW3KJ1; spf=none (imf04.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: 1659987342-772289 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