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 A412BC677C4 for ; Wed, 11 Jun 2025 07:12:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 422626B0088; Wed, 11 Jun 2025 03:12:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D3266B0089; Wed, 11 Jun 2025 03:12:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E9BD6B008A; Wed, 11 Jun 2025 03:12:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0FB5A6B0088 for ; Wed, 11 Jun 2025 03:12:45 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BBE601A0279 for ; Wed, 11 Jun 2025 07:12:44 +0000 (UTC) X-FDA: 83542252248.18.AE31778 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf07.hostedemail.com (Postfix) with ESMTP id 6992740006 for ; Wed, 11 Jun 2025 07:12:42 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of pulehui@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=pulehui@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749625962; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gEV2uZtTJuhcvlnZPxVLexqMINK+meI4Rw3FEp0fP8A=; b=WovA2oYC1m8MQ2ie3Y5xiDC6hPqdJcYZI4zRaEt96o9jeG1UzhGmRTy7aVmx48XpqNmXb7 frDDuIRa76FJvahuMoVQskZ6csR3dcoZnSbYGpjN03KFB9gVuIPP0L54ErHKLGoxt+6uoa lb9pFCBtL6FgzO6mEE+KEd6MCpXawN4= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of pulehui@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=pulehui@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749625962; a=rsa-sha256; cv=none; b=eCbIsKvXNii+UIkniXjZog3nLDgSR6A5sLzg0VbUk07lbBZc8CqQnVDLQcehIrHKx1bmUG 9Id4otO0SRgcL0RolCGBstnEX6UUFVrZnzKdGhVrbFlrpfIKzhVxfLnhNG/yiqZGLlLXVi ZIBAtxLW2ch+5r9uJbuGLX1QfkRJpYg= Received: from mail.maildlp.com (unknown [172.19.162.254]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4bHGvq1XlFz10WqD; Wed, 11 Jun 2025 15:08:07 +0800 (CST) Received: from kwepemf100007.china.huawei.com (unknown [7.202.181.221]) by mail.maildlp.com (Postfix) with ESMTPS id 31E8F180493; Wed, 11 Jun 2025 15:12:38 +0800 (CST) Received: from [10.67.109.184] (10.67.109.184) by kwepemf100007.china.huawei.com (7.202.181.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 11 Jun 2025 15:12:37 +0800 Message-ID: <0c96ef86-958c-4550-bf36-1b0c8d939550@huawei.com> Date: Wed, 11 Jun 2025 15:12:36 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled Content-Language: en-US To: Pedro Falcato , Andrew Morton , "Liam R. Howlett" , Lorenzo Stoakes , Shuah Khan CC: Vlastimil Babka , Jann Horn , , , Aishwarya , References: <20250610122209.3177587-1-pfalcato@suse.de> From: Pu Lehui In-Reply-To: <20250610122209.3177587-1-pfalcato@suse.de> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.109.184] X-ClientProxiedBy: kwepems200001.china.huawei.com (7.221.188.67) To kwepemf100007.china.huawei.com (7.202.181.221) X-Rspamd-Queue-Id: 6992740006 X-Rspamd-Server: rspam07 X-Stat-Signature: fr3qqbcjt4n4kcpqyepfg8wk1cf5cjfc X-Rspam-User: X-HE-Tag: 1749625962-499332 X-HE-Meta: U2FsdGVkX1+4wy6U9xd+/B+ECVRkgivpuf7DOCkVp9riJluiBnEJfD7F+v2JXcKp6h4EvuFHr+U0WCtU0Sjdf22NfTNcl94fl7ZyhnWiT26Z/cvtCYMve1MIqSyCCgRvgAVQWnRewaLKI2NnkW2jrHjeY+sFaGQxqIy2H/p+CCp2NtpeL3IGZ83Bnb7Py4mP3ewFnMFNbHubTxf/tDtgOuc08fzCRg2u5JR6JxWeYz/7qoHjyT7VZEYK0rZkAp2YG9i8sJ4qErdfhUvxFILZqKAeMHY/HjQNG0dWbpDddB25BK9BiUJAHFkoWidRN2GiMNNqsZV8aLN21DjK+00yxs8cTIHk4T5CFR8d5nmRHCsL0Bd2YiGsRa+pGkkieAMcxKO6SIu0mupOW5LcvxPQfLEgzUAie6jaP5NPmKD85GBARm2ZG31LpXUmWCv77YNHMQQLnOoCLuiv8H4eSGnjlVxBZVUbl5Y8mbYCvNBmDr36mgQzTJRqghskSupNIkO0OEn4vqH8FMOyEGjAct6PEsM1jfsaiv1BPl2SUNb6SLl0FKdv37GBULRFZqQ7z6J0n/MLa5QIwPfjx4MzQwQUda0Q7kUVeDbNWLyKzodTHDuuFoZpmzwZgWWno9/IevQKKLVh/9vYodf0X51X5TN82DQ/mpXde16JPdewNXxrWbP0IzsbC5sARVYf/Ed61ohL0A5ltwyPItJkPeQDa+JzbaHMeKqF+4AQk9P3Bgg+jyGwOMG9nQSUmUoljTBy94hLno/i60eA0EE1725YaIL3V75u/YfeMmxvWjXmAq/wcuA2sWv51kKTefZ/vSDJ8GfEjhruuBDkmHYM3jq4iUJH0Y3li9nUyuLaYXxEtrCd+ym3Fa+12aKfPw5av/vCugHgc2Z4gslkm383aUrOodxU6YWV//gSPo7IsWK6EyaVF9dPZbV9kBRZBX8LDePC0ykj0AcrSDQTOVmGtg7AXXE UGdf9su3 /y46668NjsV6yNg+t495u7tI31km202iVoJwMUyKVPU7ROLr3bmZco8Pnwa+h10VdV9FRZD8gYMdXpwzUvpQGHtMS1D5HHrLMLkQFsVlCbCbFKaMaNKmv5cFO3z9yGZZDWh+K02Oo12pyfLoA9bUZ51IPcbeOHg6Sp1MEdj6KdZfOh3qOArU7hMHwVRj0LvRQ2WlRfasIbWejaSfD2mj1eWaz10DNUhzl2o5OK3+9NLr09MAJtnlvBAdnnoJR33idLivUC4vzf0F2UErZGfNzm4WCcdjnpQWbiCL0YdXhuS/NMqlbANIVJD8CNo9Fe/DK+w4n 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: On 2025/6/10 20:22, Pedro Falcato wrote: > 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); > } Thanks, feel free to add: Reviewed-by: Pu Lehui