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 A99B6C5B552 for ; Tue, 10 Jun 2025 12:22:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 43F276B009A; Tue, 10 Jun 2025 08:22:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 416A86B009B; Tue, 10 Jun 2025 08:22:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 353426B009C; Tue, 10 Jun 2025 08:22:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1735F6B009A for ; Tue, 10 Jun 2025 08:22:18 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AE4B212012C for ; Tue, 10 Jun 2025 12:22:17 +0000 (UTC) X-FDA: 83539403514.07.19A9934 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf19.hostedemail.com (Postfix) with ESMTP id 936F61A000D for ; Tue, 10 Jun 2025 12:22:15 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ixfbwWCC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=i6IJxC6d; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=L5LPzlMY; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=QqvtAvf9; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf19.hostedemail.com: domain of pfalcato@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=pfalcato@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749558135; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=5t7Or3woO7t0abLNHbSdmQ4BjdUmYarkFC/ji/k7CaU=; b=7tSrjR0E7zBSlGgHIgP+ymE71DAJhicDP4JB4HbCqcCQiWNoV++t9C68uiQv9JkPQPUbY8 pKrqJzkuLSUUGec6u1KkLNhm2Ex49B1IROK4cThGWKyuRGa8Ul+ncIwuLMCBe4xrmi+liX 5gjNcsE2ja1XKaJ5KxuefZdRGWPbGqk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ixfbwWCC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=i6IJxC6d; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=L5LPzlMY; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=QqvtAvf9; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf19.hostedemail.com: domain of pfalcato@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=pfalcato@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749558135; a=rsa-sha256; cv=none; b=KO+aMYp7jtCU60vux/6SZiiO+gyykAGPp33HuvYlkQunu5NfM3Q5tk0JDBRvjCXuAJASmU 1s1BcaYTt2KYMdXGa/6noLkavdJJduSNMTsaO8wT6smNWEPaUKPCNn9SGlwOQIAsfeWQr1 yGaG2JTMV9mJd0Hc1rmCqKVLh6bvM8c= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id BEB73211F1; Tue, 10 Jun 2025 12:22:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749558134; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5t7Or3woO7t0abLNHbSdmQ4BjdUmYarkFC/ji/k7CaU=; b=ixfbwWCC3PzUi1vbx6ECWYGG8YvFpCea1TbXtwulrv8YZwateQ7vQViedXF53/JBruh3tu kfTxcF8+ME2rmjr2xLn/OAyvAuF2q9CLej4L9uw2j5SF3j9R2HmpWbDOTO1uqb+NottzXA 8hDVe6tV6HuEEV4NTs/AW7Wm3CbDl50= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749558134; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5t7Or3woO7t0abLNHbSdmQ4BjdUmYarkFC/ji/k7CaU=; b=i6IJxC6ddnkW6oBDZ2kteTRPqg4wZvncGS7IDA2XZZbSvcGLXOrtUdkmO2toMTBs51a5dR tiZYmRZS6yf5RDBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749558132; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5t7Or3woO7t0abLNHbSdmQ4BjdUmYarkFC/ji/k7CaU=; b=L5LPzlMYm0oPF4xdmxX0mAS5nv5HjJ4HZvVdu1kx44YPEPEAaCIkzlXpOyWPWSL+/JZSvf 9OhE2SXIGbAxjrC8298kjzpAwd737n0jJdk1gHXFRlGoizJgwA8FLtysp/p9uRmJQETXU9 cNa7mKTKzyaTC0jF5oalf49B0S1zvdA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749558132; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5t7Or3woO7t0abLNHbSdmQ4BjdUmYarkFC/ji/k7CaU=; b=QqvtAvf9koJ+7uHRAUVpCm+wg63s+4xupMSXzGvHmZT3Aqzplc0oCpIGFIe4s/Llt9zwKi X2J1eJV+YfhhgVCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id F25D413AD9; Tue, 10 Jun 2025 12:22:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 3Df2N3MjSGgRdQAAD6G6ig (envelope-from ); Tue, 10 Jun 2025 12:22:11 +0000 From: Pedro Falcato To: Andrew Morton , "Liam R. Howlett" , Lorenzo Stoakes , Shuah Khan Cc: Vlastimil Babka , Jann Horn , Pu Lehui , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Aishwarya , broonie@kernel.org, Pedro Falcato Subject: [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled Date: Tue, 10 Jun 2025 13:22:09 +0100 Message-ID: <20250610122209.3177587-1-pfalcato@suse.de> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 936F61A000D X-Stat-Signature: meroy175w3y6zg6fbxjjbd9b1huw7g34 X-Rspam-User: X-HE-Tag: 1749558135-651320 X-HE-Meta: U2FsdGVkX1+iX9wleK/EN40b+Gaor139oBJSty4tCpFZzBGtfRv0pcLAxGvkRExC3/Mmo4O+2lgaGTEO/Ai02goPAuIBXaZBQyDscX0zOW3aHnQJKlpmN7rS1P5j9wTxv8aFoxu4SGV2y1pLwtY3fZzkLMM2dZIH8tn2gUIFpdBL1H6YW8B0Khp9WqP5puqb99CPC+CYlagE2URVBGF+ptegO30iIUpLfIA6keVuPh5mjUrIS3vjWUMfyC+VhwHMxV+vbe6ZCCwws4Szx4daJsZiwv7PhKLB17GYWXG0dZVXh+zScIfKlv8e6PTxYimBN+6TWizLxUbuA3DPm7nE8pqVjNy7e+iJvF2vgIWWA7EPayrd1PqEc1QEmRF1n0RwFZrfZAaLmcOyx8h//E1IZXSgmlsAJmk7xs637auhM+mm9u9pEAuueukdsIxLZAhy8xk5YoJ5s5emtfdd1e2f/af1YB5f+rnUygnc5J8eo13S+HqJiTSkWmceSp21tuF8gtUbBWOBd2fcrJsuNE4L/T/Qg5xJSK0U4AbzCh+p+BbWNyaREcKXgi/YMxKsDIgAKtdKHmQFbk4kCnMKjj0uyhQbTaRIqqYbghEP3ylwDtY9Pai7RSSO1J0WE6DeAFn44CFhLEA0cKPsoz4Br7FFVcAHetzUBOv5kWFGvv0kXVzZUp8quDD+J1LpFFDXsa3hIk+vqWmFs6LYbsKGzzHgzgYjaLwgij/VhLA0KVCg5PxFRrtFVXxjhF5Hx/Lau25fJWQBybM5YoBMcaMUITUI7uHorsXLTnchyR7PRCtk15lzwWI3WBn8m6qQPPZWL85EBUC6GqFBa7ojQLrXpQhgIOoNoIl5/DwuGX3+WqKkuWpWeToYNa3nPWsV/aNfdjuYV/pfGntzu73RiZY4o/EtlFxv3+VZRFnzSt3LcFWm3OMfypujEU0bvjTz4q4eYgtmoJUItfD+MEghDa/O72g eXAMKGZU fQkdRxVnIuS2Fv5prfuhQPBt2Y5ocSD0/cKzl1wAzVnLZxXw+knrwxXIGYWhTmrzmMYdO6u6P8VIFThDfy/4DPuEADr98hNYiSzWKnC5p//Gp8EMG7HhzAHcAlwNuvW42teZ0JIk1BB0f251IhqqgIFRaGTjFMODYTzKzIac6umFP5Y5BEMh2Je/KT0xhl1UlKHyoKYz22ya2gjpz26T6gCTrMLWex+3Zrfc63TI6DYEB0nRiynhiqPT7eKyR4OnQFNqwRlZjp+FSRgM3CMYd63nKzJdfLvZeSmlf6uOlgbjikWCVqAeb0oOhyxrq90Qp/uZilq0oSfsS/s364n3xIDGWoA== 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: List-Subscribe: List-Unsubscribe: If uprobes are not enabled, the test currently fails with: 7151 12:46:54.627936 # # # RUN merge.handle_uprobe_upon_merged_vma ... 7152 12:46:54.639014 # # f /sys/bus/event_source/devices/uprobe/type 7153 12:46:54.639306 # # fopen: No such file or directory 7154 12:46:54.650451 # # # merge.c:473:handle_uprobe_upon_merged_vma:Expected read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type) (1) == 0 (0) 7155 12:46:54.650730 # # # handle_uprobe_upon_merged_vma: Test terminated by assertion 7156 12:46:54.661750 # # # FAIL merge.handle_uprobe_upon_merged_vma 7157 12:46:54.662030 # # not ok 8 merge.handle_uprobe_upon_merged_vma Skipping is a more sane and friendly behavior here. Fixes: efe99fabeb11b ("selftests/mm: add test about uprobe pte be orphan during vma merge") Reported-by: Aishwarya Closes: https://lore.kernel.org/linux-mm/20250610103729.72440-1-aishwarya.tcv@arm.com/ Signed-off-by: Pedro Falcato --- tools/testing/selftests/mm/merge.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/merge.c b/tools/testing/selftests/mm/merge.c index bbae66fc5038..cc26480098ae 100644 --- a/tools/testing/selftests/mm/merge.c +++ b/tools/testing/selftests/mm/merge.c @@ -470,7 +470,9 @@ TEST_F(merge, handle_uprobe_upon_merged_vma) ASSERT_GE(fd, 0); ASSERT_EQ(ftruncate(fd, page_size), 0); - ASSERT_EQ(read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type), 0); + if (read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type) != 0) { + SKIP(goto out, "Failed to read uprobe sysfs file, skipping"); + } memset(&attr, 0, attr_sz); attr.size = attr_sz; @@ -491,6 +493,7 @@ TEST_F(merge, handle_uprobe_upon_merged_vma) ASSERT_NE(mremap(ptr2, page_size, page_size, MREMAP_MAYMOVE | MREMAP_FIXED, ptr1), MAP_FAILED); +out: close(fd); remove(probe_file); } -- 2.49.0