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 C8DCACF11F9 for ; Thu, 10 Oct 2024 14:53:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4448B6B0082; Thu, 10 Oct 2024 10:53:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F4726B0083; Thu, 10 Oct 2024 10:53:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 294606B0085; Thu, 10 Oct 2024 10:53:29 -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 0C6936B0082 for ; Thu, 10 Oct 2024 10:53:29 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B99211A0302 for ; Thu, 10 Oct 2024 14:53:22 +0000 (UTC) X-FDA: 82657986096.19.63F2FB7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 51D1FC0018 for ; Thu, 10 Oct 2024 14:53:25 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="A8cvC/Uy"; spf=pass (imf28.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=1728571868; 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=vf9YHjnqVvQW3SA9PELXrjuxnVyxxoitmZipylkr8/8=; b=Rwi7OSxQ0jc6GrTc0R/Cc8i+vqCniKPYjmleTw4mIxNqn/j73zM+cn5zg6wrjEop+8Gngd Egj6xIQjSb6v8S7TbIBFAo76LUHcCFhRUjXU5r5pGdfp+xEJW9v63Gg593oa3gfpfj5Bc9 VfCE4YghY8R9a/ZEWWdFZGNHN9HLN/Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728571868; a=rsa-sha256; cv=none; b=QS9iYzoMuFowyUqagLn9YvBlkCIKTwRRatlObRRUTEqRN9hVju7W6z+KS3nB9sIVfXZ06U QziAN+d4ifdaeuAMkwYmlDRrq1zvLICcD439SFjHjyvTYwTe9tnGtrFKXlb0BGz+In0zT+ FMJvFIFcDMXdBS1G5Fvzx898bSF3KWY= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="A8cvC/Uy"; spf=pass (imf28.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728572005; 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=vf9YHjnqVvQW3SA9PELXrjuxnVyxxoitmZipylkr8/8=; b=A8cvC/UyxrXxWoIvEJf9aJqQMAZcWnSnPIB21FxKG5y2BW9OLBrVbkPRBuFMd1tso6nosA QKpF6W85SNPMjpY8HZKnAz/COAuOtmVYNPz0K38yu4d1HtI9vyLrurBsNpJkHL4ryFcFOr 05itjavbs6hf+Lu1pDBkwfrLExxVtVA= 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-356-uYId9j0xOgeU8iU0h1SRcA-1; Thu, 10 Oct 2024 10:53:24 -0400 X-MC-Unique: uYId9j0xOgeU8iU0h1SRcA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43057c9b32bso6248915e9.0 for ; Thu, 10 Oct 2024 07:53:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728572003; x=1729176803; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:from:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=vf9YHjnqVvQW3SA9PELXrjuxnVyxxoitmZipylkr8/8=; b=xRneC/8g5iV6522s3mA5Q7WKwVxiNZ3TJUfESaOjvE9Pj/afruGwohzYw07B7w2bmC H952QJtNz76YeV2mcJzqPct/KWrIi1h5kiuLWi9X7Xz9u5boyTTDIcZNqOd6ExcTquFI SyTedXaB+Etyo1+kt8PLIiYZO9twovx9O6fvEVryHrRCrMd4l+UH7P+caLY7OgYj9yO+ Z9hvft0j0b0ODegfZa5SRd+Ma5XF7BReMNS4Zx8ny/EbCGqgefjgAbR5yMa9ERdCRGH5 mYnJN5pAM8+JztTM9XprwFcaxolycD04Jib34J87TnVX/lR+WRYRO2buN6yghZSYF+1z XhvQ== X-Forwarded-Encrypted: i=1; AJvYcCWJ7qOuaJddcnTumW8wpo5ZKznHAPXp/AZtV8jIRqhZHuRoqIKAvp9FL9kntI480mMYzx8zs0tXTQ==@kvack.org X-Gm-Message-State: AOJu0YySYNmrWCoM2W1EGseeXUDALG/+H/l9fnvWl5O7qRA+omBuLKk6 Szo0hoqCKTArVhP+qGocLoawA2TxUAg1zR1kRQyMVBtPD+d63tLHVwNGQ2LJpc1/1eeHS6QqMEK OO/X3IaevhrA+awzwM3DV4FN5sKodHsmoG7CvgISAM+Ddu4Nv X-Received: by 2002:a05:600c:5117:b0:430:4db0:401d with SMTP id 5b1f17b1804b1-430ccf434b7mr48509055e9.18.1728572003543; Thu, 10 Oct 2024 07:53:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1Be7slPvkTh2DgBIsZzH73vvYoqMoovFoLnW1tYtxpLyOPd1EBCsHAsnBRwxZ5Mm/mIR47Q== X-Received: by 2002:a05:600c:5117:b0:430:4db0:401d with SMTP id 5b1f17b1804b1-430ccf434b7mr48508855e9.18.1728572003082; Thu, 10 Oct 2024 07:53:23 -0700 (PDT) Received: from ?IPV6:2003:cb:c742:9200:eb2e:74f9:6f5c:3040? (p200300cbc7429200eb2e74f96f5c3040.dip0.t-ipconnect.de. [2003:cb:c742:9200:eb2e:74f9:6f5c:3040]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d4b6bd3dcsm1749573f8f.42.2024.10.10.07.53.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 10 Oct 2024 07:53:21 -0700 (PDT) Message-ID: <726cddb9-b6b3-46fb-9ef4-a29ef2360de2@redhat.com> Date: Thu, 10 Oct 2024 16:53:21 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] mm: huge_memory: add thp_vma_disabled() From: David Hildenbrand To: Kefeng Wang , Andrew Morton Cc: Hugh Dickins , Barry Song , Ryan Roberts , Baolin Wang , Matthew Wilcox , linux-mm@kvack.org References: <20241010061024.1846220-1-wangkefeng.wang@huawei.com> <20241010061024.1846220-3-wangkefeng.wang@huawei.com> Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: 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-Stat-Signature: p4xtojaz7m844ignpc1wys6nkz7r9pq4 X-Rspamd-Queue-Id: 51D1FC0018 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1728572005-371771 X-HE-Meta: U2FsdGVkX1/pfRtxJw8KGQA4jHC0Xd7c+kZ8L9tvO78WhMnr7lvK5yFSzFAOGAAZGv+BsaSRamnFREkwnH1rTqjtGIc3AJEvdKhgp8DvFALqpiWynDRkgQYGEC5MGbiqGyS6VRwZmzHq8FEmmJO6RYWrQ10CGk5je6OjiXmPmLNF4TxBVlAy/HgFVKve/SWGd5LSvNAcMlmCZ9G1j5/S36TgnGLb0h705yufcb9uMeC+rHWzfv209/LFWHeBIZOtks5Z3XaYQQqDXj/cJ66lpFwJhYEGx7wQ0lKdB4W1B2PoXHk4+bZJgaHJBWOUn4pJhmuupSKSwHFi3pnjFa9RRl9ABpqzSVOmbKz99/wzoxtYCCyfQoKqxUfONtj7FT7aVCuyQaNUMWUusJnMaxzcw9Cq4ATfE7lqfyAvR0O402UrGFDBKegaittLzsPGitYGE93zJw7xAVyhkgZ2gLsZVjtHVqiSdV06/PcP7NDD3QEu2FH+cvo6IVzvdcK3ViWytdWEc6QqKbIWaT70SaMdoQnDLANCfd/qOQLJtTQwbqEEuT5aXE/HNggjfLoQHtr8fgLzc21lXWIC1yFHciJT+tzkx1vx/pZVjjCIx7XdvMyC5xMy9vY41gO62/dbE+QxuoryM4Pk5zw0ICYn9sqFyLEAEGmHKAk8hFsTaqIiZNQnkuo9GIKrf6NbmhyXwOekE6f9wLQX+7XA3YlhKLfXiZkzf+OhHfz7aKAR2NaJXpnfVPMM2exPXwzl+Ux86Ij84BRtxXp5a0tJzbq8hU5mjdyMYEoEWaVowcW6Jis809JhNKF1UbpXnsgpxrk0nnmHNORCK5XTSYl8Bwbnbo8b4K1nzluVj/Ise8eEE1GsnVdTCfzB4QtY/+SHsba+GQrjGgIuMr2pEs+XPfkGW2mvlOFA/TT5fLiL4GONJYCnGTs+nMp9X+pHnnUK6SuwYfxQhYuKIVfTCB2B2MnLZoV fA3GlWjK mFENpQ8Y9HQKIZLdHDFsmwY+7SZgx76ZZNei5lthkNeuLlc7Lx5WM4K3kV8jO6k6XsNo1LJIV9Vvau8ZOE2KtEMhNxgHJ5xzDywWdGDSD3MD3arZGDto7k4vQZZb66vujfplUA4DpJFsI5+MjNEgoYRhx07ONwG4akk+9RnXsjsOHYuvr09YjMb2DlcIq2EIlpl5ysz7uIytw4CLIEMt52Umwo01mg0iif9WARgzC/H5sG6U2on0lS2VJ8Hxqoagp2E5D8nG+km3fFWz1hYdAAgaOh+iN8yKsvwiWf9FCUllIEDschjKkgA+7dzDjPP+M9oCAptsQx+SNttF2VLSelcNQKivTm219WbOAbk1JXd1j+OQ8cI2vMY4cy1nxxCpSCTlOQvlLnJgXPIycyLWOsGbR2aHRxVEP5hOHZTfj2IlApsDsouZZUKVybskz9mQKwjsmkzYz0DBEeFLlVXkXyvgsk1/zb8XhgwC0lbSIFvo+gaM= 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 10.10.24 16:41, David Hildenbrand wrote: > On 10.10.24 08:10, Kefeng Wang wrote: >> Add thp_vma_disabled() helper to shared by shmem_allowable_huge_orders() >> and __thp_vma_allowable_orders(). >> >> Signed-off-by: Kefeng Wang >> --- >> include/linux/huge_mm.h | 19 +++++++++++++++++++ >> mm/huge_memory.c | 13 +------------ >> mm/shmem.c | 7 +------ >> 3 files changed, 21 insertions(+), 18 deletions(-) >> >> diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h >> index 795df660efa5..d77891332b35 100644 >> --- a/include/linux/huge_mm.h >> +++ b/include/linux/huge_mm.h >> @@ -309,6 +309,25 @@ struct thpsize { >> (transparent_hugepage_flags & \ >> (1<> >> +static inline bool thp_vma_disabled(struct vm_area_struct *vma, >> + unsigned long vm_flags) >> +{ >> > > I might need a patch like this for an independent fix, and the more I > look at this the more I hate the separate vm_flags and the optional vma > argument. > > Let me try to improve things. > > Long term we can get rid of the vm_flags, it just needs some madvise() > massaging. For the time being I suggest this: From 318c25742380cdf15c8c807e5e8a52cabc217ef4 Mon Sep 17 00:00:00 2001 From: Kefeng Wang Date: Thu, 10 Oct 2024 14:10:23 +0800 Subject: [PATCH] mm: huge_memory: add vma_thp_disabled() and thp_disabled_by_hw() Add vma_thp_disabled() and thp_disabled_by_hw() helpers to be shared by shmem_allowable_huge_orders() and __thp_vma_allowable_orders(). Signed-off-by: Kefeng Wang [ rename to vma_thp_disabled(), split out thp_disabled_by_hw() ] Signed-off-by: David Hildenbrand --- include/linux/huge_mm.h | 18 ++++++++++++++++++ mm/huge_memory.c | 13 +------------ mm/shmem.c | 7 +------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 67d0ab3c3bba..57b62fd1ccb4 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -322,6 +322,24 @@ struct thpsize { (transparent_hugepage_flags & \ (1<vm_mm->flags); +} + +static inline bool thp_disabled_by_hw(void) +{ + /* If the hardware/firmware marked hugepage support disabled. */ + return transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED); +} + unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); unsigned long thp_get_unmapped_area_vmflags(struct file *filp, unsigned long addr, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 3ca89e0279a7..ffbf0add2a82 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -109,18 +109,7 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, if (!vma->vm_mm) /* vdso */ return 0; - /* - * Explicitly disabled through madvise or prctl, or some - * architectures may disable THP for some mappings, for - * example, s390 kvm. - * */ - if ((vm_flags & VM_NOHUGEPAGE) || - test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) - return 0; - /* - * If the hardware/firmware marked hugepage support disabled. - */ - if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) + if (thp_disabled_by_hw() || vma_thp_disabled(vma, vm_flags)) return 0; /* khugepaged doesn't collapse DAX vma, but page fault is fine. */ diff --git a/mm/shmem.c b/mm/shmem.c index 4f11b5506363..c5adb987b23c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1664,12 +1664,7 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, loff_t i_size; int order; - if (vma && ((vm_flags & VM_NOHUGEPAGE) || - test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags))) - return 0; - - /* If the hardware/firmware marked hugepage support disabled. */ - if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) + if (thp_disabled_by_hw() || (vma && vma_thp_disabled(vma, vm_flags))) return 0; global_huge = shmem_huge_global_enabled(inode, index, write_end, -- 2.46.1 -- Cheers, David / dhildenb