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 3ABC9C25B7D for ; Wed, 22 May 2024 12:57:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A9CFC6B0088; Wed, 22 May 2024 08:57:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A4C356B0089; Wed, 22 May 2024 08:57:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8ED0B6B008A; Wed, 22 May 2024 08:57:24 -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 642646B0089 for ; Wed, 22 May 2024 08:57:24 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0EAFB161435 for ; Wed, 22 May 2024 12:57:24 +0000 (UTC) X-FDA: 82146032808.20.D3711AD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 630AA180015 for ; Wed, 22 May 2024 12:57:22 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DBubBgGh; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1716382642; 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=7dtAZKM4MiVSYLDB4Q4XKxWFHe1658DI6+IaEJTZmd0=; b=vLc5hDyn56TQFLvV7/fPIarSWa/e8UlJlr4dv9flZP5zh8VpphEJ5s9Q3FVHBFk0HJMosB 7F126ypGAnmzxaOM++qrX0vMiC8W9nolhv1ph/uDjloURT3Y5UMCewGJ3frBkXyp5dBvLS 6UvdhnUqM2NZhIdJdktyYHbhJ3AQliE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716382642; a=rsa-sha256; cv=none; b=HL31EYatlwqciKWSm+XYa9y9JAhk4llogQVrIOEcrFPzKGCdj6E7m4YDDYfjwbxAcORTrN ZgMGVI56JMqCD37y1zdN1bHUq6ooNmrmQ+k7hTH0JDseY5K1GkjJy/iGGtf8Nb6x7rEDB5 5MRBx8eT3k3Y+thQk+YPvbJiNGqXgPk= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DBubBgGh; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716382641; 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=7dtAZKM4MiVSYLDB4Q4XKxWFHe1658DI6+IaEJTZmd0=; b=DBubBgGhln9CUy8Eimv2Iuda+Oe39DoVvoBl+iTBGXqd2fe6Zj6e2DuXpMXNcg5zrBnsgR ZjzzlPZzkgMXhjwqUQJGUUaHsyDs5olRCdVhY1sMLnOX4IMl0u4Z5stgyHN0RMU6pGHYW3 UIAYwH7dxTlK8UuXEMuXtJ43pn5vsFI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-318-xc9_3YTpP6ObsEwyO8otuw-1; Wed, 22 May 2024 08:57:17 -0400 X-MC-Unique: xc9_3YTpP6ObsEwyO8otuw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id B83DF8058D5; Wed, 22 May 2024 12:57:16 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.195.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93E1040C6CB6; Wed, 22 May 2024 12:57:15 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Vincent Donnefort , Dan Williams Subject: [PATCH v2 1/3] mm/memory: move page_count() check into validate_page_before_insert() Date: Wed, 22 May 2024 14:57:11 +0200 Message-ID: <20240522125713.775114-2-david@redhat.com> In-Reply-To: <20240522125713.775114-1-david@redhat.com> References: <20240522125713.775114-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Rspam-User: X-Stat-Signature: b1d5dxdbfuf8zpefq8uuswutpofj6nw7 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 630AA180015 X-HE-Tag: 1716382642-259702 X-HE-Meta: U2FsdGVkX1+7ohMYtpLVQo745w0j6muMLtsnu16f5SDfYiScPrme0ZGz6F/RAgfZgVnwGK9FEo6UGuEUw3H4I+67BHIm0CUCKKxpOqT0TAi+pSoLV8RceqnzPtPdE/8o8wwbYLnTy0fT1d8o65G9UP/C31IQX/V+eQf5TGly3xdR7LAIH5MsHFRJFScQbpUunhtuP0hYQ4wUvJi1OOnyg8coGaxsb7u5sYg9paNqV+zuUpNgaDryEe9ZgY2avQq6anaPYBgb9bspNMjpFGp+XUGCR9r2wqIWy/5h/uCRqa/80+wzgFRSipFSiu+51eLGkpIkuNfQgjBGr+oojo8Y1/45iYxWRyggxLEQVDtDb2i/R85/brJpsjys3iJuLQUMG1HCT0CRmGqeA7VDoqYVZ7fMcTHu2lHh0uxtNk3nVzLdzpqPvnzrkS1kK9M/pHjjDy6d8DpAgZzhrXrFWtwF2LjpZ90hOr//8EsZdU9zXALlfjchF5BYtWpjWymUnwHZ5nZ+2Wes3BSoKl0IMXbpOKmVH1ZrVMnJkSKNU98lcVnKEPGxQFng3ekAkLVFqiF2/k00blyOBPkxMP1gNHeVi5WW0VanljuHzL0hjBYdOA/P0u3kVdD+p4hfg+UKD4DAI8ZBXP+DNA+2Fd5TV52198Pp1xpqld1exiFqJtOlhwXqIKuBjUXB/Fxc8f7V9OSChsvbMdQu/sEoCC9PSkGDeIUqiVJNHRoXbBehbzUaYCwjiGailTj4dc3OWxFaZLS67lBxW2uXl0IPknDuPPxZQLMke+O+cttKSiUAXN2/dKp6jw7s+uTBbCpHerjZzl3vg/gydCVRYcuJw8funsI4rrU/6kxiJv90DrR50E8IlwQiD+qvgeoFNZi0vn4RDT/lmVTBCDiXCSHOf0U8ZOGiDQJ/PVfxUubfrpkC5vLmOGn6NxHLt2N8XIfL0hCVD+R8cDWl13xreeFHOPy9VkE rBr2nwn5 cZkhLwDC7RxyHx+oaFDcEeKJ689MG1EgvAiI3xFu8SUfeXxkc2rP/0wEuYUbJysgC/4avllotDBwX/LN8wPn8SSCUFPDjA3lzLvy3xy/PZaymj7HFdo+xLnA35J3EkHEhXR2Ppiw1bePGpJGIOvXdGqr1dFK2MGub0DNh+p27G9lUr92WcvaDUnIuDTTewrLZoqtKJQ10HesIEaJO1nDXvTMhKg== 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: We'll now also cover the case where insert_page() is called from __vm_insert_mixed(), which sounds like the right thing to do. Signed-off-by: David Hildenbrand --- mm/memory.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index b5453b86ec4b..a3aad7e58914 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1987,6 +1987,8 @@ static int validate_page_before_insert(struct page *page) { struct folio *folio = page_folio(page); + if (!folio_ref_count(folio)) + return -EINVAL; if (folio_test_anon(folio) || folio_test_slab(folio) || page_has_type(page)) return -EINVAL; @@ -2041,8 +2043,6 @@ static int insert_page_in_batch_locked(struct vm_area_struct *vma, pte_t *pte, { int err; - if (!page_count(page)) - return -EINVAL; err = validate_page_before_insert(page); if (err) return err; @@ -2176,8 +2176,6 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, { if (addr < vma->vm_start || addr >= vma->vm_end) return -EFAULT; - if (!page_count(page)) - return -EINVAL; if (!(vma->vm_flags & VM_MIXEDMAP)) { BUG_ON(mmap_read_trylock(vma->vm_mm)); BUG_ON(vma->vm_flags & VM_PFNMAP); -- 2.45.0