Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
To:     shuah@kernel.org, akpm@linux-foundation.org
Cc:     Sidhartha Kumar <sidhartha.kumar@oracle.com>, linux-mm@kvack.org,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 1/4] selftest/vm: verify mmap addr in mremap_test
Date:   Wed, 20 Apr 2022 21:57:18 +0000
Message-Id: <20220420215721.4868-1-sidhartha.kumar@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?vSVXKu9Spc0A7XT6iW/+vnuGeYvmXDyyCbf6jK5LHBYbaGUvNuRiSDJy2dbC?=
 =?us-ascii?Q?f/GfUGSNFymKSFdjrybOhHYsRrErDGG2ESusY0Y8GP4uma+folZW2VQAiwNy?=
 =?us-ascii?Q?5mIRBdepJfPxcZ0x+P7GhUEZrwWGiSAYnkvv8Ue1ey/H+knm68o9x3AreguO?=
 =?us-ascii?Q?CNb/SDuHqox2qW3mPJx+ZXOp0UCrrM+CAB513VBt7usXo8zPWIKrNdc+6KRl?=
 =?us-ascii?Q?y3QRXCvE9NYEeXsIeke7gldAreUWhcQbyC085xolc3Lwfe6l5Bci9U8aPDij?=
 =?us-ascii?Q?OuodaqHmm2ZqroErZg+fyDnojOMlxhDg3vx4MXKQ1Bgm+uMIFqAK83z7nlES?=
 =?us-ascii?Q?hBfRTY9rymuSZUGpVLsByN2t4NLClECDRkhjOUYiiHulWHiictPLuhUzXjaL?=
 =?us-ascii?Q?j3CL3SZuMMKS4b3vVcKWHAK2YLZjU401PiCBftIspjte2JBnAbEF7ufrK+h6?=
 =?us-ascii?Q?5PfuT2c1Xpht3Q+7Q9N4pch1F+Xye4Q9IpN3ixmaxi5OIccBreWeK0vBrcwU?=
 =?us-ascii?Q?mfneXSvE5ptiFz0ydfu8TQkdoY48RSNaW3G3KqKzpdv/kapF27CO3+CIr5eD?=
 =?us-ascii?Q?Pa7jk9Sk55c5zMTGzchEDopQX35cZqEvqS4Fd0jsy025+3rVH4GTwWxzuR2t?=
 =?us-ascii?Q?l8Z29YeEumuiNTkGdAGizKumR5J1gTHKaRy41R38ds5PlkogFmaoKsbEH0io?=
 =?us-ascii?Q?JN2ODpEhk8Qhw6DpGkDn6Nga56ZT7MB8JWVhhSd8VGE93lntQw0/nEDHXYDD?=
 =?us-ascii?Q?ZtBT7WBIacEmH+PVhW1FjyPt3Oa2Q9GZonJfD07RAhU8ZOWeQuRVIK+Y1SDp?=
 =?us-ascii?Q?8EFmASksYjOVAASxB5IU+WIEPaGupcO4jlxveROTN9sQuzhueGJ+gJyRJfIN?=
 =?us-ascii?Q?vkINgspgezdjQQI4E/K8mbvLpvOvZBGCWoi9o2KCypYjVhsVtA5rdcLgjrc6?=
 =?us-ascii?Q?aesuPFbtHucDatOt6XF5TeozxHfl9bgVA+EB+4vVUW1CV4h0MREDN2SuHilt?=
 =?us-ascii?Q?JEekJtYkF8/ZWIrJ1eaF/Hkaob6ix9RgW9om+lrk21jKzE2uUeKGwblN2vN8?=
 =?us-ascii?Q?51Yk1XloehsmvBazIRoe8c+35rMF5hrG3wk1EjphuzGGWrk6vdtyMI9g32lc?=
 =?us-ascii?Q?zqv5pw0l4fxPAHaLkW1vYtF8vD49EBvoupO931x0lRJox9dlZxxDhaUCEawv?=
 =?us-ascii?Q?N6wod3tyoLaR0jOxoJ9xqkB/Jjgpp/Onu3U2ebUVLuJOQWEtK3Z2dg6bY8pl?=
 =?us-ascii?Q?hzwvcgl17KOdfBh4hqfATJGbZWhGIkwWLASXVTMvS/+w8Eih6dGj46bBBj49?=
 =?us-ascii?Q?1gMptwfLxpYOCkdjPOokCqSQfPET3zOG+sb/0cRnu/ie2vq3e+kSmmNepIWL?=
 =?us-ascii?Q?Mc3Ns+afeXefeyzMxkW2nqCUus3zkRwHP3qghIyJjG7snrDNCJYzgsgt/HnO?=
 =?us-ascii?Q?AAmGZssKWt5rdvyakiU45YueI2CN/WtlYkaAH14lsIwQ/bXhujWcqG08p3hn?=
 =?us-ascii?Q?vfb9z5BvNIj6TnRNpS/WckbWPBdFkX01wPwLh1Z2Tu9G7YN7DiwhefmvjHNT?=
 =?us-ascii?Q?67ryvbrhOiky0bzZiETCrUhuOzyEkTkplROg1JN5YJWtjVvj3z31xfE2ssNO?=
 =?us-ascii?Q?k49CqkcCWHJ91Nz5ETABT+OgeaqWsBRmLdIuB+mglTf+dCu/7s8N3HBW3b/R?=
 =?us-ascii?Q?LyLcj8J0YUPgsj3MPPUXbhDwwRhv2VdFwAbuzj/b8nAh7xpE52KmaaJ7/eCl?=
 =?us-ascii?Q?pRAKqkr6Mt00mVj7sWdsb4bWaggR7TY=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 98e7221b-23c6-4e97-9d14-08da2318cc66
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2022 21:57:44.3060
 (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: 1aqZ3aPDEFniKxz8+UiR3r+46C9viMSryrJ4WYDHM/UkltO67aAFgetyrxPwy7mbejPKwV2BeRtgLxr2VXYZTtXiLHjRvr2CNnP8ageKixc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5350
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-04-20_05:2022-04-20,2022-04-20 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0
 malwarescore=0 mlxlogscore=999 suspectscore=0 spamscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2204200128
X-Proofpoint-GUID: aqTgcwaqHSVa7QiZLJPtxpr_Zqqg1JvD
X-Proofpoint-ORIG-GUID: aqTgcwaqHSVa7QiZLJPtxpr_Zqqg1JvD
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=no
	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

Avoid calling mmap with requested addresses that are less than the system's
mmap_min_addr. When run as root, mmap returns EACCES when trying to map
addresses < mmap_min_addr. This is not one of the error codes for the
condition to retry the mmap in the test. Rather than arbitrarily retrying
on EACCES, don't attempt an mmap until addr > vm.mmap_min_addr. 

Add a munmap call after an alignment check as the mappings are retained
after the retry and can reach the vm.max_map_count sysctl.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
v2:
-change comment for description of get_mmap_min_addr()
-fix commit message formatting

 tools/testing/selftests/vm/mremap_test.c | 41 +++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/vm/mremap_test.c b/tools/testing/selftests/vm/mremap_test.c
index 0624d1bd71b5..2b3b4f15185f 100644
--- a/tools/testing/selftests/vm/mremap_test.c
+++ b/tools/testing/selftests/vm/mremap_test.c
@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <time.h>
@@ -64,6 +65,35 @@ enum {
 	.expect_failure = should_fail				\
 }
 
+/* Returns mmap_min_addr sysctl tunable from procfs */
+static unsigned long long get_mmap_min_addr(void)
+{
+	FILE *fp;
+	int n_matched;
+	static unsigned long long addr;
+
+	if (addr)
+		return addr;
+
+	fp = fopen("/proc/sys/vm/mmap_min_addr", "r");
+	if (fp == NULL) {
+		ksft_print_msg("Failed to open /proc/sys/vm/mmap_min_addr: %s\n",
+			strerror(errno));
+		exit(KSFT_SKIP);
+	}
+
+	n_matched = fscanf(fp, "%llu", &addr);
+	if (n_matched != 1) {
+		ksft_print_msg("Failed to read /proc/sys/vm/mmap_min_addr: %s\n",
+			strerror(errno));
+		fclose(fp);
+		exit(KSFT_SKIP);
+	}
+
+	fclose(fp);
+	return addr;
+}
+
 /*
  * Returns the start address of the mapping on success, else returns
  * NULL on failure.
@@ -72,8 +102,15 @@ static void *get_source_mapping(struct config c)
 {
 	unsigned long long addr = 0ULL;
 	void *src_addr = NULL;
+	unsigned long long mmap_min_addr;
+
+	mmap_min_addr = get_mmap_min_addr();
+
 retry:
 	addr += c.src_alignment;
+	if (addr < mmap_min_addr)
+		goto retry;
+
 	src_addr = mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE,
 			MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED,
 			-1, 0);
@@ -91,8 +128,10 @@ static void *get_source_mapping(struct config c)
 	 * alignment in the tests.
 	 */
 	if (((unsigned long long) src_addr & (c.src_alignment - 1)) ||
-			!((unsigned long long) src_addr & c.src_alignment))
+			!((unsigned long long) src_addr & c.src_alignment)) {
+		munmap(src_addr, c.region_size);
 		goto retry;
+	}
 
 	if (!src_addr)
 		goto error;
-- 
2.27.0