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 E4359C25B75 for ; Wed, 29 May 2024 15:43:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 75FC86B007B; Wed, 29 May 2024 11:43:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E70F6B0089; Wed, 29 May 2024 11:43:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 561896B0098; Wed, 29 May 2024 11:43:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 399B46B007B for ; Wed, 29 May 2024 11:43:13 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id ABB6980A1D for ; Wed, 29 May 2024 15:43:12 +0000 (UTC) X-FDA: 82171852224.20.27456FE Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by imf05.hostedemail.com (Postfix) with ESMTP id AD5B5100021 for ; Wed, 29 May 2024 15:43:10 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.hostedemail.com: domain of breno.debian@gmail.com designates 209.85.208.175 as permitted sender) smtp.mailfrom=breno.debian@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716997391; 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: in-reply-to:in-reply-to:references:references; bh=w5A6Owu5nCCfigxsQSQjSW3E/HUi1TirfJVySwzCRU4=; b=7YmCQd9BQwQET4PY5yB/jFCDMW++RX+FVVnGWC0BNTcSK635PJS6AF7R4a/Zz+/e18uzpl nNHmbDXmGncsQ9rVnB0x70JBB9gqTG4JKS3YdWSN/qBq7ONXepEg650y9oULVJPP8Uch1m mkA1eH2VyhbewEs+J/43+QUAeTxrLtE= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.hostedemail.com: domain of breno.debian@gmail.com designates 209.85.208.175 as permitted sender) smtp.mailfrom=breno.debian@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716997391; a=rsa-sha256; cv=none; b=iSvU6HHivJ6vPGdvoVkAc+gGK+IIcR5SciCM9HQWSbFpSVatM82hwsUK/xLKAB70IMK6v7 Dz8C16qsZmoQ/Hr/KcWIgmG+ZtzPVp5kK0T9mFJepkihOoqyA3RNdn4VCMuK37aDuTzhbZ N+AtN39lM/KtX0Kw60kEYAafreMvvFg= Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2e716e3030aso20548051fa.2 for ; Wed, 29 May 2024 08:43:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716997389; x=1717602189; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=w5A6Owu5nCCfigxsQSQjSW3E/HUi1TirfJVySwzCRU4=; b=dz/r9NQUdPVCRlizADEbVbpgxkUhsdl7VcwUjUfx9tgJWHuObC2IbpCJJ6s385icDK 0OWF4fxmv1K/b0scpVp6NWZjyk8FQdHP4z47m6ykKvWWXTPxHrHErZmc7SJ8IeDBgY2o rR74v9GR8uGcVvT3UED34eEg13VtuHitg5qH5mBlDQGnrczrABUipspHqov/ccKkamtM hbm4fLIToZ5eZrjujQpH1o8toBcifn4SkrpbjThJtRwbStA1/eIDtM3+AkDR9ObYljke c9eGykrc/H9M5hHwenNmX5tOh+E1IXZSgDsUl+XRuHYx5Puvjgm3B5VLmW6ZnxjXhxEI +Qqg== X-Forwarded-Encrypted: i=1; AJvYcCXTJ17JKY7CkS9/XP5F3a0ZM4afW122guvI9adnsjjsWCrb7EcugQm6eT/zGopY3gntBFZns6mbl4fudfA2tIVDaSA= X-Gm-Message-State: AOJu0Yyvu8GAFzsXsHIrwGp2qo5FrrXp5m+vABSgF0Bt7i5cwbH8aDQ9 FRXTwBLnHF2xHDqFFRNy/JoakdUgW4ZpRcJBe091uDUnO+jcQEYcaKUNMQ== X-Google-Smtp-Source: AGHT+IFyQNUSc9Pi+sOtG/54fkZ1MbMpE5ltiGitvLIjUHxiXGG6Ep8TRL/MCRlTOKXzb/lGn7EdBw== X-Received: by 2002:a2e:2c12:0:b0:2ea:7e50:6c94 with SMTP id 38308e7fff4ca-2ea7e506d11mr11694151fa.16.1716997388651; Wed, 29 May 2024 08:43:08 -0700 (PDT) Received: from gmail.com (fwdproxy-lla-116.fbsv.net. [2a03:2880:30ff:74::face:b00c]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-579cf481a7fsm4776859a12.52.2024.05.29.08.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 08:43:08 -0700 (PDT) Date: Wed, 29 May 2024 08:43:06 -0700 From: Breno Leitao To: Oscar Salvador Cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Muchun Song , syzbot+d3fe2dc5ffe9380b714b@syzkaller.appspotmail.com Subject: Re: [PATCH] mm/hugetlb: Do not call vma_add_reservation upon ENOMEM Message-ID: References: <20240528205323.20439-1-osalvador@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240528205323.20439-1-osalvador@suse.de> X-Rspamd-Queue-Id: AD5B5100021 X-Stat-Signature: 8faxki4xp8e6zrfmf48at1ttxogkmi5b X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1716997390-909072 X-HE-Meta: U2FsdGVkX18HFQMLu5s6c7KsL36Xo4P0uH75iSkYXcrNKvVC1xdgZudw+72hrO9s+QCghgadDgy6xdMlfF4fMerNhn4KffyOqGTB5TIylvnQlh2N5UppBaV7ss1LNVgwoteeuuvVY56FFcPP2QnCRI4Qn2iiaNNlDIghTQxj3Pp+/1pKWbXqUIYgg7ZSQCAxl9pBjKprJaZNVwPCKZvd+wJBkPPmR57QONw0psIPn7mdgV/JUo9wnjEEgdYwjFOz5pj8QIuHSvoYCPr2eo8OIGZ7/gHQz2E3maVVWvYnalrRyiajfyCCmeTruvMrt76GNCPiJjts4SRETmd6fyrMtWsUWrJQ59lUXsGjjsNmAnOnAGEGtRgBxs4K9nLIs+Jr9K5yzfZySPcM92n/aLyljTYzX8nfQ8LxaZxp4TEdheazaJ9y2qGtMWaBFJ9LYjFz9CnjIW1iTYZ5I4S7hoToi5FHITUMdaEHeWjhEVwTwJt0tVn/4UgjGRNgvFajeJpTCfakZv0LnyuoyqrT2VxJWPnzunXlYQalQKBrwr1xDwJgdUorMUdwEYr8Cb9nPZxQ78EV6mJiG24oVVkQB9Du3VN6MCrL9JZjdcKl6UmTDMw0r+tIcOj3FkAEl82zBSOtCou3lE8KxTPewC63hBVXErgX7MWmIaABfqRN3pwIAsn2fxVCDmq7byL8lGak8Imc9QYxGJIK8vCCnc2Tm3CubrZYGwvsRrlvB2uynmi+d+5QUF0nVQitjGZTcA7x8bCV3u+zxFKdnLAal8SR/41qlzCbh1O+CwNFrIHuVzrioKwX2duhXhuIyh/gp2u5Sre87xqYoD3U8YWO8d2XkiCZzicQwizpJbpaUh8F4gJiaVJQoS0r5uKWb0l+sYUFxS0UC+EvFJLoogZXXUenezTtOD4PNnsIxu6HyZzXALagenRWjlA2eqa3QVOdZQGcxKkesUF4Qjwggm3u3pZ8w9g Qd6h+O7t xV+z6G6ukFFViiL319Dl/UyxTv0gmQjwk2aV7QVxuh9BhI6XzFMXbt9j/JJFLZEgKKuN1Sj1hXZdMm0LyZIc2YQjtN+DR1ZvyXaE0XjmEr3xXWjCzmxlO0pKucPgr9/o1MbvPPyrnsfGhFEgL7bc7zPDkZ/eKVMlNc3UA0gdwx1ozmoDdw992z1YatDhZmCWJ3i8IOKMmHWJc5xkEc9gZGglccDRkU9y5M63tSTGM0vEzyu41P6lAmDfmJq3yseiCB70X0vBL/nKY/nEg0BchWtPq4UiVvms9ajOWfYXM7NiEAQiB9UKa5hAUrbXVLmiN52XBu328g1Fe2Trt6Ogb62B+WMs/a4V3v7IcZbTkCOvzxAguiUPt52NGOtBQE7VNnHmMa5gGwvWDWayDupkMeUky84vX+g+uZH9MbwHkWJbTGaa3mr+G4MBXbRieOI4MXLfKHPFhFpVUBcfw94/oDDKMqiXfnIvSQ46ddezSk7rRCYGy/aUi5ZexZgTlHJDui28vkqiuBZTKLjpOWAg+5TOiWdZUm/qd4YDpOAdqaDENw94dCtJrjOqhjwvtdl7kakUOZ5sGqnwJqRpOEc/66doGUdbKiXru0SWnoxhpNfCLSiMxgwYo/N3ahXogrz7VrLP4tKwH0/adquHrdBSB03/3Ih7MMEz27l+qARY8Cyc9D47FNe7U6heKur5MatC/G+/nkfbJhufT/tI= 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 Tue, May 28, 2024 at 10:53:23PM +0200, Oscar Salvador wrote: > sysbot reported a splat [1] on __unmap_hugepage_range(). > This is because vma_needs_reservation() can return -ENOMEM if > allocate_file_region_entries() fails to allocate the file_region struct for > the reservation. > Check for that and do not call vma_add_reservation() if that is the case, > otherwise region_abort() and region_del() will see that we do not have any > file_regions. > > If we detect that vma_needs_reservation() returned -ENOMEM, we clear the > hugetlb_restore_reserve flag as if this reservation was still consumed, > so free_huge_folio() will not increment the resv count. > > [1] https://lore.kernel.org/linux-mm/0000000000004096100617c58d54@google.com/T/#ma5983bc1ab18a54910da83416b3f89f3c7ee43aa > > Fixes: df7a6d1f6405 ("mm/hugetlb: restore the reservation if needed") > Reported-and-tested-by: syzbot+d3fe2dc5ffe9380b714b@syzkaller.appspotmail.com > Closes: https://lore.kernel.org/linux-mm/0000000000004096100617c58d54@google.com/ > Signed-off-by: Oscar Salvador > --- > mm/hugetlb.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 6be78e7d4f6e..f35abff8be60 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -5768,8 +5768,20 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, > * do_exit() will not see it, and will keep the reservation > * forever. > */ > - if (adjust_reservation && vma_needs_reservation(h, vma, address)) > - vma_add_reservation(h, vma, address); > + if (adjust_reservation) { > + int rc = vma_needs_reservation(h, vma, address); vma_needs_reservation returns a long. static long vma_needs_reservation(struct hstate *h, struct vm_area_struct *vma, unsigned long addr) Other than that, this is reviewed. Reviewed-by: Breno Leitao Thanks for fixing it.