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 5F02BC5478C for ; Tue, 27 Feb 2024 07:04:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E95C4401E8; Tue, 27 Feb 2024 02:04:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9247B4401F0; Tue, 27 Feb 2024 02:04:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7291E4401E8; Tue, 27 Feb 2024 02:04:53 -0500 (EST) 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 5AD036B00E1 for ; Tue, 27 Feb 2024 02:04:53 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 26FA5140A89 for ; Tue, 27 Feb 2024 07:04:53 +0000 (UTC) X-FDA: 81836696466.19.2C53369 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf09.hostedemail.com (Postfix) with ESMTP id 8938014000E for ; Tue, 27 Feb 2024 07:04:51 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=YTW+mql5; spf=pass (imf09.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709017491; 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:references:dkim-signature; bh=5Xh9xry9yXUPCbuZkIvBEujR1IE4YpcvcS1See1vKpM=; b=EN4rP6Zd9PfGs/LMg9CcRaKc0U7CaSTzIqNloBwLX/nOvCQYOoa6oBo8jtnoAujcWF1WbI JtSZ5X5eloAkleYpebkPpuJ23jh1HVUNMq3bWTQnUwL64v7iL1tWNyLqzZmjwLbhqwnCYX nmW4q91v2qo+QB0vmU9SuxhEedPd8G8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709017491; a=rsa-sha256; cv=none; b=bKqaB8hBXVVBIlwPcllrdjIuFMWZ+qBHeoOU9MWYt4tXB1aXNagQ22i7zx/Lx/Jwej6hED uIG0bogAbL5pRn+14rLraauw19jv9C1eBryZ/jbs9a5p1dgvIXi4aMN7OLXZgHsM+iPBrN YSIEqKG5KXLfG3gKZ7bIHc3NZog8qwo= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=YTW+mql5; spf=pass (imf09.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1d944e8f367so27896585ad.0 for ; Mon, 26 Feb 2024 23:04:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709017490; x=1709622290; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5Xh9xry9yXUPCbuZkIvBEujR1IE4YpcvcS1See1vKpM=; b=YTW+mql5k9D2dVwEdM0rxEGPHQ1uK2zF171NYYNW5vD5uFXhJRjZb8PwV+MuRvh9AZ 4iDAnQFYd6Il6SCCc0JfUKTaTchs3lBvipG1cJu7dFIgkdIcJoG25WTlYtJ6pkj4GUs0 AO5CpOM3llE6XLNNL8wyT0vRuohnk2nceDtBddX1RXVp+DNTlzsks9FHAY5oWSgsiLvv mnolnCF//nQkUTmiE8SRZehquuPZ89z1ZXurLXBMXF6Kpp9h1+X/anH0Xi/9eX4lKZ90 sIt4VhqWG009xEKeJbTApoD92s4JKMeSBL7KwLQPZzWBdBMKRpppjyYMu7pajm2kqel2 TuFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709017490; x=1709622290; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5Xh9xry9yXUPCbuZkIvBEujR1IE4YpcvcS1See1vKpM=; b=qVOZODDOGKjWEw5vk3+Na9mooux30VMQu7P+7iFEZPLM9GPnbfT1OqA3A+5jdrRbu2 WiH+Y+c/IwMvjbF9kIm3A5/ADiUNCTdjKMxvvPyO3ML6Z1K+cuC5Y6aL6p//EkfUDgpu z0hPhzkHLoYqkR2DSEMC6T8QpuqyfaCNGTBw0Ks/Ul2Mr9mp7tVAPBGFC8EwiiYrZwiK uCyuEq7/fclIENuQ5c/HZGQJw8/HKqxXezBrKh5hlpmBRrUk+kJt+hAC/+OMdu0yfC3a ab3v5quFGpCjHahjNWEzfVBiW+ov0EfFk1cbs+kYYVymi+HbfILjNRQdZ3lOFzFLtIgl brZw== X-Forwarded-Encrypted: i=1; AJvYcCXVR2eGj7Ccnvq3d0g0mbK8kbkdX4k7BNx6ppP6N0DoqOPB36kfVg1wllgaOl8tgBIhxDDo3xzo4N+K+ImvalRjyXs= X-Gm-Message-State: AOJu0Yy0PW0usbAgJI4UWoaIRonxhy4qgWPdgFQzN7IQZllaJLHlv9IW y1n8K2abeGM6acyDSD0Jp0XTrEx8m+diipFMxlYPXcoMyPa0v/48 X-Google-Smtp-Source: AGHT+IFubJiiCFCQwBy1qas5vdMziZFMm526L3DDKWQXlWMXfbEBJ85eKPkdLH/2M/cev2JqXT7G0A== X-Received: by 2002:a17:902:ed8b:b0:1db:d13d:6bf3 with SMTP id e11-20020a170902ed8b00b001dbd13d6bf3mr6479790plj.62.1709017490243; Mon, 26 Feb 2024 23:04:50 -0800 (PST) Received: from LancedeMBP.lan ([112.10.225.117]) by smtp.gmail.com with ESMTPSA id x9-20020a1709029a4900b001dc944299acsm783347plv.217.2024.02.26.23.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 23:04:50 -0800 (PST) From: Lance Yang To: akpm@linux-foundation.org Cc: ryan.roberts@arm.com, 21cnbao@gmail.com, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lance Yang Subject: [PATCH 1/1] mm/memory: Fix boundary check for next PFN in folio_pte_batch() Date: Tue, 27 Feb 2024 15:04:18 +0800 Message-Id: <20240227070418.62292-1-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8938014000E X-Rspam-User: X-Stat-Signature: fmgcpj734ngz1jsrojcf8npghyzzn39x X-Rspamd-Server: rspam03 X-HE-Tag: 1709017491-47386 X-HE-Meta: U2FsdGVkX1+DEnDtinC0UWnxNYMvj2Lbx6LvPt/M+i3YehYW2nR+YoNSnQJGy7Gp6+IAjZ25KD+iFPcZb4VNxDlMsR7OnT3FI/GMc9lRtIDXrV/TAw2uPYwuX68jbPBIqUzuc3y7b44L7eMDY4HyTS1KStEGtOTk/g5N9PpQNs9G9ktkiGoEVwk9uivm15EHyvLMGda0utnf+HarnfypVlgIL2WUPtrOwBlkf1IGj82heS/tmrawuX0RXTi0yapHq6xu6AFDhTa8yjrGyM1uLRtlxnhm/gYcYekueu+lVJyp8Yh7S+ZgiguRRKSScTLiwd8xrmpNX50RNpEgs5XO2x87no6ccJOrtAv3sVnLPcuWTYqQKr4DS5LfDVfJl1qR5LUEEqH8wy4fhvYnGjiOHR4wyzy5MWaf5EUqXFNS/JUMFrP95w9fQt1vH39kJaHmlJtuQF97CR2Xl4sBkkNMOYHDNXFePj1OaAfjzOeDpYk0Q61inkwV5xlCWmmY12g29UO5vAD7I9UBc76TpvckoOeItjkvtJxyBMmhsHCNVkzwZd7VNmwjOqOSMr7EqxiPtYyVQpqu3bTrAwH98Cph/KSr+YBnA75ppqPCdwColNlB+6rusRNZNopH1QQCFIPCGXH2Nktdnf++KDfMGHv0Hb69+/a9dCeNj5MXqU2YVf5Y/XgWQqjNLPwEI8J6aDaadR7IHUVYeGKsfsC9ZL0JhlVXeBnab4gq6D3sJU3VOByTcsx/etDN+YyPo9vKb//Za8ac0xcOAxeLq+Bd/o4Pq/TSSTrxxb1xArfcr+kgyiNBv3S2Thal0EAZ3mojqXsv9QVKnOGT4Vnc5Ipf3XW8x2bfA4YVdMG9iL/M3V+BIOnLB9j9FWWjoW6Im8w7Zi05Pf2LIsANzojzX7N65I6EgGQBooDZ6cTrPAi2gdWHrA6f0ylAhpNvHvx+K05su/3tbY5sURzxX/zlEMBSur2 uFNASaqW NKwXgRxDQXxiMLXoBKmV0aqJNJ4NFlF9xK9u55WYsNwWHgWVnIjE2/LVNOUR9uJDRSh0rzD3I69IWXgG737y2mksSjGJ/F+2KVoGHNWzWZ6NWHst5hZGD+M+z8AQntIBD4vFiSIKd8AGnnA5oG7XyR20XQlyyTa6eOp/w 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: Previously, in folio_pte_batch(), only the upper boundary of the folio was checked using '>=' for comparison. This led to incorrect behavior when the next PFN exceeded the lower boundary of the folio, especially in corner cases where the next PFN might fall into a different folio. Signed-off-by: Lance Yang --- mm/memory.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 642b4f2be523..e5291d1e8c37 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -986,12 +986,15 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, pte_t *start_ptep, pte_t pte, int max_nr, fpb_t flags, bool *any_writable) { - unsigned long folio_end_pfn = folio_pfn(folio) + folio_nr_pages(folio); + unsigned long folio_start_pfn, folio_end_pfn; const pte_t *end_ptep = start_ptep + max_nr; pte_t expected_pte, *ptep; bool writable; int nr; + folio_start_pfn = folio_pfn(folio); + folio_end_pfn = folio_start_pfn + folio_nr_pages(folio); + if (any_writable) *any_writable = false; @@ -1015,7 +1018,7 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, * corner cases the next PFN might fall into a different * folio. */ - if (pte_pfn(pte) >= folio_end_pfn) + if (pte_pfn(pte) >= folio_end_pfn || pte_pfn(pte) < folio_start_pfn) break; if (any_writable) -- 2.33.1