From patchwork Fri Jun 2 11:06:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 688595 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BB82C7EE2C for ; Fri, 2 Jun 2023 11:07:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235615AbjFBLHD (ORCPT ); Fri, 2 Jun 2023 07:07:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235443AbjFBLHB (ORCPT ); Fri, 2 Jun 2023 07:07:01 -0400 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23334E5B for ; Fri, 2 Jun 2023 04:06:44 -0700 (PDT) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110642euoutp013ed27646e40a023352319cf5d6bdf8c7~k0tvsSWz90189401894euoutp01m for ; Fri, 2 Jun 2023 11:06:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230602110642euoutp013ed27646e40a023352319cf5d6bdf8c7~k0tvsSWz90189401894euoutp01m DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685704002; bh=dg1KPdqa1g30CQqgCK1VP5CwiQO47gFwHbWyH2hvLF4=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=A5l5Dp0AsTr1RIc34FVHNsJfLaUAnmSusVxKX4qlpPDDurxAOdbh1gL/bxyZT60FW dRdjS4AmmB+5TM8/8NyzSsuCdKGehSeXb1pujSUbG5qikEDDFk6ZUNW3/MiShXO6cX CjZ9Ui6kS5VV9nwpGeUxyr6IFWJaId1SrKp8yUJw= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230602110642eucas1p25278f4b80e5bc361bc1250e3a0a178a9~k0tvex7YG0783007830eucas1p2J; Fri, 2 Jun 2023 11:06:42 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 49.67.11320.24DC9746; Fri, 2 Jun 2023 12:06:42 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230602110641eucas1p1e2e92293c385e8083ed104dbb96aa68b~k0tvCWeV_0085500855eucas1p1d; Fri, 2 Jun 2023 11:06:41 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230602110641eusmtrp19ef6e4a22f40bb673b99d0be0320a9a5~k0tvB3wJ52194821948eusmtrp1R; Fri, 2 Jun 2023 11:06:41 +0000 (GMT) X-AuditID: cbfec7f4-993ff70000022c38-69-6479cd42acc8 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id C3.A9.10549.14DC9746; Fri, 2 Jun 2023 12:06:41 +0100 (BST) Received: from CAMSVWEXC02.scsc.local (unknown [106.1.227.72]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230602110641eusmtip19329dc84f1680badc901c2cba72579b5~k0tu5IEoL3230032300eusmtip19; Fri, 2 Jun 2023 11:06:41 +0000 (GMT) Received: from localhost (106.210.248.205) by CAMSVWEXC02.scsc.local (2002:6a01:e348::6a01:e348) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 2 Jun 2023 12:06:41 +0100 From: Joel Granados To: CC: , , , Joel Granados Subject: [PATCH 1/8] parport: plug a sysctl register leak Date: Fri, 2 Jun 2023 13:06:31 +0200 Message-ID: <20230602110638.789426-2-j.granados@samsung.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230602110638.789426-1-j.granados@samsung.com> MIME-Version: 1.0 X-Originating-IP: [106.210.248.205] X-ClientProxiedBy: CAMSVWEXC01.scsc.local (2002:6a01:e347::6a01:e347) To CAMSVWEXC02.scsc.local (2002:6a01:e348::6a01:e348) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOIsWRmVeSWpSXmKPExsWy7djPc7pOZytTDL4f5LPYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgiuKySUnNySxLLdK3S+DK+Lt/L2vBCtGKKbu+MDcw XhbsYuTkkBAwkeg9OYm1i5GLQ0hgBaPEge4LTBDOF0aJNW9Ps0M4nxklNjYcYIZpmfEDpmU5 o8TK53fY4KpefV/LDOFsYZRoWf+IFaSFTUBH4vybO2DtIgLiEidOb2YEKWIWmMAo0bfuF0sX IweHsIClRO9bSxCTRUBF4uo/H5ByXgEbiSfr37JBbJaXaLs+nRHE5hSwlTh0+gwbRI2gxMmZ T1hAbGagmuats5khbAmJgy9eQF2tLDFh3W9WCLtW4tSWW2B/Sggc4ZCY83ceE0TCRaL51AZ2 CFtY4tXxLVC2jMTpyT0sEA2TGSX2//vADuGsZpRY1vgVqttaouXKE6gOR4kn/9ezg3wjIcAn ceOtIMRFfBKTtk1nhgjzSnS0CU1gVJmF5IdZSH6YheSHBYzMqxjFU0uLc9NTi43yUsv1ihNz i0vz0vWS83M3MQLTxul/x7/sYFz+6qPeIUYmDsZDjBIczEoivEJh5SlCvCmJlVWpRfnxRaU5 qcWHGKU5WJTEebVtTyYLCaQnlqRmp6YWpBbBZJk4OKUamKyaXGtTZaV2vc42NbX4mdexpFko zX3WX237EpNMTz3XhuuPRVavvxBgt4z34KdI/qsdbxTumCoYvFo/dcI9rbm9FmEOmf8YVsrV Ln/G93FDbOXHmxq7Inads7nS1LlZpMF6u8dS29RdyguvPFmp5PO9u/POu1u25SYHzSXv/frU lPw7WXH+3Wf7du+Rn3lY22RVQUXZRquvx1bFnl908J7pqT8RX/+8W+rwTvFT56UlgYKLs4Mv npzMbp5konxg8b9mRnv9XD/ZE0UJUzjztxksj34k9/Sdrzvn7luMudlMmrdZ+abwr53y0eC+ wZWT2b//HBSuucx1N6zt7GWPa+aR7CFPrW6evjp9Xs9S9zIlluKMREMt5qLiRACIk5eWigMA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHIsWRmVeSWpSXmKPExsVy+t/xu7qOZytTDP5ONrDYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgitKzKcovLUlVyMgvLrFVija0MNIztLTQMzKx1DM0 No+1MjJV0rezSUnNySxLLdK3S9DL+Lt/L2vBCtGKKbu+MDcwXhbsYuTkkBAwkZjxYxJrFyMX h5DAUkaJvtPn2CESMhIbv1xlhbCFJf5c62KDKPrIKNE48yALhLOFUeJ+4yFGkCo2AR2J82/u MIPYIgLiEidOb2YEKWIWmAA0dt0voA4ODmEBS4net5YgJouAisTVfz4g5bwCNhJP1r9lg1gm L9F2fTrYSE4BW4lDp8+AxYWAatafucAOUS8ocXLmExYQmxmovnnrbGYIW0Li4IsXzBBzlCUm rPsN9UCtxOe/zxgnMIrMQtI+C0n7LCTtCxiZVzGKpJYW56bnFhvqFSfmFpfmpesl5+duYgRG 1LZjPzfvYJz36qPeIUYmDsZDjBIczEoivEJh5SlCvCmJlVWpRfnxRaU5qcWHGE2B3pzILCWa nA+M6bySeEMzA1NDEzNLA1NLM2MlcV7Pgo5EIYH0xJLU7NTUgtQimD4mDk6pBqbJBevyHnhH Rb2W3iZ7I2nd0+43/8NXrijguFnDlf555kSvHunHriv3qIV6rWLMu3uqwFJMYL+TSwb7+eba Y7O3h7S+7fskMKOgIkx5Z4KlqsHb2g0G08pdsg0aVk82WeauGf591272Lc1xHx7oT9jzoTT9 fUZg3h7bqxEa6+Q/HvjxVOeJ+XOv5SuaGjLOLNlvynVmlxPvUuVW+wCd2eYzdUS2LpOYJVBw JW2KzI5zj289XvmvewvPsVaT/4d8K/v4yhQ+x9hNi2PsvSq87LBBgIcv+/LYg9Y+pseCxbia J700mpd7zNqOnd/zFg+rxpm5v/bvvNI9PTZm+rQAuSxtxxOmznckPP+kKc5QYVFiKc5INNRi LipOBADcb+IRMQMAAA== X-CMS-MailID: 20230602110641eucas1p1e2e92293c385e8083ed104dbb96aa68b X-Msg-Generator: CA X-RootMTR: 20230602110641eucas1p1e2e92293c385e8083ed104dbb96aa68b X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230602110641eucas1p1e2e92293c385e8083ed104dbb96aa68b References: <20230602110638.789426-1-j.granados@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org parport registers two sysctl directories in the parport_proc_register function but only one of them was getting unregistered in parport_proc_unregister. Keep track of both sysctl table headers and handle them together when (un)registering. Signed-off-by: Joel Granados --- drivers/parport/procfs.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c index cbb1fb5127ce..0f2d2e1ee28e 100644 --- a/drivers/parport/procfs.c +++ b/drivers/parport/procfs.c @@ -257,14 +257,16 @@ PARPORT_MAX_SPINTIME_VALUE; struct parport_sysctl_table { - struct ctl_table_header *sysctl_header; + struct ctl_table_header *port_header; + struct ctl_table_header *devices_header; struct ctl_table vars[12]; struct ctl_table device_dir[2]; }; static const struct parport_sysctl_table parport_sysctl_template = { - .sysctl_header = NULL, - { + .port_header = NULL, + .devices_header = NULL, + { { .procname = "spintime", .data = NULL, @@ -429,7 +431,6 @@ parport_default_sysctl_table = { int parport_proc_register(struct parport *port) { struct parport_sysctl_table *t; - struct ctl_table_header *devices_h; char *tmp_dir_path; size_t tmp_path_len, port_name_len; int bytes_written, i, err = 0; @@ -464,8 +465,8 @@ int parport_proc_register(struct parport *port) err = -ENOENT; goto exit_free_tmp_dir_path; } - devices_h = register_sysctl(tmp_dir_path, t->device_dir); - if (devices_h == NULL) { + t->devices_header = register_sysctl(tmp_dir_path, t->device_dir); + if (t->devices_header == NULL) { err = -ENOENT; goto exit_free_tmp_dir_path; } @@ -478,8 +479,8 @@ int parport_proc_register(struct parport *port) goto unregister_devices_h; } - t->sysctl_header = register_sysctl(tmp_dir_path, t->vars); - if (t->sysctl_header == NULL) { + t->port_header = register_sysctl(tmp_dir_path, t->vars); + if (t->port_header == NULL) { err = -ENOENT; goto unregister_devices_h; } @@ -490,7 +491,7 @@ int parport_proc_register(struct parport *port) return 0; unregister_devices_h: - unregister_sysctl_table(devices_h); + unregister_sysctl_table(t->devices_header); exit_free_tmp_dir_path: kfree(tmp_dir_path); @@ -505,7 +506,8 @@ int parport_proc_unregister(struct parport *port) if (port->sysctl_table) { struct parport_sysctl_table *t = port->sysctl_table; port->sysctl_table = NULL; - unregister_sysctl_table(t->sysctl_header); + unregister_sysctl_table(t->devices_header); + unregister_sysctl_table(t->port_header); kfree(t); } return 0; From patchwork Fri Jun 2 11:06:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 688593 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8717CC7EE32 for ; Fri, 2 Jun 2023 11:07:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235933AbjFBLHi (ORCPT ); Fri, 2 Jun 2023 07:07:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235850AbjFBLH0 (ORCPT ); Fri, 2 Jun 2023 07:07:26 -0400 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72FCD1BF for ; Fri, 2 Jun 2023 04:07:01 -0700 (PDT) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110647euoutp02796a3e284f0f0530942153a5d7c4fecc~k0t0ExKjS3001730017euoutp02k for ; Fri, 2 Jun 2023 11:06:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230602110647euoutp02796a3e284f0f0530942153a5d7c4fecc~k0t0ExKjS3001730017euoutp02k DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685704007; bh=hYhRLkPi8FoDCUTYM89A2RNac7EIMazIQAo5IMuTC+s=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=F+57COksDqKZDi9A2lx6QJL9Yj7wZ4Sw+rw2cAUwYlNDrjcRTMPcjF8Ty4XEwVn12 Xpz7SKanbB/wxdTwzMhkcWPl+sdDFGmSIC1tnns1mV8uYocjdp1M4V1vxvp4HBuw42 i3eNRYuKjLZOBTj9ATfCwB6gEvmRaZ2vrYE5G5Js= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230602110647eucas1p227c666ec3d609dbb8f6e79cc0a905259~k0tz1tsdT2051020510eucas1p2a; Fri, 2 Jun 2023 11:06:46 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 7E.7F.37758.64DC9746; Fri, 2 Jun 2023 12:06:46 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230602110646eucas1p115dd1191419eb10bca47c9a6eefa6450~k0tzlCui_0212702127eucas1p1V; Fri, 2 Jun 2023 11:06:46 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230602110646eusmtrp2700e84b8f332ee8e4b33ed0517dc2f76~k0tzkj-cx2226722267eusmtrp2J; Fri, 2 Jun 2023 11:06:46 +0000 (GMT) X-AuditID: cbfec7f5-815ff7000002937e-8a-6479cd464dc5 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 3F.DB.14344.64DC9746; Fri, 2 Jun 2023 12:06:46 +0100 (BST) Received: from CAMSVWEXC02.scsc.local (unknown [106.1.227.72]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230602110646eusmtip2e919595238ac8b6993427301d6341e89~k0tzaxyaX1061810618eusmtip2F; Fri, 2 Jun 2023 11:06:46 +0000 (GMT) Received: from localhost (106.210.248.205) by CAMSVWEXC02.scsc.local (2002:6a01:e348::6a01:e348) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 2 Jun 2023 12:06:45 +0100 From: Joel Granados To: CC: , , , Joel Granados Subject: [PATCH 3/8] test_sysctl: Group node sysctl test under one func Date: Fri, 2 Jun 2023 13:06:33 +0200 Message-ID: <20230602110638.789426-4-j.granados@samsung.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230602110638.789426-1-j.granados@samsung.com> MIME-Version: 1.0 X-Originating-IP: [106.210.248.205] X-ClientProxiedBy: CAMSVWEXC01.scsc.local (2002:6a01:e347::6a01:e347) To CAMSVWEXC02.scsc.local (2002:6a01:e348::6a01:e348) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOIsWRmVeSWpSXmKPExsWy7djP87puZytTDJZutrLYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgiuKySUnNySxLLdK3S+DKuDatn7XgEXfFvRvvGBsY r3F2MXJwSAiYSEy9ztPFyMUhJLCCUeLLrkNsEM4XRokP6zuYIZzPjBJrLrxm72LkBOtY+2oV C0RiOaPE9SPL2eCq7sw6ApXZwihx5PYqVpAWNgEdifNv7jCD2CIC4hInTm9mBCliFpjAKNG3 7hcLSEJYwF2ibfk/NhCbRUBFovHfbSYQm1fARmL2ni5miN3yEm3XpzOC2JwCthKHTp9hg6gR lDg58wnYHGagmuats5khbAmJgy9eQPUqS0xY95sVwq6VOLXlFhOEfYBDYv0VfQjbReLTxDVQ cWGJV8e3QP0sI/F/53wmkKMlBCYzSuz/94EdwlnNKLGs8StUh7VEy5UnUB2OEtcuLGKHhDGf xI23ghAH8UlM2jadGSLMK9HRJjSBUWUWkhdmIXlhFpIXFjAyr2IUTy0tzk1PLTbOSy3XK07M LS7NS9dLzs/dxAhMG6f/Hf+6g3HFq496hxiZOBgPMUpwMCuJ8AqFlacI8aYkVlalFuXHF5Xm pBYfYpTmYFES59W2PZksJJCeWJKanZpakFoEk2Xi4JRqYNr8MWtPmkrdxOCfKYvKQu0iRBT1 lqYfs1/mXHFISnv306xYbimTFleDuvmcqcFFeo5l3HN3LnCOfflHJ6Gu9laLRcoxwS3Z14Wy UvkbLisLu5pFOkqEKwrqlbpnnWa2uNr1coqogf039dDLj/nv7zj9VP6u7ATTI6HMfvvftBry irgYL18f/nylgpndxy4RwVeRsaVHF8+dNDnlbUQkF3/c86cLn/AeFl9/fP/RU/9uXHNLEZHZ cuFr9978dU9Lm7hPpjayBBvy6wWXJLGVT3ttXnNvitJUpzksxzQXGHmxZwY/uCWd2eTocloq xkyz8ZWVXofkxGt787iXXjT8wuydzRKue282T6iQJJsSS3FGoqEWc1FxIgArbRZoigMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRmVeSWpSXmKPExsVy+t/xe7puZytTDH5+U7fYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgitKzKcovLUlVyMgvLrFVija0MNIztLTQMzKx1DM0 No+1MjJV0rezSUnNySxLLdK3S9DLuDatn7XgEXfFvRvvGBsYr3F2MXJySAiYSKx9tYqli5GL Q0hgKaNEe/dzVoiEjMTGL1ehbGGJP9e62CCKPjJKTH22G8rZwijR2n6VDaSKTUBH4vybO8wg toiAuMSJ05sZQYqYBSYwSvSt+8UCkhAWcJdoW/4PrIFFQEWi8d9tJhCbV8BGYvaeLmaIdfIS bdenM4LYnAK2EodOnwGrFwKqWX/mAjtEvaDEyZlPwGYyA9U3b53NDGFLSBx88QJqjrLEhHW/ oV6olfj89xnjBEaRWUjaZyFpn4WkfQEj8ypGkdTS4tz03GIjveLE3OLSvHS95PzcTYzAqNp2 7OeWHYwrX33UO8TIxMF4iFGCg1lJhFcorDxFiDclsbIqtSg/vqg0J7X4EKMp0J8TmaVEk/OB cZ1XEm9oZmBqaGJmaWBqaWasJM7rWdCRKCSQnliSmp2aWpBaBNPHxMEp1cBUeTf/ZVjhzWMH tzmpGcYdPp6qdVg1PZHpiTLLjx86XAa3HHeyhXp0pCie9dvpmRaTfDInfqK1l3iZeti7WEG/ e7yLiq/9Xrf+6qtFj59yfH/Vn17Hs0a3bjp7zZHDhdvt/Te1aF+2z4uMzXR1YAio2PxfL5zv 6urClTcFO3q7+79rvP9TLCIzz3Prgp1ul6Yw+/zZxL33+5NvlzTvuyhICV1acmTjNpuCnfyp 0jFn7ZSuN5sLFT+r+3FWZt7x1jcrth42KXHae8GtNDvmTHRtgeDRoKuZP81zytmFeIRMbicF vHFb/+PLh9cqWzdM1JeytVvL2G61/5OI77nNf6Ys5dv87y3jk8i+4rVcd+2VWIozEg21mIuK EwE0f9g5MwMAAA== X-CMS-MailID: 20230602110646eucas1p115dd1191419eb10bca47c9a6eefa6450 X-Msg-Generator: CA X-RootMTR: 20230602110646eucas1p115dd1191419eb10bca47c9a6eefa6450 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230602110646eucas1p115dd1191419eb10bca47c9a6eefa6450 References: <20230602110638.789426-1-j.granados@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Preparation commit to add a new type of test to test_sysctl.c. We want to differentiate between node and (sub)directory tests. Signed-off-by: Joel Granados --- lib/test_sysctl.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c index e2a816d85ea2..0cf7c547d61a 100644 --- a/lib/test_sysctl.c +++ b/lib/test_sysctl.c @@ -126,9 +126,7 @@ static struct ctl_table test_table[] = { { } }; -static struct ctl_table_header *test_sysctl_header; - -static int __init test_sysctl_init(void) +static void test_sysctl_calc_match_int_ok(void) { int i; @@ -153,7 +151,13 @@ static int __init test_sysctl_init(void) for (i = 0; i < ARRAY_SIZE(match_int); i++) if (match_int[i].defined != match_int[i].wanted) match_int_ok = 0; +} +static struct ctl_table_header *test_sysctl_header; + +static int test_sysctl_setup_node_tests(void) +{ + test_sysctl_calc_match_int_ok(); test_data.bitmap_0001 = kzalloc(SYSCTL_TEST_BITMAP_SIZE/8, GFP_KERNEL); if (!test_data.bitmap_0001) return -ENOMEM; @@ -162,8 +166,18 @@ static int __init test_sysctl_init(void) kfree(test_data.bitmap_0001); return -ENOMEM; } + return 0; } + +static int __init test_sysctl_init(void) +{ + int err; + + err = test_sysctl_setup_node_tests(); + + return err; +} module_init(test_sysctl_init); static void __exit test_sysctl_exit(void) From patchwork Fri Jun 2 11:06:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 688592 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C3FFC7EE24 for ; Fri, 2 Jun 2023 11:07:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235301AbjFBLHk (ORCPT ); Fri, 2 Jun 2023 07:07:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235852AbjFBLH1 (ORCPT ); Fri, 2 Jun 2023 07:07:27 -0400 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA231E47 for ; Fri, 2 Jun 2023 04:07:02 -0700 (PDT) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110649euoutp017c3495b697e8c7e1e8b3727d8488292c~k0t2gd8380063500635euoutp01H for ; Fri, 2 Jun 2023 11:06:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230602110649euoutp017c3495b697e8c7e1e8b3727d8488292c~k0t2gd8380063500635euoutp01H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685704009; bh=f1HjrLD6njVVPjduaddJfi5+Ds9joRkOIy3esLq1bnY=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=k0PEgADhvo9GS/8EziJJ8+YBDRBajjsrbEBycS2y3yquOZqIH/7/yezUD5rIA2oBj SkfPi0x0Slsy9VUBzRSI7D0JAaM3EKB6GRXf/qJa81xdmukBg1zs2WNTytDVoaMDsz WAyje9wOMKFrKEG2tyyx/rDdC6jghlVqjfzaaEms= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230602110649eucas1p28840581b7ed263d9183eb206ae73eb8b~k0t2PEHvj3164631646eucas1p2s; Fri, 2 Jun 2023 11:06:49 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id F0.77.11320.94DC9746; Fri, 2 Jun 2023 12:06:49 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230602110649eucas1p1fc4db9a31735ed13e14c3142e1edb23b~k0t2AAFU52550025500eucas1p1s; Fri, 2 Jun 2023 11:06:49 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230602110649eusmtrp117f0da1caa43f6460c75da86d68d59c4~k0t1-iGSw2194821948eusmtrp1l; Fri, 2 Jun 2023 11:06:49 +0000 (GMT) X-AuditID: cbfec7f4-993ff70000022c38-85-6479cd49faef Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id BA.A9.10549.94DC9746; Fri, 2 Jun 2023 12:06:49 +0100 (BST) Received: from CAMSVWEXC02.scsc.local (unknown [106.1.227.72]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230602110649eusmtip129b8cc86ce1cff9465c3b2643e67ef54~k0t1yIPZj0530205302eusmtip1U; Fri, 2 Jun 2023 11:06:49 +0000 (GMT) Received: from localhost (106.210.248.205) by CAMSVWEXC02.scsc.local (2002:6a01:e348::6a01:e348) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 2 Jun 2023 12:06:48 +0100 From: Joel Granados To: CC: , , , Joel Granados Subject: [PATCH 4/8] test_sysctl: Add an unregister sysctl test Date: Fri, 2 Jun 2023 13:06:34 +0200 Message-ID: <20230602110638.789426-5-j.granados@samsung.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230602110638.789426-1-j.granados@samsung.com> MIME-Version: 1.0 X-Originating-IP: [106.210.248.205] X-ClientProxiedBy: CAMSVWEXC01.scsc.local (2002:6a01:e347::6a01:e347) To CAMSVWEXC02.scsc.local (2002:6a01:e348::6a01:e348) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJIsWRmVeSWpSXmKPExsWy7djP87qeZytTDO5uU7DYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgiuKySUnNySxLLdK3S+DKONSyhLHgtEjFqv67LA2M bwS6GDk5JARMJPq2v2bqYuTiEBJYwSjxr2cNI4TzhVHi56OtUM5nRom3H1qYYFrWdJ1kgUgs Z5R4f+koC1zVx/+rWSGcLYwStyavYQdpYRPQkTj/5g4ziC0iIC5x4vRmsLnMAhMYJfrW/WIB SQgL2EvMO3YNbAeLgIrEqRuzWEFsXgEbidnH1rBC7JaXaLs+nRHE5hSwlTh0+gwbRI2gxMmZ T8DmMAPVNG+dzQxhS0gcfPGCGaJXWWLCut9Qc2olTm25Bfa2hMARDombT3dAFblIND7+yghh C0u8Or6FHcKWkTg9uYcFomEyo8T+fx/YIZzVjBLLGr9Cg8ZaouXKE6gOR4l/57uAbA4gm0/i xltBiIv4JCZtm84MEeaV6GgTmsCoMgvJD7OQ/DALyQ8LGJlXMYqnlhbnpqcWG+WllusVJ+YW l+al6yXn525iBKaO0/+Of9nBuPzVR71DjEwcjIcYJTiYlUR4hcLKU4R4UxIrq1KL8uOLSnNS iw8xSnOwKInzatueTBYSSE8sSc1OTS1ILYLJMnFwSjUwWVUy3fw9uf5l+cLXlvFfFJaq7VzE YcQufCTiueHBgOeiXgFpXd+WfNkptOXe5NPvhH8828Bvc/rxEmUu/6+1Mzy37bpVsvJky8d5 GUuOGIjd28P4Z233SvOv6zP0Gw4GrGub867ft3zD/L/3o5j4NjLk/1Q8KSv5mSmRM29CwrzP cwJ/7JrDbfBcdf31HfITrhoeql91/WVWnNj0CzY/j2Z9LoteejHL57LK4Qi315oup9e/WFcu 4nhho4jnmaJT6TqvuJ1bptx2jfA+o+5umS3/ycxijbven/jKT5+03+t2PbvMslSaoSuvd474 RrU7yZ/svS/Z597Oeuw+YV/e1AtGgdoCC5f8f/X91oIE3ywlluKMREMt5qLiRAAIYHaBjAMA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPIsWRmVeSWpSXmKPExsVy+t/xu7qeZytTDP6e4LbYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgitKzKcovLUlVyMgvLrFVija0MNIztLTQMzKx1DM0 No+1MjJV0rezSUnNySxLLdK3S9DLONSyhLHgtEjFqv67LA2MbwS6GDk5JARMJNZ0nWQBsYUE ljJKTF/jDBGXkdj45SorhC0s8edaF1sXIxdQzUdGiXN3n0I5WxglWs5OZAOpYhPQkTj/5g4z iC0iIC5x4vRmRpAiZoEJjBJ9636BrRAWsJeYd+waE4jNIqAicerGLLAVvAI2ErOPrYFaJy/R dn06I4jNKWArcej0GTaI82wk1p+5wA5RLyhxcuYTsJnMQPXNW2czQ9gSEgdfvGCGmKMsMWHd b6iZtRKf/z5jnMAoMgtJ+ywk7bOQtC9gZF7FKJJaWpybnltsqFecmFtcmpeul5yfu4kRGFPb jv3cvINx3quPeocYmTgYDzFKcDArifAKhZWnCPGmJFZWpRblxxeV5qQWH2I0BfpzIrOUaHI+ MKrzSuINzQxMDU3MLA1MLc2MlcR5PQs6EoUE0hNLUrNTUwtSi2D6mDg4pRqYVI/r7353sMEn d5PRV/ZF0x0WfNm58vqKvtVyrMus9qbErH7V15Zzj/uVEOfaR8cWZ54wMHor0Rn0SurBs3PZ pRt6FTg+McUcvT7T8f/6lTGyrzYxiqixT1sfaPsuenXG8oSFC900ptzdp/m22cP47e8/a648 1pogs1Fq7uUNs8xWn67YmbpKszS3cuLynGcM1ycuX78r70jAw8jLmZfDOh47pof3r9A9yOw5 cwmzBv+xKzvrEx6xu8xS8+eTnbm0Xujig5O60bYB388s/lB/vmvDPOabu+VmxytYsufzTX5m cvXpbJn+qK9la4r1T3ZrXDvW3yr4KOfeUj7zf66uco+l7874p84h9uCtzdwdopuUWIozEg21 mIuKEwEfEtWDMgMAAA== X-CMS-MailID: 20230602110649eucas1p1fc4db9a31735ed13e14c3142e1edb23b X-Msg-Generator: CA X-RootMTR: 20230602110649eucas1p1fc4db9a31735ed13e14c3142e1edb23b X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230602110649eucas1p1fc4db9a31735ed13e14c3142e1edb23b References: <20230602110638.789426-1-j.granados@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add a test that checks that the unregistered directory is removed from /proc/sys/debug Signed-off-by: Joel Granados --- lib/test_sysctl.c | 30 ++++++++++++++++++++++++ tools/testing/selftests/sysctl/sysctl.sh | 16 +++++++++++++ 2 files changed, 46 insertions(+) diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c index 0cf7c547d61a..555244687443 100644 --- a/lib/test_sysctl.c +++ b/lib/test_sysctl.c @@ -170,12 +170,42 @@ static int test_sysctl_setup_node_tests(void) return 0; } +/* Used to test that unregister actually removes the directory */ +static struct ctl_table test_table_unregister[] = { + { + .procname = "unregister_error", + .data = &test_data.int_0001, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + }, + {} +}; + +static int test_sysctl_run_unregister_nested(void) +{ + struct ctl_table_header *unregister; + + unregister = register_sysctl("debug/test_sysctl/unregister_error", + test_table_unregister); + if (!unregister) + return -ENOMEM; + + unregister_sysctl_table(unregister); + return 0; +} + static int __init test_sysctl_init(void) { int err; err = test_sysctl_setup_node_tests(); + if (err) + goto out; + err = test_sysctl_run_unregister_nested(); + +out: return err; } module_init(test_sysctl_init); diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh index cb8f83dfe16b..a6d79d7a36e4 100755 --- a/tools/testing/selftests/sysctl/sysctl.sh +++ b/tools/testing/selftests/sysctl/sysctl.sh @@ -31,6 +31,7 @@ ALL_TESTS="$ALL_TESTS 0005:3:1:int_0003" ALL_TESTS="$ALL_TESTS 0006:50:1:bitmap_0001" ALL_TESTS="$ALL_TESTS 0007:1:1:boot_int" ALL_TESTS="$ALL_TESTS 0008:1:1:match_int" +ALL_TESTS="$ALL_TESTS 0009:1:1:unregister_error" function allow_user_defaults() { @@ -797,6 +798,20 @@ sysctl_test_0008() return 0 } +sysctl_test_0009() +{ + TARGET="${SYSCTL}/$(get_test_target 0009)" + echo -n "Testing if $TARGET unregistered correctly ..." + if [ -d $TARGET ]; then + echo "TEST FAILED" + rc=1 + test_rc + fi + + echo "ok" + return 0 +} + list_tests() { echo "Test ID list:" @@ -813,6 +828,7 @@ list_tests() echo "0006 x $(get_test_count 0006) - tests proc_do_large_bitmap()" echo "0007 x $(get_test_count 0007) - tests setting sysctl from kernel boot param" echo "0008 x $(get_test_count 0008) - tests sysctl macro values match" + echo "0009 x $(get_test_count 0009) - tests sysct unregister" } usage() From patchwork Fri Jun 2 11:06:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 688594 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7884DC7EE2C for ; Fri, 2 Jun 2023 11:07:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235897AbjFBLHg (ORCPT ); Fri, 2 Jun 2023 07:07:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235846AbjFBLH0 (ORCPT ); Fri, 2 Jun 2023 07:07:26 -0400 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 756DEE42 for ; Fri, 2 Jun 2023 04:07:01 -0700 (PDT) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110651euoutp02aa6c490559bc46be20ca1133ed332ec5~k0t3x3g6k3126531265euoutp02G for ; Fri, 2 Jun 2023 11:06:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230602110651euoutp02aa6c490559bc46be20ca1133ed332ec5~k0t3x3g6k3126531265euoutp02G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685704011; bh=bxclUZv9jPrQ5jKcyYEbND/Krq83dxgsRJ8rzENWdE8=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=nwgMTkPtOstQSgGbGvbFM77EiUqy78EItNzVChb35/ko9FezeXJDwfuzh3zsT9UG5 GMaQ6JYATiSCwlPEcdUn3xfNCf28D2lWPFNpALNWAPJH6/q0LFXlDD+hxQkpsTECHe CM+eAYQSWOfOX/3X4UJIWkE1LlYfuf186vPUzeAI= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230602110651eucas1p14e20bc6236c10d4fc8d6e271e60ffb79~k0t3rdCIa0212702127eucas1p1a; Fri, 2 Jun 2023 11:06:51 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 78.6A.42423.B4DC9746; Fri, 2 Jun 2023 12:06:51 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230602110650eucas1p1e04fdac1151ed028d1d081cf30433174~k0t3Ycr2b2548925489eucas1p1m; Fri, 2 Jun 2023 11:06:50 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230602110650eusmtrp124d79e1d2067604f7bd0bfd887a8c663~k0t3X77E72194821948eusmtrp1o; Fri, 2 Jun 2023 11:06:50 +0000 (GMT) X-AuditID: cbfec7f2-a3bff7000002a5b7-44-6479cd4bf821 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id EB.A9.10549.A4DC9746; Fri, 2 Jun 2023 12:06:50 +0100 (BST) Received: from CAMSVWEXC02.scsc.local (unknown [106.1.227.72]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230602110650eusmtip2aef1f882657ce0c13324aa492ba559cd~k0t3NbY5X0430104301eusmtip23; Fri, 2 Jun 2023 11:06:50 +0000 (GMT) Received: from localhost (106.210.248.205) by CAMSVWEXC02.scsc.local (2002:6a01:e348::6a01:e348) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 2 Jun 2023 12:06:50 +0100 From: Joel Granados To: CC: , , , Joel Granados Subject: [PATCH 5/8] test_sysctl: Add an option to prevent test skip Date: Fri, 2 Jun 2023 13:06:35 +0200 Message-ID: <20230602110638.789426-6-j.granados@samsung.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230602110638.789426-1-j.granados@samsung.com> MIME-Version: 1.0 X-Originating-IP: [106.210.248.205] X-ClientProxiedBy: CAMSVWEXC01.scsc.local (2002:6a01:e347::6a01:e347) To CAMSVWEXC02.scsc.local (2002:6a01:e348::6a01:e348) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBIsWRmVeSWpSXmKPExsWy7djPc7reZytTDI7+ZLHYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgiuKySUnNySxLLdK3S+DKWHG3m6Xgn2zFuktP2RoY 70t0MXJySAiYSHRd3cfcxcjFISSwglHiUusGdgjnC6PE1i/fWCCcz4wSU5dOYYdpaTjykQ0i sZxRovfWNna4qlmNO1khnC2MEo8+rAJrYRPQkTj/5g4ziC0iIC5x4vRmRpAiZoEJjBJ9636x gCSEBVwkelp/MXUxcnCwCKhIHPljAhLmFbCR+L1xFTPEanmJtuvTGUFsTgFbiUOnz7BB1AhK nJz5BGwMM1BN89bZzBC2hMTBFy+gepUlJqz7zQph10qc2nKLCeQGCYEDHBLH5nQxQSRcJJr2 zmGEsIUlXh3fAvWzjMTpyT0sEA2TGSX2//vADuGsZpRY1vgVqttaouXKE6gOR4kPU1rZQL6R EOCTuPFWEOIiPolJ26YzQ4R5JTrahCYwqsxC8sMsJD/MQvLDAkbmVYziqaXFuempxYZ5qeV6 xYm5xaV56XrJ+bmbGIGJ4/S/4592MM599VHvECMTB+MhRgkOZiURXqGw8hQh3pTEyqrUovz4 otKc1OJDjNIcLErivNq2J5OFBNITS1KzU1MLUotgskwcnFINTLM+HwoWFrIwOnY8/Jaawkwv 3W+lfx8yLxbwsPy7vzP3TeP5s9ksLIWG7kcrj8Re31cu0fyIb+L5GQFrdtjeDhYWnqGwx2mb RczPuecWXC2rySyPtv36SOL77sLPLdfTlnxYmeWzPO2xxs9VVxJnPPibyuh6ZCbjbdWd2l8M 70Q9U109q8JXckX+g675JbszK7qniLY6fnu7O8TfZKbDpPmv0r4dbrOwcsv7+PS8/iSXzG3M VQ9v3cq/sO/CZTbO86/Uzaao9SeKrYm0VpNW06j4ud/HSeZEcJfl/GlPlolyLL/Uabz8PEPO nC+PFfg5q1mWOq2fwx3y+gDznTzNJ1825YX3tFxddUHY1dXm3zslluKMREMt5qLiRACx43L5 iwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHIsWRmVeSWpSXmKPExsVy+t/xe7peZytTDA4t1rHYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgitKzKcovLUlVyMgvLrFVija0MNIztLTQMzKx1DM0 No+1MjJV0rezSUnNySxLLdK3S9DLWHG3m6Xgn2zFuktP2RoY70t0MXJySAiYSDQc+cgGYgsJ LGWUuLStBiIuI7Hxy1VWCFtY4s+1LqAaLqCaj4wSPaevs0A4WxglLm/oZwSpYhPQkTj/5g4z iC0iIC5x4vRmRpAiZoEJjBJ9636xgCSEBVwkelp/MXUxcnCwCKhIHPljAhLmFbCR+L1xFTPE NnmJtuvTwWZyCthKHDp9Buo6G4n1Zy6wQ9QLSpyc+QRsJDNQffPW2cwQtoTEwRcvoOYoS0xY 9xvqg1qJz3+fMU5gFJmFpH0WkvZZSNoXMDKvYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECIyo bcd+bt7BOO/VR71DjEwcjIcYJTiYlUR4hcLKU4R4UxIrq1KL8uOLSnNSiw8xmgK9OZFZSjQ5 HxjTeSXxhmYGpoYmZpYGppZmxkrivJ4FHYlCAumJJanZqakFqUUwfUwcnFINTBZSoqvcHsT/ XLtnkWSSicn+iwuSO5n4XnuFSl7fFlsR99T+jcv+pdfXl64XyvxtJqgcZzP9YPHCin+Zy29a OnCoiW+tvcInJHR1T9SBf8EBVd+nf/pqnRq94X5PgtiH2JPbk3NXCxYYPNta/nqx37Npcckc 5z5tebIvzvjvj7yuqIYcD6lthy/pW61rdNIOfRwzmdn4yf3V0TJTHC5suT2tcrFrgkLiW7kt 0spp1bKPNZqmfVBz2LdNSjJY/n3o7H8ftM8tj5fsvGGrl227nsG8jmWmbehxdyapbzvuc6/6 o+cyfVfYFuY5/UaT38yW50p1scq4HVjN7atyuIPRi/Va4u0jhQu0567YFqVSpMRSnJFoqMVc VJwIAMNhuCYxAwAA X-CMS-MailID: 20230602110650eucas1p1e04fdac1151ed028d1d081cf30433174 X-Msg-Generator: CA X-RootMTR: 20230602110650eucas1p1e04fdac1151ed028d1d081cf30433174 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230602110650eucas1p1e04fdac1151ed028d1d081cf30433174 References: <20230602110638.789426-1-j.granados@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Tests were being skipped because the target was not present. Add a flag that controls whether to skip a test based on the presence of the target. Actually skip tests in the test_case function with a "return" instead of a "continue". Signed-off-by: Joel Granados --- tools/testing/selftests/sysctl/sysctl.sh | 66 ++++++++++++++++-------- 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh index a6d79d7a36e4..9c0e9711138b 100755 --- a/tools/testing/selftests/sysctl/sysctl.sh +++ b/tools/testing/selftests/sysctl/sysctl.sh @@ -14,24 +14,26 @@ TEST_FILE=$(mktemp) # This represents # -# TEST_ID:TEST_COUNT:ENABLED:TARGET +# TEST_ID:TEST_COUNT:ENABLED:TARGET:SKIP_NO_TARGET # # TEST_ID: is the test id number # TEST_COUNT: number of times we should run the test # ENABLED: 1 if enabled, 0 otherwise # TARGET: test target file required on the test_sysctl module +# SKIP_NO_TARGET: 1 skip if TARGET not there +# 0 run eventhough TARGET not there # # Once these are enabled please leave them as-is. Write your own test, # we have tons of space. -ALL_TESTS="0001:1:1:int_0001" -ALL_TESTS="$ALL_TESTS 0002:1:1:string_0001" -ALL_TESTS="$ALL_TESTS 0003:1:1:int_0002" -ALL_TESTS="$ALL_TESTS 0004:1:1:uint_0001" -ALL_TESTS="$ALL_TESTS 0005:3:1:int_0003" -ALL_TESTS="$ALL_TESTS 0006:50:1:bitmap_0001" -ALL_TESTS="$ALL_TESTS 0007:1:1:boot_int" -ALL_TESTS="$ALL_TESTS 0008:1:1:match_int" -ALL_TESTS="$ALL_TESTS 0009:1:1:unregister_error" +ALL_TESTS="0001:1:1:int_0001:1" +ALL_TESTS="$ALL_TESTS 0002:1:1:string_0001:1" +ALL_TESTS="$ALL_TESTS 0003:1:1:int_0002:1" +ALL_TESTS="$ALL_TESTS 0004:1:1:uint_0001:1" +ALL_TESTS="$ALL_TESTS 0005:3:1:int_0003:1" +ALL_TESTS="$ALL_TESTS 0006:50:1:bitmap_0001:1" +ALL_TESTS="$ALL_TESTS 0007:1:1:boot_int:1" +ALL_TESTS="$ALL_TESTS 0008:1:1:match_int:1" +ALL_TESTS="$ALL_TESTS 0009:1:1:unregister_error:0" function allow_user_defaults() { @@ -614,7 +616,6 @@ target_exists() TEST_ID="$2" if [ ! -f ${TARGET} ] ; then - echo "Target for test $TEST_ID: $TARGET not exist, skipping test ..." return 0 fi return 1 @@ -902,16 +903,36 @@ function get_test_target() echo ${TEST_DATA} | awk -F":" '{print $4}' } +function get_test_skip_no_target() +{ + test_num $1 + awk_field=$(remove_leading_zeros $1) + TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$awk_field'}') + echo ${TEST_DATA} | awk -F":" '{print $5}' +} + +function skip_test() +{ + TEST_ID=$1 + TEST_TARGET=$2 + if target_exists $TEST_TARGET $TEST_ID; then + TEST_SKIP=$(get_test_skip_no_target $TEST_ID) + if [[ $TEST_SKIP -eq "1" ]]; then + echo "Target for test $TEST_ID: $TEST_TARGET not exist, skipping test ..." + return 0 + fi + fi + return 1 +} + function run_all_tests() { for i in $ALL_TESTS ; do - TEST_ID=${i%:*:*:*} + TEST_ID=${i%:*:*:*:*} ENABLED=$(get_test_enabled $TEST_ID) TEST_COUNT=$(get_test_count $TEST_ID) TEST_TARGET=$(get_test_target $TEST_ID) - if target_exists $TEST_TARGET $TEST_ID; then - continue - fi + if [[ $ENABLED -eq "1" ]]; then test_case $TEST_ID $TEST_COUNT $TEST_TARGET fi @@ -946,18 +967,19 @@ function watch_case() function test_case() { + TEST_ID=$1 NUM_TESTS=$2 + TARGET=$3 - i=0 - - if target_exists $3 $1; then - continue + if skip_test $TEST_ID $TARGET; then + return fi + i=0 while [ $i -lt $NUM_TESTS ]; do - test_num $1 - watch_log $i ${TEST_NAME}_test_$1 noclear - RUN_TEST=${TEST_NAME}_test_$1 + test_num $TEST_ID + watch_log $i ${TEST_NAME}_test_${TEST_ID} noclear + RUN_TEST=${TEST_NAME}_test_${TEST_ID} $RUN_TEST let i=$i+1 done