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.133.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 D6F571E3DDE for ; Tue, 7 Jan 2025 08:49:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736239767; cv=none; b=SsYvjXFmCwe/G+DebgWGZHmGY+QI0j0tw3h3HJj1Kpd8IbjhctiLrCZF6b1op9B37ITyzvlvYvjEU2IehHKYvHPlkzndlJCudxWj8gA9/NS23evreu2rSGzQ3jfaJtcrTqxUad9Bm+FPTbZfhT5IFesIKhf+0evvuAoQiH2cAHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736239767; c=relaxed/simple; bh=0uRx/z1QXWU/6dC4sQUrSqU3hvLWBkkc77Lep+B+uYQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=C0xGWIRtMezFyVnSCmQ/OqHXjDln/qe+pfX9oj05uvMne6wRVzLPgA+P24/M53PJsZp3gW0oiFyvpdwgzpFVvkOoBJdr9s9RlYVG92qF1lc3g4hFqabLdXKZTLndsF5L3AK4mV+DwTAhUPWhHZhgUyb5qDZ9DtQL3IBBOCZZdqw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=Qq9Bfhws; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="Qq9Bfhws" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736239764; 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=LGg2HgBxxkq+HSeUhG7rZz+ADaUvalQmRHFX1L6pNmk=; b=Qq9Bfhws3MIhWtuHJPMW9EwlcNSAzhGJfnzl0PiA0RvC6LR5SVXaoVF+C6C54eys/yrgnO /X1F645O4/4mI94Sfb8xh4DpI9zFFVuPdjuSTi37ogogTtv6RadYkl8zsGCMcrKQRMFn7F 9wlzdvc2vFWaxN0BE4lUFQ8LNTsYLJE= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-312-Yd2SVT_dMNuvDKy1y4qv3A-1; Tue, 07 Jan 2025 03:49:23 -0500 X-MC-Unique: Yd2SVT_dMNuvDKy1y4qv3A-1 X-Mimecast-MFC-AGG-ID: Yd2SVT_dMNuvDKy1y4qv3A Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-43621907030so117011145e9.1 for ; Tue, 07 Jan 2025 00:49:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736239762; x=1736844562; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=LGg2HgBxxkq+HSeUhG7rZz+ADaUvalQmRHFX1L6pNmk=; b=vY8s0rm3PvigvtXOnlkdkkAMSiTbMyqnifkIgfYXYgdV3nMT+ru7t7AjjTJnYlAqjO 6G8qK7CDq1nzRqUEs1dhf6ECcyebV9jemXhZ6gZJPmx7nB4BwfKcRApdHPyNUCaszi9r SlvO1z01a6lhERJFNOJ3Cuz6vdHA4qZwRPh6RK1m7Le77q3/842fj8v7qtsJGV1wlnSl zJ4VPzxCxsXPf+mtZhBRST+MJVIu9m/aV2QCUVGGcicfnOFG5kscHGHez+I0mVxPVHNV ErRnmKCxBKbRbu/U18zc15eYIlPJOlegmoaLdimObvvOiphj4LaGE6p8ZkPKWldtu6rE k1+g== X-Forwarded-Encrypted: i=1; AJvYcCWgDkwpXDk9TvlNHonRQZ8U+gGp6tB6ew7lrLmQXfWgI7IeGSAumGuP8PKQlXWyHAcfLw+R3AumDDiD9m8=@vger.kernel.org X-Gm-Message-State: AOJu0Ywj4GG+fpjoiTL6j4RyV+pJyOpC+Zs1Sz+jIJKp9wzQr2bpPtnF D0hB92thsG4NxcH5vIeW+PnTS/GPVb1P57U9T5l8bVnlCoMwGj7vb3JvQUMJIivgiF604XUx84I T7brQY/74h8kn8xdwbG2NvZ+l6W//tl3XJVVeOjo0LRf/hoe5/RHSEo+Jb8uVog== X-Gm-Gg: ASbGncuUsrkbysFK+Kx+s9FLn0ZK1zdM9j/W4u3CAtKYGQvNDSmQR6zMIU5DxqYZ1qL yGHWtSG7pmk6rKtJUs2Fi3JZjSZrwJBUZ9EYD3M6DD2fhmk8qgJ/EP3FdGVFaNwkte7+6A20UVJ SOxIWRmjbsrhs4hWR6Q7B4Eolzw63suhxKbO/5RZg+Eksn8vJmCT77aRB5UKHGCGN06loz43uMd wnNXAMgC5yEPjGS5WLwG0ovcSD249C2L168klWaYYhhOfuCkBtPkwk4YhyiZX/h8Ddy+dUJUlif 3Q/O0paPxVOan8ftCcG3it5V2aRdu/DV5BMjanQcxzvvBxTmTI/KDX/UN1aNBpNNlMv502WI0KP jaZNX2C5J X-Received: by 2002:a05:600c:4f95:b0:428:d31:ef25 with SMTP id 5b1f17b1804b1-4366854c111mr556191085e9.12.1736239761751; Tue, 07 Jan 2025 00:49:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IHXa3p6QI+qrOF8gbYMvgK+KHEfmIBfNhBlVgfOqfPyvZZZju3UsMifa+Sa1vivxlaIqmkBrQ== X-Received: by 2002:a05:600c:4f95:b0:428:d31:ef25 with SMTP id 5b1f17b1804b1-4366854c111mr556190875e9.12.1736239761405; Tue, 07 Jan 2025 00:49:21 -0800 (PST) Received: from ?IPV6:2003:cb:c719:1700:56dc:6a88:b509:d3f3? (p200300cbc719170056dc6a88b509d3f3.dip0.t-ipconnect.de. [2003:cb:c719:1700:56dc:6a88:b509:d3f3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c832e69sm49347658f8f.35.2025.01.07.00.49.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jan 2025 00:49:20 -0800 (PST) Message-ID: <85ea0bc9-0892-489d-b42b-430ff8a1f368@redhat.com> Date: Tue, 7 Jan 2025 09:49:18 +0100 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 mm-unstable v1] mm/hugetlb_vmemmap: fix memory loads ordering To: Yu Zhao , Andrew Morton Cc: Mateusz Guzik , "Matthew Wilcox (Oracle)" , Muchun Song , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Will Deacon References: <20250107043505.351925-1-yuzhao@google.com> From: David Hildenbrand Content-Language: en-US Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250107043505.351925-1-yuzhao@google.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 07.01.25 05:35, Yu Zhao wrote: > Using x86_64 as an example, for a 32KB struct page[] area describing a > 2MB hugeTLB, HVO reduces the area to 4KB by the following steps: > 1. Split the (r/w vmemmap) PMD mapping the area into 512 (r/w) PTEs; > 2. For the 8 PTEs mapping the area, remap PTE 1-7 to the page mapped > by PTE 0, and at the same time change the permission from r/w to > r/o; > 3. Free the pages PTE 1-7 used to map, hence the reduction from 32KB > to 4KB. > > However, the following race can happen due to improperly memory loads > ordering: > CPU 1 (HVO) CPU 2 (speculative PFN walker) > > page_ref_freeze() > synchronize_rcu() > rcu_read_lock() > page_is_fake_head() is false > vmemmap_remap_pte() > XXX: struct page[] becomes r/o > > page_ref_unfreeze() > page_ref_count() is not zero > > atomic_add_unless(&page->_refcount) > XXX: try to modify r/o struct page[] > > Specifically, page_is_fake_head() must be ordered after > page_ref_count() on CPU 2 so that it can only return true for this > case, to avoid the later attempt to modify r/o struct page[]. I *think* this is correct. > > This patch adds the missing memory barrier and makes the tests on > page_is_fake_head() and page_ref_count() done in the proper order. > > Fixes: bd225530a4c7 ("mm/hugetlb_vmemmap: fix race with speculative PFN walkers") > Reported-by: Will Deacon > Closes: https://lore.kernel.org/20241128142028.GA3506@willie-the-truck/ > Signed-off-by: Yu Zhao > --- > include/linux/page-flags.h | 2 +- > include/linux/page_ref.h | 8 ++++++-- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h > index 691506bdf2c5..6b8ecf86f1b6 100644 > --- a/include/linux/page-flags.h > +++ b/include/linux/page-flags.h > @@ -212,7 +212,7 @@ static __always_inline const struct page *page_fixed_fake_head(const struct page > * cold cacheline in some cases. > */ > if (IS_ALIGNED((unsigned long)page, PAGE_SIZE) && > - test_bit(PG_head, &page->flags)) { > + test_bit_acquire(PG_head, &page->flags)) { This change will affect all page_fixed_fake_head() users, like ordinary PageTail even on !hugetlb. I assume you want an explicit memory barrier in the single problematic caller instead. -- Cheers, David / dhildenb