Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc:     Muchun Song <songmuchun@bytedance.com>,
        Michal Hocko <mhocko@suse.com>, Peter Xu <peterx@redhat.com>,
        Naoya Horiguchi <naoya.horiguchi@linux.dev>,
        David Hildenbrand <david@redhat.com>,
        "Aneesh Kumar K . V" <aneesh.kumar@linux.vnet.ibm.com>,
        Andrea Arcangeli <aarcange@redhat.com>,
        "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
        Davidlohr Bueso <dave@stgolabs.net>,
        Prakash Sangappa <prakash.sangappa@oracle.com>,
        James Houghton <jthoughton@google.com>,
        Mina Almasry <almasrymina@google.com>,
        Pasha Tatashin <pasha.tatashin@soleen.com>,
        Axel Rasmussen <axelrasmussen@google.com>,
        Ray Fucillo <Ray.Fucillo@intersystems.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Kravetz <mike.kravetz@oracle.com>
Subject: [RFC PATCH v4 5/8] hugetlb: rename vma_shareable() and refactor code
Date:   Wed,  6 Jul 2022 13:23:44 -0700
Message-Id: <20220706202347.95150-6-mike.kravetz@oracle.com>
In-Reply-To: <20220706202347.95150-1-mike.kravetz@oracle.com>
References: <20220706202347.95150-1-mike.kravetz@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?J0hL9i8FM5dw1vm4+38q7B0G7r3WHnSWJIMaE2B9rWXmztBcRcEMn/R3vEOS?=
 =?us-ascii?Q?afQ5EtR9qUPsd+AJ9MQURAiTLAZjsRouiHMB+bHprKVD7DD4D7Te789mPanB?=
 =?us-ascii?Q?16/SyC+cgs8zyYBwn8vyAXp1AaZrvmRxeuZ5evIVZmCL4n0t45Vz26MjR1FG?=
 =?us-ascii?Q?YA/ZxS4SAgi12wUtcp0mgzKR0GTvsqN25+Geyzhep40E3S5MJ2rGlN+/0jrb?=
 =?us-ascii?Q?LHwTtf8fD8VIEnJ95yem9Hhx0p4VZL5QPr15wnrcTRAdlaDokilgLSA+IJkT?=
 =?us-ascii?Q?OwgUOSkyRnaYymNHi3A9k6U6+kvAcEJ+YlcZzHXUcmu+oxfuIvBFP92O6Vma?=
 =?us-ascii?Q?v8KDL2fPKxegk+IJsqZFvBEQfuXnoD1zqgr+VDbe9qLX6qv1mLmmatfrc8X/?=
 =?us-ascii?Q?Hg1Ov3N2pNcg1FUgsJ1t0j2vsUmjBr7R0MXLGb7uou/cazZVz0h+nB3hMAET?=
 =?us-ascii?Q?h+NvNjL/+FanNEkP7+yThQ55hHY2PP6ua0xlgIQUXtwipTMfYVdwJbk0Nkgb?=
 =?us-ascii?Q?TDndnSm79TSKe0m5T+ikWA9KXgg5clf2Xl9S/RYi9Hro1rpwaoX+31bCaLgi?=
 =?us-ascii?Q?49XPvLlQBt2WOMqekog75ElrFqbHz+AOT3FommA/tXtb0f24t01JJ2uSXXdV?=
 =?us-ascii?Q?ejSHqM8hnL1HHaOggoLR84DpL1IoHFF9UL3kfGTQBZ0BemRUBWiXlXbf7HFY?=
 =?us-ascii?Q?8RdJ41YIy3/9yzzI6GESusSrfdXu2lp+b8zVvmEw7xj/AXuEkv9leBG1AbKc?=
 =?us-ascii?Q?HEfdLY1W9kaMn5ADWUi1MKPe/fHEEVx9U08JpV8HScQmVuI1EWDgPJbNgdGZ?=
 =?us-ascii?Q?pFki/JxpGgc+sqctALgnzZDB2hLG7G0NsozBj5NdPodppKmW2HWNGxnEg0Nt?=
 =?us-ascii?Q?TuZBktngQvixKg2QhpgvGt4n4u1ApPI/xODDpaEkZZz240uj2103ua8Wa9mH?=
 =?us-ascii?Q?nDwcB6A9WErOSDkG4BiA/y5iLirboIM9vxuuOxVHF7v6R+6AwCILuodvy2ar?=
 =?us-ascii?Q?YpmjUKUeW/1ly05Is4Aw0tJ9Psa/ut8aPjyy+uOmNE9ocJJ1+qjqg7/Rb9nM?=
 =?us-ascii?Q?wl6oCYWywV0bDJ0ShVmlX/pXh93+rPC4iU/pl7Uc6kHDbyukV7nfHobrS9+B?=
 =?us-ascii?Q?BaFEfqsyQ2qilEF+eSp+9PhbcEPD9nFksJr4SlS2qZWvPHrUvnlIkEYpaYjK?=
 =?us-ascii?Q?SGDdon5Clnu3bUmejM43x0IYtr2Lr9fb8Egf1qSjMxySChzyPCcmiSMFf7n6?=
 =?us-ascii?Q?3AHpJTrw4dQn5qxZHoRTKcBRX93xAOomsTG5XpYXUmnHoHtm1TBR1jpCVFJ/?=
 =?us-ascii?Q?sIPjj5VKgB/IslCAx+XawS/ijbmYWc5PYn86Yc7xcUHCmlJ5qI7FwJGOv07l?=
 =?us-ascii?Q?m7McWe8XSwilE2VsPREbgX4TXNyXxWvKtfT8riePAokUDisVlHR8yLLRfMnk?=
 =?us-ascii?Q?vyJveA412KSsWEPb28XZ08RfphGipgs0t7CsaBPc7ghp9ZjqTRzBWFmAjYSM?=
 =?us-ascii?Q?VTLUw7Y80kTjXyusx5is0kzGlQBaHUYizcT/0FrQMJzrweUZufTXJd3RqnaW?=
 =?us-ascii?Q?dmurH1fYVBUogvurft0AgogfuebRBhb1UJ69RtvcNVXgJLJwTTWKgGxc2HBE?=
 =?us-ascii?Q?zg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e4515aef-f2fe-42c9-e86a-08da5f8d7911
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2022 20:24:05.4309
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Jl/W//LXPsegmOVd0AEewaXrNY8pMPyx04/P7XglEentO0Lb4ucCpef/52vpgKM+mDU4KefHMTKud6zz3QgTrQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4032
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-07-06_12:2022-06-28,2022-07-06 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 phishscore=0
 adultscore=0 malwarescore=0 mlxscore=0 spamscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207060078
X-Proofpoint-ORIG-GUID: SPUdiZNZXjU_T3bplexlJVegEH02KK8H
X-Proofpoint-GUID: SPUdiZNZXjU_T3bplexlJVegEH02KK8H
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Rename the routine vma_shareable to vma_addr_pmd_shareable as it is
checking a specific address within the vma.  Refactor code to check if
an aligned range is shareable as this will be needed in a subsequent
patch.

Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
---
 mm/hugetlb.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 25f644a3a981..3d5f3c103927 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -6639,26 +6639,33 @@ static unsigned long page_table_shareable(struct vm_area_struct *svma,
 	return saddr;
 }
 
-static bool vma_shareable(struct vm_area_struct *vma, unsigned long addr)
+static bool __vma_aligned_range_pmd_shareable(struct vm_area_struct *vma,
+				unsigned long start, unsigned long end)
 {
-	unsigned long base = addr & PUD_MASK;
-	unsigned long end = base + PUD_SIZE;
-
 	/*
 	 * check on proper vm_flags and page table alignment
 	 */
-	if (vma->vm_flags & VM_MAYSHARE && range_in_vma(vma, base, end))
+	if (vma->vm_flags & VM_MAYSHARE && range_in_vma(vma, start, end))
 		return true;
 	return false;
 }
 
+static bool vma_addr_pmd_shareable(struct vm_area_struct *vma,
+						unsigned long addr)
+{
+	unsigned long start = addr & PUD_MASK;
+	unsigned long end = start + PUD_SIZE;
+
+	return __vma_aligned_range_pmd_shareable(vma, start, end);
+}
+
 bool want_pmd_share(struct vm_area_struct *vma, unsigned long addr)
 {
 #ifdef CONFIG_USERFAULTFD
 	if (uffd_disable_huge_pmd_share(vma))
 		return false;
 #endif
-	return vma_shareable(vma, addr);
+	return vma_addr_pmd_shareable(vma, addr);
 }
 
 /*
-- 
2.35.3