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 96649C3ABAB for ; Tue, 29 Apr 2025 14:23:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BB4B6B000A; Tue, 29 Apr 2025 10:22:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 944056B000C; Tue, 29 Apr 2025 10:22:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F7A66B000D; Tue, 29 Apr 2025 10:22:58 -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 4D6726B000A for ; Tue, 29 Apr 2025 10:22:58 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 918CB12059E for ; Tue, 29 Apr 2025 14:22:58 +0000 (UTC) X-FDA: 83387298036.11.6D8791C Received: from gmmr-2.centrum.cz (gmmr-2.centrum.cz [46.255.227.203]) by imf15.hostedemail.com (Postfix) with ESMTP id DA0F1A0017 for ; Tue, 29 Apr 2025 14:22:55 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=atlas.cz header.s=mail header.b=f9aDRZJP; dkim=pass header.d=atlas.cz header.s=mail header.b=f9aDRZJP; dmarc=pass (policy=none) header.from=atlas.cz; spf=pass (imf15.hostedemail.com: domain of arkamar@atlas.cz designates 46.255.227.203 as permitted sender) smtp.mailfrom=arkamar@atlas.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745936576; 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=zcz3KV2j9DGPThJRRrNIl1X5dqrILd4s9iLxPnBmOwI=; b=ieE4cVTpRE5yAmRT+FnjHOT1a79Pby5NfR1OpRaTVijek2Ly4bWAvsWLUXSQgsIeFabuW5 V07Hsy6AFrRA7q8es6zh50hda/JVm47jsiJu/71HTwczbd+qsof/rrNC2MDvt7f8x4Aynk /qicFKDbkts3kXV7xsLwCzKRgXZ27GM= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=atlas.cz header.s=mail header.b=f9aDRZJP; dkim=pass header.d=atlas.cz header.s=mail header.b=f9aDRZJP; dmarc=pass (policy=none) header.from=atlas.cz; spf=pass (imf15.hostedemail.com: domain of arkamar@atlas.cz designates 46.255.227.203 as permitted sender) smtp.mailfrom=arkamar@atlas.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745936576; a=rsa-sha256; cv=none; b=lPsJtp82AxBB2/B2NJ4NjYYuOVIiqbQVSzzMPnVNV51NQ/nBT7MwQ4kUWzHDNJmaeB53Yz B2XHEezL9Qm0rB05Vfk0I7VmOUI//bgOWgsZYeBDsNHGXHsS0xxf//UPGD8H9/eJNpt9yH kth5C/aKlL+1Gv3iQr5Wl92sNpb7KIQ= Received: from gmmr-1.centrum.cz (envoy-stl.cent [10.32.56.18]) by gmmr-2.centrum.cz (Postfix) with ESMTP id 0DB1A2026A14 for ; Tue, 29 Apr 2025 16:22:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atlas.cz; s=mail; t=1745936574; bh=zcz3KV2j9DGPThJRRrNIl1X5dqrILd4s9iLxPnBmOwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f9aDRZJPq3ISnnxofAMOSl9GJu8xXrwiQrXqNNXt58DoxUbj3OeGIum+5hy9canqA 1lkPogCxu/rBwG8iIfE2ppbkf2ZMs6uLkhT+aXvmsrpZdqOA8OHzyltImZYEKCJnzb G6akwzulKzmBsRNuIqVq+hsnzTuiD1sbjA+UhX5Q= Received: from gmmr-1.centrum.cz (localhost [127.0.0.1]) by gmmr-1.centrum.cz (Postfix) with ESMTP id 0AD4C19B for ; Tue, 29 Apr 2025 16:22:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atlas.cz; s=mail; t=1745936574; bh=zcz3KV2j9DGPThJRRrNIl1X5dqrILd4s9iLxPnBmOwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f9aDRZJPq3ISnnxofAMOSl9GJu8xXrwiQrXqNNXt58DoxUbj3OeGIum+5hy9canqA 1lkPogCxu/rBwG8iIfE2ppbkf2ZMs6uLkhT+aXvmsrpZdqOA8OHzyltImZYEKCJnzb G6akwzulKzmBsRNuIqVq+hsnzTuiD1sbjA+UhX5Q= Received: from antispam64.centrum.cz (antispam64.cent [10.30.208.64]) by gmmr-1.centrum.cz (Postfix) with ESMTP id 0930CEB for ; Tue, 29 Apr 2025 16:22:54 +0200 (CEST) X-CSE-ConnectionGUID: YpSGceRmQye+NjdaFecdsw== X-CSE-MsgGUID: nVQDrnWZShShA9j8GCQ5Sw== X-ThreatScanner-Verdict: Negative X-IPAS-Result: =?us-ascii?q?A2FUAgBZ3xBo/03h/y5aHAEBAQEBAQcBARIBAQQEAQFAC?= =?us-ascii?q?YFKgzSBcYRVnWqGM4EgjEkPAQEBAQEBAQEBCUQEAQGFBwKLMyc4EwECBAEBA?= =?us-ascii?q?QEDAgMBAQEBAQEBAQENAQEGAQEBAQEBBgYBAoEdhTVTgmIBhAAGIw8BRhAYD?= =?us-ascii?q?QImAgJWGYMCgjABAzGyY4EyGgJl3HACSQVVZIEpgRsuiFABhHxwhHdCgg2EB?= =?us-ascii?q?3aFEIMOgmkEgy8Ukw6LEkiBBRwDWSwBVRMNCgsHBYFpAzUMCy4VbjMdghGFI?= =?us-ascii?q?YIRggSJCoRQLU+FMYElHUADCxgNSBEsNxQbBj0BbgeVQ4NkB3IcQwllxU+CQ?= =?us-ascii?q?4QlhE6cexozl1IeA5JkLodlkGsbpDGEaYF+gX8zIjCDIlIZynt2PAIHAQoBA?= =?us-ascii?q?QMJgjuNYYFLAQE?= IronPort-PHdr: A9a23:7DIe1xLD1W0/wyHy/9mcuA9gWUAX0o4c3iYr45Yqw4hDbr6kt8y7e hCEv7M11BSTA9mDsbptsKn/jePJYSQ4+5GPsXQPItRndiQuroE7uTJlK+O+TXPBEfjxciYhF 95DXlI2t1uyMExSBdqsLwaK+i764jEdAAjwOhRoLerpBIHSk9631+ev8JHPfglEnjWwbL1sI BmssQndqsYajZVjJ6s+1hfFvGZDdvhLy29vOV+ckBHw69uq8pV+6SpQofUh98BBUaX+Yas1S KFTASolPW4o+sDlrAHPQwSX6HQTS2kbjBVGDRXd4B71Qpn+vC36tvFg2CaBJs35Uao0WTW54 Kh1ThLjlToKOCQ48GHTjcxwkb5brRe8rBFx34LYfIeYP+dlc6jDYd0VW3ZOXsdJVyxAHIy8a ZcPD/EcNupctoXxukcCoQe7CQSqGejhyCJHhmXu0KM6zeosDxzI0gIjEdwJsnvUotr6O7sdX +2u0KnFzi/OY+9M1Dvh6oXFdA0qr/GWXbJ3dMrc0VMhGB3ZjlWKtIfqMCma1uITtmiY8uFtU vigi3Qkqw5rpzig3N0sh5LTiYIJzlDL7z55zJwpKty5UUN2Z8OvH5RMuS+ALYR2Xt8iTH9yu CY80rAKpIK3cScKxpg6wxPRa+GKfpSI7BzsW+ucIjZ1iX1qdby/hBu/70eux+7+W8S60VtHr iVInsTPu30P1hHf98uKR/1g9UmiwTaCzw/e5+BeLUwqlafWK4QtzqAumpcTq0jOHC37lF3og KOLeEgo4Pak5/r7brn8uJOROJN4hhv6P6kvnMG0HP42PRIUX2eB/OSxzLjj/UrkT7pUlvA2i azZsIzCJcQcu665HxdZ0oY95Ba7CDeryNsYnXweIFJefRKHk5DpN0zSLPziEfiwnVKskCtxx /DbO73tGInCL3nbnLfge7Zy9VJcxRI8wN1e/Z5YFLEMLfLpVkPvqtDVDgU1Pg62zur/DdVyz IIeWWaBAq+DN6PStEeF6fg1I+mPfoAVvSzyK+I+6vH0kX85nUUSfbKz0ZQLaXG0Bu5mLFmBY XrwntcBFn8HvhA+TePwjl2OSyRTZ3GpUK0i/DE7FJmmAJzZSYC3hbyNxju0HppTZmxeEFCDD W/od5mYW/cLcC+dONVhkj8eWrikUYAhzwqjuxXmy7pjNOXU4TcUuo7i1dRt/e3ciQky9SBoD 8Say2yNS2B0nmUVRz45xax/pEl9x0yA0ahmmfNXCd9T6+lOUgcgOp7Q1/Z6BMzqWgLdYteJT 06rTc+lATEpS9I82NsOY0d7G9W/gRHPxiSqA7gIl7yNGZM76L7c33n2J8Z70XrG07Mhj1Y+T stVKWKmnrJ/9xTUB4PRjkqWjbiqdaUB0yPW7meM03eBvEFCXw5sS6nKQXcfZk7OodTj+kzCV 6OuCaggMgZZzc6CK61KasDmjFlfR/fsJs7eY2SvlGe0HhuI2LyMY5Twe2kH3yXSFlIEkwYN8 naCLwQ+AT2ho23GADx0CV3ve1/s8fV5qH6jVU800xuFYFZl17Wr4RMVm/OcRO0J3r4euycut S90HFCj0NLSEdaAoBBhfKpEbdM7+1hIzXjZuBBlPpy8M6BigUYTfgYk93/pghF2DJhQ1Msnt nUnyCJsJq+CllBMbTWV2db3ILKEBHP1+UWXZrLMkm/X1nWVsvMG8vcxrlz5lAi1EkM5tX51h YoGm0CA74nHWVJBGan6VVw6ol0j/+myXw== IronPort-Data: A9a23:rpmI7aIjTJoZfwztFE+RFpQlxSXFcZb7ZxGr2PjKsXjdYENSgzcPn DYYCmqFa66PMWX3L95xOo3n/EwOuZ6Dz9IwSgQd+CA2RRqmiyZk6fd1jKvUF3nPRiEWZBs/t 63yUvGZcYZpCCaa/krwWlTYhSEU/bmSQbbhA/LzNCl0RAt1IA8skhsLd9QR2+aEuvDnRVrQ0 T/Oi5eHYgL9h2Qlajh8B5+r8XuDgtyj5Vv0gXRhPZinjHeG/1EJAZQWI72GLneQauF8Au6gS u/f+6qy92Xf8g1FIovNfmHTLyXm6paLVeS/oiI+t5qK23CulQRuukoPD8fwXG8M49m/t4sol IgS78zYpTABZcUgkMxFO/VR/roX0aduoNcrKlDn2SCfItGvn9IBDJyCAWlvVbD09NqbDkl/7 cc3Iz03aymSiqGQwr6yZORnit88eZyD0IM34hmMzBnWCLM9RIzbGv2M7tJewC0tg4ZFD54yZ eJFN3w1MUmGOUcSfAhIYH49tL7Aan3XeidboVecv4I+/2za10p6wtABNfKEI4bQHp0Lxi50o ErAwV3VGBclBuef8jqso3D8qcT2wBjkDdd6+LqQs6QCbEeo7nYCARtQT1yxrOOlkWa3QdcZI EsRkgInt6s78UWxZtDhWxSj5nWW1jYYWtxNA6g/7SmO1KPf4ECeHGdsZjdCcNkOsM4wWCxv2 FiUmd/gGT1otvuSU3313rudszK+ETIYIW8LeWkPSg5ty93ippwjyxHCVNBuFIargdDvXzL92 TaHqG45nbp7pdUX3q+/8HjZjD+24JvEVAg44kPQRG3N0+9iTNL7Idb1tB6Bt6sGc9nxokS9g UXoUvO2tIgmZaxhXgTUKAnRNNlFP8q4DQA= IronPort-HdrOrdr: A9a23:ObIzvKGGm2sPaHnppLqE5ceALOsnbusQ8zAXPo5KJSC9Ffbo8P xG/c5rsSMc5wx+ZJhNo7q90ey7MBDhHP1OkOws1NWZPTUO0VHAROpfBMnZsl/d8kbFmdK1u5 0MT0EHMr3NMWQ= X-Talos-CUID: 9a23:VeA6gG67VOsqT1+1Z9ssxVYvNcsoSHjk3XqTBU20AEhkQ7GOVgrF X-Talos-MUID: 9a23:O4Q+6wZNZj9OYOBTsQHVqCtkC/VT45+uIREPwbotgpS/Knkl X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.15,249,1739833200"; d="scan'208";a="91223060" Received: from unknown (HELO gm-smtp10.centrum.cz) ([46.255.225.77]) by antispam64.centrum.cz with ESMTP; 29 Apr 2025 16:22:53 +0200 Received: from localhost.localdomain (ip-213-220-240-96.bb.vodafone.cz [213.220.240.96]) (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 gm-smtp10.centrum.cz (Postfix) with ESMTPSA id 44AE080911A1; Tue, 29 Apr 2025 16:22:53 +0200 (CEST) From: =?UTF-8?q?Petr=20Van=C4=9Bk?= To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Ryan Roberts , David Hildenbrand , linux-mm@kvack.org, stable@vger.kernel.org, =?UTF-8?q?Petr=20Van=C4=9Bk?= Subject: [PATCH 1/1] mm: Fix folio_pte_batch() overcount with zero PTEs Date: Tue, 29 Apr 2025 16:22:37 +0200 Message-ID: <20250429142237.22138-2-arkamar@atlas.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250429142237.22138-1-arkamar@atlas.cz> References: <20250429142237.22138-1-arkamar@atlas.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Stat-Signature: h3iaadjsind331br8pxiwh6qz9coqufc X-Rspamd-Queue-Id: DA0F1A0017 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1745936575-620228 X-HE-Meta: U2FsdGVkX1/N7V4Fbj4g7otMv6konRn8LtoJfwvlN0FMVTgbmR4eCizbRhHsqrkEiFci/BaKdIrQJxV1pU+aEb7eSEwUWRW77SUU3jWqIKm6k+qqgmUaUDI2Wg4yu/bNSu7IHDKbMUBKPNRMffk0XSSW/+q8l621SmBpnDmliilwyozPDEmY38yTUeu0QoilzKQYmZdCBq53jR1dpKpSGE4GKv3+k0DeMriKDjWuYIZWJfaMplDu3pD2OzQ71pufGZQ8AP5riYyuTKWsy/CIH7wdAw0Yfqt51DyhXjEf2EcN1WkBTv0we1EZfjZClFQnph7RMSjvG/8isFDtrLKMKFx8uARSk2GMDZVVAHzfR59datO46WCgDdtEZCmsEbxYofyncz7v/1/QFQs0NK2JbE/w9FHT9YOM+dKk71kRf4pog5e3dLtQYUYh9A834laKvP9jFMw1dpMPw3Mxx1aPKGWtrPsVif9i1OTbDosvSSNsiiHCPQw2oSk5htptNLrDq+S3qUldZV4u37r7keqmC1iHULC9azOBM/DFoyGHCDpHxvz/w0U0kOD4xr3LlCEhhDDgCB/GRizw5GZfpCH91PWsWUAip7IbQlpNLN4sItkUZ0BYfy4/9Qnom4NccMKvfZgfNt8jFYQS7T03pM0mWd7184kjZuJ+AJNvI3pB/NfX57UVbdzfUogYWSv9me6xdAKpJQ6haOMWZmDpWZ5s45Ro1selOm5GBKHtz6kGFeYT7WULK3pz+zrZmLh6RD34v5jhYWEeWr49gU8AevSd6CuW61viKNjz0gmqUNsdlR+zM+qbssF449EiR+1sTgiyjtMle5ZvYV2Rc5il1xzVXAnmZxbMIK3xizP7kOF2LKyvaBtICPTlkf+U8AYjM+a0T9UlYChOdK7u+DSu7C3f+P9Z3hD+NI94dkDi9u5kvIOTT9yAZErA5rnobd7gLQUMeiXq62rndcbjV595uJE Occ9Wzke iI8RCUMxMETMDVueX7WRb3O1fOWkpFN21Ps8mVi3xufZws2/i/voM4gk6VTdJOTjzt+3xFzcrvHDdBBXT7TDN56UpPELn3v8Kreda1TnWZz0UIr4bOK36Wv/xBfToAqZkRTdN2kCYLFTNPlg+NT91ha1nMDAVdFoQqnCoyIlXpsLCV+WqBg1zyG6EvVscfxuij4CPIsvMI37CwV9IwcNuL8yyZBP8x3GHCUolbIxRaj4l0PkUuSVSOTkw/ghcyy2M5PcbspOUiS5MOrHD6OK4UUjCmjBx4s3EywkOVLJ9HH1PzFIZBA3K7c9Tp0Pd+LkQq+/BSa9Vu/26N4OG/9OAirc3nuceqBUDkn40hxhxVRDcPD9XQV9JWAMsUNvLUvpmwFWmP9m55HlGR+BcZBlxciomXuiEvMNXC67CciFxAyrqfxDoZNg12bkCDw== 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: folio_pte_batch() could overcount the number of contiguous PTEs when pte_advance_pfn() returns a zero-valued PTE and the following PTE in memory also happens to be zero. The loop doesn't break in such a case because pte_same() returns true, and the batch size is advanced by one more than it should be. To fix this, bail out early if a non-present PTE is encountered, preventing the invalid comparison. This issue started to appear after commit 10ebac4f95e7 ("mm/memory: optimize unmap/zap with PTE-mapped THP") and was discovered via git bisect. Fixes: 10ebac4f95e7 ("mm/memory: optimize unmap/zap with PTE-mapped THP") Cc: stable@vger.kernel.org Signed-off-by: Petr Vaněk --- mm/internal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/internal.h b/mm/internal.h index e9695baa5922..c181fe2bac9d 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -279,6 +279,8 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, dirty = !!pte_dirty(pte); pte = __pte_batch_clear_ignored(pte, flags); + if (!pte_present(pte)) + break; if (!pte_same(pte, expected_pte)) break; -- 2.48.1