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 D8C73C3DA4A for ; Thu, 1 Aug 2024 08:50:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 525576B008C; Thu, 1 Aug 2024 04:50:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4AD5D6B0092; Thu, 1 Aug 2024 04:50:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 300776B0093; Thu, 1 Aug 2024 04:50:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0DED06B008C for ; Thu, 1 Aug 2024 04:50:26 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 796C9804FD for ; Thu, 1 Aug 2024 08:50:25 +0000 (UTC) X-FDA: 82403055210.02.749C9B6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 3E5444000F for ; Thu, 1 Aug 2024 08:50:23 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DEDo3vE1; spf=pass (imf01.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1722502148; 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=clzayXSw0T9Pink1HUicNm+MIZ3TP2gz+wqmLrsBXaU=; b=jHtzdPm9/adXEv8xsM9ZTMyN8c9134W9gFzqUJDCCD0crgRmjcd6N9uOVJiVbgPcT42mOm kwq3s+1ZG7iQD6KMNEQN0UW0EHgYUUrfFoOc1yXlFJd6+WBlcP37TBECvO9j3OqDmAA78N vEgH+EiQ93nyMKFp4Ex4JATHt8+kQbg= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DEDo3vE1; spf=pass (imf01.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722502148; a=rsa-sha256; cv=none; b=JztC+WLdioEEKeIPCad2M1DADZCrOD1MQf6s92sDZaLHHH/4B3BMoGTlPXXue/sXstDMpE uH2ke2hRjzT8rSXVWaj0Hk00EGxflNI1RXPIRLQ+PlE1cZJezn0EWDehdON1H9q3uNb0QZ uIvB/KcjSozNWbcZWTf9i7XSS228b+I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722502222; 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=clzayXSw0T9Pink1HUicNm+MIZ3TP2gz+wqmLrsBXaU=; b=DEDo3vE1ZZlzevu7XxjKL1CzWzlfP8DKkgnEFNJnTrRQ/90OQqHszq6bb0G7nlMUn6ESeq eyBabF1zVj1P+pXanqjAxYz5IRo2Tu8Ps49RghRrgeRtHHByl8wOg0YW3YO1OE3wId3HLF eJ0JjZTrsLU5PicJqwudohTdbEzHC7U= 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-653-Ov1SfqkQNYewky3OfdeZvg-1; Thu, 01 Aug 2024 04:50:21 -0400 X-MC-Unique: Ov1SfqkQNYewky3OfdeZvg-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-428076fef5dso41961885e9.2 for ; Thu, 01 Aug 2024 01:50:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722502220; x=1723107020; 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=clzayXSw0T9Pink1HUicNm+MIZ3TP2gz+wqmLrsBXaU=; b=C1NjQlSy3gzJb11aWe+uLE2JFFNSqTFMDk1IcOZBGzzr96BxPjocIaA5KpMgU9TIEb utyz5+6nf5upYH1JHa0IexUw3LLzNzc2WkeA/e2AEgK8EY9dIOOXpwP847p8XAAXin5J PgS5DYer4usg+LU4BiPICOL7LVFkLw4gPClxc+fX5Mhsvk1CTGIzadE1n34f0XkttRuv ct+MQHgWUtaHiKgAiKwH7Q4Or7SEYKyJiL0TaBBLbXYEitojcdTSNwH99fN6S0wcA+LJ Z+svawpvAgICR1uysGDgE5oW2qGGeqeBVhqbfwr0vOrsq7aNHTbX62L85cHm5epuR357 1Wyw== X-Gm-Message-State: AOJu0YyAP3L4b0b2vDYEAvydybuh3cl3bNgNtc5h4fB+uVWtUVcKmWvn c4MOyD87hWLlz2pEq1jciR8mpsk6X4HTOm6MO5rRHaIN+MKBGnUIozTgbpci05LoBNi5pec373E 2Vmim4bgHtvzew/KjiPNc4580BZBWJgBV4WlqiNsmqV5dyO7INedY+Ftz X-Received: by 2002:a5d:6046:0:b0:368:4638:add0 with SMTP id ffacd0b85a97d-36baaee6a08mr1057724f8f.35.1722502220059; Thu, 01 Aug 2024 01:50:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbxlsN1Q/32e+LZJga1SOQCPV4S5aIJTLoE5J2Z5dJwTMAydx5HcZxt2teUWtnH/PZ1/wMPw== X-Received: by 2002:a5d:6046:0:b0:368:4638:add0 with SMTP id ffacd0b85a97d-36baaee6a08mr1057697f8f.35.1722502219530; Thu, 01 Aug 2024 01:50:19 -0700 (PDT) Received: from ?IPV6:2003:cb:c707:5c00:e650:bcd7:e2a0:54fe? (p200300cbc7075c00e650bcd7e2a054fe.dip0.t-ipconnect.de. [2003:cb:c707:5c00:e650:bcd7:e2a0:54fe]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b367fd071sm18902825f8f.62.2024.08.01.01.50.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Aug 2024 01:50:19 -0700 (PDT) Message-ID: <541f6c23-77ad-4d46-a8ed-fb18c9b635b3@redhat.com> Date: Thu, 1 Aug 2024 10:50:18 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] mm/hugetlb: fix hugetlb vs. core-mm PT locking To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, James Houghton , stable@vger.kernel.org, Peter Xu , Oscar Salvador , Muchun Song , Baolin Wang References: <20240731122103.382509-1-david@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240731122103.382509-1-david@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 3E5444000F X-Stat-Signature: o6no4mf3foyc6fqm4kek9yujbrsceypr X-Rspam-User: X-HE-Tag: 1722502223-644599 X-HE-Meta: U2FsdGVkX18/IykyXdQql0ibZWixdtax3GUbJwfhU0B/ZsO4ZlbSHIzIr/sOxmYaJf5SBrstzcNIfzw+0ep8yjX5QlQh5IzX43bcQ5xRlKlCNMv2kEKwJXJFxBbSMz7vbt1dhX9Oba5vP5AqtWwcdIFmErsul1yjgmze+oClvJLXXTRI5khHrc9J+dbE4YNTkdlq/vXWWz5LNSCmo/FwWbSBIYXERbMbBqmGeBbVObBNfw33stKvl4fZSKFRx8ytsjZZgUcFXUc7AF9xoxf/cEjpPQY2FXQY90/UlO7waRA/l2iVdsTuyhfOp88ltVUB/NhwxFeJi3leFT8T4VcOgB0Dq3gHI22YxHVYhRPsSFeg2Q78chvGW29NmN46FsJzD2Yx/mPy48d3heYswIXG6v4l2X2ED0kt67thm3+/8Z8gGmrItev7e8YO4xPOxZzw9zl0L3nb41qzMm9qcWhpVf2RQ67A1XBeYQ654ReA1ZNQdXY+UZ/KdcZ9WHa25axuR6+NJkYJt86R6d++JDhb+jRp5EuHA9nGU5qLZvI3N0Kob+k3+4qN07WDFShm7Tlx3UVgsikH2Hcw7iizzeIZdxsSYZk9RgJWT2GvChT/5VLurAIuHjwnDtesfsdZafi8z4kbPoqcxlZSp0UcVhSaUFfcay9y7D62L70kphDI/cTtAY2KGSKlnaEsGi74j+XX9Uuo17lQJey2H7plrgKs3PqALN8j5RTNXu1I7Bt7r5FITIwTwgcSnYrvOPXDcRL59aPTfeCInVmkI5/SOA4WfbJOIqI/KEvNzk43/L4XmWUit3b7Hox9uLd8vd/QgN98PbfVpj8fs93wkh2dwlifZiYOjdLT5Z+3x7VWylS44A5nqRE5OO4ez6LRSFrgDoKYJVoG++B6VJKJ/N+cBkAQZ5ri4PGnQ7LGk9QGjzQ7AZEEnsrGZ/eEMcpVLZqiV1jtiGW6Ucvn9W/xKheF/Ns xZDIE4Gd pkB4z7QI0GFS8P/IS1vPExP3b1Pu9wAH0qb8TSCirJ8Hcr1MiDbEdo9S1Lsn33Ib+8PIH+aQ7Aj+MHAk46PqPPtj7EUoyU2YzvA2Omu2ualKOlQ85y1EhvUStEh9d3FHxx0iUxKtUlJwaWJMOKOppnjHpwMwSkt/r0MTDn3ufDy02XDAYUuV6Psiq1VXQag7CuebVsQ+q6Wpip0ugdm6fXtBBKdv8N1iThoATMu6pXcLBZ2W/p4z4D+q8goUkH+Z4pI9lMaCujj96QtH1PPnZH6/sUxwa3vmOVGnrii8Renq0qoQxIQ2jgL4H4edLZaQuCcGZ 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: On 31.07.24 14:21, David Hildenbrand wrote: > We recently made GUP's common page table walking code to also walk hugetlb > VMAs without most hugetlb special-casing, preparing for the future of > having less hugetlb-specific page table walking code in the codebase. > Turns out that we missed one page table locking detail: page table locking > for hugetlb folios that are not mapped using a single PMD/PUD. James, Peter, the following seems to get the job done. Thoughts? diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 8e462205400d..776dc3914d9e 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -938,10 +938,40 @@ static inline bool htlb_allow_alloc_fallback(int reason) static inline spinlock_t *huge_pte_lockptr(struct hstate *h, struct mm_struct *mm, pte_t *pte) { - if (huge_page_size(h) == PMD_SIZE) + unsigned long size = huge_page_size(h); + + VM_WARN_ON(size == PAGE_SIZE); + + /* + * hugetlb must use the exact same PT locks as core-mm page table + * walkers would. When modifying a PTE table, hugetlb must take the + * PTE PT lock, when modifying a PMD table, hugetlb must take the PMD + * PT lock etc. + * + * The expectation is that any hugetlb folio smaller than a PMD is + * always mapped into a single PTE table and that any hugetlb folio + * smaller than a PUD (but at least as big as a PMD) is always mapped + * into a single PMD table. + * + * If that does not hold for an architecture, then that architecture + * must disable split PT locks such that all *_lockptr() functions + * will give us the same result: the per-MM PT lock. + * + * Note that with e.g., CONFIG_PGTABLE_LEVELS=2 where + * PGDIR_SIZE==P4D_SIZE==PUD_SIZE==PMD_SIZE, we'd use the MM PT lock + * directly with a PMD hugetlb size, whereby core-mm would call + * pmd_lockptr() instead. However, in such configurations split PMD + * locks are disabled -- split locks don't make sense on a single + * PGDIR page table -- and the end result is the same. + */ + if (size >= P4D_SIZE) + return &mm->page_table_lock; + else if (size >= PUD_SIZE) + return pud_lockptr(mm, (pud_t *) pte); + else if (size >= PMD_SIZE || IS_ENABLED(CONFIG_HIGHPTE)) return pmd_lockptr(mm, (pmd_t *) pte); - VM_BUG_ON(huge_page_size(h) == PAGE_SIZE); - return &mm->page_table_lock; + /* pte_alloc_huge() only applies with !CONFIG_HIGHPTE */ + return ptep_lockptr(mm, pte); } #ifndef hugepages_supported diff --git a/include/linux/mm.h b/include/linux/mm.h index a890a1731c14..bd219ac9c026 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2869,6 +2869,13 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) return ptlock_ptr(page_ptdesc(pmd_page(*pmd))); } +static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte) +{ + BUILD_BUG_ON(IS_ENABLED(CONFIG_HIGHPTE)); + BUILD_BUG_ON(MAX_PTRS_PER_PTE * sizeof(pte_t) > PAGE_SIZE); + return ptlock_ptr(virt_to_ptdesc(pte)); +} + static inline bool ptlock_init(struct ptdesc *ptdesc) { /* @@ -2893,6 +2900,10 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) { return &mm->page_table_lock; } +static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte) +{ + return &mm->page_table_lock; +} static inline void ptlock_cache_init(void) {} static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; } static inline void ptlock_free(struct ptdesc *ptdesc) {} -- 2.45.2 -- Cheers, David / dhildenb