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 E98A5C47DDF for ; Wed, 24 Jan 2024 12:17:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 680926B0078; Wed, 24 Jan 2024 07:17:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 630A76B007D; Wed, 24 Jan 2024 07:17:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F8716B0082; Wed, 24 Jan 2024 07:17:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 41F156B0078 for ; Wed, 24 Jan 2024 07:17:31 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D7F3A1C16AF for ; Wed, 24 Jan 2024 12:17:30 +0000 (UTC) X-FDA: 81714105060.07.EBEC469 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf23.hostedemail.com (Postfix) with ESMTP id 06A2314000D for ; Wed, 24 Jan 2024 12:17:28 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706098649; 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; bh=hzQf2TsbXSuWluN1lIbCxTXtX+i0ox/9sNwT7Oh4iXE=; b=XaG7LMum/sGXsDVtH+PHzlR/GWKPhmcN5mT9tLzMg5fljvkx/6qBP9Q/k6FJqn2ee+PjIu jwkEI3k0Yv/U8cgrus0IxyS+yPQ2PSVVB1Vw1cCGj651z9w0RqTQXvSkvkMcPf7eUASmtA Whi6kwZKgXpkmJdRJyqOqEmSoFjyyMs= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706098649; a=rsa-sha256; cv=none; b=LQavIq1JRzkTxuhv75bgOKTR/dqqcHCfoc2DErUI4OKG58H3pRapwQll5thjkXi0mTe8Ls DUoADazAIDp8jV4f7o2LOTrNv4Lhd2V8dCYYc/gFfq2Pdo5aMibPFjdnM5rpB/Cc5GWGuL ZlJqevfg29rq3Pj0rw8+yfRstXnr3Zw= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E2E681FB; Wed, 24 Jan 2024 04:18:12 -0800 (PST) Received: from [10.57.77.165] (unknown [10.57.77.165]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 715B63F5A1; Wed, 24 Jan 2024 04:17:24 -0800 (PST) Message-ID: Date: Wed, 24 Jan 2024 12:17:23 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v9 02/10] mm: Non-pmd-mappable, large folios for folio_add_new_anon_rmap() Content-Language: en-GB To: Jiri Olsa Cc: Sven Schnelle , David Hildenbrand , Andrew Morton , Matthew Wilcox , Yin Fengwei , Yu Zhao , Catalin Marinas , Anshuman Khandual , Yang Shi , "Huang, Ying" , Zi Yan , Luis Chamberlain , Itaru Kitayama , "Kirill A. Shutemov" , John Hubbard , David Rientjes , Vlastimil Babka , Hugh Dickins , Kefeng Wang , Barry Song <21cnbao@gmail.com>, Alistair Popple , linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Barry Song , linux-s390@vger.kernel.org References: <20231207161211.2374093-1-ryan.roberts@arm.com> <20231207161211.2374093-3-ryan.roberts@arm.com> <41dc7dff-1ea8-4894-a487-88d46ec2b2d8@redhat.com> <1188e67e-5c04-4bb5-b242-78d92c3fc85c@arm.com> <6caaced7-a9d7-4fe4-823a-11b96be83e46@arm.com> From: Ryan Roberts In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 06A2314000D X-Rspam-User: X-Stat-Signature: 161zqtfcba79tn4awhj4qgg5zns5whwm X-Rspamd-Server: rspam01 X-HE-Tag: 1706098648-74574 X-HE-Meta: U2FsdGVkX19dzOF7cMEiHw7jj7RLsQy51n+5GxaLe0Q8MVaD16ewCiFgB2igwEmYUguUpx1WKZNu98Oi8Go+z5swN9eqbQqEqtxr5FYX0OKpLDls4T+jF1q8yPym5aFEWEofxZyT2pSueS7LeAbqTxPVF0wVkpodWKY7jgCmK6vw0GhfcfP+LWzj5/HE71UECHEivl5ltvXmgvdSbHc1P2ozzrQMN1oJPJThgT0FbbKprJscbrDXLegppZcp8WVn+Fm5hJ+nsaMncKeAdFqqFhrjDJywMtJapbOBy64OfywME7zF6DgysD+FqX8BJ7JQ75N0jvg14UY8hkdzJezQOIUOuCAzTxlZGVNIl/JbvTaCmxFcrfHaWkeFPqmV1mBPbuAy/91+O9BeLRMFdlooawCV9IqswwGWQ4tuv7MSEmkhxjQflEdP5D8wN4hm1cAuFUS+sinvd6SthNJanub0HJJ5IF9UWvNLofj06IYk1eaR7Piy6JJI5WfVyUbvRZMsA6BDxCmXlV5shBzINbjo9vwODY7Yl9lTpr7CS+hBmUjQYScdD2HIzy51oFEvAQQ4TQBL1z4tEBTUsup1nHVUy9sbd54YMH+d07qAQs4qQeUKjVML0ik/yyfyR3m8izCKTunWmQ1xlOuXJNSb/+5kmxKOvioAw9BxIpU1zwRUYKf0fwdhYqS3dXYYKA+2dUM0t4EYxsXm39AgzwMO1wWuEpbABPqCbA6NWWpkAA/dK4pGXm1lxFKi/XPBhUWeY6lr6C6hqbUjhpicyRzjheWkYfCI96BYsvtjyBDV7/na3v2zIIeb910yb5zqQNrnKw1IDv/TZDc47cNBTnkTA/ZiAI3v0Szei+3eGCPZJsUf4QbiQ0kMcz7TUBIkOxZWx7FkMaZ4cVu69M7IQpsPv/csX2TdqjRmQ9OpB5u1xWM9oiEKsrKzgQzILo2/VgZLZMOnfgThmsrh9XH0kN5V6eU zlV8iI7C +zKEt5CuFjiYcKcsmY3ZnbzBenHLFyyVhyA4g89ikSgZ/0MOcz9r11nL2vdpKDnzTFY4S/TOUpxX41FtuCACqxFtPIBHxpvqEmRETT5sX0fF5RqDWLbgtZUxq/RBYCouKOGbBvnHxXvr6GhSUVMJ+8QLAfiBL9+FQUwkYRnm6JgB83nO+DnGNhUA50aL5mdkavqdvQb1ScoZMOVIjjUZXIy/KILvj6YZY/YIEWphwBwyb3iGVhQ0qopOJ2ebea+iLa+2OXSfbEm7xd7JI6+gPk0JSd4cfl7AYQA88EOicwB0XiXsdeyCLWqYKHdN9x3hwFiTUBXS26LK8v61Sp6k06fK3PoaVppi0x5Yi0bTogqkc6kgjDcaTSwg6v88AY8tBeNcyzNbkohgIK/Q1xTAMZhqupcYD29+YPJfZza3k1V2iOkxGqyPXPR1ljsJiCJJ9uE0LX4loPNzzGf6h06+t+v2JTimdOm6nqqTxHqcTnHpWnnMOCXhabHQe1XdED25fWtjnjS5HJt3VeTXgDmF4/E65+pF2//PGL26WlJMYBzmeU12U+DiLj4WaCQ== 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 24/01/2024 12:06, Jiri Olsa wrote: > On Wed, Jan 24, 2024 at 12:02:53PM +0000, Ryan Roberts wrote: >> On 24/01/2024 11:19, Jiri Olsa wrote: >>> On Wed, Jan 24, 2024 at 12:15:52PM +0100, Sven Schnelle wrote: >>>> Ryan Roberts writes: >>>> >>>>> On 14/01/2024 20:55, Jiri Olsa wrote: >>>>>> On Sun, Jan 14, 2024 at 06:33:56PM +0100, David Hildenbrand wrote: >>>>>>> On 13.01.24 23:42, Jiri Olsa wrote: >>>>>>>> On Thu, Dec 07, 2023 at 04:12:03PM +0000, Ryan Roberts wrote: >>>>>>>>> In preparation for supporting anonymous multi-size THP, improve >>>>>>>>> folio_add_new_anon_rmap() to allow a non-pmd-mappable, large folio to be >>>>>>>>> passed to it. In this case, all contained pages are accounted using the >>>>>>>>> order-0 folio (or base page) scheme. >>>>>>>>> >>>>>>>>> Reviewed-by: Yu Zhao >>>>>>>>> Reviewed-by: Yin Fengwei >>>>>>>>> Reviewed-by: David Hildenbrand >>>>>>>>> Reviewed-by: Barry Song >>>>>>>>> Tested-by: Kefeng Wang >>>>>>>>> Tested-by: John Hubbard >>>>>>>>> Signed-off-by: Ryan Roberts >>>>>>>>> --- >>>>>>>>> mm/rmap.c | 28 ++++++++++++++++++++-------- >>>>>>>>> 1 file changed, 20 insertions(+), 8 deletions(-) >>>>>>>>> >>>>>>>>> diff --git a/mm/rmap.c b/mm/rmap.c >>>>>>>>> index 2a1e45e6419f..846fc79f3ca9 100644 >>>>>>>>> --- a/mm/rmap.c >>>>>>>>> +++ b/mm/rmap.c >>>>>>>>> @@ -1335,32 +1335,44 @@ void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, >>>>>>>>> * This means the inc-and-test can be bypassed. >>>>>>>>> * The folio does not have to be locked. >>>>>>>>> * >>>>>>>>> - * If the folio is large, it is accounted as a THP. As the folio >>>>>>>>> + * If the folio is pmd-mappable, it is accounted as a THP. As the folio >>>>>>>>> * is new, it's assumed to be mapped exclusively by a single process. >>>>>>>>> */ >>>>>>>>> void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, >>>>>>>>> unsigned long address) >>>>>>>>> { >>>>>>>>> - int nr; >>>>>>>>> + int nr = folio_nr_pages(folio); >>>>>>>>> - VM_BUG_ON_VMA(address < vma->vm_start || address >= vma->vm_end, vma); >>>>>>>>> + VM_BUG_ON_VMA(address < vma->vm_start || >>>>>>>>> + address + (nr << PAGE_SHIFT) > vma->vm_end, vma); >>>>>>>> >>>>>>>> hi, >>>>>>>> I'm hitting this bug (console output below) with adding uprobe >>>>>>>> on simple program like: >>>>>>>> >>>>>>>> $ cat up.c >>>>>>>> int main(void) >>>>>>>> { >>>>>>>> return 0; >>>>>>>> } >>>>>>>> >>>>>>>> # bpftrace -e 'uprobe:/home/jolsa/up:_start {}' >>>>>>>> >>>>>>>> $ ./up >>>>>>>> >>>>>>>> it's on top of current linus tree master: >>>>>>>> 052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat >>>>>>>> >>>>>>>> before this patch it seems to work, I can send my .config if needed >>>>> >>>>> Thanks for the bug report! >>>> >>>> I just hit the same bug in our CI, but can't find the fix in -next. Is >>>> this in the queue somewhere? >>> >>> we hit it as well, but I can see the fix in linux-next/master >>> >>> 4c137bc28064 uprobes: use pagesize-aligned virtual address when replacing pages >> >> Yes that's the one. Just to confirm: you are still hitting the VM_BUG_ON despite >> having this change in your kernel? Could you please send over the full bug log? > > ah sorry.. I meant the change fixes the problem for us, it just did not > yet propagate through the merge cycle into bpf trees.. but I can see it > in linux-next tree, so it's probably just matter of time OK great! How about you, Sven? Do you have this change in your kernel? Hopefully it should fix your problem. > > jirka