From patchwork Mon Jul 29 18:38:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13745583 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 B117AC3DA61 for ; Mon, 29 Jul 2024 18:39:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3BA046B0098; Mon, 29 Jul 2024 14:39:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 36B3E6B0099; Mon, 29 Jul 2024 14:39:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 231746B009A; Mon, 29 Jul 2024 14:39:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 057476B0098 for ; Mon, 29 Jul 2024 14:39:22 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 86463A05B8 for ; Mon, 29 Jul 2024 18:39:22 +0000 (UTC) X-FDA: 82393652964.20.E05EEC8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id D5E0A1C0015 for ; Mon, 29 Jul 2024 18:39:20 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Y1X7yEQA; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722278318; 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=exvRAG2tHq6VgTaD/fmuS7ZLph4K5zUJO/hhwy+FasE=; b=Dvw5J6fOFM8mydrRBgahG1yXIAvKZohjqo51rbCEEwEVHuJDye9CrWaRLuAPMSSOlKBPaj Yl0UC0DUmkYCcl9QX35rIzpM95D+XVg3SiMeNaC4EJlzPJt5fZEBaGKOSPFs1JsRvsh7Uj LPjVE4lv3Jb+6MaTTlw8emOfhyYT1Gc= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Y1X7yEQA; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722278318; a=rsa-sha256; cv=none; b=lQkERHTLR+iiI6HIeNnsclcxZ2lE3iZvqJX0qiFOysDIj1Phatz3TZJumqay0qqZWf6j+6 Ur78usdrkutSSa3iYqqHy/jrjoMM5lMp0nsI9xm9z+SPKdNeow3RtgZjKBWlx3PrgPPWBN TG6aYx6NSKbj8ot9vI0I2oGL53XY4RU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722278360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=exvRAG2tHq6VgTaD/fmuS7ZLph4K5zUJO/hhwy+FasE=; b=Y1X7yEQAJBeTsJOUGjWBmDWbQY8nJI66rlBAK5d3fsZ5F33zsPpnUu0Rtrt8TATAecrqAK NqvEkFKQQ6XofaRGGpk+a9ywAGwXBzXf6TCzP7Qn+otuoWj8MkYFuItfKLVqxc/E6CIa/w MTM9FUiJx6zEFgSQkpesKw+TymmoBG0= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-157-8rBTIKH0MemeRNuEhQNSCw-1; Mon, 29 Jul 2024 14:39:15 -0400 X-MC-Unique: 8rBTIKH0MemeRNuEhQNSCw-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6FB9A1956064; Mon, 29 Jul 2024 18:39:13 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 079E61955D45; Mon, 29 Jul 2024 18:39:07 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, David Hildenbrand , Andrew Morton , Matthew Wilcox , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Janosch Frank , Claudio Imbrenda Subject: [PATCH v1 2/3] mm/gup: convert to arch_make_folio_accessible() Date: Mon, 29 Jul 2024 20:38:43 +0200 Message-ID: <20240729183844.388481-3-david@redhat.com> In-Reply-To: <20240729183844.388481-1-david@redhat.com> References: <20240729183844.388481-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Stat-Signature: 4kmfyiq33of8q955ughgwucih5u3k5qw X-Rspam-User: X-Rspamd-Queue-Id: D5E0A1C0015 X-Rspamd-Server: rspam02 X-HE-Tag: 1722278360-214110 X-HE-Meta: U2FsdGVkX1/m/9pybZwGI1ycpireqDz+M1QDx7W8e91PDeoB+EkPik++XMFHiF2EdqLJHh0XZoa0YvMmncZRdSOG1F3sjLYfmgFVs7TNYx1yXrXnzqygxMNyDnTg4p564bN+xt/cTvXaM83dgSSStFJvd8BipKW29RS5Dy/3nDtA04vLPAQ3jCDSsQwxiuqk0Gd4UtBhaqevgRybOtiJ5/0AzF12hEW8eVOpcj+VdTXmgHpuMy2+ZzRSOooV3aWofykaYN9qI3KrSKQDOgvxYtTcibI8AkrQ5REe61wB7Rtc8MJHVM9CNXQ6341pcE1ja2wfdZhm+gz2b1IR83fJDjEFhJV8LZmls/W6lAVicIq9qs4m8jUP3qXYK6vz7IwIfljB5P5+3qjrnqtjIpMMGgfSO73iPYg/1vAt2mt4cQEQkc3sd4xUFtLkbeqrz3fho7Bx854vSseAL4KE8iFjD8zsvT4SnbSYKDsRNeD6YSmLfBa32sfg41LIAtkf47kvU0RV9zNz20G9lK2WVHpNfuGdJXvYQELTWz4F2t16WIQfLSOaRNjg9INGVJVluH5qBBG76g91FfItkFpOreUEq6mdH39AGvszNEA/mlT7qDzV9WOQc4ClhE5s+ZyYUtZfeyGevqpZv1c0bP1p6kJJYmbzwaCAEBXzRHvKP7oL+2mh0E1o3+TZefwRO/7hsb08R3pD1x8TMA7ZlhyzNDO2X94tyv9IbDDXgwu2XVLlp4wTvG9Vg4wR25+j2rWKKfQXTLUjg8Ga4YFGqBDzDVU4TAQGdpxUtYGWKYRHw+UWgfARUykDSKg6WLt1wG0CkutjQdOHayi6VOaVt0DFCooSendoUTL7gTjCcyMiyY1lvlQajb9sVwqMHOwHu3GiGpBdzpDXeESQgdCKGHrJGda7r+lSu4zBNweOVOIKJ5sNA/Rvc4/D5ThRcFUMHbRL6Wu189ec/uQ240xkoq7DdQa +fnkg3Hq lCmeHGXPjaypIWKcdgJ/3OmLlXc4GPO9zrVG9hbaPgvu0wIvYAXieKZKrFnUoiIR4trtmRLvr9G/J5LLOc44i/6xmYxXtU477Fd2yWz6+bPmkP3+UU8cQMS7iELA3rmA6edxTKszIhf+Y8qGlbxQhwX6sef0TEtsLLXG5N726/2gMaMQEXcJUYrMfCQnCJm+r2dROADKwTZqW0GvWe4P3cXaZbEZ4mZfpldZelMD1DiXMfuE4DjajjA4C+KQVej5vaeF2ZYM0Ko2OXpbtmKHDCz8QcjokZaLMy+rB7WAXLStSul8mzwMSp6z9HK5Rck1iNjRr2/RxLOnP27fmRtzZXQ9eqQ== 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: List-Subscribe: List-Unsubscribe: Let's use arch_make_folio_accessible() instead so we can get rid of arch_make_page_accessible(). Signed-off-by: David Hildenbrand --- mm/gup.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 120740cf5a348..3e8484c893aa8 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -819,6 +819,7 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, struct dev_pagemap **pgmap) { struct mm_struct *mm = vma->vm_mm; + struct folio *folio; struct page *page; spinlock_t *ptl; pte_t *ptep, pte; @@ -876,6 +877,7 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, goto out; } } + folio = page_folio(page); if (!pte_write(pte) && gup_must_unshare(vma, flags, page)) { page = ERR_PTR(-EMLINK); @@ -886,7 +888,7 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, !PageAnonExclusive(page), page); /* try_grab_folio() does nothing unless FOLL_GET or FOLL_PIN is set. */ - ret = try_grab_folio(page_folio(page), 1, flags); + ret = try_grab_folio(folio, 1, flags); if (unlikely(ret)) { page = ERR_PTR(ret); goto out; @@ -898,7 +900,7 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, * Documentation/core-api/pin_user_pages.rst for details. */ if (flags & FOLL_PIN) { - ret = arch_make_page_accessible(page); + ret = arch_make_folio_accessible(folio); if (ret) { unpin_user_page(page); page = ERR_PTR(ret); @@ -2919,7 +2921,7 @@ static int gup_fast_pte_range(pmd_t pmd, pmd_t *pmdp, unsigned long addr, * details. */ if (flags & FOLL_PIN) { - ret = arch_make_page_accessible(page); + ret = arch_make_folio_accessible(folio); if (ret) { gup_put_folio(folio, 1, flags); goto pte_unmap;