From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5390821E0AC for ; Tue, 29 Apr 2025 15:46:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745941565; cv=none; b=FKpZLjHV+BtBVsx57nNRp/McA47LUGMzq5kjGSZuFlT+wyl12G16mF7Czp/CnmhjxWbiOcl9L0OfXUN0KKgLyW94V8oMiiKt2RALJH5VTLKpD27Jrsk1HRjO2yWD2se0jWwDBNRylVPAdvq4VCGms23TngDT1kHFKBB/MjSJ6RE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745941565; c=relaxed/simple; bh=S7itzmkTPv/yQdqAjes8b8Y4TuhqFNIK1LkVNhNlswM=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=U4zqpOYwdvjDAJzVSdazf2eYGgtbJuC56j+6PUJknehl8dzMVfpBJKJ6a8iZ7mlFoga4E4QxlGYMNOheGFovI4LRAgstimeEeP+yca1seXG7t6vA/rtclvic+uNjqzmj8aPKZx6J20g/MxXe9v7W6sv2grch3HIgKMoxQNMfGrI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ATnjZElS; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ATnjZElS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745941562; 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:autocrypt:autocrypt; bh=KJkBeINQl3NFAYCfsyQAhOdLaYy8cgJsBpXeXsGczuA=; b=ATnjZElSfgGyCC6ky+FSjrOylQ8Q4JkGT3cE0XxRQwt3Y5YSnuo9KSEj0cFo4QsmqdmOA5 NMYaGrz/ujiW6SpjYYn9zCiOFE5RjxbdQk1G0F6BAFpAh794NpkQsf88edC77x7ikSUTuZ lEVaAIzcv5V2Ipb7P+s1gNSnwekmmyU= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-31-GO_W3gmBM0CdtPTXJFALew-1; Tue, 29 Apr 2025 11:45:56 -0400 X-MC-Unique: GO_W3gmBM0CdtPTXJFALew-1 X-Mimecast-MFC-AGG-ID: GO_W3gmBM0CdtPTXJFALew_1745941555 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43d01024089so41153125e9.1 for ; Tue, 29 Apr 2025 08:45:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745941555; x=1746546355; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:from:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=KJkBeINQl3NFAYCfsyQAhOdLaYy8cgJsBpXeXsGczuA=; b=qfF1jF5fraKs3DZM9gkKteRoj8P9yxA2Du5Y+k5ycfd4oXFr4+rZPdKobU0oWh1sP/ P10hr+XmA8j0f94fjVBeLYAN6E+8+gUirhgzrq+KLD5d1OgDmPqmuuU9C9vyGzMbumyY sJVv2RNWFzg7b5MRb3gbWDnMz/a2lKOuAQBmlGp6jJr2SAEqY2VKz5UX7DoO97iBICxt m5KwCGljqkbwnF9hFD499hG6xzH2mjT1Zf83Qr1s+3ieeAfuz9qZl+B8IG0aHZ29col6 2f138oUj8rR2HlF9rURx7k2rMvmmpB24fFY8RaKcUj2LjP+c2qlSY5Ut+bqEaf0Pr1kL ATuQ== X-Gm-Message-State: AOJu0Yza37OqWQeXmaaLqOrmYxzps7Ey9PFK+PQALQypXnRvsXug2Ckg dkLRmINq+7ZxakofMHwnwiwCxJ5IVTtgIyeeRzEvoZByratOT+lNGO3uGVmZAbQfuGSHCYhN0Qc 4f8QLBcVSg/tWrE68VZpUaWWtLNJXmtt7wKhUQP9NxfvrCra/fSHo/Uvab+LPzQ== X-Gm-Gg: ASbGncsDOsO1wTJ3TAVPw6xZFShxsl97wRkMoHHSSxB8t/ZQZJXE5o7omps8WB9e/jS 2WrhCt1peE7K8wWfVrDRUQ4eVrqCHIHJov0ZCPBPDfb8gZS8QR3f1k72eKnpKJG/VsVCGLrYSDM 1DhKi72i+MbuPYoxtnlhrdZiu+qEE9pDqbU5URdWti96H7hdH1A29U2zS9hmpPAa1vqD5EghRBU fRRi72SUPRgIMH22ustw7rurlSTmql2io21As7r8pHRDBW/whKWe+udeU7gxZZH8MJxtaOArOU9 BJf7Ubhde1gmqMmC71L7s10jJHizv1yUqjPdBwb8snoDEC3BA3rUD0TfV30Hat8OPg2jCJgeWzv rWVnhfbKjjaY8A1UzGjzFkWPRHNeFyzj+1ewD7mI= X-Received: by 2002:a05:600c:46cf:b0:439:9424:1b70 with SMTP id 5b1f17b1804b1-440ab871770mr128621595e9.30.1745941554884; Tue, 29 Apr 2025 08:45:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFt0DK2rmUfljN2z2b+q11frPzsFEc1skfJ0nZYXWdcoUPJqbsw4oWgy/3IkPCYXvYpVzK/AA== X-Received: by 2002:a05:600c:46cf:b0:439:9424:1b70 with SMTP id 5b1f17b1804b1-440ab871770mr128621335e9.30.1745941554500; Tue, 29 Apr 2025 08:45:54 -0700 (PDT) Received: from ?IPV6:2003:cb:c73b:fa00:8909:2d07:8909:6a5a? (p200300cbc73bfa0089092d0789096a5a.dip0.t-ipconnect.de. [2003:cb:c73b:fa00:8909:2d07:8909:6a5a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441ae3ee26fsm19485125e9.1.2025.04.29.08.45.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Apr 2025 08:45:54 -0700 (PDT) Message-ID: Date: Tue, 29 Apr 2025 17:45:53 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/1] mm: Fix folio_pte_batch() overcount with zero PTEs From: David Hildenbrand To: =?UTF-8?Q?Petr_Van=C4=9Bk?= Cc: linux-kernel@vger.kernel.org, Andrew Morton , Ryan Roberts , linux-mm@kvack.org, stable@vger.kernel.org References: <20250429142237.22138-1-arkamar@atlas.cz> <20250429142237.22138-2-arkamar@atlas.cz> <2025429144547-aBDmGzJBQc9RMBj--arkamar@atlas.cz> Content-Language: en-US Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 29.04.25 16:52, David Hildenbrand wrote: > On 29.04.25 16:45, Petr Vaněk wrote: >> On Tue, Apr 29, 2025 at 04:29:30PM +0200, David Hildenbrand wrote: >>> On 29.04.25 16:22, Petr Vaněk wrote: >>>> 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; >>> >>> How could pte_same() suddenly match on a present and non-present PTE. >> >> In the problematic case pte.pte == 0 and expected_pte.pte == 0 as well. >> pte_same() returns a.pte == b.pte -> 0 == 0. Both are non-present PTEs. > > Observe that folio_pte_batch() was called *with a present pte*. > > do_zap_pte_range() > if (pte_present(ptent)) > zap_present_ptes() > folio_pte_batch() > > How can we end up with an expected_pte that is !present, if it is based > on the provided pte that *is present* and we only used pte_advance_pfn() > to advance the pfn? I've been staring at the code for too long and don't see the issue. We even have VM_WARN_ON_FOLIO(!pte_present(pte), folio); So the initial pteval we got is present. I don't see how nr = pte_batch_hint(start_ptep, pte); expected_pte = __pte_batch_clear_ignored(pte_advance_pfn(pte, nr), flags); would suddenly result in !pte_present(expected_pte). The really weird thing is that this has only been seen on XEN. But even on XEN, a present pte should not suddenly get !present -- we're not re-reading from ptep :/ -- Cheers, David / dhildenb