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: 102485 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp944294vqr; Fri, 2 Jun 2023 04:09:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4KLDQ5n8g+LL9vNLO7KYKpJ9XxFQVUV+vdXyW50RXp7LJn0sZr1r4bT75cdFQGnHSimu/1 X-Received: by 2002:a17:90a:70c4:b0:256:ae6e:993d with SMTP id a4-20020a17090a70c400b00256ae6e993dmr2425808pjm.1.1685704157374; Fri, 02 Jun 2023 04:09:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685704157; cv=none; d=google.com; s=arc-20160816; b=G638Ys4Be5SkSWTXidnAUipkkMM6UFzUcHEwp16RgdBTifeu56UCRj/vuroJR/qYDc yl8aAmUY1l3D6nUbeOn1hCRBegWT7zHgk4HmxTtMrysGYOZHDPln1fwRcEQlJdFiU81U NCBLq00Q8kPPDKfy9CAnzhcwgqP5jB/Q84ity0XIVzdBfMnCp8SACjNLXdqkCHi7B8n5 wwS+AhBGMoXkY6xhFOm3KwfJlmSV9Z9HFsBroSW5XCC1nEi92P22JnrdNFIZXo3h7YbW KnstK6pX63OnLGS+spZo1mNNxUtZy1j+BLiDPCTMVpGdbZDc1zcHx/Z0G48mgnV6fio5 qtHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:cms-type:content-transfer-encoding :mime-version:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=dg1KPdqa1g30CQqgCK1VP5CwiQO47gFwHbWyH2hvLF4=; b=Wd4VuU1I0yUSQtAVMtAJwm41ZF+s9ZwrwHOg2f9akpqUT7T9qUWB9WoDCNpajZ62W4 AIxCZhpg5XATAEqP9GGNSJ9whO4fe8SoZhEswQ3AI6d3guu0jGCfiYGmQ7V1FrAI7OVQ iBea2ZlgTl/q9aKO4jiQ5YAWzWjPaN3C7CYH1oeviHfypzZAYayDN780ABsnu+pvLDWm RyYw+VrxWtQ//ZFgpY4dW3HyCGDHvI/ByoSTiO8J6zyqGYg0P3ngUIY/syrofAkjux1T cIs/AKoLGdOVQVDRRyfg/USeFpbOa4N4hlrFIXt+s9WU8I1L5bfrYlkotAQPG41SRTyv JPtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=A5l5Dp0A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rj14-20020a17090b3e8e00b002563e365aeasi940332pjb.53.2023.06.02.04.09.03; Fri, 02 Jun 2023 04:09:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=A5l5Dp0A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235549AbjFBLHJ (ORCPT + 99 others); Fri, 2 Jun 2023 07:07:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235107AbjFBLHA (ORCPT ); Fri, 2 Jun 2023 07:07:00 -0400 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D218313E for ; Fri, 2 Jun 2023 04:06:43 -0700 (PDT) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110642euoutp02f4f42ea2c575fd17332f6f652a4223a5~k0tvuC0eL3126731267euoutp02D for ; Fri, 2 Jun 2023 11:06:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230602110642euoutp02f4f42ea2c575fd17332f6f652a4223a5~k0tvuC0eL3126731267euoutp02D 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> X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767588922616080032?= X-GMAIL-MSGID: =?utf-8?q?1767588922616080032?= 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:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 102494 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp950274vqr; Fri, 2 Jun 2023 04:19:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ49oxbwDbsPnaCOAsrHCBVrg2p638N95qAS0hY51BLC9uuunHjIyE/RDMoLTGVcu16BVU+G X-Received: by 2002:a05:6358:7242:b0:123:3f75:f56a with SMTP id i2-20020a056358724200b001233f75f56amr7784994rwa.0.1685704769511; Fri, 02 Jun 2023 04:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685704769; cv=none; d=google.com; s=arc-20160816; b=vSri5j4p0wyQ6JViVCdCTc52YnVddcpmTHeBLToyEcZE+GBu+paS0AotWz+ybzCnb5 Zep9m5tyiNHVMMPdVV4BKmLrKaMv8DaOny8GPQRQTqteDJlb5i9pOX5nsdlqae7I85U/ hjnljN1JI3pQ7RYShfcpWZs0fwxTFtsgEv3M3wXee0JY+V2r4K5s0VaPVOAlUlOhu+Ny h6+SRYm4rBySFjWMGK/+m4nLIDSdwTAeQ7rEXScSw5kmOdpO/OrsNDEfTkv6CfuYBmm4 47EEW5XXRabEe/g6DwOtSmGkwjB3ozffQ9rJ4bglkNTrHejZ8kBuLvDNhISoNxl69NHs n4JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:cms-type:content-transfer-encoding :mime-version:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=gwuzFK21w1IOUF2ZGdDkpZFWv7+ktlTmNmcMNJTZlNE=; b=0WWYd3t/3MVzk44TgrGCy0gRC5gAeKCOA59TtjjMc2FiImggmS/Fn1olEvFNxO4xgO 6X5/d2bYzAzc2boF6NhgThsBTXXmN4C6taMKpJpE6gRwemV10lxzsg+u+doczO6HtFpy 4zcA3u93L3lOP6z33bPvx7dcemjfNSywrSjn9nGEU6szvLwp6fexAe8p03cHEYdO5hvQ ksk1HRRFrGcP63PHigkydFCX+7aZarLSLqLSmbatUofEYqOt9TG8bLr4aF/B+bKHkNNS P7cJXE7S5yK5NVAGP1jAD40zZtK4lWge52Yuz1vEeR7Lc0QHr+LTexktopw1NW5SGrKT V8BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=lcErz3Zn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j189-20020a636ec6000000b0051423af249fsi866320pgc.304.2023.06.02.04.19.15; Fri, 02 Jun 2023 04:19:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=lcErz3Zn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235822AbjFBLHR (ORCPT + 99 others); Fri, 2 Jun 2023 07:07:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235054AbjFBLHE (ORCPT ); Fri, 2 Jun 2023 07:07:04 -0400 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE244E62 for ; Fri, 2 Jun 2023 04:06:46 -0700 (PDT) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110645euoutp017eb5fef9d52f3cd7fa95167977d4c49b~k0tysvedV0189401894euoutp01o for ; Fri, 2 Jun 2023 11:06:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230602110645euoutp017eb5fef9d52f3cd7fa95167977d4c49b~k0tysvedV0189401894euoutp01o DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685704005; bh=gwuzFK21w1IOUF2ZGdDkpZFWv7+ktlTmNmcMNJTZlNE=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=lcErz3Znew6Cqgq6ClEyB0FClsY3UnYnjd0HLH70Qz3y2F9yhnV3JaRUXWBniT47r u++2iOnhmF0rlaTnXDYEx223Mo1dGpcbe+Xapd8uuLQnJ4NyJeM1bINIY+0PJCanCd 6NFT30IHbGkWNHfw2pOnXwiWNVjfSKBccKG3m+ec= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230602110645eucas1p2443fb17acbed500c524607354f4e339f~k0tyoJ_Bo0783007830eucas1p2P; Fri, 2 Jun 2023 11:06:45 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 54.6A.42423.54DC9746; Fri, 2 Jun 2023 12:06:45 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230602110645eucas1p1ee5f3fe8c849258d7773288e1607e183~k0tyREed30212702127eucas1p1U; Fri, 2 Jun 2023 11:06:45 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230602110645eusmtrp14019d1d594f4a33202fbe00e12e43d12~k0tyQn6No2194821948eusmtrp1Z; Fri, 2 Jun 2023 11:06:45 +0000 (GMT) X-AuditID: cbfec7f2-a51ff7000002a5b7-33-6479cd45188b Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 26.A9.10549.54DC9746; Fri, 2 Jun 2023 12:06:45 +0100 (BST) Received: from CAMSVWEXC02.scsc.local (unknown [106.1.227.72]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230602110645eusmtip23cc9b3b71b8ced0fc78dfa05a342c3a8~k0tyGqxd_1061810618eusmtip2E; Fri, 2 Jun 2023 11:06:45 +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:44 +0100 From: Joel Granados To: CC: , , , Joel Granados Subject: [PATCH 2/8] test_sysctl: Fix test metadata getters Date: Fri, 2 Jun 2023 13:06:32 +0200 Message-ID: <20230602110638.789426-3-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+NgFvrOIsWRmVeSWpSXmKPExsWy7djP87quZytTDK4eU7bYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgiuKySUnNySxLLdK3S+DKeHr9G3PBVqGKu31bmBoY u/m7GDk4JARMJO6csexi5OIQEljBKPH1SDcjhPOFUWLHscvsEM5nRomu2fuAHE6wjrWzG6Gq ljNKrJ31hwmu6vT+r6wQzhZGibZdT1hBWtgEdCTOv7nDDGKLCIhLnDi9GaydWWACo0Tful8s IAlhAWuJOSt7wXawCKhI9HxZzgRi8wrYSOycu5kNYre8RNv16YwgNqeArcSh02fYIGoEJU7O fAI2hxmopnnrbGYIW0Li4IsXzBC9yhIT1v1mhbBrJU5tuQV2toTAAQ6Jv90fmSDB4SIxpSsM okZY4tXxLVA/y0icntzDAlE/mVFi/78P7BDOakaJZY1fmSCqrCVarjyB6nCUOHy8mxliKJ/E jbeCEAfxSUzaNh0qzCvR0SY0gVFlFpIXZiF5YRaSFxYwMq9iFE8tLc5NTy02zEst1ytOzC0u zUvXS87P3cQITBun/x3/tINx7quPeocYmTgYDzFKcDArifAKhZWnCPGmJFZWpRblxxeV5qQW H2KU5mBREufVtj2ZLCSQnliSmp2aWpBaBJNl4uCUamBiW7pqlT+3/NeKf/+frTN+LvGzf1e6 Eff/xyqaG9e6dchEPz77f+l/8xVWj/7bf+SfHb9l5u/8YlHmiVtd1Wp80rdpHnnVp694zrn/ dOuZkA23XLMdGH+kbHWLa3Cv+jLPvnyCqf3SSNPYwJaF3xWdZr7UOiWhIaPj3rbhR+GkGy9d yjo78hWOzIo2mmUqrrzRSGLZy0WVu+PVrYWe6RacusAZKNLyRu57gauwS/SJibfMrAznuchn M0iVPmW8mPU366vczjtTvh9x473hffVWe0LcI+13L1al8Am+Ws+3OHhq0ILvVxfa22ftqFA4 cPO5Y0OI22Ym5RrPasMbTMd2H3gvs7Llxf4/pmcmz/2ixFKckWioxVxUnAgAMesZQIoDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRmVeSWpSXmKPExsVy+t/xe7quZytTDOau5rPYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgitKzKcovLUlVyMgvLrFVija0MNIztLTQMzKx1DM0 No+1MjJV0rezSUnNySxLLdK3S9DLeHr9G3PBVqGKu31bmBoYu/m7GDk5JARMJNbObmTsYuTi EBJYyiix8v0pRoiEjMTGL1dZIWxhiT/Xutggij4ySjQ+nssO4WxhlJjUtZ0FpIpNQEfi/Js7 zCC2iIC4xInTm8HGMgtMYJToW/cLrEhYwFpizspedhCbRUBFoufLciYQm1fARmLn3M1sEOvk JdquTwc7g1PAVuLQ6TNgcSGgmvVnLrBD1AtKnJz5BGwmM1B989bZzBC2hMTBFy+YIeYoS0xY 9xvqhVqJz3+fMU5gFJmFpH0WkvZZSNoXMDKvYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECIyq bcd+bt7BOO/VR71DjEwcjIcYJTiYlUR4hcLKU4R4UxIrq1KL8uOLSnNSiw8xmgL9OZFZSjQ5 HxjXeSXxhmYGpoYmZpYGppZmxkrivJ4FHYlCAumJJanZqakFqUUwfUwcnFINTHvbb+lOuZwx 8UCp21Ffh3XC/zjC9E+0n+VWOxNoZPGZX4THp8u61nurXGRrc0yuZSO3n9L1CC5GnuyKx8vr ymM79+ln7LcM4jvPwiS2OfZMwK9Z2ht7BUskf2m/1FI3eMnqkyCS1+pTuavvCtPMHZaLNJsK hPMNeJbN9Zm1XG2BzPf84NKgqX1NH9q5G+S8tZdsCFzcnMYm1s7+WvzxeqFrV1rPeWeL3tBf PKPq44ETkgmXDy9teMX8RkpP7zVTQUVojF1I/OvJvw7pLO+5klkdPrE6ddNiXcaNIfvb1m96 qf9yUtDtY1VCRW/XVjlP+njqnfelM3NrVY0cD/z7r3p3Ik/qo1MzVz3MEDRWYinOSDTUYi4q TgQApbbyXDMDAAA= X-CMS-MailID: 20230602110645eucas1p1ee5f3fe8c849258d7773288e1607e183 X-Msg-Generator: CA X-RootMTR: 20230602110645eucas1p1ee5f3fe8c849258d7773288e1607e183 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230602110645eucas1p1ee5f3fe8c849258d7773288e1607e183 References: <20230602110638.789426-1-j.granados@samsung.com> X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767589564218363214?= X-GMAIL-MSGID: =?utf-8?q?1767589564218363214?= The functions get_test_{count,enabled,target} use awk to get the N'th field in the ALL_TESTS variable. A variable with leading zeros (e.g. 0009) is misinterpreted as an entire line instead of the N'th field. Remove the leading zeros so this does not happen. We can now use the helper in tests 6, 7 and 8. Signed-off-by: Joel Granados --- tools/testing/selftests/sysctl/sysctl.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh index bfc54b422f25..cb8f83dfe16b 100755 --- a/tools/testing/selftests/sysctl/sysctl.sh +++ b/tools/testing/selftests/sysctl/sysctl.sh @@ -730,7 +730,7 @@ sysctl_test_0005() sysctl_test_0006() { - TARGET="${SYSCTL}/bitmap_0001" + TARGET="${SYSCTL}/$(get_test_target 0006)" reset_vals ORIG="" run_bitmaptest @@ -738,7 +738,7 @@ sysctl_test_0006() sysctl_test_0007() { - TARGET="${SYSCTL}/boot_int" + TARGET="${SYSCTL}/$(get_test_target 0007)" if [ ! -f $TARGET ]; then echo "Skipping test for $TARGET as it is not present ..." return $ksft_skip @@ -778,7 +778,7 @@ sysctl_test_0007() sysctl_test_0008() { - TARGET="${SYSCTL}/match_int" + TARGET="${SYSCTL}/$(get_test_target 0008)" if [ ! -f $TARGET ]; then echo "Skipping test for $TARGET as it is not present ..." return $ksft_skip @@ -857,25 +857,32 @@ function test_num() usage fi } +function remove_leading_zeros() +{ + echo $1 | sed 's/^0*//' +} function get_test_count() { test_num $1 - TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}') + awk_field=$(remove_leading_zeros $1) + TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$awk_field'}') echo ${TEST_DATA} | awk -F":" '{print $2}' } function get_test_enabled() { test_num $1 - TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}') + awk_field=$(remove_leading_zeros $1) + TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$awk_field'}') echo ${TEST_DATA} | awk -F":" '{print $3}' } function get_test_target() { test_num $1 - TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$1'}') + awk_field=$(remove_leading_zeros $1) + TEST_DATA=$(echo $ALL_TESTS | awk '{print $'$awk_field'}') echo ${TEST_DATA} | awk -F":" '{print $4}' } 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: 102486 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp944406vqr; Fri, 2 Jun 2023 04:09:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ay8g3GRxqdY1OJIqDOjWWPL2VuXbU04GmMp/1VscseBD3PhkniIzzGjJsOtDHrLQitwK+ X-Received: by 2002:a17:90b:3106:b0:256:38d1:eec3 with SMTP id gc6-20020a17090b310600b0025638d1eec3mr1988482pjb.38.1685704167694; Fri, 02 Jun 2023 04:09:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685704167; cv=none; d=google.com; s=arc-20160816; b=pGOcnICdwxAYjTSoNfj7S4xewGtvdBp9g2grRY6UCyhs7Q06LMK6Q0oafoSwJ/4egX JSxR4RzUVB35EMihkDL5dwKy5JNUF74thJ33rbCo6usCwuw5KBlugpR/c+388BR2Y3xL Z9ZR3xEXG2aphmAk6zd+Zt4dzusspUALg7jzOir6SeBVJngVjwikdoRgZCsSwc2h+4M6 W9GJNa1e2vnYOVFd96uztlC4wwJ2xti1UbAE/ah5kkaCg5937Xf3GTbOhSgJWHL+yfws YgqdjOvnaH5quFK9dSIcANq3dYjEQWadmnmxztWaQhTalXxBmtZdMzlhrPhCvPK/f3jh pbyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:cms-type:content-transfer-encoding :mime-version:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=hYhRLkPi8FoDCUTYM89A2RNac7EIMazIQAo5IMuTC+s=; b=itMr7R8NWksSL57XZjdBE/zjDsttgfpcvCGn0ZBwMA84hlclfAcNzyUtcXlMHYTnEb rDnnN+hOyjVkcRDvfbMs/hiakmtx5x4S9F1lnx6tBOLMLfca3sTF0Iw0+Dm1ovaFf4fC cjW/froK0SaPrctxeJqAguriRRJKo9C43bdS6/UJAlO0qLJuDzIHi1C8eaHFI7Lg4CGa DcFA8dwppSLMItXU72wHnDCVMv1WvGLa38uqhivYarK5Ufn801hahoYyk+BVbVwVw0Ib JGSDsI0VFrWD5Gu6FwKhNTHKU4FL+sdJzhmdssCUQ4a/I/tunfHs32N/rBaJKvjlthck Xntw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=F+57COks; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l5-20020a17090aec0500b0025684ce9c40si891305pjy.83.2023.06.02.04.09.12; Fri, 02 Jun 2023 04:09:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=F+57COks; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234655AbjFBLH3 (ORCPT + 99 others); Fri, 2 Jun 2023 07:07:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235828AbjFBLHR (ORCPT ); Fri, 2 Jun 2023 07:07:17 -0400 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A384195 for ; Fri, 2 Jun 2023 04:06:48 -0700 (PDT) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110647euoutp016371b3127838f2398e5fffe0d0f6ddae~k0t0EoeL50043200432euoutp01d for ; Fri, 2 Jun 2023 11:06:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230602110647euoutp016371b3127838f2398e5fffe0d0f6ddae~k0t0EoeL50043200432euoutp01d 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> X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767588933283099424?= X-GMAIL-MSGID: =?utf-8?q?1767588933283099424?= 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: 102487 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp944503vqr; Fri, 2 Jun 2023 04:09:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6yjtJIlbb/KG7B/ZrFo2rgUq4AOqACCt1bkY4ePA3lzVH12IRRWdZSI6bxy10vJxSkOCVM X-Received: by 2002:a05:6a20:3c8e:b0:10c:b1b0:3ee3 with SMTP id b14-20020a056a203c8e00b0010cb1b03ee3mr5500355pzj.21.1685704177148; Fri, 02 Jun 2023 04:09:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685704177; cv=none; d=google.com; s=arc-20160816; b=YxL+QxZrgvsm6kASfkzxtx+tIgTSoQL8pzkMOdO2fDufoCcZnaaukYnXMXLrDcYqG3 8AxvYvlh6UsgtnH8D4UV769ALGjWjaKPsmTNJ9XTzICjfv4kpV2iZSUhUGmk8tzdnkxm 85ZexA0pixugQtCtpoMuDtOcf2Dn4BTXB2GEKUxRCfc3DFkajo4K5Bg8GB043y34LKoZ WuNcW/nO8fydnCx+HaXS5lrG92car7zGMOmVaaONLydsxcrvGP80K2j1MeFLuh1/6d92 8/U4zP/7jgYvosQq+t6aMMFP3JJcOZiCq8gte7l2OgrM4svhCAaDcJn6OhEH7lLzLxEH OLtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:cms-type:content-transfer-encoding :mime-version:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=f1HjrLD6njVVPjduaddJfi5+Ds9joRkOIy3esLq1bnY=; b=PmAARu5Az+jk8qz14OwYRe+wDUAe5VqcEYinaMBu3dkhuGRk9ChXAHFy+xkkZcZZZx I8l/camEnehb6j7t1CnxvcgYzWpqMkrdQE3RWbI249DNHggyREYysZx8j//V5n4ZeOnC Z2lAWap5UhtJb0hV8nvntCYFPpUfcknzeh+7r9KIPplPUL8B+d0+qmHqIOsXXvLGPYkw GnnXpTIN5VXkyNv5m7SMAJndX9+q8yyC2uIQfCfwuc9gaJI6B2WKHQVghto4scqKThoP il7UY/URAyWUDOhpSNpo8VFFq0uvddWiRALI9HATvQEPFkUHMkcVe7QMbEUlwMuBa1TW mg6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=k0PEgADh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k8-20020aa79988000000b0064c9be61fa8si620429pfh.6.2023.06.02.04.09.22; Fri, 02 Jun 2023 04:09:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=k0PEgADh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235909AbjFBLHh (ORCPT + 99 others); Fri, 2 Jun 2023 07:07:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235845AbjFBLH0 (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 73D5DE41 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 20230602110649euoutp02827c31108c4612c79d0e7e0238bc0b2e~k0t2gQ8kf3126531265euoutp02F for ; Fri, 2 Jun 2023 11:06:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230602110649euoutp02827c31108c4612c79d0e7e0238bc0b2e~k0t2gQ8kf3126531265euoutp02F 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> X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767588942804056784?= X-GMAIL-MSGID: =?utf-8?q?1767588942804056784?= 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: 102488 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp944799vqr; Fri, 2 Jun 2023 04:10:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5pILrcuC8xrQppk/0fqixU6sYhLy0m0oBKpVPhejyG6fjPn2xXIsuLj22FV85bTATHGX6+ X-Received: by 2002:a17:902:e884:b0:1b1:84c5:8abf with SMTP id w4-20020a170902e88400b001b184c58abfmr1270555plg.49.1685704202496; Fri, 02 Jun 2023 04:10:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685704202; cv=none; d=google.com; s=arc-20160816; b=dZMfYSnOYhG7IPIxruYVriOdbytBPsNFtwrGNNjzETrcwJ6+kEbxVRlK3CFqxCGm51 Yh3Euub94B1443H/FeViCkCwfFjFJyROkSV34PsJ8Nb8pUCcVMXN977FPPl38QzECTNi hXHLnPqQaUdfznT+ZufWRo67uXcGfhOJd4h8PcGDiIUTcoGswmLtMzgQ+H0s37mIHEL4 aC1iHkki0D7M5o7ChSAiTY86yuDbE3XE/DNM/UsWZ4YVXxJ2rkPQNvPKe8HEG8TvkHRo tT6ozkMPW8pAilZK+PK2UEv4uQyRblKQ79qEccb7OfzfgudZH8gmPRzM40h6gjylxAJw 9s6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:cms-type:content-transfer-encoding :mime-version:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=bxclUZv9jPrQ5jKcyYEbND/Krq83dxgsRJ8rzENWdE8=; b=PHeIs4NBvqSgknu75mJWi1WRQmQP5evFfohQHLomRent81HUwux1K/EmHI9+sjdJdp aBvJHwO5FUdOp5HgLYRq8fNCaGC1EzT6l1kCUlC3w1WZizE/ScOvX7iVOOmRptksgNEU f9a86dH3A3BKF/4O2LEY9feecq2JZ8p98KLtG0bOjG7+zatznBXlCBt8LAYF86qQvZUH cZmVxZuW+AiX1H19h9Q6pIYQLWNmOE+nvsdemmqJlivkdCmMPlvi2EzViSOailVcIUmS Xx5XufCMDWEVSTX/EWO3atRSN7iATCLaImjANjHbbgkGRjgYjvwpvSzAx4ztDipp1/7A taLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=nwgMTkPt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t12-20020a170902bc4c00b001ae7c64654bsi731338plz.387.2023.06.02.04.09.47; Fri, 02 Jun 2023 04:10:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=nwgMTkPt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235829AbjFBLHk (ORCPT + 99 others); Fri, 2 Jun 2023 07:07:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235849AbjFBLH0 (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 73709E40 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 20230602110651euoutp02d7d7db1fbfff4a8890a6f7f03a510f46~k0t3xsNTK2929029290euoutp02t for ; Fri, 2 Jun 2023 11:06:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230602110651euoutp02d7d7db1fbfff4a8890a6f7f03a510f46~k0t3xsNTK2929029290euoutp02t 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> X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767588969861792492?= X-GMAIL-MSGID: =?utf-8?q?1767588969861792492?= 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 From patchwork Fri Jun 2 11:06:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 102489 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp944989vqr; Fri, 2 Jun 2023 04:10:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6oa/22jLNlw6sHQLEVf1h6Ddm6aitmg9sQIuDDdP7/Eso5q2ewnF9wZwNS43XvF99u4p4b X-Received: by 2002:a17:90a:7485:b0:255:63ae:f940 with SMTP id p5-20020a17090a748500b0025563aef940mr2005913pjk.36.1685704218327; Fri, 02 Jun 2023 04:10:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685704218; cv=none; d=google.com; s=arc-20160816; b=YUX5fi4mfAjIynTn8c2n8JUctdt2nYhnLW0TLc/NUx8kVw6M05bvDTJffnA6DJh9P5 qnwFMxrhH4ban1ph5lRsffyWwxMF821eKbZjERh96ulV13sWwso3yCC9523SqxTDNbND jVVr7+oo61Z3siX7fs/BbdHssnuFA0NaQIFLBYMVET7uS6/W2lVZPhIj//UR1vxkOU1S 8aknkDcm1/1ek6dWe2UOpRPIf4ZsdW4l6xemPfuvqSHG1XO8woRL0mnyQbK3m53LxJRn 7MP5RahqT0ZvTLOInSf0ZmTChc6X/4KakX6yKjIrmcPhNw31bjvOwZjZX5ebpLPPgYFB 6Gfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:cms-type:content-transfer-encoding :mime-version:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=kfxf1qr5GWf+HXq/jSKKNVDlnExuNV1LXklo/nv5rro=; b=TmuHKOA+OVrDxMcN7oaqtgY0vIECSV8TkSxkUqHI6hUiqEqmA/3HSNdVep/i+ZyF/y T0g1EDzNEk4bVSktzt7MRg38+hcHjun4NBArQagG3zft5/RjIbLg+N1YG5xk39wtIa+C HqrKNadjir6DMS1w5js9RBXQ3pC1JLgSR6xZXmBlZa7kEhX1+DKU1L5XyzduLPFTZDOH fNAnMkBu+jlSv5K8Bul880Do8OAwaag4x4uHbzpjYR3u+CuUhAbRrvusLRXzw0xmtI4+ PXVQrtsxevmeQphFqgwcbPKuQGPdjZ1uWLYg4+AcK/392hgBMiryIQTK5wRr+fU8RRfD 7zhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=qDbUlCYK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d23-20020a17090ad3d700b00251e16303f2si877115pjw.86.2023.06.02.04.10.01; Fri, 02 Jun 2023 04:10:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=qDbUlCYK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235939AbjFBLHo (ORCPT + 99 others); Fri, 2 Jun 2023 07:07:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235830AbjFBLH1 (ORCPT ); Fri, 2 Jun 2023 07:07:27 -0400 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85AA3E46 for ; Fri, 2 Jun 2023 04:07:02 -0700 (PDT) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110654euoutp02904e8423a247976647ce90216361a132~k0t6k7eY02929129291euoutp02x for ; Fri, 2 Jun 2023 11:06:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230602110654euoutp02904e8423a247976647ce90216361a132~k0t6k7eY02929129291euoutp02x DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685704014; bh=kfxf1qr5GWf+HXq/jSKKNVDlnExuNV1LXklo/nv5rro=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=qDbUlCYK5vteGCIvveFEhAOIKnOIZwIOxB1BgxJ64hzXNPxc6sBrHA4igyaR0HQaH x0VO1japVLfX6o76J/ShIIWGxJrThIiEibuTk0YGO+FCgOKemr2eSv9k4SopDGz4lp /LkxL3viu4qQV3aSWE+kGeVr+8E75esT+wgDNmcE= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230602110654eucas1p168408bec9728da4d94d35a3afe9e936e~k0t6cuSv-2550025500eucas1p1x; Fri, 2 Jun 2023 11:06:54 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 1A.6A.42423.D4DC9746; Fri, 2 Jun 2023 12:06:54 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230602110653eucas1p19b1f6aac96a61c61e49af5738a0a11ff~k0t6I_-cd0823408234eucas1p1M; Fri, 2 Jun 2023 11:06:53 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230602110653eusmtrp23493124332f3a9b991bafc65ca7bf558~k0t6IexGM2226722267eusmtrp2Y; Fri, 2 Jun 2023 11:06:53 +0000 (GMT) X-AuditID: cbfec7f2-a3bff7000002a5b7-4e-6479cd4deb3a Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id E6.EB.14344.D4DC9746; Fri, 2 Jun 2023 12:06:53 +0100 (BST) Received: from CAMSVWEXC02.scsc.local (unknown [106.1.227.72]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230602110653eusmtip117fecc7740d2420720213f1b1b20bde5~k0t6AF1NP0530205302eusmtip1X; Fri, 2 Jun 2023 11:06:53 +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:52 +0100 From: Joel Granados To: CC: , , , Joel Granados Subject: [PATCH 6/8] test_sysclt: Test for registering a mount point Date: Fri, 2 Jun 2023 13:06:36 +0200 Message-ID: <20230602110638.789426-7-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+NgFvrOIsWRmVeSWpSXmKPExsWy7djPc7p+ZytTDI50Mlns2XuSxeLyrjls FtPvvGezuDHhKaMDi8emVZ1sHp83yQUwRXHZpKTmZJalFunbJXBlPLv0ialgt3JF97eVrA2M x2W7GDk5JARMJBpefmMCsYUEVjBKXHwr2cXIBWR/YZRoP/EfKvGZUaL7oSBMw4pJs9ghipYz SvS/WckC4QAVbZ71B8rZwijxZuc8VpAWNgEdifNv7jCD2CIC4hInTm9mBCliFpjAKNG37hcL SEJYwEXi++S7YPtYBFQknu76ww5i8wrYSLya9pENYre8RNv16YwgNqeArcSh02fYIGoEJU7O fAI2hxmopnnrbGYIW0Li4IsXzBC9yhIT1v1mhbBrJU5tucUEcoSEwAEOickbT0MlXCTO7zgN tUxY4tXxLewQtozE/53zoRomM0rs//eBHcJZzSixrPErE0SVtUTLlSdQHY4SE1auBjqJA8jm k7jxVhDiIj6JSdumM0OEeSU62oQmMKrMQvLDLCQ/zELywwJG5lWM4qmlxbnpqcWGeanlesWJ ucWleel6yfm5mxiBaeP0v+OfdjDOffVR7xAjEwfjIUYJDmYlEV6hsPIUId6UxMqq1KL8+KLS nNTiQ4zSHCxK4rzatieThQTSE0tSs1NTC1KLYLJMHJxSDUy2j0/VXjodk1gUtHX2d76i33qs JYHyShvzvnXWC3IKivCVCakqXxQ/JWP+Yds7n4dlHpveP3y15SKr04JwRrEtK6ffmW1ke0Ty zdE9E/kjA/K4ZpyVfiRk8HuTU7DCaiuRotnim5Uevsh+KGH0skzs8BfWEzsint0/2KfFycrM 6THj0HkdqQ6/urOpfT13Eu1eW1qdP3XLvfH4o8oKwXuZIUVH1URVbuywZzt9bW0o56y4NfJu uxbsvdw0b8E1gyCf351bLJhuTeCoWbYwseKz8f9NCpvV2NTXld6XLtXeyPFxxh+LFetCf++9 qzf3lvf0FS+sb0l/Z9pjbDvr03HeP6aT1i6fsLsn7cX95L43SizFGYmGWsxFxYkAKSk8g4oD AAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRmVeSWpSXmKPExsVy+t/xu7q+ZytTDE5f0bbYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgitKzKcovLUlVyMgvLrFVija0MNIztLTQMzKx1DM0 No+1MjJV0rezSUnNySxLLdK3S9DLeHbpE1PBbuWK7m8rWRsYj8t2MXJySAiYSKyYNIu9i5GL Q0hgKaPErV8z2SESMhIbv1xlhbCFJf5c62KDKPrIKHF0ZRczhLOFUWL3qgOMIFVsAjoS59/c YQaxRQTEJU6c3swIUsQsMIFRom/dLxaQhLCAi8T3yXeZQGwWARWJp7v+gK3jFbCReDXtIxvE OnmJtuvTwYZyCthKHDp9BiwuBFSz/swFqHpBiZMzn4DNZAaqb946mxnClpA4+OIFM8QcZYkJ 635DvVAr8fnvM8YJjCKzkLTPQtI+C0n7AkbmVYwiqaXFuem5xUZ6xYm5xaV56XrJ+bmbGIFR te3Yzy07GFe++qh3iJGJg/EQowQHs5IIr1BYeYoQb0piZVVqUX58UWlOavEhRlOgPycyS4km 5wPjOq8k3tDMwNTQxMzSwNTSzFhJnNezoCNRSCA9sSQ1OzW1ILUIpo+Jg1OqgSm+xeyq3Ky7 FZsbZv962cm2UUfj+4YfRxiX8WRFHCq+FPT4Xxh/QeDEjanHOsS9Xs0L2+TGxt08cfb6kKh7 96v1j7XFLmVdM8t+K1+TnZfvc+ePj0W8p9ue8kjZbzn7dGHTWy6+lGfsbVvzJNYufT+f84XW a8cp64V3vRKYxjQlcseU/zPOlrrL+K5eJ5Qu8/7alpYFgfbaSZq5FxbXLGn94y2/w7tAjoux 3UpxwZU1/DwdrXczok22LWRMMf+UeujOw+LmPIupkp1bj//LcPRJ+h+6Lv94RnN/9KIJrone Ntz5d/Y+25ijE9BSHS/sVlmsOOdI3ouOs0d/6fktC/GMaLENqFH6Hhf78L/ydSWW4oxEQy3m ouJEAGm23/AzAwAA X-CMS-MailID: 20230602110653eucas1p19b1f6aac96a61c61e49af5738a0a11ff X-Msg-Generator: CA X-RootMTR: 20230602110653eucas1p19b1f6aac96a61c61e49af5738a0a11ff X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230602110653eucas1p19b1f6aac96a61c61e49af5738a0a11ff References: <20230602110638.789426-1-j.granados@samsung.com> X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767588986506418891?= X-GMAIL-MSGID: =?utf-8?q?1767588986506418891?= Test that target gets created by register_sysctl_mount_point and that no additional target can be created "on top" of a permanently empty sysctl table. Create a mount point target (mnt) in the sysctl test driver; try to create another on top of that (mnt_error). Output an error if "mnt_error" is present when we run the sysctl selftests. Signed-off-by: Joel Granados --- lib/test_sysctl.c | 45 ++++++++++++++++++++---- tools/testing/selftests/sysctl/sysctl.sh | 16 +++++++++ 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c index 555244687443..8036aa91a1cb 100644 --- a/lib/test_sysctl.c +++ b/lib/test_sysctl.c @@ -30,6 +30,13 @@ static int i_zero; static int i_one_hundred = 100; static int match_int_ok = 1; + +static struct { + struct ctl_table_header *test_h_setup_node; + struct ctl_table_header *test_h_mnt; + struct ctl_table_header *test_h_mnterror; +} sysctl_test_headers; + struct test_sysctl_data { int int_0001; int int_0002; @@ -153,16 +160,14 @@ static void test_sysctl_calc_match_int_ok(void) 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; - test_sysctl_header = register_sysctl("debug/test_sysctl", test_table); - if (!test_sysctl_header) { + sysctl_test_headers.test_h_setup_node = register_sysctl("debug/test_sysctl", test_table); + if (!sysctl_test_headers.test_h_setup_node) { kfree(test_data.bitmap_0001); return -ENOMEM; } @@ -195,6 +200,26 @@ static int test_sysctl_run_unregister_nested(void) return 0; } +static int test_sysctl_run_register_mount_point(void) +{ + sysctl_test_headers.test_h_mnt + = register_sysctl_mount_point("debug/test_sysctl/mnt"); + if (!sysctl_test_headers.test_h_mnt) + return -ENOMEM; + + sysctl_test_headers.test_h_mnterror + = register_sysctl("debug/test_sysctl/mnt/mnt_error", + test_table_unregister); + /* + * Don't check the result.: + * If it fails (expected behavior), return 0. + * If successful (missbehavior of register mount point), we want to see + * mnt_error when we run the sysctl test script + */ + + return 0; +} + static int __init test_sysctl_init(void) { int err; @@ -204,6 +229,10 @@ static int __init test_sysctl_init(void) goto out; err = test_sysctl_run_unregister_nested(); + if (err) + goto out; + + err = test_sysctl_run_register_mount_point(); out: return err; @@ -213,8 +242,12 @@ module_init(test_sysctl_init); static void __exit test_sysctl_exit(void) { kfree(test_data.bitmap_0001); - if (test_sysctl_header) - unregister_sysctl_table(test_sysctl_header); + if (sysctl_test_headers.test_h_setup_node) + unregister_sysctl_table(sysctl_test_headers.test_h_setup_node); + if (sysctl_test_headers.test_h_mnt) + unregister_sysctl_table(sysctl_test_headers.test_h_mnt); + if (sysctl_test_headers.test_h_mnterror) + unregister_sysctl_table(sysctl_test_headers.test_h_mnterror); } module_exit(test_sysctl_exit); diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh index 9c0e9711138b..444b2befda82 100755 --- a/tools/testing/selftests/sysctl/sysctl.sh +++ b/tools/testing/selftests/sysctl/sysctl.sh @@ -34,6 +34,7 @@ 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" +ALL_TESTS="$ALL_TESTS 0010:1:1:mnt/mnt_error:0" function allow_user_defaults() { @@ -813,6 +814,20 @@ sysctl_test_0009() return 0 } +sysctl_test_0010() +{ + TARGET="${SYSCTL}/$(get_test_target 0010)" + echo -n "Testing that $TARGET was not created ..." + if [ -d $TARGET ]; then + echo "TEST FAILED" + rc=1 + test_rc + fi + + echo "ok" + return 0 +} + list_tests() { echo "Test ID list:" @@ -830,6 +845,7 @@ list_tests() 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" + echo "0010 x $(get_test_count 0010) - tests sysct mount point" } usage() From patchwork Fri Jun 2 11:06:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 102497 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp951506vqr; Fri, 2 Jun 2023 04:21:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5sGe9QagfxU+R+xkReoCwcs7fVCVeuvTX2YfqL0fQ7OC+8yHsqETNYy/G3/7fwfJ6RS4jO X-Received: by 2002:a05:6a21:998a:b0:110:a18f:2653 with SMTP id ve10-20020a056a21998a00b00110a18f2653mr9128297pzb.42.1685704912188; Fri, 02 Jun 2023 04:21:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685704912; cv=none; d=google.com; s=arc-20160816; b=R/aheOJiebrw5lqgx9AZczQFEsp/KIbHwIx7vzvDuGXI/obBkH0stKW2Tr2v8KSZZn 0CzAcJeFPeCWlPyl4LvZ2zPL47akrUKP9+yXygVSvxhyyjC5+RR2+H7cBSJQh4q5ZQyL YdUfpptKMP+gSxx0IDHY9zmVul0bHWIpI7wLWRrGTkUzivlap5igilTRDj47Q38LHpeO fFpAQg/cWlz7rFq4x2grUyF3V1bvUByamknGvy2AmhyPc+pv9ie1/QRerv4Tmn/e6uVt JkeTBoBUben1L3n6s3kwNoIPloVaZHOpV5PZ1V3NbsIKYRIDBqrSQloQ9TpOHHAqGTJl Mwqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:cms-type:content-transfer-encoding :mime-version:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=k6w26tA5MuuVW167a8RaVYBvH9le+QbGGVR79rArU/4=; b=laa2hjbe64JwGlMCoMBL/KT7rbG1gTZpFTdYU0Pj+I5r7mMpj76a9OyKN1XWrrQr6Y IUG4MTOb4P9PpOtiUAudPBwuA7tQza/+ekYqiTo03VjW7JxqpujaaOdeTU4jTqcweTzt /gLc/s77VdpRfJkHR0X6oPmNaa5dS0/82AhzTXAfKSqOO793dmvujB/PfxOYgv8KD7bg kuL9Dfjmzc0A8C2EtQ/sx8s7YNs2KGzs9Tm/wTDXHhk0Efj+WFE4CetHuCIMWZYKylPv e54qsPM3NCnxCrTmPcPvK8exDc4rmmbq1S/mfLT1MBdw9phXUMFl36Y4TCYWr420wgSk frEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b="h8UHQj2/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q6-20020a170902a3c600b001a64fba3382si764224plb.148.2023.06.02.04.21.37; Fri, 02 Jun 2023 04:21:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b="h8UHQj2/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235970AbjFBLHw (ORCPT + 99 others); Fri, 2 Jun 2023 07:07:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235443AbjFBLH1 (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 F0C11E49 for ; Fri, 2 Jun 2023 04:07:05 -0700 (PDT) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110655euoutp01c46a2b07570e4fb747833e6f96a6851f~k0t8AjGsQ0110301103euoutp019 for ; Fri, 2 Jun 2023 11:06:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230602110655euoutp01c46a2b07570e4fb747833e6f96a6851f~k0t8AjGsQ0110301103euoutp019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685704015; bh=k6w26tA5MuuVW167a8RaVYBvH9le+QbGGVR79rArU/4=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=h8UHQj2/jVHqdxNAasLw3FBNzysehIA1ap5mRDIBZjzJzDX3Rvu7Sjl6PHcxRufE2 PMp89oVLf83knfN2tPL1NgTqB+YK+3M+mYUkozBYAPMrFRyjt2PAGAaDJBF6Y0KKOP OON3vcNMoqwwabRN1k1vI3lvxJjyaT+0RbJt3iu8= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230602110655eucas1p227675246ff808500707c7c36c19ed8a4~k0t73-8Gr2054620546eucas1p2e; Fri, 2 Jun 2023 11:06:55 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 96.8F.37758.F4DC9746; Fri, 2 Jun 2023 12:06:55 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230602110655eucas1p158a37f974de602978a3307dc9e4a1356~k0t7qfo190085500855eucas1p1m; Fri, 2 Jun 2023 11:06:55 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230602110655eusmtrp2078bab60da58c0b9d3e545dc16bc4eb8~k0t7p-lp02226722267eusmtrp2f; Fri, 2 Jun 2023 11:06:55 +0000 (GMT) X-AuditID: cbfec7f5-7ffff7000002937e-a9-6479cd4f2f25 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 2A.EB.14344.F4DC9746; Fri, 2 Jun 2023 12:06:55 +0100 (BST) Received: from CAMSVWEXC02.scsc.local (unknown [106.1.227.72]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230602110655eusmtip14bd9c332aca74c82127b8f77fbca7809~k0t7hYWXJ3230032300eusmtip1D; Fri, 2 Jun 2023 11:06:55 +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:54 +0100 From: Joel Granados To: CC: , , , Joel Granados Subject: [PATCH 7/8] sysctl: Remove debugging dump_stack Date: Fri, 2 Jun 2023 13:06:37 +0200 Message-ID: <20230602110638.789426-8-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+NgFvrBIsWRmVeSWpSXmKPExsWy7djPc7r+ZytTDE4/V7bYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgiuKySUnNySxLLdK3S+DKOD/xI3NBD0vFgSlP2BsY tzN3MXJySAiYSDQ2T2bpYuTiEBJYwShxZep+KOcLo8S8m6cZIZzPjBJv5+8CynCAtbTcEoSI L2eU6Lo1jx2u6FzTVSYIZwujRMea7ywgS9gEdCTOv7kDtlBEQFzixOnNYGOZBSYwSvSt+wVW JCxgIXFr1VMmEJtFQEXiw7s+sDivgI3Eoe9zWCGulZdouz6dEcTmFLCVOHT6DBtEjaDEyZlP wOqZgWqat85mhrAlJA6+eAH1qbLEhHW/oebUSpzacgvsUgmBIxwS11uPskAkXCSWNS5nh7CF JV4d3wJly0j83zkfqmEyo8T+fx/YIZzVjEAdX5kgqqwlWq48gepwlGjZ8IkdEmJ8EjfeCkJc xCcxadt0Zogwr0RHm9AERpVZSH6YheSHWUh+WMDIvIpRPLW0ODc9tdg4L7Vcrzgxt7g0L10v OT93EyMwcZz+d/zrDsYVrz7qHWJk4mA8xCjBwawkwisUVp4ixJuSWFmVWpQfX1Sak1p8iFGa g0VJnFfb9mSykEB6YklqdmpqQWoRTJaJg1OqgUl0b030Jm/+x1s2HRH78O99pZPY9usfV0Z/ srrEPfWAtpS0M/vr5G3y6itlZPiF1c3iCm0Prm74y1PNUbZ9r7e/xHR/rpvlx8x3zLe5+P1J SspE7clS7O52l3p/X2FJWbZccaVtm3T3q5hr04t32Mw42uZvzn3276+XKX5hhY+FWucam6+f KaNlfeN4q6b1jhDH50/k+SZ+dJFlPHGoTT23fArzsyQGve5LdovtWr9/eXLhV+ytM4kX9C2i /eVaduzISc7+Xbee75Vgwod6ZxWfaYoPX3FPZ3i5LSim2PFa8qTqRpW1boeurjoaWTNVQfq0 jPrMpmUsczn2WbzvmPwiTTPUcJ044/yApx2reJVYijMSDbWYi4oTAcGIBbKLAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPIsWRmVeSWpSXmKPExsVy+t/xu7r+ZytTDBb/E7XYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgitKzKcovLUlVyMgvLrFVija0MNIztLTQMzKx1DM0 No+1MjJV0rezSUnNySxLLdK3S9DLOD/xI3NBD0vFgSlP2BsYtzN3MXJwSAiYSLTcEuxi5OIQ EljKKPG77TJLFyMnUFxGYuOXq6wQtrDEn2tdbBBFHxkl+jatZIJwtjBKtM3/xQRSxSagI3H+ zR1mEFtEQFzixOnNjCBFzAITgDrW/QIbKyxgIXFr1VOwBhYBFYkP7/rA4rwCNhKHvs+BWicv 0XZ9OiOIzSlgK3Ho9Bk2EFsIqGb9mQvsEPWCEidnPgHrZQaqb946mxnClpA4+OIFM8QcZYkJ 635DzayV+Pz3GeMERpFZSNpnIWmfhaR9ASPzKkaR1NLi3PTcYiO94sTc4tK8dL3k/NxNjMCY 2nbs55YdjCtffdQ7xMjEwXiIUYKDWUmEVyisPEWINyWxsiq1KD++qDQntfgQoynQnxOZpUST 84FRnVcSb2hmYGpoYmZpYGppZqwkzutZ0JEoJJCeWJKanZpakFoE08fEwSnVwKTvVC66pNx3 +9ea9cyZsr8Xe684YJ2gfNyjzlt524Uew92a31xmPgqd7u58+E9o+Z2qbR7J4nUVKb/8zd/+ Cnl8v9n96evF0x7vbGE/GVMzd8ttmfQC92XWvreyr+xNXv4udmrDw5kn7ULSlp7/Zre1exJL dauN3JT9QU5BTuxORzckfk+bdl13TfllT+vqjmU6bm8iVHOcn5rIvl93quxy11m/NZNit0p+ y1jw3ungVo4zp/4abay6av38GtNzE5VZBxeKrA47spE5ZtqlHK8nF2MFYlm1zpo0zezJCr51 7YnbxrMcHk7ndgTMmPmm8OppngXbGuTbly5dPUOo5/2r1bd3uNlvulxWqsDGtcJJiaU4I9FQ i7moOBEACqT9ejIDAAA= X-CMS-MailID: 20230602110655eucas1p158a37f974de602978a3307dc9e4a1356 X-Msg-Generator: CA X-RootMTR: 20230602110655eucas1p158a37f974de602978a3307dc9e4a1356 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230602110655eucas1p158a37f974de602978a3307dc9e4a1356 References: <20230602110638.789426-1-j.granados@samsung.com> X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767589714106870711?= X-GMAIL-MSGID: =?utf-8?q?1767589714106870711?= Remove unneeded dump_stack in __register_sysctl_table Signed-off-by: Joel Granados --- fs/proc/proc_sysctl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 8873812d22f3..07804097f997 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -1406,7 +1406,6 @@ struct ctl_table_header *__register_sysctl_table( spin_unlock(&sysctl_lock); fail: kfree(header); - dump_stack(); return NULL; } From patchwork Fri Jun 2 11:06:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 102491 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp945714vqr; Fri, 2 Jun 2023 04:11:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4i/sL80fiJ2gZsrpgufyuotrmi3C9mTmUtQhFNWGHjbUBJXX8/0U5MPEs1PYu7Evas1yuw X-Received: by 2002:a17:90a:9cb:b0:256:468b:fb50 with SMTP id 69-20020a17090a09cb00b00256468bfb50mr2023206pjo.47.1685704288543; Fri, 02 Jun 2023 04:11:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685704288; cv=none; d=google.com; s=arc-20160816; b=Ge72dKx25ttKFetg6vHYOXtPlpthgdyYPv5Eub1wiEHHCPvf46de+8vI9LgCEqxOVL tjP9wXXnPRxPzWlCJyUvRogxQwaQlf1fkB7oc0AEUo2lVnzVRss0PVivUNAaKwaeZHDg D1tJmw5xc2jVW/qJZXtF2oRraSPpLA0IuDzsnwIJJqRv+n3aMa2Z3NWLqDBzpGaHyENM sQon/Axyvq7LZT+3CqjGBKR6IxFT2ZMAE9cpX6NV1W/i2mqzwj1LOY3yMyazfwvGoY/X uwr71OIgokr2iah1B8LgOCrkGp/Kiz+6Pj5RO+oCVhHA3vwP4FzHKOqJTjnMTLO0LrE0 26+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:cms-type:content-transfer-encoding :mime-version:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=BhjlbE3l65EDbxXPKpYH+/IItCuSaglkyGpoc2fZJys=; b=ZMpaMchQhN99flFSAHxc0KRCyF8fhjJewNvrcziWsR62SYzVbd5cDrDX2QnKi3jT2k edCvljHMLBpCrd57Wckp4h9HUnNNC8MXSgVeTboDzk4Gzjq7HcWmcM1roZKOpR+AkWQA 6pqOasc8KOg4Q8EKghgM7PtdqgKsoNdG1/PhYVw6/wi570myAYNNHsCk42JYTPqCZRTc juCFFzfxyOvMAu3i05X7rvejRCQRecMbe7djAu7i3GInUOZB8V833+OQtpz3Rv0Jpau8 G7J0+Kg3x7iJ8Mhoeo275GJKPehxcYaAu7RIlMPf4XIVoU78mUBvhsT3czHdhIRORc6b pqQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=X0LTpbuq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l5-20020a17090aec0500b0025684ce9c40si891305pjy.83.2023.06.02.04.11.14; Fri, 02 Jun 2023 04:11:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=X0LTpbuq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235957AbjFBLHt (ORCPT + 99 others); Fri, 2 Jun 2023 07:07:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235857AbjFBLH1 (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 EF519196 for ; Fri, 2 Jun 2023 04:07:05 -0700 (PDT) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230602110658euoutp01892398afd87e6ae068e43d5aa39bd2db~k0t_siAjl0189801898euoutp01Y for ; Fri, 2 Jun 2023 11:06:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230602110658euoutp01892398afd87e6ae068e43d5aa39bd2db~k0t_siAjl0189801898euoutp01Y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685704018; bh=BhjlbE3l65EDbxXPKpYH+/IItCuSaglkyGpoc2fZJys=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=X0LTpbuqcSvbiXMG8CGVd2hMCiFANmN0MeNr9nHqf5XoJm0XPowTlO9Q39fGZsCww VYNpi/yndgc1369Xeb/TxQjIua+Zz5/gD72Hwb0UpzYmcH3UCVX7WF/P+iAQwScyo5 4hY8AAhHhkMuo17hdYwUhg74s6lqbCIm7csNdLy0= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230602110658eucas1p27ccf28cedfee77b724984314dfce3c77~k0t_jdLpI2052120521eucas1p2d; Fri, 2 Jun 2023 11:06:58 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 97.77.11320.25DC9746; Fri, 2 Jun 2023 12:06:58 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230602110658eucas1p27d31eeac2417f9e19f8d4b6de012209b~k0t_KGxtF2052220522eucas1p2z; Fri, 2 Jun 2023 11:06:58 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230602110658eusmtrp19add2e18ca5bb2a26ee0cbd401c5a237~k0t_JjZpq2194821948eusmtrp12; Fri, 2 Jun 2023 11:06:58 +0000 (GMT) X-AuditID: cbfec7f4-97dff70000022c38-9a-6479cd527b71 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 51.B9.10549.15DC9746; Fri, 2 Jun 2023 12:06:57 +0100 (BST) Received: from CAMSVWEXC02.scsc.local (unknown [106.1.227.72]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230602110657eusmtip2922d74715e738263fbe99c2d1cb968c1~k0t9_p76L0244502445eusmtip27; Fri, 2 Jun 2023 11:06:57 +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:57 +0100 From: Joel Granados To: CC: , , , Joel Granados Subject: [PATCH 8/8] sysctl: replace child with a flags var Date: Fri, 2 Jun 2023 13:06:38 +0200 Message-ID: <20230602110638.789426-9-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+NgFvrBIsWRmVeSWpSXmKPExsWy7djPc7pBZytTDCbdELfYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgiuKySUnNySxLLdK3S+DKeP5oEnPBUrOKJzevMzcw PtXpYuTkkBAwkbi2+AdzFyMXh5DACkaJ/QvWMEE4XxglDk7pZ4dwPjNKdE6ZwgzTcrxpHQtE YjmjxInFG5ngqn6v64FytjBKvGrbyQLSwiagI3H+zR2wdhEBcYkTpzczghQxC0xglOhb9wus SFjAWqL77xJGEJtFQEXi8rz5bCA2r4CNxI2Dx6F2y0u0XZ8OVsMpYCtx6PQZqBpBiZMzn4DN YQaqad46mxnClpA4+OIFVK+yxIR1v1kh7FqJU1tuMUHYBzgktk8Ph7BdJNb92QxVIyzx6vgW dghbRuL05B6wnyUEJgOD6d8HdghnNaPEssavUJOsJVquPIHqcJTo790FtJkDyOaTuPFWEOIg PolJ26ZDhXklOtqEJjCqzELywiwkL8xC8sICRuZVjOKppcW56anFRnmp5XrFibnFpXnpesn5 uZsYgYnj9L/jX3YwLn/1Ue8QIxMH4yFGCQ5mJRFeobDyFCHelMTKqtSi/Pii0pzU4kOM0hws SuK82rYnk4UE0hNLUrNTUwtSi2CyTBycUg1MOy7cush8WI87YYdC45XLBsV85Z77eOuZlCNF uLJml7nqmdfr/fk8e02/e/LZVKMrV2w4NsXeFl+w3mzb+49S+zlDogUZ68rcFxyZJ5TxxCn7 6ow9VrLFZjK71pz7KKXbuuZ54cWPeRtOa1757bj1b5n/ltlSvvUBxl2u4e9rT0bNa05T6VvB pn0xfKqPimlrQrKYebzaW7vDbSVpESelRLaJ7/Lb9J5bYIX4wn8VqT77zX+8c1JWdt4Qu6eI xWXpPYNFifp7jv7/VN2fNHF+27O/zf9ndX8VNeNJ3P6n6CtDocc0lvRd4bwzlkycslssfsrs lZL7QpcbG11cJzBDyZ97k6kir7jEQYfqN15KLMUZiYZazEXFiQCl5pPziwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRmVeSWpSXmKPExsVy+t/xe7qBZytTDK4ftLHYs/cki8XlXXPY LKbfec9mcWPCU0YHFo9NqzrZPD5vkgtgitKzKcovLUlVyMgvLrFVija0MNIztLTQMzKx1DM0 No+1MjJV0rezSUnNySxLLdK3S9DLeP5oEnPBUrOKJzevMzcwPtXpYuTkkBAwkTjetI6li5GL Q0hgKaNEx5EfLBAJGYmNX66yQtjCEn+udbFBFH1klLgxeSYThLOFUeLk0tXMIFVsAjoS59/c AbNFBMQlTpzezAhSxCwwgVGib90vsLHCAtYS3X+XMILYLAIqEpfnzWcDsXkFbCRuHDzODLFO XqLt+nSwGk4BW4lDp8+A1QgB1aw/c4Edol5Q4uTMJ2AzmYHqm7fOZoawJSQOvngBNUdZYsK6 31Av1Ep8/vuMcQKjyCwk7bOQtM9C0r6AkXkVo0hqaXFuem6xoV5xYm5xaV66XnJ+7iZGYFRt O/Zz8w7Gea8+6h1iZOJgPMQowcGsJMIrFFaeIsSbklhZlVqUH19UmpNafIjRFOjPicxSosn5 wLjOK4k3NDMwNTQxszQwtTQzVhLn9SzoSBQSSE8sSc1OTS1ILYLpY+LglGpginw5ye355S9L uGIrg1zeNGxcsvXd9HMnnssv3H/lvMb0+25NC+qWTnlm/ibnk4tR4YokyTc8HH0Z0dryZX97 eUxWPtWdx8T8nOOL3qevLZ+8zmdutvZf+fBszJLWn01PHkY/ePQ86quTZ9Zzbd4TZ1mlTmxb IvB88ksTN+WfH9e2VDGszSjfFZ7ZwL8p6u7e7N7dM2vefrvdVm3fE/9+Web7+cddz4nFB/6x n728oJ/Drzdqe98sHb5vOxLcLHmfbLr8tcaH/YzSRo+rNondu5p0ZbYLunrd57/pOq9+6qNk fl2VTon8Dc84WWapB86qKZB8uNGwvFzebY7TLY/g4/MqE4qmHPup91QltD4gQomlOCPRUIu5 qDgRABcI0OAzAwAA X-CMS-MailID: 20230602110658eucas1p27d31eeac2417f9e19f8d4b6de012209b X-Msg-Generator: CA X-RootMTR: 20230602110658eucas1p27d31eeac2417f9e19f8d4b6de012209b X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230602110658eucas1p27d31eeac2417f9e19f8d4b6de012209b References: <20230602110638.789426-1-j.granados@samsung.com> X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767589060040046830?= X-GMAIL-MSGID: =?utf-8?q?1767589060040046830?= This is part of the effort to remove the empty element at the end of ctl_table structs. "child" was a deprecated elem in this struct and was being used to differentiate between two types of ctl_tables: "normal" and "permanently emtpy". What changed?: * Replace "child" with a u8 "flag" variable and use it to differentiate between types by refactoring the permanently empty helper functions. * Remove the "empty child" check from sysctl_check_table * Remove count_subheaders function as there is no longer a need to calculate how many headers there are for every child * Remove the recursive call to unregister_sysctl_table as there is no need to traverse down the child tree any longer * Add a new SYSCTL_PERM_EMPTY_DIR binary flag * Remove the last remanence of child from partport/procfs.c Signed-off-by: Joel Granados --- drivers/parport/procfs.c | 1 - fs/proc/proc_sysctl.c | 81 +++++++++------------------------------- include/linux/sysctl.h | 4 +- 3 files changed, 20 insertions(+), 66 deletions(-) diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c index 0f2d2e1ee28e..4e5b972c3e26 100644 --- a/drivers/parport/procfs.c +++ b/drivers/parport/procfs.c @@ -387,7 +387,6 @@ parport_device_sysctl_template = { .data = NULL, .maxlen = 0, .mode = 0555, - .child = NULL }, {} } diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 07804097f997..a180bc952397 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -29,9 +29,8 @@ static const struct file_operations proc_sys_dir_file_operations; static const struct inode_operations proc_sys_dir_operations; /* Support for permanently empty directories */ - struct ctl_table sysctl_mount_point[] = { - { } + {.flags = SYSCTL_PERM_EMPTY_DIR } }; /** @@ -48,21 +47,14 @@ struct ctl_table_header *register_sysctl_mount_point(const char *path) } EXPORT_SYMBOL(register_sysctl_mount_point); -static bool is_empty_dir(struct ctl_table_header *head) -{ - return head->ctl_table[0].child == sysctl_mount_point; -} - -static void set_empty_dir(struct ctl_dir *dir) -{ - dir->header.ctl_table[0].child = sysctl_mount_point; -} - -static void clear_empty_dir(struct ctl_dir *dir) - -{ - dir->header.ctl_table[0].child = NULL; -} +#define sysctl_is_perm_empty_ctl_table(tptr) \ + (tptr[0].flags & SYSCTL_PERM_EMPTY_DIR) +#define sysctl_is_perm_empty_ctl_header(hptr) \ + (sysctl_is_perm_empty_ctl_table(hptr->ctl_table)) +#define sysctl_set_perm_empty_ctl_header(hptr) \ + (hptr->ctl_table[0].flags |= SYSCTL_PERM_EMPTY_DIR) +#define sysctl_clear_perm_empty_ctl_header(hptr) \ + (hptr->ctl_table[0].flags &= ~SYSCTL_PERM_EMPTY_DIR) void proc_sys_poll_notify(struct ctl_table_poll *poll) { @@ -230,20 +222,22 @@ static void erase_header(struct ctl_table_header *head) static int insert_header(struct ctl_dir *dir, struct ctl_table_header *header) { struct ctl_table *entry; + struct ctl_table_header *dir_h = &dir->header; int err; + /* Is this a permanently empty directory? */ - if (is_empty_dir(&dir->header)) + if (sysctl_is_perm_empty_ctl_header(dir_h)) return -EROFS; /* Am I creating a permanently empty directory? */ - if (header->ctl_table == sysctl_mount_point) { + if (sysctl_is_perm_empty_ctl_table(header->ctl_table)) { if (!RB_EMPTY_ROOT(&dir->root)) return -EINVAL; - set_empty_dir(dir); + sysctl_set_perm_empty_ctl_header(dir_h); } - dir->header.nreg++; + dir_h->nreg++; header->parent = dir; err = insert_links(header); if (err) @@ -259,9 +253,9 @@ static int insert_header(struct ctl_dir *dir, struct ctl_table_header *header) put_links(header); fail_links: if (header->ctl_table == sysctl_mount_point) - clear_empty_dir(dir); + sysctl_clear_perm_empty_ctl_header(dir_h); header->parent = NULL; - drop_sysctl_table(&dir->header); + drop_sysctl_table(dir_h); return err; } @@ -479,7 +473,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb, inode->i_mode |= S_IFDIR; inode->i_op = &proc_sys_dir_operations; inode->i_fop = &proc_sys_dir_file_operations; - if (is_empty_dir(head)) + if (sysctl_is_perm_empty_ctl_header(head)) make_empty_dir_inode(inode); } @@ -1136,9 +1130,6 @@ static int sysctl_check_table(const char *path, struct ctl_table *table) struct ctl_table *entry; int err = 0; list_for_each_table_entry(entry, table) { - if (entry->child) - err |= sysctl_err(path, entry, "Not a file"); - if ((entry->proc_handler == proc_dostring) || (entry->proc_handler == proc_dobool) || (entry->proc_handler == proc_dointvec) || @@ -1465,25 +1456,6 @@ void __init __register_sysctl_init(const char *path, struct ctl_table *table, kmemleak_not_leak(hdr); } -static int count_subheaders(struct ctl_table *table) -{ - int has_files = 0; - int nr_subheaders = 0; - struct ctl_table *entry; - - /* special case: no directory and empty directory */ - if (!table || !table->procname) - return 1; - - list_for_each_table_entry(entry, table) { - if (entry->child) - nr_subheaders += count_subheaders(entry->child); - else - has_files = 1; - } - return nr_subheaders + has_files; -} - static void put_links(struct ctl_table_header *header) { struct ctl_table_set *root_set = &sysctl_table_root.default_set; @@ -1546,28 +1518,11 @@ static void drop_sysctl_table(struct ctl_table_header *header) */ void unregister_sysctl_table(struct ctl_table_header * header) { - int nr_subheaders; might_sleep(); if (header == NULL) return; - nr_subheaders = count_subheaders(header->ctl_table_arg); - if (unlikely(nr_subheaders > 1)) { - struct ctl_table_header **subheaders; - int i; - - subheaders = (struct ctl_table_header **)(header + 1); - for (i = nr_subheaders -1; i >= 0; i--) { - struct ctl_table_header *subh = subheaders[i]; - struct ctl_table *table = subh->ctl_table_arg; - unregister_sysctl_table(subh); - kfree(table); - } - kfree(header); - return; - } - spin_lock(&sysctl_lock); drop_sysctl_table(header); spin_unlock(&sysctl_lock); diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 653b66c762b1..0cd79a7f1d3e 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -137,7 +137,7 @@ struct ctl_table { void *data; int maxlen; umode_t mode; - struct ctl_table *child; /* Deprecated */ + u8 flags; proc_handler *proc_handler; /* Callback for text formatting */ struct ctl_table_poll *poll; void *extra1; @@ -229,7 +229,7 @@ extern int unaligned_enabled; extern int unaligned_dump_stack; extern int no_unaligned_warning; -extern struct ctl_table sysctl_mount_point[]; +#define SYSCTL_PERM_EMPTY_DIR (1 << 0) #else /* CONFIG_SYSCTL */