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 38670C3DA7A for ; Mon, 2 Jan 2023 13:24:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A1E98E0002; Mon, 2 Jan 2023 08:24:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 951A08E0001; Mon, 2 Jan 2023 08:24:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 818EA8E0002; Mon, 2 Jan 2023 08:24:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 71E8D8E0001 for ; Mon, 2 Jan 2023 08:24:56 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 319AE1408BB for ; Mon, 2 Jan 2023 13:24:56 +0000 (UTC) X-FDA: 80309929392.26.3083DAE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 381EE40012 for ; Mon, 2 Jan 2023 13:24:54 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TMW4k06v; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672665894; 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=WujQwgIkHtmZyzY7+DAjl2gdJ0RQMKNNTKjIUToe/C4=; b=rp0UAGw3aKCSWZDnjTLD+Ul0cOWLHHrZZruD5wqqKPGJjcf7c7QZV/ch8oeheFxW6ERQvd CGOiQqfkjBXw1nRvA4vdeo48ZkJ+QqZjB0ylmjfEnLGYqgdwAQRERU84OomQk2teG7Zo0B XVAwWaqVZAzTGUTm0X20MDOylRg2pMw= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TMW4k06v; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672665894; a=rsa-sha256; cv=none; b=yakC23/meoJM4+I11n0zilqcdkppm+XnS2oNo7g8gZERFz9C+3MTepqfuu1n1PUw3/d7rc ZZFdpfIdemKggTxiElwTKXZlQmaF7JOgPXlC1XiQdwHg9u+OYx9jLR948ml1GBRlGymean 5dIXTuZYG7Sf3F5VgwCJG2SiSyBvkEg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672665893; 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; bh=WujQwgIkHtmZyzY7+DAjl2gdJ0RQMKNNTKjIUToe/C4=; b=TMW4k06vP0pjap5Z2l+WgOEiSbqiZRVYcvwU7b8yuOBSwGOmBdNrtFlDPJBx4F3tVR2yse QODKdk04pqmOhhAtsH47sn4UvH2Xx+MfT6XCeG8A1iNEz/ZNJLYjLQjtBvvCSJ4xJX2j9M 1St5vRw1gXWjS0ziwmwkwmeJaT50W2k= 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_128_GCM_SHA256) id us-mta-361-hZ0ww5AvN4ON655VF_jdEw-1; Mon, 02 Jan 2023 08:24:52 -0500 X-MC-Unique: hZ0ww5AvN4ON655VF_jdEw-1 Received: by mail-wm1-f71.google.com with SMTP id c23-20020a7bc857000000b003d97c8d4935so10835025wml.8 for ; Mon, 02 Jan 2023 05:24:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WujQwgIkHtmZyzY7+DAjl2gdJ0RQMKNNTKjIUToe/C4=; b=nlwwoG41544oUvl7hyImoUo1hXeCljIVVulrNZZdDvVwwAP4Kykj0qT8CXLAz3ui+M G1ip96EiMd0Ze5/Wkc3hXCXU3YXSvjIFn5Z/f4b6Rq8qa0IotP64JJwAX8M5CU2A1yqA rHsghhU49BXOufH/iXoWagQvi3uRkBZixyO5UKkIo8Pa7E7VqdsqMX4+MHvu2eqdTIvk zebcqYKn0fN9NiCf92pWxxLaep11eMhWMJxidkgLzDF73cn6bsV5yDy61NeudTbbbDAG Bi2DFzzptZrR+yrO+V0enQ+XPDDYzyCIlxkK83zV+Pzci+fCna7u9b7kEDFTGc5gDx7I Abng== X-Gm-Message-State: AFqh2kqgUEHPqHZu3W2TAV/dbSYJS8rvQ6ajXpvEiYyZo7g7VzNbaFHj Jsg2GjjeoUdlEMiigGLRH0uZ0boLfEVNfatu0jOXFNRXqILAXFXKyhwS/nLFr7rVOg91OGajECW ZLoKxKObFgYY= X-Received: by 2002:a7b:cb59:0:b0:3d3:5709:68e8 with SMTP id v25-20020a7bcb59000000b003d3570968e8mr28780114wmj.36.1672665891027; Mon, 02 Jan 2023 05:24:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXvGXpmOs594DvjBlRTPZbxABBjx00NH4Ky9JtRYOWnGFllgHj/Op1bMqkuKQdPjdrYn2TaC7A== X-Received: by 2002:a7b:cb59:0:b0:3d3:5709:68e8 with SMTP id v25-20020a7bcb59000000b003d3570968e8mr28780101wmj.36.1672665890711; Mon, 02 Jan 2023 05:24:50 -0800 (PST) Received: from ?IPV6:2003:cb:c703:500:9382:2e5a:fea:8889? (p200300cbc703050093822e5a0fea8889.dip0.t-ipconnect.de. [2003:cb:c703:500:9382:2e5a:fea:8889]) by smtp.gmail.com with ESMTPSA id l42-20020a05600c1d2a00b003d23928b654sm48163704wms.11.2023.01.02.05.24.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Jan 2023 05:24:50 -0800 (PST) Message-ID: <82e1b316-5b83-bbc9-ccc2-f416bd8e35c6@redhat.com> Date: Mon, 2 Jan 2023 14:24:49 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH] mm/shmem: restore SHMEM_HUGE_DENY precedence over MADV_COLLAPSE To: Zach O'Keefe , linux-mm@kvack.org Cc: Andrew Morton , Hugh Dickins , Yang Shi References: <20221223003833.2793963-1-zokeefe@google.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20221223003833.2793963-1-zokeefe@google.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-Queue-Id: 381EE40012 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: gqg64x4p5twn8jnnwg97fcn95zr3bym9 X-HE-Tag: 1672665894-881523 X-HE-Meta: U2FsdGVkX18t+BAG5OksHQxPRZQY7jH0UXTAkDgO+XcNyA72LMMfNGp7ss8Gy1mW33PRiIo6yYl0mvfYyQALNcMsYm5HIEPdCBYVUy/L9D73kWUyEp6tLlbaHitX4OJpKJjBKvCcsO9oYDvYgjCt48VLVwpkPHxpfoxlMZ7lkIix4OKrClX3e+OvEms0Lcctn4cxFYwsv3kuaN8Xek2xC/wccjXw8P4CIXgR1Qsyh7tEK/v9L+ej6XlRhgghdj6j7L5adJY7lrLT2x8HHD1XXnP67cP08PUVZ3Nxn3xIjGFRK5n2UYpXEaGgaaNwUoyCdWtoRn9K7cjg/BQorNj9wAXDHIYMO5SmXNSF/DfuEd0hNf9FiZfYaC9ZSX5aZpwtbQn250myolhjTeYSPQ4lPDF5SAru7OAHaBd9gmmr9k+SacYP4oYx++63IYHPzVpekTG2HxjE34t/obTYvJEFLS0A+5/0ddavM3NEqqHh5lgccL3hx9+BnK62BVrPQneWzmd7aIPvgSMLmSYQt8v6rW/zl/OtPL5JsBRFIF2DvVfahVc0BDQ+nk7QJDU79dOgYnVly7D6v/nTMJqY3YKh7Z8MUSGNkQqt791y0ubxItA3gutfYcWPjvXAF9tUfopY0NGuFNbHPOMlw9WdpJonrNmVHqfI8ygDA8ZEbm+Cwpp9wqHYHDmogBm4DuAliWs8NoYQosgdT90wAN4WbnFRYZWreDEgV4E91jJgc8LGboaaUBLg52+NHlgQlVjZOrxshr/8NpKWE3DD1xPdJBNzIgB5yuqYw6ZRxoeki6hR7T8YOY7eNT/+0vo0aictpPJK0YDZ0QTSxys2zmTYJpo5TXxKn2gwFgt29gcVyEOA+AqdCcnJyKOOoSIicOCtzwi2sAykzg/8c8ru0kaBrCQQowcwbwL2TsmVjpwnoGYZk0NgMpkKpAA24sEu4zySGhhRI5B2Yn7WP6JGETg/coO Z9ypiVRT 9QBkzSFFa3tFtOm0CWWghnXmSnGF45prE2SEU1Z7Ui73qs3RsKQZ+Kx9F34ycLbonqdA9s5994yvPbFQ1YEfDrTUgEFdSxAtqFusDzrFcVpXcyUusBUPXoIM72ObhJCRkuLd22ap5elg9/iqh1WOl9lVISQvkEA9dB7T1R6GzdS+DgsWvFufZpdVEFbQ3Vbo189RC 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: On 23.12.22 01:38, Zach O'Keefe wrote: > SHMEM_HUGE_DENY is for emergency use by the admin, to disable allocation > of shmem huge pages if, for example, a dangerous bug is found in their > usage: see "deny" in Documentation/mm/transhuge.rst. An app using > madvise(,,MADV_COLLAPSE) should not be allowed to override it: restore > its precedence over shmem_huge_force. > > Fixes: 7c6c6cc4d3a2 ("mm/shmem: add flag to enforce shmem THP in hugepage_vma_check()") > Suggested-by: Hugh Dickins > Signed-off-by: Zach O'Keefe > Cc: Yang Shi > --- > mm/shmem.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index c301487be5fb..0005ab2c29af 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -478,12 +478,10 @@ bool shmem_is_huge(struct vm_area_struct *vma, struct inode *inode, > if (vma && ((vma->vm_flags & VM_NOHUGEPAGE) || > test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags))) > return false; > - if (shmem_huge_force) > - return true; > - if (shmem_huge == SHMEM_HUGE_FORCE) > - return true; > if (shmem_huge == SHMEM_HUGE_DENY) > return false; > + if (shmem_huge_force || shmem_huge == SHMEM_HUGE_FORCE) > + return true; > > switch (SHMEM_SB(inode->i_sb)->huge) { > case SHMEM_HUGE_ALWAYS: Looks sane to me Acked-by: David Hildenbrand -- Thanks, David / dhildenb