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 21EEFC677C4 for ; Wed, 11 Jun 2025 14:23:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A2F656B00AC; Wed, 11 Jun 2025 10:23:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9E0266B00AF; Wed, 11 Jun 2025 10:23:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F5D96B00B1; Wed, 11 Jun 2025 10:23:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 710D36B00AC for ; Wed, 11 Jun 2025 10:23:40 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 120D5160DAF for ; Wed, 11 Jun 2025 14:23:40 +0000 (UTC) X-FDA: 83543338200.11.AF45EB2 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf03.hostedemail.com (Postfix) with ESMTP id 477C420006 for ; Wed, 11 Jun 2025 14:23:37 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VxwUuUJa; spf=pass (imf03.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749651817; 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:dkim-signature; bh=+g6EWQvcA6MF8DbCUNITBYPXL+JKeLsdTZNkai8JS7s=; b=pj39QfphC7vn9uox3pbOlBVRSYfZWA9KJyE+nsImtoozLRP6gXR+i1VISwHB786JsX50y5 cdtJJwxMQ+k51L/H6Zl0CYN6xLZJhm0Ej67/L9AiGVd4z3hYeolvmoN5GcdloFP3fHUF8F ZiyD3lzluNvTGUvhD0x8924pwUq6qW4= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VxwUuUJa; spf=pass (imf03.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749651817; a=rsa-sha256; cv=none; b=Qqsnm6TT0gEpjPTMnILvOUVgdKV09ff4iX9lULn5MP7//40bZcq2Vc14rk++5CQhfVmkRN YkKSEdsoy1kg/72lFyVo/5FVr5gCpG2b3bJOGWX1zCEuCLaWpMgrq2d/eidzpDWxRVUtQc 5FiZ1lU/adlAPzenZPCKaUb3dRrHJd0= Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55B7KRhJ027642; Wed, 11 Jun 2025 14:23:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=+g6EWQ vcA6MF8DbCUNITBYPXL+JKeLsdTZNkai8JS7s=; b=VxwUuUJaGvwTfmrSsU/O3K mnIKDtrEsMGxawu4v31ZI70rJGDgH7ASW+C3GvFVrT1Ukp4M6/LDi02y39Xw9ztZ 3YrfwurQU5QqIWxXFhOd657gIwZTCHdEwZzYlLSDEozbQN0rU2xLtkjuItOczm9a LsIxX5r53LIpisJXDSVJYb2YHtKpiiCa3zP9yQVP/SFDwG76VsD7YDZKXdrC8y8j gSxuYk5JKXvcyHxOh0BZl+P0yMifnR7CK6La9UT+Qx5MUe+HxeQ80pQZvB+HCqNf NraLB+ltnJCvqAdwdUe1l2UgG2aTB08NAxhOEpJZ2WLx4MXT04GvUdydIrI9m8iw == Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 474x4ma6ap-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Jun 2025 14:23:25 +0000 (GMT) Received: from m0360072.ppops.net (m0360072.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 55BECEVn014991; Wed, 11 Jun 2025 14:23:24 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 474x4ma6ak-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Jun 2025 14:23:24 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55BCai7a015180; Wed, 11 Jun 2025 14:23:23 GMT Received: from smtprelay05.dal12v.mail.ibm.com ([172.16.1.7]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 474yrtg9xj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Jun 2025 14:23:23 +0000 Received: from smtpav05.wdc07v.mail.ibm.com (smtpav05.wdc07v.mail.ibm.com [10.39.53.232]) by smtprelay05.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55BENNsw17433244 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 11 Jun 2025 14:23:23 GMT Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0674B58059; Wed, 11 Jun 2025 14:23:23 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C980B58053; Wed, 11 Jun 2025 14:23:18 +0000 (GMT) Received: from [9.109.245.113] (unknown [9.109.245.113]) by smtpav05.wdc07v.mail.ibm.com (Postfix) with ESMTP; Wed, 11 Jun 2025 14:23:18 +0000 (GMT) Message-ID: <6f29b528-a89d-446c-ad0e-8148a8af3c3c@linux.ibm.com> Date: Wed, 11 Jun 2025 19:53:17 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled To: Pedro Falcato , 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 References: <20250610122209.3177587-1-pfalcato@suse.de> Content-Language: en-US From: Donet Tom In-Reply-To: <20250610122209.3177587-1-pfalcato@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=Y4X4sgeN c=1 sm=1 tr=0 ts=6849915d cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=IkcTkHD0fZMA:10 a=6IFa9wvqVegA:10 a=VwQbUJbxAAAA:8 a=7CQSdrXTAAAA:8 a=VnNF1IyMAAAA:8 a=h6i3v21f8pZAO7MeEkkA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-GUID: wKBTw5oQiynaHMLs6nGwUdXbb3j6T2Yt X-Proofpoint-ORIG-GUID: engL8-gUt2CQUqk9B7L4HXrpkczpb7Lc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjExMDExOSBTYWx0ZWRfXxvFdLtsHF3Ue 5V4dQLkSYsxqpZoRHN8ImVU885CCFMHEweVVMKFEhvsg7/dklu4p2X1HBzS3hXH64Aakoczy/6r 0AUXK5Buyc4lZhrZpSgkUfgzVfNfMSQcesH20vKJLxXmpTDXgTy63CPm2ICThA0TIrl7pqye3SS IHkYlPTVYKXW0HQSxdJhHnmVQySnn32yB/NGM06EkdEuZciOgGoZRdVYeUSsiCOsij5tD+c1Uej oDYkokrYijzITaiaSjxhzsnOVbi8U2rvkskTayP1rzYrZOYeHx9jUZ0WnPPaOpvG8OP4SHcPvzP ap69exRLRzG4u5aGQHtkRA/F/4kxumB372w162WG6QZ5J14WwZKQEuu66BaW74DdL+qqjOLy7jP 4wMk8c/MAZqAhzf/yKtUQOsv0NgJ9pIwdgu467PhZcf5ITA6gls0rRyQhVkwvqwa8tEy1D+7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-11_05,2025-06-10_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 bulkscore=0 adultscore=0 impostorscore=0 suspectscore=0 phishscore=0 mlxscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506110119 X-Rspamd-Queue-Id: 477C420006 X-Rspamd-Server: rspam03 X-Rspam-User: X-Stat-Signature: rk7g6rsj1nokryd8ajhe9fofy9adrexj X-HE-Tag: 1749651817-798124 X-HE-Meta: U2FsdGVkX1+lx6jFQI9iSoGn8ESwGmqeSGaYXl+aNznBjFfFdm3M8FrSolEQnU3FGnLVPewInVfWGtiUph4mokcVRECFRjODJkVS0Zw2fuHwuNtWR4QISWEkWFeJHuYdtif3hgUQ7bK504jvE0ofITHZwFrFkuHP1pd6u6HuH+JZsFQ6FslgTq5OdLv2sywiWyyOBEwGSH+4F957rbOKJn3gcU5VT8s5DJYUxVCWE2MK6BCgujTrr/NDObfZw+UHVhS+XGBiYiym8gLY5LqlqNdUjsZ7tnbFJ4MemEADd9JcGAna7mEzUIKl2XNXmr8Nnj9PMNGZGF6hTH+bwhwjox44t9ESPVrOUh1hlZyqikOwrgHQzuwaAmPnJXDowpW6wUob882eLnedsXXJBOCkHmNjZldlBAyBseyZtozhb4GXz3ETJmNNWOBncxQHzGfhyzXvtvry1Ql3gqAgM1WyU0usDwoPfh9ACs/JEKw/Aq3JpakiUL+F67KFu879Y+IIU0CqLwjo1axFLBJoCFX1A83o7qReZOo7D7yEI8sCWKL6siuoSiFcSGR1M0+Agca+nZyeRq4jaeFLJetGbcVmSAsjBIjqawZ3FoAU11luIt9TzzTpppY9Nw8gx8sHgcRIxdsSw6EdhUIwiiULMjIXikIaRMez+XgJ4/dT28Ntp7wmcd5M2+V04n0DKrOjxfv1nAHzd2ZWxO3A/74YiXe0zhIRMrDc5naPVYRmNGhEuve4+jlSWD+FBc+oerq83Eg0hlRE2rpXkEExol9Q5EhyWGRsPFQHKx0z6IT7tK2/IWt80yluj7VoL2/Hvt0AXHUDvOd5/pZU+qozY1Nb3V1QU7gaBrHF/mBb/E64oDPHY/F8dVADxjEcZ1vNR8yhohVoYtSYTsb8K1FuYaytqqlmAyhz/ha5QLP5MXq0uF3887la1w+giMYNw2pswkoDXtVVGSgb5siN3pmI3ycEg4s atGsOijP 9bsXO7aIUqb89fVMdX0BPRrNkk7dJ/lmoUwBcdZIpUs1njYMN0eQFkBkiggNguoqUAMdrUelImoUYZ8VB4n8gz1wJAS4+XOTusd+p1I2CqQBVPPGC7X+aJn0EXkmVOx+BJ8V7MhjwCp4TkvWlMKmgz8H5+7Jj4//kjLovQUM1YmB71vJE5NehtUUQeV2Kedt28pIv2rEc1q6XQuAUbR+e5vEff/chaLbJ/oe9w1iX1fdfycSdeV44adPLZ1a429xdBBpNlnpbV+Zbx0+5jivfUQnB+2uVbtLF6FDn+2yYBIPj/8ebrCRxga5VHn1YGFUn7rZcXqO6TggJb/szYE0AHLZi2mAp5zmAsgDPZ+3FQ4iDiWBUyvE+d/XSc2Y0UFF1a0eSwJzYRYj7Tq30hn0Jfa6WzO9XT5/si7fp8nXG5ipR/vo0Z/y20HmPRfxOLDbmpRhXxxQbSwlSJEM= 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 6/10/25 5:52 PM, 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"); > + } This looks good to me. #  RUN           merge.handle_uprobe_upon_merged_vma ... f /sys/bus/event_source/devices/uprobe/type fopen: No such file or directory #      SKIP      Failed to read uprobe sysfs file, skipping #            OK  merge.handle_uprobe_upon_merged_vma ok 8 merge.handle_uprobe_upon_merged_vma # SKIP Failed to read uprobe sysfs file, skipping # PASSED: 8 / 8 tests passed. # 1 skipped test(s) detected. Consider enabling relevant config options to improve coverage. # Totals: pass:7 fail:0 xfail:0 xpass:0 skip:1 error:0 Tested-by : Donet Tom Reviewed-by : Donet Tom > > 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); > }