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 E325EC74A5B for ; Wed, 15 Mar 2023 17:16:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5545B6B0071; Wed, 15 Mar 2023 13:16:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5049E6B0072; Wed, 15 Mar 2023 13:16:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F3216B0075; Wed, 15 Mar 2023 13:16:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 31EFC6B0071 for ; Wed, 15 Mar 2023 13:16:51 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 03FE2AB77E for ; Wed, 15 Mar 2023 17:16:50 +0000 (UTC) X-FDA: 80571787422.12.AB1CB1C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 500A1C0020 for ; Wed, 15 Mar 2023 17:16:48 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="U712WQO/"; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@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=1678900609; 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: references:dkim-signature; bh=zvezbU1ptkdFZAvuDb0blk+QkhG0CCjoFIruzUfPyhk=; b=RHbU+XJJZPMY6kjxtVG5AQeC0jicITgHEu6DrpcBEp61lu/LNrbb96tib95JwUI47D6cXF A+XyB4Yc/Q67JM/i7Q0zFDYGBeeaebrKmLAvp6s/7oYh5OfitEWd5dXqf09KnPVcqZeIHI l04Ty9rs5ef2Efbt6Zfqv2rkI+UAYCk= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="U712WQO/"; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678900609; a=rsa-sha256; cv=none; b=Rd4tzK8S98j5wrJE7EWoHxqgJ0WBerCTsZQ9TEwEZNHuMXPhR3/CJelPctFMRLoE8pg3vL Zhkoy56S5cp3DdabEDCTr8Kj0DqpZG4cKSJph3QtMSU8hkdhxndqZCy2fwStlNTXcviUrc Fc/Nk0u1qC175jk14jv0taCb4ETG/xY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678900607; 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; bh=zvezbU1ptkdFZAvuDb0blk+QkhG0CCjoFIruzUfPyhk=; b=U712WQO/wobqw4EA+YZZzXLJh2H1BfPYNNVkIqGaKFW5k10cN3NnVy93z+NTYh4fe8C9RM dFh4wu1ZCb9oO3dBkkFOWtmavqxrteShqMAg2JFV4v/QnERQQpYcm3bX4GSHXY2CBnyYIz +M1q29lwNKxcYA2UTUMpsf0iv3yW66Y= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-379-wEDp1-tANDq-g0xMCAYvmA-1; Wed, 15 Mar 2023 13:16:46 -0400 X-MC-Unique: wEDp1-tANDq-g0xMCAYvmA-1 Received: by mail-qt1-f200.google.com with SMTP id p19-20020ac87413000000b003d2753047cbso1032766qtq.19 for ; Wed, 15 Mar 2023 10:16:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678900605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zvezbU1ptkdFZAvuDb0blk+QkhG0CCjoFIruzUfPyhk=; b=1D8eGKa8aN1g2h/FVpi9OW5NLMou2wbNgxb46/3MqZpzuB7l5TrgQSp7f/VgN7BJQ0 v/hfLBKmdI1ARJSQgAAfWFsRuFSepRDykPwFvinujA7N+hKsBM8DXi+k+R/cgpEM05yH ENWPhBzB4PAVMHKxXxTfBfmL5bLNh0aSRkuEVAKXrNhO0KnKIY8nJ4jzCpmGAdmMHgFZ F41An5+G7x1VU+tpn3KfIRq0A9Az6BwkDz8TO0Zt0jTNKnI0ZUmv99s+QBfIBJ3qbLG2 R/I2c3qCwgxAqqa4/IqYWX+V+Xavv/o0pM7/ZA801ZuuWYaxMptP5+c98HC5ImToBpPP h8qQ== X-Gm-Message-State: AO0yUKXy4S/Ox9pRuKxYdWUMljsSn0FrGlFbYLNxu7jjMvz6aU07U3xS N19oAE5cwccT7Wag65bcO8vkL+D3i2SdmVhMwI+wF4G3LbFHa1TKmK46gp2Z2Sm7X0e3tjgicQl C48Bpj/ZQoyc= X-Received: by 2002:a05:6214:1c84:b0:56c:d9e:c9a0 with SMTP id ib4-20020a0562141c8400b0056c0d9ec9a0mr34426344qvb.1.1678900605144; Wed, 15 Mar 2023 10:16:45 -0700 (PDT) X-Google-Smtp-Source: AK7set8YRHSBI5uUIkKGKAACcKTfkMve3FmPCkb+zky8sTaHDcPuoOWo3g2xqNgdKMa02gE2SPiFmg== X-Received: by 2002:a05:6214:1c84:b0:56c:d9e:c9a0 with SMTP id ib4-20020a0562141c8400b0056c0d9ec9a0mr34426317qvb.1.1678900604835; Wed, 15 Mar 2023 10:16:44 -0700 (PDT) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-56-70-30-145-63.dsl.bell.ca. [70.30.145.63]) by smtp.gmail.com with ESMTPSA id 198-20020a370acf000000b007424376ca4bsm4065432qkk.18.2023.03.15.10.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 10:16:44 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrew Morton , peterx@redhat.com, "Aneesh Kumar K . V" , Yang Shi Subject: [PATCH] mm/thp: Rename TRANSPARENT_HUGEPAGE_NEVER_DAX to _UNSUPPORTED Date: Wed, 15 Mar 2023 13:16:42 -0400 Message-Id: <20230315171642.1244625-1-peterx@redhat.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: qaywncehecgf5homed48qa1qtni5umcm X-Rspamd-Queue-Id: 500A1C0020 X-HE-Tag: 1678900608-780743 X-HE-Meta: U2FsdGVkX19b0N7JriD1htY6iaHhc3TLRV5pIdtnjBEZ7vNeQUUtm/XGdR3wdLEvniVLqSy8w2Bu3UwDL9Tg6CvjdJi9PNzyazHcBQIay3i4COoNUZzTGqKtzGXQ6KcfqrXdgxK3Z9AKEfEwnUOkaf/HV421vNyzI6Bu29MXqSSRX5V0Zk2uuy65fIkwIHToO719tKFWbPNIdpbI/rqv+20u3XRAOJGI27MkiKyr5bljtXR2cjtnTrL/49m0YgHxrYYThyvBzI9apsqIa4Hp6pqEW2eKUqDozOLnA5m11Zv0Mw9WPKlc9QQJkj3AuhPrqWUVxeKsgqRRx35zDYUIppQgUetbRr661uknQ2NJ4pIIcS7e5Pq/zJ2jo1vC8K2f7enK/JCaQqyLPsBYMFFRnn81dSBU7ZosADNo01DplQpB9bt6MZfJ6LrQocvCE1cnds2BHt4JqLlhj6MR8d+xjYbWghBHykgUbGJxw0t6XXFGiLjpmMYYfW0GKYJ6at3aOWaJMuDr3oQFjymuZaOXp4NkHVYVn76FsBchyOxlVYVeV93ZnalptzU8kxnbshu0cJiOd0mGpodVSsuFwL5BNJIDk4VFd7OH6f3zYCQeB6DAM44Pm/8zC2MbKc9Dw2s7UJ41QFpoe6iP7h1CZJLegNu3sDQWMNl6cwjNHMLXObzvRYD8xSOi14OEvcu5i3/lYVL1nl01S3/XF1qnbyUAOFdGMXjqAzq/dG5VHHp6dNvrAhFLZg4nHKasGkAIOJ6hgBgLc3cd6lsjllP0ib3SpY8gMFiZzBCA0QuwjOTJZ6I/YivCVqpMYfvggno5r3/3Vn6YZLm6vb1rSDxJf4UUvKF8Iiz11aR+e06vkz09JcE67xuKO/r7QcIjhgdAOyBoU941Z92Rzf4sUayArgtJ+8hO93TsRAWo7DQST+hjpzNGznjMCGDlI3yt7jqbA395d3lbj26ABs2k8zNe7Bv wMGeKxoa 5hvKaWK/uNvwoQcTeULhMxU5MxIdFv23vg++KJ8jb04mcP3gXeSlBjKwLXAGuQdbW4yHQ8D69SLAK041rxVfnv9XBAWeT0foWcgKl+XYq4mRCi8/P2oD9/o9lsU4KqcWT2BFBfrIm6o7JpyTXZ6g8TRsxnFjSJX0qeBXdp8F2TYbjNpV5FrsYzt0bdkF0m9h9kT2ryhoeKQd7kG5H8G3t2s7+f/+wSB2EUbSs8JnufNTUpsboofXXIP/8K/OBWzNltYzKQGwALS8mnZ0dM/Wzo+oZdkDoulFCyxT1pDTR3CKQ8tCzkgW/5sApQmJi5pGMO1GM2p8EDgpihk0Xl/JEew4iNLyzn9F/O8bWyKMhs4FR7HjBhdwLwCv1SVJvnfoZRso/5gCJ6rONeLp5E5D3M1xtuV4yccPHepK7A61fPkJeZLTjdGOoHJ202TNQ3Of/EZr0LOUXbwHglgnj2efYA/jQOHIl1daZFVBsqwqJDUANnuFzOT0mQm9xrA== 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: TRANSPARENT_HUGEPAGE_NEVER_DAX has nothing to do with DAX. It's set when has_transparent_hugepage() returns false, checked in hugepage_vma_check() and will disable THP completely if false. Rename it to reflect its real purpose. Cc: Aneesh Kumar K.V Cc: Yang Shi Signed-off-by: Peter Xu --- include/linux/huge_mm.h | 2 +- mm/huge_memory.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 70bd867eba94..9a3a3af2dd80 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -79,7 +79,7 @@ static inline vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, } enum transparent_hugepage_flag { - TRANSPARENT_HUGEPAGE_NEVER_DAX, + TRANSPARENT_HUGEPAGE_UNSUPPORTED, TRANSPARENT_HUGEPAGE_FLAG, TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG, TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index b0ab247939e0..913e7dc32869 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -88,7 +88,7 @@ bool hugepage_vma_check(struct vm_area_struct *vma, unsigned long vm_flags, /* * If the hardware/firmware marked hugepage support disabled. */ - if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_NEVER_DAX)) + if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) return false; /* khugepaged doesn't collapse DAX vma, but page fault is fine. */ @@ -464,7 +464,7 @@ static int __init hugepage_init(void) * Hardware doesn't support hugepages, hence disable * DAX PMD support. */ - transparent_hugepage_flags = 1 << TRANSPARENT_HUGEPAGE_NEVER_DAX; + transparent_hugepage_flags = 1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED; return -EINVAL; } -- 2.39.1