From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc:     Axel Rasmussen <axelrasmussen@google.com>,
        Peter Xu <peterx@redhat.com>,
        Andrea Arcangeli <aarcange@redhat.com>,
        Mina Almasry <almasrymina@google.com>,
        Shuah Khan <shuah@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Kravetz <mike.kravetz@oracle.com>
Subject: [PATCH] userfaultfd/selftests: clean up hugetlb allocation code
Date:   Mon,  3 Jan 2022 18:17:29 -0800
Message-Id: <20220104021729.111006-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?EJHkPB+uIXoa3RhyQ9ryrcSwCFpw/5MdQjMAXYAK4k3QORbpWUcC4p43rIs6?=
 =?us-ascii?Q?3/04ds9owqDoeZw8VxKD5BADI2xiRJ3wBuqfy6NW8hcRMCIVCN5axS3vU7uI?=
 =?us-ascii?Q?q3NmpFGjL+P0oEypbegsN6rF9mNy1SVNelb6IRBjH3vW0ulEK+eBoIPKicFj?=
 =?us-ascii?Q?8vFKrDXhrOMTA+4Va8n723SYEnBQSMg3hNkc9w6/36OcKo/UXkpr49Ck0ty1?=
 =?us-ascii?Q?QVl5TnlMvs4xOl7znLa9kOCVOlvuIuu+V0NpcDmkYCtS3F85TLhsg2xSAkcH?=
 =?us-ascii?Q?BNnI6H0C3asshf7OQBlzJIL6esH/Z9KwiJayyYHJM2dD1AwN5m2RAdL7Ngvj?=
 =?us-ascii?Q?cTooHOE9Amdyvj7gj5UdlzGu0Gn1MEpKYP5emrjcG/dWQInBKZTjgY/2Niuz?=
 =?us-ascii?Q?vIcjSbqimOivXuIN4Fb9tMSir2AzzrKaRRgbWmoT7l1hFlt2tbpn1NysZaaa?=
 =?us-ascii?Q?0FbLFrS1sT9jJ0T/A++z+UgABEuaa/sR+Q95XBjZvfmBcK58sL+MKAlxT4Ev?=
 =?us-ascii?Q?vbh0NpEcDCrVyah/KTdesQm9ay8iqQi5gaqYHz0xZn5Xy7B0/nUFQ1RQwTE2?=
 =?us-ascii?Q?IGZw8MoheDDueY5y2I870Xt5L41mWhiS2GoUrNsrDhwJb+o2lFQWqiZc+IPC?=
 =?us-ascii?Q?0Micayk8hiiOrnVm+gDI77K/7jHuBLbe5CmtmfZayBrBNb5WVyBMKGS5KR5k?=
 =?us-ascii?Q?WC5LUtCeLIxxL//a0XArEkjQPc7hhwSCcL9xmF0+b2KZ1yw+9oBygum+vRb0?=
 =?us-ascii?Q?QRbPb0vdBjQ3rjd7MqoQaJtiIeqFx8unaVwT9Y+JwcTXxF2V8DWJi3TUNiYx?=
 =?us-ascii?Q?kNuc6++T52W+gpSjhi+zr2A5G9P72o/1Dq0LDcyObMVq9ac5JEaAmo5e2fL1?=
 =?us-ascii?Q?7GzwmIrvFgEjpoa4jP28P3KmwYzh/fy9LrNTsLDKOBsH5HyTPIcmWKwECE3c?=
 =?us-ascii?Q?08N/T4f5gLAsCrxYPsr7MhdWb/RWoN+NEk+roHRGlRI4zGjuGPZ3qpk1OHiE?=
 =?us-ascii?Q?q+lwj2PIM65q9PCpal2hCudXuwOwqaJDiB/reuxq7ubUhxQVu0YittKay2SV?=
 =?us-ascii?Q?hnqNs12lt+8uBdPkPyi2lzZdPuZKk3JQJCBQoU6WBpe59jJzq7AActtN5Wzl?=
 =?us-ascii?Q?qyA/xxHpuYtnrE/dT9vkb3o60Jo4RRd4rPSFqoOks7s4Hpac48mZIDzXdsrA?=
 =?us-ascii?Q?r1yV5pUokhz5BktTN/58PjDxRKv8VQjiQ881s9780QUtsxmna6dnnAWFUFlf?=
 =?us-ascii?Q?5PUkGR8VzYYqsNUnMpMxjAKqRCuIL0yIOeWdfmtoXmrIDuTFz9IeSklm9Znb?=
 =?us-ascii?Q?gwTVML4tE/hH3my4+rT/1GY2Kxi3CqPXLns/Bh0AVEjh7QQnkva/3VLck7pA?=
 =?us-ascii?Q?erglAxFl2n1iQY+sHC3ejOKGlyxMEmM1v+I68nha6bCC+rCeOqP8CVyvq/d4?=
 =?us-ascii?Q?Kx7NqugSZqeEqXPqRfah3HLrVccUgh9IuOyh3yHDKNt4LBkdHPCIaRiiOQZy?=
 =?us-ascii?Q?816ZsCovOC/NjukwOE9iSZFgfrTdI7yi/Shk9a5JAbhfyGvVVt61g3U4hpHP?=
 =?us-ascii?Q?wRziX0P9NTYguTLgfotbR4raAXEL05Hx4UMi01VYIFLq+lAe06+gXdLqTzdL?=
 =?us-ascii?Q?EJuobgWMPaVx31sIua4Eoh4=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fe9e85b4-85d8-40de-f8fc-08d9cf2862ae
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 02:17:41.3711
 (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: fJcNXff7TnrDiitohItbFOd/zn97FiT44ZCupvVPc1izEFTkJ+LfdQ0K8kCR4r8tL0cHdKgXavk8vLbIDTworQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3495
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10216 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 bulkscore=0
 spamscore=0 adultscore=0 phishscore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2201040013
X-Proofpoint-ORIG-GUID: rJQYRKXPtzA6QIq6inSLpNSE04Hmy8JI
X-Proofpoint-GUID: rJQYRKXPtzA6QIq6inSLpNSE04Hmy8JI
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The message for commit f5c73297181c ("userfaultfd/selftests: fix hugetlb
area allocations") says there is no need to create a hugetlb file in the
non-shared testing case.  However, the commit did not actually change
the code to prevent creation of the file.

While it is technically true that there is no need to create and use a
hugetlb file in the case of non-shared-testing, it is useful.  This is
because 'hole punching' of a hugetlb file has the potentially incorrect
side effect of also removing pages from private mappings.  The
userfaultfd test relies on this side effect for removing pages from the
destination buffer during rounds of stress testing.

Remove the incomplete code that was added to deal with no hugetlb file.
Just keep the code that prevents reserves from being created for the
destination area.

Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
---
 tools/testing/selftests/vm/userfaultfd.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index 9354a5e0321c..0b543a9a42b2 100644
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -87,7 +87,7 @@ static bool test_uffdio_minor = false;
 
 static bool map_shared;
 static int shm_fd;
-static int huge_fd = -1;	/* only used for hugetlb_shared test */
+static int huge_fd;
 static char *huge_fd_off0;
 static unsigned long long *count_verify;
 static int uffd = -1;
@@ -223,9 +223,6 @@ static void noop_alias_mapping(__u64 *start, size_t len, unsigned long offset)
 
 static void hugetlb_release_pages(char *rel_area)
 {
-	if (huge_fd == -1)
-		return;
-
 	if (fallocate(huge_fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
 		      rel_area == huge_fd_off0 ? 0 : nr_pages * page_size,
 		      nr_pages * page_size))
@@ -238,17 +235,17 @@ static void hugetlb_allocate_area(void **alloc_area)
 	char **alloc_area_alias;
 
 	*alloc_area = mmap(NULL, nr_pages * page_size, PROT_READ | PROT_WRITE,
-			   map_shared ? MAP_SHARED :
-			   MAP_PRIVATE | MAP_HUGETLB |
+			   (map_shared ? MAP_SHARED : MAP_PRIVATE) |
+			   MAP_HUGETLB |
 			   (*alloc_area == area_src ? 0 : MAP_NORESERVE),
-			   huge_fd,
-			   *alloc_area == area_src ? 0 : nr_pages * page_size);
+			   huge_fd, *alloc_area == area_src ? 0 :
+			   nr_pages * page_size);
 	if (*alloc_area == MAP_FAILED)
 		err("mmap of hugetlbfs file failed");
 
 	if (map_shared) {
 		area_alias = mmap(NULL, nr_pages * page_size, PROT_READ | PROT_WRITE,
-				  MAP_SHARED,
+				  MAP_SHARED | MAP_HUGETLB,
 				  huge_fd, *alloc_area == area_src ? 0 :
 				  nr_pages * page_size);
 		if (area_alias == MAP_FAILED)
-- 
2.33.1