From patchwork Tue Jul 12 14:53:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12915086 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 86223C43334 for ; Tue, 12 Jul 2022 14:53:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 174FE6B0129; Tue, 12 Jul 2022 10:53:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D788940063; Tue, 12 Jul 2022 10:53:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E44846B012B; Tue, 12 Jul 2022 10:53:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CF12C6B0129 for ; Tue, 12 Jul 2022 10:53:39 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9787A34AC1 for ; Tue, 12 Jul 2022 14:53:39 +0000 (UTC) X-FDA: 79678741758.26.E00C46B Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf12.hostedemail.com (Postfix) with ESMTP id 02D5940071 for ; Tue, 12 Jul 2022 14:53:38 +0000 (UTC) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26CEqsnr030909; Tue, 12 Jul 2022 14:53:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=W6LhCbBLPWU4N7d33MafLJ8sBmip0H8lx2NpnOh2CnM=; b=eyMjceE45lkRYk5IBiornsRXVZU2aWtgaIoK6fXtQDxhvOvBjiJ/lfRjuvVSTTr7oiIF nKRwrNEl0GC6GFhd1dDu9p9/Atd8KYgsj7maUnrAAm4HcO6mlTANQY8Xo9cgW6HLhWdT uvw1Ol0Bx3OtqZcJl5lNCzv5LP1L/HlJeqUQhvfzwC0dNVTZmbLEPihde7wnM7pd5zw+ bLYr5yqgfTODyCbfn7LSOJ4y/wXSbP/nsFyPxSdXVCI2f35kJaAy+o+vaUIIcHvzChQ/ a1oVDi3i65CTydgI428IK+ZWGKYeYdQUOXkxYYGWjCKm/aD2TBuNtk7f4BBF2ILjlfD8 /w== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3h71r1700r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Jul 2022 14:53:33 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 26CEobkG034870; Tue, 12 Jul 2022 14:53:12 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2171.outbound.protection.outlook.com [104.47.59.171]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3h70433tan-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Jul 2022 14:53:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CtPcj2QEOEfIDHu0WV8yUdDbBs+eZew24kHymDBoUsKH2wBsk6TJWnJBKatg6Kp0ByMHCOJOkYtDNPveaXwSz1+8WCGFDzWrYnqyj9ZUI2dfY8m1qJFdUAjy5yhs7RlOdJuG1ycDFnwF2WXugWFfoyw9TO6V8vyfsRspDTATuz6r+KPS7DkHYdHyBz6q4VqYXqZqGzlpcIMROYRTNHaUUpzbrxaXu5S4MMU3aYDHCReMfuOcaMHU6dOKQxSet0nk8+xemmp2++3+HiFhBTZzwuBG7Fehtof1g8Go7lqpng7vOkeYU2h4RxTtQMOQvpAkSBI/stv3pMcApWmmeTL4Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W6LhCbBLPWU4N7d33MafLJ8sBmip0H8lx2NpnOh2CnM=; b=j1Ie4VXLbDrPgHYpCJMzKELWSosbYFDKh/4wy0koVmSYtlCBoLNPzNFao290ey6A1629iC/U1UKfPdY2oBkRWCzDAnR7CVQLiyv9Po5bC3XoVCwAjCmqhfeHMtOcssCjIi/XXQIfAk0AihrxZ9VZYNC34VxIu4HZkAY3mUnnBb8IQ+Et1YDdL+4IXfeq5Vu6jkL5UL8pQJL/uAvowlP674s9L3+/I6qoeW197WYe8gOxEY1jLJEGQwBOKySkkeZnEolG5jwOn2VaN/oImvdSOedU7M12QFyGHfGh5EIFC5PITIWGG7VsXXgNPivuVwZoswwCuo3YzM93ouq6NIMZHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W6LhCbBLPWU4N7d33MafLJ8sBmip0H8lx2NpnOh2CnM=; b=Qz+0nyyawNJ6FqEe51eqdE9pvQXjtuet1Glf79nL/W6sD/GdP5CI9VWGLj7ZJNUjVMwd1y0Wnst8Qra00IW/4c3NSt39o5Ta8/L3AdeBjyeemvAUXFHY4Jl5Tq6yHar4Cp88mzMDMHVkDJSJM5dgcBWFYEP041CQr0MMBF6kk2s= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by BN6PR10MB1585.namprd10.prod.outlook.com (2603:10b6:404:49::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Tue, 12 Jul 2022 14:53:11 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d1:edc3:7d21:7c68]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d1:edc3:7d21:7c68%6]) with mapi id 15.20.5417.026; Tue, 12 Jul 2022 14:53:11 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Subject: [PATCH Fix] test_maple_tree: Fix accounting in check_erase2_testset() Thread-Topic: [PATCH Fix] test_maple_tree: Fix accounting in check_erase2_testset() Thread-Index: AQHYlf8bdeI0TAIbz0iXnYHg7oghBw== Date: Tue, 12 Jul 2022 14:53:11 +0000 Message-ID: <20220712145303.4191493-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3b92b988-a54a-4c32-c568-08da64163d8b x-ms-traffictypediagnostic: BN6PR10MB1585:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TNyUDZ/EBz04DuB3XUtPISfvtTkIKqshivLwqysoZUx9qQ6GKclJ2brafwmBOsdgnak6ZN2qK4nbzwFv8hmFrfF3ITzLAgY7CjUGi7ixy/9ESSu0cYosKu3uvsxcbzF57bD6rr/7D2MMiMEs5QFPRSP6ZgizW3q7hJtlY0BYuidC5xNd7XdB+FhSRg1rNMJmCeHZrFnLP7rdhtyOheTducK+XAyB18wKVOLUc3TvxNF+ClQ064j1VnvbzFahvSuL8zUlAe9aOQS7B+M8hRhtZKh4hfljSeJdJRhbV6lY5FWdSQ1Xsu0XfGdaKFGZxgNGcheHGi4MFGR/3LPcs7nzQFRW8VHpHjyBhZfBTBok3j7u5BfjQkTRuCgpUGHs37Jl9NSEzMAVvPwPeu7tR7dBsK2PKegLj6gTEY2ZDdzXof8fAAHkJ3v7fETeisr4JP3kNzp9Rl86Z9szowYR3VhYiAe+jcwAxvo4l6SO/571Vm8i2aeg70yJlYW1xfp0wbZst1lEiU8TXgBv2edJixBasxnNo0/yW/iKMEhTMtxIDoUhAayGjiH2UnZwzzK+EfNexE/uMilKG+nRoplE8zdfiicAPu0Hkj+iaGgAZ4vT/AuYUg88I1GSx6zJtQV23HaM6E4zS8DRCuhcwEsOTxT2ylbKCj5EjuKD3ZIJ4EYQQYP/9l+/Qhj4ZlAPn8V5mF0M/rD905VAIW3RVlb7IWzQdNOsiHWpCwPGVBd7rLd2lBOcKYhZHAT+glbmrOPAUyXdW9Zx2/zI8cffPAf+gGZ6zxg28qHesUIwLQ8kT0vVxAc/cFwFjacpOa5PrCLonv2p x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(376002)(346002)(366004)(39860400002)(136003)(396003)(478600001)(6486002)(83380400001)(8936002)(44832011)(36756003)(64756008)(4744005)(41300700001)(66446008)(76116006)(66556008)(91956017)(8676002)(71200400001)(316002)(110136005)(5660300002)(2616005)(186003)(66476007)(6512007)(26005)(2906002)(6506007)(38070700005)(66946007)(86362001)(122000001)(1076003)(38100700002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?En1+27STvEuCg5UtEHHKyG0?= =?iso-8859-1?q?2463+BWlfLQCmQ7QTiVqejq3vSsdfQyhwTvvAoyZ26OYXAuKLCsYZKyeeek3?= =?iso-8859-1?q?lS8rME5kKtMG3L6odSzk+x0AzAgrgQIKtRdSvDmVMaz/cMjdlXp6TWf8uEos?= =?iso-8859-1?q?apI5fxBY5+mchtFE/tZtZP2hfzo3m/RDp+C1+59glujR0UUnv0otzKP7247T?= =?iso-8859-1?q?FA3scID2JTxuJfkl1RzlygKXdiYJb7Wb12cotrgD9V9hn06/Slhz8piAbLXX?= =?iso-8859-1?q?rMy7BKVSyHXLIUE6Oq5eZFMScZ35+4/FcJiOWslY/X6wyf8KzoLuZZ3+DalF?= =?iso-8859-1?q?YSnndpUJW9FjleeFrCuoxbs6jvI17ITfg51hMyUy0qmMquq4QnVw0oph2KPI?= =?iso-8859-1?q?Q/UYuECxLMVjBfT4FyClovWlR6Ttsa+KUTVwaL4wzJ2mbl7wb1pgr9IQg07W?= =?iso-8859-1?q?+5wRGZGjB1PnsBlMCys0XkGioFIMb9XEXWQ/TSU0C2LOWcOjh+qKzrbtU9xc?= =?iso-8859-1?q?cb5cuco4JRvLHlIeSSCpk60H/91yDcxHFdZ2Fz6vfdMYdhybTCafA+GiSo/z?= =?iso-8859-1?q?8/9guUf0265qx8vk54IrAaMeyfiIgx8Xeqwb8qJz62hf1pLlQIX9qtnQ/E4k?= =?iso-8859-1?q?7zbEWZQv0fSpBFyKamAUjt9bmZwyqvhRidhSYfEpAX8UIRmowyUIcpbP6uKo?= =?iso-8859-1?q?BqWRBhGRyMH8E83c6+o1G8mk/hN8NMDcy3GKkA/5WCBZRzQjz0Nii+ncHI+p?= =?iso-8859-1?q?5JAgdxUCPFYaKMwh8OxkzygPJMG9x8pISbsnIjfM1Jr7ysCdk0A3z4h93UGq?= =?iso-8859-1?q?Euk8SwzZiOhHuF817O8kVx5qvCTU3rqe1zdbAI6PhYPwQbz1+bgJnEvWEavB?= =?iso-8859-1?q?BhDf0o4LYUhsBHLjJWscXPurH7FsBpga6yKx49chRdwZ657/BO/CHd+o4Skm?= =?iso-8859-1?q?y8QTDNzcJd5fCOr/lao+f8OQKo66Gw7wR5QAm4PFPe20/Fg0FNPXqELTN/VF?= =?iso-8859-1?q?QSBQCqQiXBlAd9z7Av1QD2+OeDv9zL5n9qb9cJC2jMT6fjE4ucjrvLgzUNCv?= =?iso-8859-1?q?pbrp35z7vKwRL3JYDD3FqnAE7N37lMzfN7bt+5Yk9INed8yKUTFhZ8ipM6rI?= =?iso-8859-1?q?ZBN6grso1s3rsNt8E05QzYKP83b8recXkvOu8YriDbJXQfLebwa1XrPuB4sx?= =?iso-8859-1?q?hd92nmUQEMxgiAIJ0h4SKHrPSQnj/cwBq/5fOESFbD/RrRKCSjUNb3S9+RkN?= =?iso-8859-1?q?srBkAbXdvDPhmxyTADv+GessDmeXYqss9KyzXdb4Fc5jvDp7jaIpq4LeXs5P?= =?iso-8859-1?q?K+RI6WAyUN+rQpRZzLiHKNUGBTmm2dYrvAFb+gYGdL86FsQJSdmA9g5hs83d?= =?iso-8859-1?q?qWR9475JcSmKcX2OW79Rh39G+A//boxT9Vh2u3i0kRq2vtxVqkDXmPMNXDXQ?= =?iso-8859-1?q?MQ8en+rcNFQjZ5kCzEzSTKCGfTjzYZmoOL5SWcRmNKvAQ32dP2Bv1qzDrCRw?= =?iso-8859-1?q?+z1Bzc6Ykfg7pp6WPq9OGN/maLsTkL1mMZNn1DhJxN7SwJeyTqUKn2EP8PrJ?= =?iso-8859-1?q?R3NxIJR/KnYHNliTDzaCh356nZiA9w/bm8OmaVauc941CTEUpqgUsEzf2JPP?= =?iso-8859-1?q?KN3PsTaIn3yvIHklJz4qY6EBO8XvyRrOLld6SLA=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b92b988-a54a-4c32-c568-08da64163d8b X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jul 2022 14:53:11.0662 (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: r6NVrlgRc2eUDQneqlLxdndV5Yw3dZ5XeczgFqWsDcWDLFzURjf2f+lj6/cvoSN8kqobxnFmYQpb7x9U1OPLrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR10MB1585 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883 definitions=2022-07-12_08:2022-07-12,2022-07-12 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 mlxscore=0 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207120058 X-Proofpoint-ORIG-GUID: T7eLuc1Xapic4xoZG4uHXWyLjpHQJLK7 X-Proofpoint-GUID: T7eLuc1Xapic4xoZG4uHXWyLjpHQJLK7 ARC-Authentication-Results: i=2; imf12.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=eyMjceE4; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=Qz+0nyya; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=none (imf12.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1657637619; a=rsa-sha256; cv=pass; b=UBt4KZvjH8vwKKNb1S6HQEZ9IHH9bywTKVd9xijBilsbiuFwemKCiGtJ1mtmzpyWaJkw43 WkbFNAAetM8tuQEVGfhYtcnvwl8XmWHh3lgRoi2dG4ez+cT+qOfDSb8wtOPb9EFOyBWsiu k8bB6bhGENzKVFGUkMhZC4i2RjREILA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657637619; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=W6LhCbBLPWU4N7d33MafLJ8sBmip0H8lx2NpnOh2CnM=; b=s95pU5M7nnOGN6M71fVCZC19CpsgUS02iFFhukL6c28Db6oGibhorSWD4S+Ld8YOTqLDU6 Uo1lB5XvNRqIRbVvv8eGfpshvhKR8DSJsra6m9HxoPbr9CMF98Oc11zvXkj+coQVsB3jsX uRPPv5gQbFo0lA8ZgSTSbJmUwAw1bNc= X-Rspamd-Queue-Id: 02D5940071 Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=eyMjceE4; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=Qz+0nyya; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=none (imf12.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: p4nzfdsu3krm68jq6j36nowy856m7wqi X-HE-Tag: 1657637618-445476 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: When overwriting an empty area, do not decrement the number of expected entries. Fixes: 51282228cdd4 (lib/test_maple_tree: add testing for maple tree) Signed-off-by: Liam R. Howlett --- lib/test_maple_tree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index b028f5648857..c5fcaa2ba054 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -1486,7 +1486,8 @@ static noinline void check_erase2_testset(struct maple_tree *mt, switch (set[i]) { case SNULL: if ((s_min == set[i+1]) && (s_max == set[i+2])) { - entry_count--; + if (s_entry) + entry_count--; } else if ((s_min != set[i+1]) && (s_max != set[i+2])) { entry_count++; } else if ((mas_start.node != mas_end.node) ||