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 11027C2BD09 for ; Sat, 13 Jul 2024 01:03:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E0496B008C; Fri, 12 Jul 2024 21:03:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 790E26B0092; Fri, 12 Jul 2024 21:03:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 608E76B0093; Fri, 12 Jul 2024 21:03:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4273B6B008C for ; Fri, 12 Jul 2024 21:03:22 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B1A1EC0D86 for ; Sat, 13 Jul 2024 01:03:21 +0000 (UTC) X-FDA: 82332931002.19.3AAFDB0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 5AA3414000C for ; Sat, 13 Jul 2024 01:03:19 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Knds15M6; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1720832582; 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=njOu1EaTiZGt3EM1QiAOXf7xb5THADxRrRxy/YZCZ1o=; b=6+GDYm37yFZXqAegQA4mAGG7sMxaP6/FjINYDCcxknpg8a7sFekq5dpKoT8GDeguVs9Coc V5TnLQkfDKDlQ3lLXijA3vKOsFf50OhmOyLfhZy8zcb1OMqqxRiFive9bLBDq3562O2I8A WgxcQ6QjewP1PPhGK7YA12XQ6pPYcqo= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Knds15M6; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1720832582; a=rsa-sha256; cv=none; b=sWYHDmmaFRhguQkRcNtqMISSa6q296QOFO85HtZgbnCamKCt99j+lDKCeGwvWXipOENRS7 41rKZA0ebKGzlync5hZ50euOZGvsDamOapaP/13JXCQfooRds94mJFyWHPrDGQ6lI3hEDA puT4GhxrssEVT39zYD5LkNy9eDBT3bg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720832598; 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=njOu1EaTiZGt3EM1QiAOXf7xb5THADxRrRxy/YZCZ1o=; b=Knds15M6xESxu/5IrgZ+9weorJTtNBdMtq1p+0PqVcWHsMqbSUkg4SvZk/W+xekRt9GZnG VTvrXaRkdoInwfr3yZbgAjA5exh1JQ1aAZeTNI7E6d5ILgCcf4gr5hK0ndlUV5cgfP0q5d OqZ6d1RnNFM2OX//H087wuGEmB9DbfU= Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-338-7WFt4sZQP7amnuuJUkgKZw-1; Fri, 12 Jul 2024 21:03:14 -0400 X-MC-Unique: 7WFt4sZQP7amnuuJUkgKZw-1 Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-1f6810e43e0so19981915ad.0 for ; Fri, 12 Jul 2024 18:03:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720832592; x=1721437392; 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=njOu1EaTiZGt3EM1QiAOXf7xb5THADxRrRxy/YZCZ1o=; b=IdJxLAMGBUYasD/TW9HmXckc7QDnXimKjeX6WkFVPnVv2/HDtzhoi8jwRjjpKK2MYk 7G4pfCSRmyPzOl3a43TqDrbsynd3S9JmcaMgsmDywjG6oEwrEr8JjoeWeoWWQQniPmUh uRA+3bqqhRK27ezSgBJ2/p77ZjBPt2tKevgYLBNpHlq1ggqoJkgk+otSifzsB77aliuQ 7hrHgNZp1reT2THvtq6NhxnqZmWTIcHq0A4x3Jhlxn6OZHpmCWYF+R/W9CjPz8S5P+9/ C1qt+9OpUBBUz56OKRw/EHuioi4oIhYb5YhI5zmj3snwyH815vRUb4i8PD396QXrMc5U +exg== X-Gm-Message-State: AOJu0Yz7p4JIMSYRHfNOgWz8dAQuPj4Tfm2OUcGJ7rO3ewbfh798AQwq CN3I3niNRGZcLdkrVd3pqLKNQsYnAY/VzvJg8AWiXX0bho64Af9emEgJJyuSVS0wU4LcDhD6ETX 6hSF7ZxnQFAWbcw+wN0hAKZz0Tv18oU7+mM8hHHYgjeGqJ7NJ X-Received: by 2002:a17:902:e54e:b0:1fb:9cb0:3e46 with SMTP id d9443c01a7336-1fc0b4b6453mr4690235ad.7.1720832591942; Fri, 12 Jul 2024 18:03:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwvIyu645ginLcnOU79cuOOkLvO6pcECrChF26Gh5N2PEpynwczfyA7mKSNLq2ec+lPeS1Mg== X-Received: by 2002:a17:902:e54e:b0:1fb:9cb0:3e46 with SMTP id d9443c01a7336-1fc0b4b6453mr4689775ad.7.1720832591455; Fri, 12 Jul 2024 18:03:11 -0700 (PDT) Received: from [172.20.2.228] ([4.28.11.157]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fc0bb6ffdesm597715ad.53.2024.07.12.18.03.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Jul 2024 18:03:11 -0700 (PDT) Message-ID: Date: Sat, 13 Jul 2024 03:03:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/huge_memory: Avoid PMD-size page cache if needed To: Gavin Shan , Matthew Wilcox Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, william.kucharski@oracle.com, ryan.roberts@arm.com, shan.gavin@gmail.com References: <20240711104840.200573-1-gshan@redhat.com> <63a0364b-a2e0-48c2-b255-e976112deeb1@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <63a0364b-a2e0-48c2-b255-e976112deeb1@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: 8bit X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 5AA3414000C X-Stat-Signature: fhoe7sxt9moow6h8jopjsjmmxmzogxcq X-HE-Tag: 1720832599-190386 X-HE-Meta: U2FsdGVkX18qxt10NKRJ5HplUojpufokMPCAg2gKTtxX9bNITS5geJLVUY+ePASczNTL8VxIb+3WMoSg/ZPvfINioMzGk9eTiuDDDjjeqbVtySBIjAB1VRpmPVt+U1oaw2FIf+MDP5kLccTaGA5+VhTebLLsh2E3ArnxwiC//59D+OMPEwpFo/pijYD8NO2oFXJCCUCLaxH2v5a6BVocYkHFf8EZVmbaD1zq7F8zxNZkZq2iFXGUyaa676OgEf9g2+kWSLR31kIXZmpVZFlVyLfMElIxL6I7O3Ro56A8P4XCp0SitobfsLx/IFDjugaG7odEcp5bTZLPSYITqKhBl+SXSEs0l/Y93IZNTiABrrJHa6qx9EmuaWlGIV4wQfQ9fSoPjguXLhEzPoFEATefGppbwTprgyB1KMnvPcdKQtQMiHskac9c5VVW06HIr5RnntPocnR/G/dkZEZVsjJxM3E1+hwO09ZL/J/5UBcwnx+AerC6ohKZrUgA7Qhhgqf/go9wL/Y06uTZ2NU6jCq0LDgJqxiw3eRoUcvjHGJul6L2rZndVLEPSDVvCAwbNKlZNFtMofOgvnVGAC83qSFfNkjdqIGyN3uJavqUlE4Xs0eJMCZ5oNuqqwVAUdsVQN51Dh7Efm61VoLPByZHeE8dRWj3uLeq9ewNsoV2nUsJ/s9n/IMjnLEN4wecjd9u5h6cdgffaFAVM1IWbyilvZ4ctI+Rq90XdbuXaAGa4IufululxrXLkEUlM2w7949SUfxcXnmG/ugEyyJE4Jx87Ltu7CFQfXjTkCRSgfE7IW9BxaQ5p5tSOfIMJWhTzl2n1oz+mzZ00JDEZCEoK/cDCK8XpSDJLeazjvUYZXthjkDPBeYv+eZBE5la3kOsZvtAz4K6j6Sk4l4QStlhnNkbQjbBhWnV+XgzI00qRJRD9W2HEdcp0iuyxdS+BvFXHNYvCNbY4yiSk/HXlwEO5Pk9APc fqZkIxJS ebUVHQj/k/vjsM1Mbpi742YioGPkI5AKDx0X2qvkYOMCJbyfOx6yWRIdtGtYRvSMT+Ex9//DjBb1aVVV2hk8jPDnbeBPHwoCqI3TKUOQzmlAKtzHupqDn3iZ5ph9tfAzHFe8sdHZO9r4NKqIsFj0kYMVqGeGxCBpUU/zIyDEoG60WZFYw7COi0P80jxveKUe7qvZkJuHj97Q8S20iKUnq3eZ01g1OIgfv+WOyLVwTOvmD/NMt21tUypCERxf2Z1dEQEQUB/TPmfrULnUoV2ypBTSNxOF0u+U0zLiEe+GkCXFKQeZhW2AMfd2SifS3l/9rwtQBNPZS87paDxwXK3ITNGTjoeiA3ov456WKFwsqjjNANSE4q+PRmGiStdtSfWEKTm5n94sUzce2rS4uWf8Zw3HoO5KYU+HoogqyJkDFrIwux80HyM1PFEzJ+GTaXU5Jv4967mxnkYYbu8ZuRFhqTUlBTN8qB/vrykO6QSi2QcRiWi0= 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 12.07.24 07:39, Gavin Shan wrote: > On 7/12/24 7:03 AM, David Hildenbrand wrote: >> On 11.07.24 22:46, Matthew Wilcox wrote: >>> On Thu, Jul 11, 2024 at 08:48:40PM +1000, Gavin Shan wrote: >>>> +++ b/mm/huge_memory.c >>>> @@ -136,7 +136,8 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, >>>>           while (orders) { >>>>               addr = vma->vm_end - (PAGE_SIZE << order); >>>> -            if (thp_vma_suitable_order(vma, addr, order)) >>>> +            if (!(vma->vm_file && order > MAX_PAGECACHE_ORDER) && >>>> +                thp_vma_suitable_order(vma, addr, order)) >>>>                   break; >>> >>> Why does 'orders' even contain potential orders that are larger than >>> MAX_PAGECACHE_ORDER? >>> >>> We do this at the top: >>> >>>          orders &= vma_is_anonymous(vma) ? >>>                          THP_ORDERS_ALL_ANON : THP_ORDERS_ALL_FILE; >>> >>> include/linux/huge_mm.h:#define THP_ORDERS_ALL_FILE     (BIT(PMD_ORDER) | BIT(PUD_ORDER)) >>> >>> ... and that seems very wrong.  We support all kinds of orders for >>> files, not just PMD order.  We don't support PUD order at all. >>> >>> What the hell is going on here? >> >> yes, that's just absolutely confusing. I mentioned it to Ryan lately that we should clean that up (I wanted to look into that, but am happy if someone else can help). >> >> There should likely be different defines for >> >> DAX (PMD|PUD) >> >> SHMEM (PMD) -- but soon more. Not sure if we want separate ANON_SHMEM for the time being. Hm. But shmem is already handles separately, so maybe we can just ignore shmem here. >> >> PAGECACHE (1 .. MAX_PAGECACHE_ORDER) >> >> ? But it's still unclear to me. >> >> At least DAX must stay special I think, and PAGECACHE should be capped at MAX_PAGECACHE_ORDER. >> > > David, I can help to clean it up. Could you please help to confirm the following Thanks! > changes are exactly what you're suggesting? Hopefully, there are nothing I've missed. > The original issue can be fixed by the changes. With the changes applied, madvise(MADV_COLLAPSE) > returns with errno -22 in the test program. > > The fix tag needs to adjusted either. > > Fixes: 3485b88390b0 ("mm: thp: introduce multi-size THP sysfs interface") > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index 2aa986a5cd1b..45909efb0ef0 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -74,7 +74,12 @@ extern struct kobj_attribute shmem_enabled_attr; > /* > * Mask of all large folio orders supported for file THP. > */ > -#define THP_ORDERS_ALL_FILE (BIT(PMD_ORDER) | BIT(PUD_ORDER)) DAX doesn't have any MAX_PAGECACHE_ORDER restrictions (like hugetlb). So this should be /* * FSDAX never splits folios, so the MAX_PAGECACHE_ORDER limit does not * apply here. */ THP_ORDERS_ALL_FILE_DAX ((BIT(PMD_ORDER) | BIT(PUD_ORDER)) Something like that > +#define THP_ORDERS_ALL_FILE_DAX \ > + ((BIT(PMD_ORDER) | BIT(PUD_ORDER)) & (BIT(MAX_PAGECACHE_ORDER + 1) - 1)) > +#define THP_ORDERS_ALL_FILE_DEFAULT \ > + ((BIT(MAX_PAGECACHE_ORDER + 1) - 1) & ~BIT(0)) > +#define THP_ORDERS_ALL_FILE \ > + (THP_ORDERS_ALL_FILE_DAX | THP_ORDERS_ALL_FILE_DEFAULT) Maybe we can get rid of THP_ORDERS_ALL_FILE (to prevent abuse) and fixup THP_ORDERS_ALL instead. > > /* > * Mask of all large folio orders supported for THP. > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 2120f7478e55..4690f33afaa6 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -88,9 +88,17 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, > bool smaps = tva_flags & TVA_SMAPS; > bool in_pf = tva_flags & TVA_IN_PF; > bool enforce_sysfs = tva_flags & TVA_ENFORCE_SYSFS; > + unsigned long supported_orders; > + > /* Check the intersection of requested and supported orders. */ > - orders &= vma_is_anonymous(vma) ? > - THP_ORDERS_ALL_ANON : THP_ORDERS_ALL_FILE; > + if (vma_is_anonymous(vma)) > + supported_orders = THP_ORDERS_ALL_ANON; > + else if (vma_is_dax(vma)) > + supported_orders = THP_ORDERS_ALL_FILE_DAX; > + else > + supported_orders = THP_ORDERS_ALL_FILE_DEFAULT; This is what I had in mind. But, do we have to special-case shmem as well or will that be handled correctly? -- Cheers, David / dhildenb