From patchwork Sun Mar 30 12:17:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032901 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 D3AE8C36011 for ; Sun, 30 Mar 2025 12:17:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C00A4280003; Sun, 30 Mar 2025 08:17:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8A09280001; Sun, 30 Mar 2025 08:17:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0424280003; Sun, 30 Mar 2025 08:17:36 -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 82C73280001 for ; Sun, 30 Mar 2025 08:17:36 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id CA5F4ABA71 for ; Sun, 30 Mar 2025 12:17:36 +0000 (UTC) X-FDA: 83278118112.27.05FA67F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 007E4100007 for ; Sun, 30 Mar 2025 12:17:34 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ekssB7FZ; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337055; a=rsa-sha256; cv=none; b=qQTJzUcIGketJDdKgq1T/JzGFkHTKavNdziOJIZeXbVzgCM9emkHciTsYYrm8jUTi1Oo7i Ml8KelcSdemCruLOvEfG3vLTZpiT+0HLS2fPNLpVCEfb2OFRAgAvUsKdfqYxYNu2wlpFin YvmnJ6UAQVsHzVJ9TrbmCpOjIDK8wG0= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ekssB7FZ; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337055; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=66JPNi1zYSbyVc7TO8PPyR6Yrn7uiScYJyyuaMI/UWs=; b=ZcMcskiL55fRgWrz6YXObifcI36HjYFEM17YWnyYSmZPVt9R9hWclQj/5czodo1ZGf6yP1 HZvbAasRkdvJj2E0hjYG6eSLk+65E0FpIYtozr5/151YJX1v1lLDSZrBc3sOQWja5t/2pj wgs3eqfptM20OShnCOCANvRlvV2kbbU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=66JPNi1zYSbyVc7TO8PPyR6Yrn7uiScYJyyuaMI/UWs=; b=ekssB7FZiKW0HrZmHkDCZT3Yc7UEg2ljXIz7dmT8qGqQLvR3yY0eESDLqDE1fwQp7Uyk5C gEVJKlGzG/+Nm4+9TLG0+N2D1BE9BPeCq/hSgoVIF3Ih/lASIT7A1jlaph1KMPrK24wb2y NxhM6QHE6EU3cnHFI7jlS3yxBmzLNnM= Received: from mx-prod-mc-05.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-207-vuwXJPkUN92ViNpZjUnXmw-1; Sun, 30 Mar 2025 08:17:31 -0400 X-MC-Unique: vuwXJPkUN92ViNpZjUnXmw-1 X-Mimecast-MFC-AGG-ID: vuwXJPkUN92ViNpZjUnXmw_1743337050 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 992B5195E92A; Sun, 30 Mar 2025 12:17:30 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E5C71801750; Sun, 30 Mar 2025 12:17:25 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 1/7] mm/gup: fix wrongly calculated returned value in fault_in_safe_writeable() Date: Sun, 30 Mar 2025 20:17:11 +0800 Message-ID: <20250330121718.175815-2-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 007E4100007 X-Stat-Signature: bp7r5szk54oqnbzfxbz7ybqe9z37gxdj X-HE-Tag: 1743337054-907030 X-HE-Meta: U2FsdGVkX19c3sxolvMM96XjpI1ZQSWGIWmRczWaZYKGVdjyL1YL7TYciC+xyezamwylEW2zrpoXKS++A6HyA2fVREY2DeBlSAPhkSjd6kWKFekVfJFvUGZhIcdNIOXNqW+uDHZIUwXDickoE/QnkIZr+jtgqLAzy8/WRc+NFR79RW8aFC7nuDorklgB3AMyzyLaqMpRa8YC/bkfpmjH/VmZAq/o11qmZseAEm1itVyKwdcXsyOqiCjvaoPgWFOW339DL/W1Cf+lY9+j/7Zg9oUFM75zzNACW7VVUio2R6VrgK3Gse9IRnK6Ewyd53BkMk71pOiCeGqigv2/0rgBUpuD59e47cZ3iyFIblpsG96FJtvZAOOSF8qoijPsHE3XRMJBxnh9cUcHMGN6BIq2zyTtDrjGKmlBxOyj+rQy5tjgcVsosWaijzqLC/9GDAchpEz89nQFfg+xoRFEDgB/nFAS5Uw9HCGT0kL0YrEq3y+YLBlsbPyeZh/G3Rs+0UVQrnNz/6SA7OwsJ9tNeWFKUHcDA9nWK2lirEcm50xX1anbZmhye/0NZkp6yQg2p0f2UEoxYlLhcj7qIIAeYedYWLi9zwG58m0KkJG9VGRgNYan6CRyGjAa19rYQ7vGN5rkDMkgDoj9HThPzzmJJzwy+YPTztu8oAFROswJsVaEvnJDkYlrmdThO4nTFFevRKfSFoXTiX6MmLZn52a24rhHf3HBmEgOL4uSGFdvWGKwyJ6n/fRFTa16i0DjIVn2VJ8aUV/V4kzqqXj7czSAkQbFmCWhUBWKQIvsFe5SPL0CxVj9T44vvv97zvMjah+H5snHXV7xjxMRngm3RAN1oO7+Tk5obyc3fv4E1bFRKAHbFo536AcdNBSCHav2rPHdg/eqnf/8QoBNEOiVF2ZURpDngx5cd9JmqX6aiFpIGyTJ7bsQKSEDXMA8ZRW4jICFlhlvWBdU4swCZIuGsHz45U2 zOGLbvUZ nCX30UXk11TB8SgypDDzHda7a6mpfTI8UW+3pJzy2kJpKTRgHyiQLGcUTCUchNZWjONgsxu5Hmr+krTgG+9BhVFj11Ki0fW0fwRoWjaDPkEO0NLtM1YzsOt2as888LP/EGteCSh9zIJis0Av0/JXm2QPzqoSAA5VCN5JYzNPphwhs+zinJjRUv0BtvNqCP0e1iBr0zOXtUbfFRDiuJJjM+97EIunjRey9scVnZUeAukbOQaz9ns4d+EqhY0UhKBTJhu6i6tkbgxtn53hEoY2gSFlu1VrTkI0XTA6pPh188A6P1AuFCiUvcVcifKzNrMXOrF8wNogKwTRyKhxaJlWpkQQXKznyg/flJGJJVgxF5U5zURz9yki8c5+1SmOT1Ub/oZsq 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: Not like fault_in_writeable() or fault_in_writeable(), in fault_in_safe_writeable() local variable 'start' is increased page by page to loop till the whole address range is handled. However, it mistakenly calcalates the size of handled range with 'uaddr - start'. Fix it here. Signed-off-by: Baoquan He --- mm/gup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 855ab860f88b..73777b1de679 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2207,8 +2207,8 @@ size_t fault_in_safe_writeable(const char __user *uaddr, size_t size) } while (start != end); mmap_read_unlock(mm); - if (size > (unsigned long)uaddr - start) - return size - ((unsigned long)uaddr - start); + if (size > start - (unsigned long)uaddr) + return size - (start - (unsigned long)uaddr); return 0; } EXPORT_SYMBOL(fault_in_safe_writeable); From patchwork Sun Mar 30 12:17:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032902 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 4D0F5C36011 for ; Sun, 30 Mar 2025 12:17:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D511280005; Sun, 30 Mar 2025 08:17:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 36083280004; Sun, 30 Mar 2025 08:17:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B0F0280005; Sun, 30 Mar 2025 08:17:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E67EB280004 for ; Sun, 30 Mar 2025 08:17:39 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 32AE1567C7 for ; Sun, 30 Mar 2025 12:17:40 +0000 (UTC) X-FDA: 83278118280.29.095F9CB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 7723B40009 for ; Sun, 30 Mar 2025 12:17:38 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fdkTjFR4; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337058; a=rsa-sha256; cv=none; b=hE2MFfar7qq5EebqjkfYijrRaEi55Hy7oV8yNsTDQvmHcA1Chn9QsfO/iCe3TLdkrHnW0F HbYAQRg6HnUVkPq0Uu2JUrSvHrd4l+UA8eYdZ6NQAhV6zaNfLeo7s67P0j5X4svVN8uEpB XTfKtJWazEPZ2F3aclJzGNOfCBr//WQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fdkTjFR4; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337058; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0G+7enjJ3hUuHc8nn+ZMKDLjMZiATmJ3BHld8fzSZf8=; b=bwKzBg3/h4dLjurWMvjwOsCWJn0mlVhSTLN4txJkTdRj883J+I4AwRw/fStXFpA58wqoKp y7iVCxRm7cfR3qTDX2KoRO3X5SQjomumWbsYYrqg1tOtOE/fJxjGxoJPpeeWOdVwvO4PL/ AOg4nzQTYGqCUFeFfiGfEIeiaNBJKP8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0G+7enjJ3hUuHc8nn+ZMKDLjMZiATmJ3BHld8fzSZf8=; b=fdkTjFR4/u+RmrFojedpqwCuRGBUUKbaj1vswAv7fmnM3utCv0qQXNgIxGOaVcOII5uzVj Ad3bAuIvyjfY+DWZJ3NuXdQxjtujHQsygH3IqQyyMGYkTw4F7328unXanhuphZGkcOI/QP TPuWw3jGsWhoDtil0IQwSwUiuruO8fY= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-fhcRkH7YOYeKvg-myRGkUg-1; Sun, 30 Mar 2025 08:17:36 -0400 X-MC-Unique: fhcRkH7YOYeKvg-myRGkUg-1 X-Mimecast-MFC-AGG-ID: fhcRkH7YOYeKvg-myRGkUg_1743337055 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0173E18004A9; Sun, 30 Mar 2025 12:17:35 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2BD13180094A; Sun, 30 Mar 2025 12:17:31 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 2/7] mm/gup: check if both GUP_GET and GUP_PIN are set in __get_user_pages() earlier Date: Sun, 30 Mar 2025 20:17:12 +0800 Message-ID: <20250330121718.175815-3-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 7723B40009 X-Stat-Signature: 64ui7cwoj9usfawfsd8ephq6op8mou7t X-HE-Tag: 1743337058-915689 X-HE-Meta: U2FsdGVkX1+untHMvRfoTExNk+dB1RBxa5AGXD568piDomJK2+8gGT9ncFAuTqEkTHUZ46kJ4XUtWgPE64yJIfMYt9r53jkM3Tl5y3zKjhP4dFqDzrCVov6m1KydG8T5JrmxFpCsqcjCwfhNvKg3oqsub58qpNA8huTpRafgT6TCB8Z4weg5Qbo9jQQFT+Ao5W9P/zD/yDEn0tBKWO26KN/J7RQzsVVglXrmEEan5wBrl3kis4hGg1DMzNlYJKPz4fYWDIV8tuDDKuzVIrVifDD/6g7H21sc5L2DcL0QlMvyKbum+gqodqS7fg5ZU6LFV5mbbeyEBA5PXW26xPSMtzHMQAtOGnXYKoL5HhGnNEZQFlEe6V+SbpMGeD/RPD209xczJZshyvwRi0BXPonTIC4zyHD+V0dsx9R2FZFYL9d9taboBVnmFK6dWrMFA9pgvomMFwJKXQCeTk5LhB0cjX6hjvYkh+XXbewt0qwlhe8yBh6kkpoCSRiZwfx3qKdo3wS5kIsC2i+VvyCcRJaet+Ad/HtgvW0pxzgBhsSBk0NWuetnhbw4BMFqW8JPV+4NxLCZzcHddme8rYET/yk7h+Fq+/hWW/Yr1nNSfjbpAgh03Z5IMsRlLkCwlSEaDiEcXdbyv/7/qDr2klzJX9rVDi2BKprgpn64HkFwzWy/v6qsKvluJVHGXTR+ZVLYZAgEXbrRDVJJF/AAoPULagHyyHx8kqxDF/OZ8eCF4HYX3mZxFlT6elV4ym+qz82dvjXLBJzARYT2EHI6lAPoVMBN8V1NjbfGomRzmcPKm4sIzrpeD8ij82turwmwmSRk80L0WWK1jOGajZtIb6+lRoo7mtq/dFajdO21wkJDhyByv1TUMwTt6weqiiGWtSzFfnQuzd4XJOyO1LgAaVtA+wl62c6KtzRpVT5n6+yFE0KxfBHGfjAABsLp8PXk/XJccGOafXqt2KuKasLIlmy91XP M0arPiLf SZHAVvpIQ3imGOm8ZZiVER76WMNUgplGEOxX8vaK9kQB9v6tCqCGRL+mN6bftujIZd6oIcUdYLcqyDT/LkGE2cPbCrC8mwNZI8iZrIraPZPNbDZ6hwfZ2PHqxd9y7JOW/xP1n8WYMkfIdAIkjPkDKoQv5rfrUuLZOXhefRFVa6OrmS2Cfkn62Qa2g3daJ4SWapqE+oxC98y6E4un+eJDiB3cw4K9OoJ3Rg5i6DfQmx+bSX6/3Z5mkgJUzs9loNhZQVRPRm2PkJ2iKX09ygtoqqT8sTBfV/zVHH5aezltLQaRJTdue/0ifg1jiQmxAM+nzWmAxXdoVUAliDCk1mTXbZXzQSMxDSK6xr/jvIdf4D5qq2NdDMSTKBfY/h2wg+homIZmV 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: In __get_user_pages(), it will traverse page table and take a reference to the page the given user address corresponds to if GUP_GET or GUP_PIN is et. However, it's not supported both GUP_GET and GUP_PIN are set. This check should be done earlier, but not doing it till entering into follow_page_pte() and failed. Here move the checking to the beginning of __get_user_pages(). Signed-off-by: Baoquan He --- mm/gup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 73777b1de679..8788105daee8 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -847,11 +847,6 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, pte_t *ptep, pte; int ret; - /* FOLL_GET and FOLL_PIN are mutually exclusive. */ - if (WARN_ON_ONCE((flags & (FOLL_PIN | FOLL_GET)) == - (FOLL_PIN | FOLL_GET))) - return ERR_PTR(-EINVAL); - ptep = pte_offset_map_lock(mm, pmd, address, &ptl); if (!ptep) return no_page_table(vma, flags, address); @@ -1434,6 +1429,11 @@ static long __get_user_pages(struct mm_struct *mm, VM_BUG_ON(!!pages != !!(gup_flags & (FOLL_GET | FOLL_PIN))); + /* FOLL_GET and FOLL_PIN are mutually exclusive. */ + if (WARN_ON_ONCE((flags & (FOLL_PIN | FOLL_GET)) == + (FOLL_PIN | FOLL_GET))) + return ERR_PTR(-EINVAL); + do { struct page *page; unsigned int page_increm; From patchwork Sun Mar 30 12:17:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032903 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 0E5D9C36013 for ; Sun, 30 Mar 2025 12:17:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E82DE280006; Sun, 30 Mar 2025 08:17:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DE456280004; Sun, 30 Mar 2025 08:17:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C862E280006; Sun, 30 Mar 2025 08:17:45 -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 A46DE280004 for ; Sun, 30 Mar 2025 08:17:45 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C35B7C1140 for ; Sun, 30 Mar 2025 12:17:45 +0000 (UTC) X-FDA: 83278118490.12.13A7837 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 09BDC180007 for ; Sun, 30 Mar 2025 12:17:43 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="OP+/mKNc"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337064; a=rsa-sha256; cv=none; b=mYXy2vMiv6pZ+Ge+8JizQxLDj25F6MOTO/j55wBfLc93KWUtPS1YEpo1uqvUXA9y85acha g12rhiw52mfuh7BGUhCS/rkj+OA9xBYFmY+9k44EcnAoFNFntEqfeQWQIHZA5z7eBznfPG j8P3rsgbzflRvZjL2XAhxwgn2/y+gPs= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="OP+/mKNc"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337064; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7LqQOrccmB1vzyfnAtlatGcQGL//TNrd+LmFWKgXy5M=; b=2+g1HG32EoNkp7SFMwItwFXuMcGZ6MQOnMYD1gBtrot1vIpMa2wWaWA/tOojLO4jJXUWoI ZUhnA0V/CbnlvfBM/T9+AFZPaEGZ5IHTuMA1iizSgONjU+W/PXDRFhwbdp/AJapRUtuu2u qoHh2TWzVOg18jkolhO9cikX5hLpECQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7LqQOrccmB1vzyfnAtlatGcQGL//TNrd+LmFWKgXy5M=; b=OP+/mKNcN3CxGInyM5UviuBxMYDJnttYlXFnSHlCXuXLNCrH4DJjN93LHdkpUhxN3a1Rid 109G37qZoRQuXLkAc+vyEsVOFL5YrfTDw9ys+sbCaTdAiR7JS6Iu4P/bBL51y30N2EeMhv Joeq7Cx3U7rINSppLiKAq8XPzbbxJk4= Received: from mx-prod-mc-02.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-14-LJRw6BwZMB2lZhSVeFH_uQ-1; Sun, 30 Mar 2025 08:17:39 -0400 X-MC-Unique: LJRw6BwZMB2lZhSVeFH_uQ-1 X-Mimecast-MFC-AGG-ID: LJRw6BwZMB2lZhSVeFH_uQ_1743337058 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6FFEF19560AF; Sun, 30 Mar 2025 12:17:38 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CEE2B180094A; Sun, 30 Mar 2025 12:17:35 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 3/7] mm/gup: Fix the outdated code comments above get_user_pages_unlocked() Date: Sun, 30 Mar 2025 20:17:13 +0800 Message-ID: <20250330121718.175815-4-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Queue-Id: 09BDC180007 X-Stat-Signature: cw3eczz38qi6fkp6rxu4wceyd6mxa38t X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1743337063-409902 X-HE-Meta: U2FsdGVkX1/uGhuynZeHr1OaxYIrGLrgfuKNjLdsWWFP9KwZpsa7iM6zNfqogFl9sTTF7KXfaWbfepzMOXkiMIdYK+1OT17q9/9/VZ13QHKMa05EHfDg1zfOwobgdUTIFMxfGm+PxOAf10218X6aHAbdBPuR8oq2HdisPpKnO6vVveJFDZXLKAN/Q4nHSBA/X3MmIrmIV2WZXw1uq3NRPLPP0Q9uPfpkW0TKXRSYKeTYqtjgbi3BuzRhoocRxm90GRXH10Lk4LGSqbGaIOj2dHQf4okyYvEgTsczGsCFGTRkGVr+mCQe4kHJj7c84MLeNl4axBYBtXP0+YqM36PpI8oSjiYNQC6iWQcHsw0XX4F1OveQdkTNZx24ClvSC9ZY7Rhl3mFXSLbxIEHfjDs+WZPJ7Wmml5fZfmv5GFpfBBI85oR86WtXSH162zPYfCGTeBH98eIPHpJXEDWhr5bYwS2FS7A3f4WgDgrXgGWpcZQt01TCgHZfkl1+Vpg9aEl22CjggDJdVHnOY73FKtk2KRPBVeKlPiVx9W6oEJp+UYFEt2tNBKa71nIwNO2TLkNDdz/HOGguwF6kGeLZVWXLP/mKWcER5xTdgD8/TP8JrPVN+e7s7oRJ/v2aJak+IV+7qMnkLQwioFe0VJWWrhJtn5U5bRGvWRF3FJTB2aGizxe7+8RFcRqx29G8poTQGb23G0Tc+Ei+Gk0440v00E0u+4kN4SsoIPVXmSdCBgJ0g9JKryfSME3KagnWLCS7FapgvTL7OcwsuahFW6Ma5TbU6p5OgokBCbrzXsUX0HyQu7M0Y8rTQIYk97JHYi8H3jq1AJGX0LjS5P4AxEBrgZgGuie0yLLWXQW+ISlB70by77o/0KiISJwjmxTY3+0PUccCkzbP5i8zHbfzIF9azQk0hPkY43loXqwZw0PmykBinY1vjiETH8qkrK6zbVOsr2zhSmEPWqyTGquRlrZdea6 1xmZQ5RM 15EXnTX3/GsZDZ3Z5pipkuVDUbktd+1BvWa0mhuzVAFyPI/GSNDd1jSThdPUfitFBjUOJf10XmhUu5jAoBZPkcOncNEiXjG/lb7HTIC4MUEn9sMVYg2CgFVxjq9sImgAUP1uyZrQP95sPJJXxQJMzPZQYLeRtEfiA6niYCfTZgfNkGEdyQFnwJeqboOGiJfLHCARa3gYuhdfUb+zsnZHiir018vSju059IqHDVwJKVSG5obeU7OLCFphS579m5GDfdBk2X6o94IZlG7WU8PXcGGKmKunFwkwskKy6NJSmP4xFm4zqA9zTLvSXIXGPFDRebzfsDWL4ezWqCzyI9SX1p+JQzngvn28HYJUjEUaeZYyI84DzC2orIN/3PMGM4YjAFJY7 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Since commit f0818f472d8d ("mm: gup: add get_user_pages_locked and get_user_pages_unlocked"), get_user_pages() doesn't need to have mmap_lock held anymore. It calls __get_user_pages_locked() which can acquire and drop the mmap_lock internaly. Hence remove the incorrect code comments now. Signed-off-by: Baoquan He --- mm/gup.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 8788105daee8..3345a065c2cb 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2702,19 +2702,9 @@ long get_user_pages(unsigned long start, unsigned long nr_pages, EXPORT_SYMBOL(get_user_pages); /* - * get_user_pages_unlocked() is suitable to replace the form: - * - * mmap_read_lock(mm); - * get_user_pages(mm, ..., pages, NULL); - * mmap_read_unlock(mm); - * - * with: - * - * get_user_pages_unlocked(mm, ..., pages); - * - * It is functionally equivalent to get_user_pages_fast so - * get_user_pages_fast should be used instead if specific gup_flags - * (e.g. FOLL_FORCE) are not required. + * get_user_pages_unlocked() is functionally equivalent to + * get_user_pages_fast so get_user_pages_fast should be used instead + * if specific gup_flags (e.g. FOLL_FORCE) are not required. */ long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages, struct page **pages, unsigned int gup_flags) From patchwork Sun Mar 30 12:17:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032904 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 04B58C28B20 for ; Sun, 30 Mar 2025 12:17:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 874BA280007; Sun, 30 Mar 2025 08:17:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FE8B280004; Sun, 30 Mar 2025 08:17:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67733280007; Sun, 30 Mar 2025 08:17:49 -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 45810280004 for ; Sun, 30 Mar 2025 08:17:49 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 70F841CB55C for ; Sun, 30 Mar 2025 12:17:49 +0000 (UTC) X-FDA: 83278118658.22.AA27D31 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf27.hostedemail.com (Postfix) with ESMTP id D2DAB4000E for ; Sun, 30 Mar 2025 12:17:47 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SBWCTnW1; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337067; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hxqDMoJetNer7F1DwMLPFhLQrU8sSqdg39HX8cZyX4Y=; b=C19AU/PHdKD2elBbL0CkOKyrxZ9kb/x0pzvPqujwpDeKGniR4HIfWteie3GtHeRUWAN2yq Vr9M7CakEe/wM5/irJYBNPfIZYeg1U9qLrNqsV8pNjaJGC/cXxZUGHo64Zh40zXvdkewau op26+DlvrMsjcjR+qcT43YVSieKRwzE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SBWCTnW1; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337067; a=rsa-sha256; cv=none; b=eaisU1i2np6u3mML2/UnXIO9yNUmOEYucymVs+Rp8RAlPLpmAurw3iXQityqTbjuSKA2om BCnJ/PB/4vo655B/lJS0BldR+MT5JgNmaowSnPg4KXCzuAVSv2ig/vsy580vxIFj2MJPhw wi39Vsn94xIeB5iSdXNywzWE5Q41bXA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hxqDMoJetNer7F1DwMLPFhLQrU8sSqdg39HX8cZyX4Y=; b=SBWCTnW1iM2ul+g6V3EgV3mt54ZfoUrAWkRxsrSzR+8ccObDxQYqyvY5Vj3g74ohwxMtlH oE630Qc5BoOYGkhZeb2NArnAWkrusfaW0/zA23FnqPjY0EGIy/oZxBrbSgtIEpBo7NHJWs aED3mP56knpo4BYQvMZzJyF3laWVkuo= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-371-Zv7FARzWNZOEPs16cB8FOQ-1; Sun, 30 Mar 2025 08:17:43 -0400 X-MC-Unique: Zv7FARzWNZOEPs16cB8FOQ-1 X-Mimecast-MFC-AGG-ID: Zv7FARzWNZOEPs16cB8FOQ_1743337062 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 200B31800266; Sun, 30 Mar 2025 12:17:42 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 630CE180094A; Sun, 30 Mar 2025 12:17:38 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 4/7] mm/gup: remove gup_fast_pgd_leaf() and clean up the relevant codes Date: Sun, 30 Mar 2025 20:17:14 +0800 Message-ID: <20250330121718.175815-5-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Server: rspam01 X-Stat-Signature: cbxc5fu18xuz8nxnhk3ugi63utimk6ye X-Rspam-User: X-Rspamd-Queue-Id: D2DAB4000E X-HE-Tag: 1743337067-961735 X-HE-Meta: U2FsdGVkX18PU4I7YLabC05kbuaL1yvd1b82zL6apQvJnO8wpeIND8O06h0g2xUpXi/EYkigHqY1FNPexCueilGYILPPOJRwCBJ1W5FAzjuIKQ/5BGdcc/GbFzP7F3ZfLbKOnKozpUPfzTvCx8Rm8SMzxvbHcC+QINJRutc3o3hUO1A2Sc3j6HsZIix7TaKFkvFYRGicIR+VKWdQpYczSHjO3RW8sfRcWxfF8PrhI7KZ5ru9y004jtHOh+XeAZ3fpVM/DxHWGiFSEQ86cet7/RPYRVOtPZ5iG2oMbb2u5XYdLzZ2SPS2Ag6+Ag93zVaovsXe1RkaMsqOeZ5xcCkJMMkdSJ3hI15l9cxo6WkO5W31YHryEGgjA9RCB+ImcRlsTw2Z0BZEjIJLSH7/pW1UvNb1nz7sP0vNrfvJIQroZwpVVi6/TF9rgP4Ez/YxzT231zrPlnax4L1DSUsM7J6RIz1O9HS8OxIM4hpAcw1lZPqAX4jVhQhvD0erg1jp22co3/+fcB5P82ORCubdJzB8J1TAw1T/IC3plxUbftiNXcB6hrmawLewAJn/HOgrXK9S7esKWpBrCDlbU/gyJign5R5Iu4nzA+ESO4ClmcHoa6LcXlo7k69Zszouhcn0YEY16WP84GZKe2Rlc3KYCXkHHme+4X5I034c4cXhv1KgAQxW+m8xRA9fXsYguGG0OQuQGBSWRW+g3NEajpIfcNavYVjffRNjIDdQZSqhc3mirXYhPN+jdAwnjWPAf8zxXKofUK+kAQ86diyoXb7xmD5yeahphWN1t1OtAnL/+JTtlPbE2odRlrxPtShtIBC6LEyj48EHLjajbeNO2l2sgExnH/VtSdlWPrFRKpYnJNF9acctSZbP22mwE0KFwDu9FYFt2b8gdDSSY6BqY+fqV0CTdpcTOg/VSlcCmUzy7rFOe73RCgyXf7ebzKBvKY24tClYFCl9U0OU38LJyiwYZ/h CNR57MLg tDlgZpywPZbBlY/WIbpSW5N2fNo1y+tHe8mrGpFnlibGGxdFTC0vJ45MwpqnVsrWvcHq0XpTr5LpN2WTkoxpsOCkzoG4QoAHolud4ZxyLXzwHI7c= 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: In the current kernel, only pud huge page is supported in some architectures. P4d and pgd huge pages haven't been supported yet. And in mm/gup.c, there's no pgd huge page handling in the follow_page_mask() code path. Hence it doesn't make sense to have gup_fast_pgd_leaf() in gup_fast code path. Here remove gup_fast_pgd_leaf() and clean up the relevant codes. Signed-off-by: Baoquan He --- mm/gup.c | 49 +++---------------------------------------------- 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 3345a065c2cb..3d2c57f59b4d 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -3168,46 +3168,6 @@ static int gup_fast_pud_leaf(pud_t orig, pud_t *pudp, unsigned long addr, return 1; } -static int gup_fast_pgd_leaf(pgd_t orig, pgd_t *pgdp, unsigned long addr, - unsigned long end, unsigned int flags, struct page **pages, - int *nr) -{ - int refs; - struct page *page; - struct folio *folio; - - if (!pgd_access_permitted(orig, flags & FOLL_WRITE)) - return 0; - - BUILD_BUG_ON(pgd_devmap(orig)); - - page = pgd_page(orig); - refs = record_subpages(page, PGDIR_SIZE, addr, end, pages + *nr); - - folio = try_grab_folio_fast(page, refs, flags); - if (!folio) - return 0; - - if (unlikely(pgd_val(orig) != pgd_val(*pgdp))) { - gup_put_folio(folio, refs, flags); - return 0; - } - - if (!pgd_write(orig) && gup_must_unshare(NULL, flags, &folio->page)) { - gup_put_folio(folio, refs, flags); - return 0; - } - - if (!gup_fast_folio_allowed(folio, flags)) { - gup_put_folio(folio, refs, flags); - return 0; - } - - *nr += refs; - folio_set_referenced(folio); - return 1; -} - static int gup_fast_pmd_range(pud_t *pudp, pud_t pud, unsigned long addr, unsigned long end, unsigned int flags, struct page **pages, int *nr) @@ -3302,12 +3262,9 @@ static void gup_fast_pgd_range(unsigned long addr, unsigned long end, next = pgd_addr_end(addr, end); if (pgd_none(pgd)) return; - if (unlikely(pgd_leaf(pgd))) { - if (!gup_fast_pgd_leaf(pgd, pgdp, addr, next, flags, - pages, nr)) - return; - } else if (!gup_fast_p4d_range(pgdp, pgd, addr, next, flags, - pages, nr)) + BUILD_BUG_ON(pgd_leaf(pgd)); + if (!gup_fast_p4d_range(pgdp, pgd, addr, next, flags, + pages, nr)) return; } while (pgdp++, addr = next, addr != end); } From patchwork Sun Mar 30 12:17:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032905 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 3862BC28B20 for ; Sun, 30 Mar 2025 12:17:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17F19280008; Sun, 30 Mar 2025 08:17:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10875280004; Sun, 30 Mar 2025 08:17:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EEADA280008; Sun, 30 Mar 2025 08:17:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CD638280004 for ; Sun, 30 Mar 2025 08:17:52 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F166AB9ED2 for ; Sun, 30 Mar 2025 12:17:52 +0000 (UTC) X-FDA: 83278118784.07.F1CB4BE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 3C8E012000B for ; Sun, 30 Mar 2025 12:17:51 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bMoOmwn2; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337071; a=rsa-sha256; cv=none; b=vAS0YFbeqpelQlUEz5jsN4k3NkfUesf0KYVDMTgALWerMa5anOV1P/bYX37B+aZM6DbR+l tKw4LdEilNSr0Qiqt+6GyBSPaZed94c9+he9QIpnuoABP1Q0TxU0Ltdc0Oo3h/PuFT06GU EGqeXOMK82yje4aXkbHqppExI6Q9/IA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bMoOmwn2; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337071; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7ECEhQdPvPexYB/Ok4Vzz5g2XDSSP0HaL/jTvOM1baE=; b=n97Pw3Ps0/zIHXGhj5Qaae5N66TocLp1+qeWnLh4Drzt2xdtxc2O8X6vRxB3JF0k6RanoM Xvlvt7pKBSy6aFX3UXPweZDsl5gQOffiMGaAtMrZYTFFQksCvuFhH/NyYa03T0dDLgzYvD QufiA7KvPHZvmmg6cXsuBEocL6nSq3Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7ECEhQdPvPexYB/Ok4Vzz5g2XDSSP0HaL/jTvOM1baE=; b=bMoOmwn2Qv/FS2WjhI/GNKZgrV7B4H4mWkIfMLGSVJnbzm4M8DR4VZdKYi5zd7FF5fVKmW SImsn5DWns+2HDUxNalIUAIpzgFueFCSAkxtarTK05skSgDtkIbUOThaBPw/+GEv7r8N2q 7GHTVyjoCIfa2t1UOgz4CZ8vQG3pki0= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-541-SWtT2QNYNkS5LbpE4fkmHA-1; Sun, 30 Mar 2025 08:17:46 -0400 X-MC-Unique: SWtT2QNYNkS5LbpE4fkmHA-1 X-Mimecast-MFC-AGG-ID: SWtT2QNYNkS5LbpE4fkmHA_1743337065 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A71F11809CA3; Sun, 30 Mar 2025 12:17:45 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0F745180094A; Sun, 30 Mar 2025 12:17:42 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 5/7] x86/mm: remove pgd_leaf definition in arch Date: Sun, 30 Mar 2025 20:17:15 +0800 Message-ID: <20250330121718.175815-6-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 3C8E012000B X-Stat-Signature: w11rerdjopqgnir95rk78xdy5chm9q1a X-HE-Tag: 1743337071-719473 X-HE-Meta: U2FsdGVkX1/805rNFMrQrWUOxYfmTgn4uxgQeumhi1c3y7d+8KK2bZEGUs173goh4k3J3atVl+oRv28YsAkTvT6JsWL4CkSHAvzMFu6beCGaMRRUtLDXI4ZmMRRUIwyS2uCRPl9FKTMyM+nh8Gg+l0CEecDUs0w725gQMZnG2OFimmpgZJs5MbmS8xZubEDpSyJJcwKAqFKmNbXkGd7M40eMiuE5OuHBcQ6ZpfrDuSY8Wa1Vgr4+R04yo6o0EwMPm0kNS38/krQF886OVV9uM32JY8tMSJUP0clzjfli5U7CnZAw1dpukwQNUuwKXJRBwKF9nyE9Gg7iO1LsNf7yzJa7eJ5ve423VVMKmgkpd9wTJYTbNCRSwtfaFJnVGinB30cjY42PJOzWhG8Raw3zNOF7Tx6PfGqaREBOjrDt5bk2blNunqCnUxBYe0zOBHqTEph21XV/6eMJqYvZ8SVZA4vPqgUEcE9U3YuefpntutAZgx9F9BrlRS5bgM7e7KgRFNMYr7KQOM2micjP2+30RLfRbs8uUczT99RZ5CZxVWcE4kZe7sanM1Q013POzx8C766LOJYpGiQOdKtq5AYQYXV3vXyTbbNT1mbEmGaQGtojKjfvmKQ/htziL4JEGsRfQWwa4RRKuxVDWN+fcpHcUBzEJEbmsLJWr0i+lF68mwptWzGXIVCT195anyfvU3K2xUMmUEgoe/T0wUo97TLzUig2ngEpDd7H0A0r7YYiubjtiitYr+0ATDIqZUe99mjhX3W62AP9viit5wOfbE8sT+abMqH7vijdn53RcLZ2sV15BB2HiKFajn8T/psmt9PHYPz80NaL/aF0scw/D8Ubd7kDYvsc/CaMBQwOICu6Hwi5l7rs62MOwIbJ7LWL4Ph9wh6ihwcWgGiqOCa7ie+BlCR7KZZhpM8qyr/y5ayIPMaECGP5D8MtZXvpmS6urT9hQmb9pq26n+29xdlQ28a F79rkERl T78eH3VO7nzXxRSmB6aMDFQ6mF32vG05o3UWJan49E2C1yJGwrnDVPKnG40l3x0yPvrtaft29JQlUPESehdIejpBFxjM7FDi/tAOvehDITb4RebFDSgbc+UIMIfUQDqF+zq+kD/yv0AHbhG+/aWbLe7QqW2yuyGuGBHK7QsBnQk0lFz4M0S3kIIwBCitbo7H9a1JB15nOwEPsN/U56itZN4SifhnPTuU+HuCAxBob8pQDqhaxWM0jugwWt9947sQjpe4ZDtRdjs+9NsU48fud/kyMilMSeTXpuyDC8Vy9h20MCFvVa6ZkwpEvDz/ngqX9DKZeZ06CFxTKGTg1nKsM6VcEHgqVRtBpTTV+oq5cUihEBHnRajpiZl66eYn61oll/Rqb 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: pgd huge page is not supported yet, let's use the generic definition in linux/pgtable.h. And also update the BUILD_BUG_ON() checking for pgd_leaf() in pti_user_pagetable_walk_p4d() because pgd_leaf() returns boolean value. Signed-off-by: Baoquan He --- arch/x86/include/asm/pgtable.h | 3 --- arch/x86/mm/pti.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 7bd6bd6df4a1..5f4fcc0eea17 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1472,9 +1472,6 @@ static inline bool pgdp_maps_userspace(void *__ptr) return (((ptr & ~PAGE_MASK) / sizeof(pgd_t)) < PGD_KERNEL_START); } -#define pgd_leaf pgd_leaf -static inline bool pgd_leaf(pgd_t pgd) { return false; } - #ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION /* * All top-level MITIGATION_PAGE_TABLE_ISOLATION page tables are order-1 pages diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index 5f0d579932c6..c2e1de40136f 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -185,7 +185,7 @@ static p4d_t *pti_user_pagetable_walk_p4d(unsigned long address) set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(new_p4d_page))); } - BUILD_BUG_ON(pgd_leaf(*pgd) != 0); + BUILD_BUG_ON(pgd_leaf(*pgd)); return p4d_offset(pgd, address); } From patchwork Sun Mar 30 12:17:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032906 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 A8812C36013 for ; Sun, 30 Mar 2025 12:17:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 871AD280009; Sun, 30 Mar 2025 08:17:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FC4C280004; Sun, 30 Mar 2025 08:17:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 653D8280009; Sun, 30 Mar 2025 08:17:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3FE24280004 for ; Sun, 30 Mar 2025 08:17:55 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9D3B9576CD for ; Sun, 30 Mar 2025 12:17:55 +0000 (UTC) X-FDA: 83278118910.17.83050AF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id D8B35C0007 for ; Sun, 30 Mar 2025 12:17:53 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hg3lIVra; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337073; a=rsa-sha256; cv=none; b=p78fFl9kiYMEsSERLLpDrT5cppoSKxz13MROEWeMWHbmF+/yjQcRNZ/PIuDFUtpsBL+MKy gn9nOd9ZURX2PAWRLW6sFsRsevDsrFsdXu7H3BbfPoT56wxcxiPOKdjo3WG6Smb/BOKSTT PFlzvR/CTdX0uGhAgETbqzouH0bCjo8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hg3lIVra; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337073; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SMo4jBzg968VcT1tEVh1MekL7DuKyZ/p1dzOuEaPw7g=; b=RIXbhUtvsy8WyWsv7n7n4EJY1Xfs0kpAGwJFAZuX5MOAeeqm0lfOHEYxlTkmkIeX6zx/Bi bUgiTpdFKcFmzAf3AfX1eowqYOz7FAiJsS4rytdi6ii+BlHlgKlCHCqAdF7bBOxm1yhTKk 8p97QxCFI8474/lB0T7XF73pJQvx8MU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SMo4jBzg968VcT1tEVh1MekL7DuKyZ/p1dzOuEaPw7g=; b=Hg3lIVraLVxl7b6vI+SQT1LMRlrhxLoN8ScimIjg8jv8fPjVCfl9czDV/V0ZIeiWMWw8k1 aQCdaUwZH5lONauE9Zw7Vn3WiTXJVUdgg2fe5GQojFBK062lAycUAJAD1Y5IDdMF/6RKvS l7dJ5vnoJ+JL+Ps7YimbfUsDP0UIZ34= Received: from mx-prod-mc-01.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-170-q4F2WwCWPOek5DYDs2vaGQ-1; Sun, 30 Mar 2025 08:17:51 -0400 X-MC-Unique: q4F2WwCWPOek5DYDs2vaGQ-1 X-Mimecast-MFC-AGG-ID: q4F2WwCWPOek5DYDs2vaGQ_1743337070 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 21841196D2D2; Sun, 30 Mar 2025 12:17:50 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B2190180094A; Sun, 30 Mar 2025 12:17:46 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 6/7] x86/mm: remove p4d_leaf definition Date: Sun, 30 Mar 2025 20:17:16 +0800 Message-ID: <20250330121718.175815-7-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Queue-Id: D8B35C0007 X-Stat-Signature: yjxrkn81gsxhkqb64yxszbp65qiafwb7 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1743337073-24685 X-HE-Meta: U2FsdGVkX1/42/HbNhqc+r9Gz4ws2ARE9MinXSaXfjLvWtMVTacARzy6WWvyedhHwbmmV6Gu+mZSbWAnTB1dE/gJUDmVL9FILcyFkHP1XeeGZdpddCHjdEzJzXKnYWVfzslXSyoRG01s5+Bch8G1ObmINUpGqqN9m+hBoeYbZRbKnsUXVjtS0kHT3c+/IjDPUyEGPqQau0ph0UPqSavMqttybXX9Kv3klnbVs09zlb5U8M6aTdrhoUiHDqHRvKsasgNLThtNuntf9tGnyZWzCk6MLshJy1MVWDWdZ9kvNQKShgHrjWms4ZprB4xXZ/kTkwtRC8Ih16t3A0v+3tvHkIuIN/+KLO+VORMphCPMtcmgOwIJDbtfWvNNmQusxU115moms7HkiWf6rocvw/DBCt5JsN5TL9ry12DtgiPuMs6YQ0h9mFT0GnRpmaY3ZJLxvhPifW7DVC5ms7ku39bz3y0RdkA/u5KB/iGgIrF7BDJHuVY9ZCss1wNohN9w50TH2do7mWwhcaBYDO7fQnaQumxSC0zSzIMnb+MvcYfV7cgZYKMiMfTdlQLva8LoHebg82K6bP0P7JMSEWPPaY4tgAeWqxh400/acGNrSjWTGrs8vrzfAzCvAadosjkhYYvCXWhK2e9hE9URO8IlojcUDR8ru3/7NEelfa/V/3zF3MIpl8GRachdXJncaE/m9v88qScJDK69+Vyiagqk9081IpJUFkyppcKyyfFhVTyjZjj15TWlaTTKuXW9myEkR/NpiUoZ54QUvZrpYJrzpvbCiUolBShApIMtqnjxf3sBJwPzXhcP5F29hhYuVkV+ifWuAq0uDRaoAU+TzsQGp2yujjabHesU0oD0U2yDJSFrKG7dCcoJRn5gXl3egpOhz4b+C7qElH8Yn2V15tQ+DnIkeLnFIOjrnHgDe4jaVaokXvdwz43JVXAp/ZeaJAVZR8hbYWITYDt4Ln6SIc0VOzl VC910NbK x1kUuczJpqRZtAp59JhUeB8kpFNAJk8NIE/HrEtphQj9NyY0qjGPJJhxW7xj3ryChHRI0KGkz99QuaOsnxd523KY/Upx9LOj0VWezGS2dxddDVDnr3VzBtfQiTw7PmqGhACUUhfOmKY6/S8njvBcY1+/7Ek03311CVfK6laVAZpGD5+JVDyPzmlMVzaZnWnw+zoVK/XsgqVFM0lIA/gAMRwrW6t+IQjNV5iXE2lfSdTotzarVEuFywBkwUK3nqjwT5UscU8vJUd7H08iza4n/f5z1aAB25pAq359QA8ABIhBi5Q9/eq5AE9KX0IGUGwfZAzGF8uNWpC5yxWxTfUwdpp8nvhvePu9orcSH4s6nac7poEfuCOwbgHF4HHUxyoIu7pDt 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: There's no p4d huge page support yet, let's use the generic definition. And also update the BUILD_BUG_ON() in pti_user_pagetable_walk_pmd() because p4d_leaf() returns boolean value. Signed-off-by: Baoquan He --- arch/x86/include/asm/pgtable.h | 7 ------- arch/x86/mm/pti.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 5f4fcc0eea17..5ddba366d3b4 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -292,13 +292,6 @@ static inline unsigned long pgd_pfn(pgd_t pgd) return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT; } -#define p4d_leaf p4d_leaf -static inline bool p4d_leaf(p4d_t p4d) -{ - /* No 512 GiB pages yet */ - return 0; -} - #define pte_page(pte) pfn_to_page(pte_pfn(pte)) #define pmd_leaf pmd_leaf diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index c2e1de40136f..190299834011 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -206,7 +206,7 @@ static pmd_t *pti_user_pagetable_walk_pmd(unsigned long address) if (!p4d) return NULL; - BUILD_BUG_ON(p4d_leaf(*p4d) != 0); + BUILD_BUG_ON(p4d_leaf(*p4d)); if (p4d_none(*p4d)) { unsigned long new_pud_page = __get_free_page(gfp); if (WARN_ON_ONCE(!new_pud_page)) From patchwork Sun Mar 30 12:17:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032913 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 E48FBC36011 for ; Sun, 30 Mar 2025 12:18:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA51B28000A; Sun, 30 Mar 2025 08:18:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C2E76280004; Sun, 30 Mar 2025 08:18:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACFFA28000A; Sun, 30 Mar 2025 08:18:03 -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 8BF9B280004 for ; Sun, 30 Mar 2025 08:18:03 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E51EA1CAA67 for ; Sun, 30 Mar 2025 12:18:03 +0000 (UTC) X-FDA: 83278119246.24.364A708 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 300E6100007 for ; Sun, 30 Mar 2025 12:18:02 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BmhGqaRx; spf=pass (imf05.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337082; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OLa+87RL1ZqH7qyvR+sAYoFO3JtN0cQjwozLl9C4JYM=; b=YRWOhgoB+tWLpOy/b6QI6iQ9J5j4eXzpvtvbJQrERUBssx4aLV73Oe4g5NmFYsztVOQFr/ imxGDxuKF2Tkm3xTi/rUdA2J5gvDHJeJAWlAnFvljIlQyPQj4o0qSejEo4dkviCcpjxq3/ 1Y0QKs3ER90Hs4vvhydThVnRuwoTq2k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337082; a=rsa-sha256; cv=none; b=L3H/gCipBcEca3L6Dl31cVkAj0sXtWoE3Ub1pIIvCr92ycVRAPKxAfGkLj107oUuPPBFUk XRAjgAPMqmxc22Ra4s7k4HMmtjJN48fdT2s5vZmFCkkgHtoKAz8jYoNTbs1c06dyLYkLae X3Rp3Pxsz2lAj78fuUu7Jr2EK/vJlZ0= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BmhGqaRx; spf=pass (imf05.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OLa+87RL1ZqH7qyvR+sAYoFO3JtN0cQjwozLl9C4JYM=; b=BmhGqaRxOnV61ukLqxie6UqcBuiGPreiFJQiNoG75RSYFGe+CByF7861RXJgpLymXcdsqG 5jaiWZ5Gv14yYG/ai9V5lQvp0BLw41szL1ff9Wkqbbk7U/hMWPCpOQbuG2s7PzULX/m0/5 lJwPNR7H955KX+75+4R2SntEpnCyqsQ= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-588-LnXfi8BcOTSlNfX2co1fyQ-1; Sun, 30 Mar 2025 08:17:55 -0400 X-MC-Unique: LnXfi8BcOTSlNfX2co1fyQ-1 X-Mimecast-MFC-AGG-ID: LnXfi8BcOTSlNfX2co1fyQ_1743337075 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EA27218007E1; Sun, 30 Mar 2025 12:17:54 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 883731801750; Sun, 30 Mar 2025 12:17:51 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 7/7] mm/pgtable: remove unneeded pgd_devmap() Date: Sun, 30 Mar 2025 20:17:17 +0800 Message-ID: <20250330121718.175815-8-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Stat-Signature: uuebffkyzbz19kqkyga4yc4etgu4fdrm X-Rspam-User: X-Rspamd-Queue-Id: 300E6100007 X-Rspamd-Server: rspam08 X-HE-Tag: 1743337082-440258 X-HE-Meta: U2FsdGVkX1+lHDdtaORv0yqpM2dFGMQD6F5FQQrqjGFikoqW3wU+RthXnqIacv2EjNY7mwwb15JZNskF1W+r4o2Ap0GkRPhq4PxonNasDJ5/SxpFM1tg17i9CWJkMm17qKHwXXX6bUyohAitVuABh05ziLupBIduNkdDTvVdbuYJ78f7+YV35oKVEViaBT4GnHxBviBYugZaOcy/9IQ28V+NywmpFeHjSj0bHYeXaRkulHXDC7O1ibx0sSTGRoAVckfDfSgZQQxgxAIaIrQHzVHIPkdk2pGzyCMo6PGhQUhYyyfZexNqfUDDBnMUIPQQTHQH2Jds+yShfWzXz5eCSknqcf26spvuKEZ0A+afYQaEWxFeLziV/sr/QREA7mgJkENt8YcP7iUHOU8M2Y8bO6/BOerAKEdy7aFAgiFuVYcp6jAo1LDJBk1aVd64Je8bunERoUnHvyExjjsiCLDho5F23DaCR0mAj3ECocxeZn8rlqKOCiSQKJBe2uNoUrmCjBFVdsGxKcoj1N/bMGSFCNq+mWD7q0wdwaYL/ALxpSEK1653kNCNUVo8XvZt82v0M7pl+Fw3gcM+cjvxQcCJL2sPmRvuzzAGBNgXrzUFOn8KTtjHjrybwHk1H/yMDSJN35rF8nYC1m0l3p9s5ZpUUpwJ5nwTq0VGVQdocLZVJBxTrHwj8k6cKZma7G0DiBJRzDUrtQwzaEU80crUf06AuhKXd9VjgVbPxbWafoxEFAySyBwFkB0YUGIWiPDgQYqBJMAoD47DXUhQhiRH7kO591aRwljlCjxyHGj/GpODEDMjujgc48AkkcLf2jFKomDMDU6bjvXzV7ox2ccghszgQ1zLlqHa7d1mLSv4UWTeVVsmvlrEIanI0XZWdrAmXSVGzytOWTNtD3CrFLvU15OJ4lFTaWfXkcSLo2iAMbO5qTmD0bBZaOIGFZtN2pfXAPDmnfAmVMy0NQTzyoqXqzQ Wfpsa8hz CfEclUD2dRrpjQKTejPxljxQ9QiX1Tw6ELd0vaKGeVhBmykxM6/IBQU3DoSdzI6U5vVka7ZSyidstl0Xt2hTqXd3GrEhpe5scXjSUisxqsFgbRir4OWBIrRj19H/j2GziYYPrl6sBFxdZ9oIYha2r8uqmii84LYi4t176aNWJDnWCzWXHOF2U2LOHo0jP7zS3oyMv6+1mFG95PCDXYDEnOs8XFfli2RNqY81dPw66TiWZ2bb2mxFFFGxbyh2JYV3iWTuMoLReynvI2VUiPYEvwbcQYUf+bM/znxiACPg32ofP9kQ9+loxLZK3mlMfnJ3/mwd0iren5dk+gLLOdOCq+4ep6oOl75pEG26aK+WAdTNMRd1hXaCHYQLeTtW/cGLut6A5 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: There's no user of pgd_devmap() now, remove it from all ARCH-es and linux/pgtable.h. Signed-off-by: Baoquan He --- arch/arm64/include/asm/pgtable.h | 5 ----- arch/loongarch/include/asm/pgtable.h | 1 - arch/powerpc/include/asm/book3s/64/pgtable.h | 5 ----- arch/riscv/include/asm/pgtable-64.h | 5 ----- arch/x86/include/asm/pgtable.h | 5 ----- include/linux/pgtable.h | 4 ---- 6 files changed, 25 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 84f05f781a70..e0cab581edc9 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1230,11 +1230,6 @@ static inline int pud_devmap(pud_t pud) { return 0; } - -static inline int pgd_devmap(pgd_t pgd) -{ - return 0; -} #endif #ifdef CONFIG_PAGE_TABLE_CHECK diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h index da346733a1da..d9b04296d9f5 100644 --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -615,7 +615,6 @@ static inline long pmd_protnone(pmd_t pmd) #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define pud_devmap(pud) (0) -#define pgd_devmap(pgd) (0) #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index 6d98e6f08d4d..0da1c8d7f778 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -1405,11 +1405,6 @@ static inline int pud_devmap(pud_t pud) { return pte_devmap(pud_pte(pud)); } - -static inline int pgd_devmap(pgd_t pgd) -{ - return 0; -} #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #define __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h index 0897dd99ab8d..c6da4c8354a3 100644 --- a/arch/riscv/include/asm/pgtable-64.h +++ b/arch/riscv/include/asm/pgtable-64.h @@ -411,11 +411,6 @@ static inline int pud_devmap(pud_t pud) { return 0; } - -static inline int pgd_devmap(pgd_t pgd) -{ - return 0; -} #endif #endif /* _ASM_RISCV_PGTABLE_64_H */ diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 5ddba366d3b4..3d6e78af525a 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -361,11 +361,6 @@ static inline pud_t pud_mkspecial(pud_t pud) return pud_set_flags(pud, _PAGE_SPECIAL); } #endif /* CONFIG_ARCH_SUPPORTS_PUD_PFNMAP */ - -static inline int pgd_devmap(pgd_t pgd) -{ - return 0; -} #endif #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 94d267d02372..9d2dd5f71443 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1615,10 +1615,6 @@ static inline int pud_devmap(pud_t pud) { return 0; } -static inline int pgd_devmap(pgd_t pgd) -{ - return 0; -} #endif #if !defined(CONFIG_TRANSPARENT_HUGEPAGE) || \