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>,
        Miaohe Lin <linmiaohe@huawei.com>,
        David Hildenbrand <david@redhat.com>,
        Michal Hocko <mhocko@suse.com>, Peter Xu <peterx@redhat.com>,
        Naoya Horiguchi <naoya.horiguchi@linux.dev>,
        "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: [PATCH 5/8] hugetlb: rename vma_shareable() and refactor code
Date:   Wed, 24 Aug 2022 10:57:54 -0700
Message-Id: <20220824175757.20590-6-mike.kravetz@oracle.com>
In-Reply-To: <20220824175757.20590-1-mike.kravetz@oracle.com>
References: <20220824175757.20590-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?sJiBa6wsm6KJ5zBz66XkDs1Rve96iA3fq1XW9wm15QKkUhOt0TTzi6oyvVaW?=
 =?us-ascii?Q?qRQzZNrv4e4E1BQGOYLEUwhrgHcYdXD/2a9KugqLRylFTZ7dulHRDoBjKMkd?=
 =?us-ascii?Q?jR/S8qos5wfrvNhoSJlceLxOYgqBQGKsNWtJHwwf7AihrsxKUq7yHTVLZ6/s?=
 =?us-ascii?Q?m3TCi60YXV3oywlRa6KTmW/qr3frA3tMOmt0QRoEtXPutCgadAYF7b28S2Tu?=
 =?us-ascii?Q?qepNAFcwDp+3bhiCxoEH/jdC3hY2CMe7k1wxPlG7D15XoGd7ZpM/OMAd4dTr?=
 =?us-ascii?Q?hSkqzevEwtXRb7K9/ckQa5sDN5chyCmMq3q9/ayRAUxx+cdyY3MfIzzHlPpC?=
 =?us-ascii?Q?DJHQ6l6vJfYre/HsWmhAulO13gKG7hcxkt8OKl+dTdxjx5+mgOm9Pj555Atz?=
 =?us-ascii?Q?hOZfrNnxejZhiWgRI3QDArT2T7PcnBNjnbaeewla+VYezxvAHRb7z798iSII?=
 =?us-ascii?Q?HxWH8Xgbh5qYKuIh/xGSbJRYmQw6A2V3Ywmq2BKiD76ikzgCOy2dJPNSPbh9?=
 =?us-ascii?Q?KwNCSaBPNBErB0Mfe9y492/6SlY6+/fkEPl/7pm4pDI+75rT5UqKve9IIfFB?=
 =?us-ascii?Q?PGXOXivf6GnY0sR4ioHQCzgogjupBJN1Ud0H3Gzigd9+DJFB8u+JemB8RMss?=
 =?us-ascii?Q?nYz5jmIYRCiZas+uSa6spkNNUUwbdA4YQ2Mg26Spv3MUm2nouuLehEohzgJd?=
 =?us-ascii?Q?EhA8J/JBeZF7ZoWgid0kKx6Dgn4qOHpiK4L9aTzqeoFyb9YWjDmgPQY4Zrbd?=
 =?us-ascii?Q?rf/G/SzrD2FDWB6fvZb1jQpMY6VLpjSZKv1UZtxbDk72kwEvtTf1Ozg02EiI?=
 =?us-ascii?Q?fIxPQk1GggyJKmI5f90Nmw66w1nOUBE3FFMBs0KDuULxoF7+QVE4cIc0Yfap?=
 =?us-ascii?Q?44Of5fAV3IS3pT3yCsuWlREW6on0rnnUL5Ji+/tjiQ8vCKqT8xJ/22/22OgA?=
 =?us-ascii?Q?R1XuxFKljiJ1qSyrYsiNZgsOlnpwnGQrdE3/gXKqx61V8eqjdGUsJDq/fd4J?=
 =?us-ascii?Q?BKRKQxYbY4LD+RmBtNMzWzUZx1WweXh+6+TF9EBdY9EJD3YSgputO3lzZDEU?=
 =?us-ascii?Q?XNs/A4d8Ro7mO9lAaO8GurfSRvjMZhOW467K4Baeh3UTc1p0mr60BaCHo7pf?=
 =?us-ascii?Q?9M4vE3Z9XQwTAYnbDgKrfmtPQXl5xELLzO3WxK7Q/uqeLRGo9RFYXV8CclVw?=
 =?us-ascii?Q?1mgb76okHOuJuIvzebFrzGTZCIk68ikAlbfVKlG7T3yl8mfs3ETLHvtkIL/Z?=
 =?us-ascii?Q?mz+Q5CauzT1iXX/NhB7gQwDrumBP/uMnXHFSUM3cndjrXhPLio205Hxwv5aC?=
 =?us-ascii?Q?8p+rVveBDzhHGg+m8q4Xclrco22gmVx4ya4B32Z2kWFHBWHkpIT0yCJOv0c7?=
 =?us-ascii?Q?IAA4lttd4vsd1QKZwTDKgt0ptf1hLFRrmNTLgn10uukSx2TiVogUGim2Gqkh?=
 =?us-ascii?Q?D+Y5Vww8qDZlsB+gd2tSL82x9ZG6OFE38gycWQzAR8SVzY2OxuowdkY9IJ15?=
 =?us-ascii?Q?M3jBq5cNFCmiKpKNxAqV7P+fVSLRIQLpdwnyf/9wfYlcuaAazCUu3crlRCVz?=
 =?us-ascii?Q?gzFHRy2BM14X9G0jliHFG9UB10pkyMvZL5Ol7khyGgMmvq7Y5ILHbXwqJsvi?=
 =?us-ascii?Q?Aw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f22e230a-f671-41ab-5e8d-08da85fa39cf
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4201.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 17:58:18.5337
 (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: tB2OYvFd2x1ZpbFcBLkqPUBVSGgcjG6EjQwuXpXeMFJPYqM2mFpvsw1LTGLC+nUJHsHoJDUEfpH5BCLzxuY4mA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4520
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-24_11,2022-08-22_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999
 phishscore=0 adultscore=0 mlxscore=0 bulkscore=0 suspectscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2207270000 definitions=main-2208240066
X-Proofpoint-ORIG-GUID: qzDGbdXMLe7l5D7Nxr2hAGVfcXHJslbp
X-Proofpoint-GUID: qzDGbdXMLe7l5D7Nxr2hAGVfcXHJslbp
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 a6eb46c64baf..758b6844d566 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -6648,26 +6648,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.37.1