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;
From:   chris hyser <chris.hyser@oracle.com>
To:     chris.hyser@oracle.com, linux-kernel@vger.kernel.org,
        dietmar.eggemann@arm.com, peterz@infradead.org,
        vincent.guittot@linaro.org, "Chen Yu" <yu.c.chen@intel.com>
Subject: [PATCH v3] sched/numa: Fix divide by zero for sysctl_numa_balancing_scan_size.
Date:   Tue,  4 Apr 2023 14:29:15 -0400
Message-Id: <20230404182915.2264557-1-chris.hyser@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hLECzwDM8/pVvQR+YYgBXK0cvFYep66CbNz0PLE65T3qEd+WSbJzasNC0/1O?=
 =?us-ascii?Q?N1xLzq9X1D9TtKJQWo6djr/exDx2KOoH9aaK/dbSvSqqMZ+SCcQPINswoFxK?=
 =?us-ascii?Q?l6eN/YNJ8r/exv5P7ccWWY5vAYT/O15fI7oUeqxPr5xfWYBVr8fXuwx7B96W?=
 =?us-ascii?Q?yuLqgLtcycD3W0j3qKHeli7Wa7HRwERVTY9rl23ZHGM+W4l6OHbTB+gGgEKt?=
 =?us-ascii?Q?u3NZJiaJTHJlZq7kR8CuR70EhWw/zJCRJB/f3XUDvIohcdwh3QN3yMXtOAa3?=
 =?us-ascii?Q?ICjkN20QKaCmBanwXkQQxezVhiZAli3wqIR4S1sk0oNa7cw3S7LPClwAvGSr?=
 =?us-ascii?Q?OGZZuj+p0us4NPId3Vug41ck7JbEgMeMkv/KMc+j/jWcM6uzy5SdQbLsUlm4?=
 =?us-ascii?Q?moAnM4dRQlWFS/c/CVLH9qzeK7QW+xv1Mn6N5hqBJiNQ7nJ3svqfak2RGTPC?=
 =?us-ascii?Q?mJrhLuVeXnbDNFaqrJ460rwEgi6suPSwLD75xEAFQxmCqbhySIc4VV8E8Bep?=
 =?us-ascii?Q?+3P82Mn7v8uy7x2l79cSBX/IxiUaByiwiQkyOUbi3PshvxSm4zpgRetwReQf?=
 =?us-ascii?Q?FfQoKHty+jKfM6tiRgNgXjBhuG3FqnAelGW/d/PfXnFJDvgp319EemhLTK3t?=
 =?us-ascii?Q?/2+O5jJiTxuD6rzjs1ZrY8zf7anzNX2CCmyBIbJSbDDG4TRLaxZNciz/3s8S?=
 =?us-ascii?Q?EfJvWrQLAfluRtDqjTaATh2uqVMs7WPWa9uWeSqgIv/wcMqS8JGDHRVjJXMe?=
 =?us-ascii?Q?Ln/UrNXtN+0SCb8ACmhkxLZ8awndobyWcRGP8KKDHbbsUggliYivxcjmauX/?=
 =?us-ascii?Q?JdHjb2QhbBUOZAg7Jd4g+6ql+NkpHpXxTDjhbHGfLrXw9ZtqQCxn87fOpOfQ?=
 =?us-ascii?Q?DsxY7lOrLhnU0IurX/TK/MhyC+NX8hBIJK0S33sCzNCmtQoWmpNEo8/YDcpe?=
 =?us-ascii?Q?aULm/F4auR5o2zq51sOJSdrzD9eCdcoVZz85Gpa1kB4flylua8a85Yq54Jlb?=
 =?us-ascii?Q?OhsH/stClcLNhf3319dA2+sOtxsrgKPWvzhBHkWukRR5GDO1f4ZI/zSFR9D8?=
 =?us-ascii?Q?/UHjRwFV0m/0G43RIx0NVg7eQBVyy2OBDKMMrXyd3DoAlS/yS9l2Lrz8Dyn7?=
 =?us-ascii?Q?Ba2D8/JAeHSIjTwV8OonB7P1/I+LB6Ennt8tCf6Cp0R/r+j6I/z7WRVQJ/yW?=
 =?us-ascii?Q?4RPLSjoGSkCmbiBp2OcDdfICT6u23qfdbkG2Y3maVQf4zRqb2W6oyRQNYFBg?=
 =?us-ascii?Q?NSB0VsBOHoFf4ECyOL5gE7WQA5vZ2zpxP8kinAg8AvgghbH7Jxro3cQkx58M?=
 =?us-ascii?Q?vYy9CLEDJN29g3g0Urs8L0uHuBUxxya3IZC0/qCaiSWTL6kKVLYO1m+2FZpc?=
 =?us-ascii?Q?FB+Eom2DuLMoK6CTKnO6/WRgtclzZhOzSw5GUcB98hZ1ACNTK63cgUA2Rm9L?=
 =?us-ascii?Q?wX1WreEYwh+F4Z8WIn4YB7C8oKIbwR2SaPOT/BYnxuyvm/gkZj3ogntF7Ydo?=
 =?us-ascii?Q?bwqZ8OuX6a3uUnLy6F8d+DRKq8TuCGS3WFVQKMl7QZWsUIDd1e4egldl9tWW?=
 =?us-ascii?Q?nc959B40B+2sxsdbRdkAQB5MLD8+USeihwU2Y3Rv?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: pIUTZ8ddPOF89Siit9vo6aJ6QxFIF0o0s9Xoe9AGLmSEwb+GoSRmMG7/wnWdPBYYK253k4nlaH0osn7oSFLO2N3WFgxM49FYy4vWrFoVA1CRJDYWJ5dSwcgbrj4SIgQZsvr/Vu2zI7oMfBxn31Rg7ZOZQPi6OYvNXg4E+VHJSU2nRpQbIN+Z59CERA4hyjwy5lda8wuChu0JGvfiKMABBwYGgF93KtmqBGFFafYuKc0tp6oTok549bp7Y04YLKNgqqpnjSspkFGLUKty54IsSogmC8K2U35uPIJpuFEfcwCBhru7qqbMRb8sW2snhobWTPFi4uuUg5FneisorI+GRJ3posX5N1Wjv+dZb+1Tk6ZaYYU2hnciKsT73M+ri8aGBz+MPd+C7/5cEduxKY2Zy4dw0iibxHN1TyCMjVbVOPQ3llDx0/utWHxI15ifCivDxxh/bDegx+jdhOxe8+yZHZjk3h5oN/FLsBY3fvnOfZO1XuP46RFXm5wy6aNuafb3/qdPxs8u3HdBtSfN6IWQ7d8PLQKrFNHOGLJmZZHOhcqlqbsVgeAV1MLFMdK26F8wEKr3FlIvpDebivTmnPZ4nltNR9f8dLXGaJ/PAl3leNRAm75XviFbChO6FCTCYQTtU4RSHzXkCvy/jsG9isyeDRBeYaGqAf2ZUgoWB9Q5BvTbCq/FpFgtmWTbRDwzEDzMIE+TGvwCYCb6kv7Q0akGgCrQ+KzRPSBgTUBfTKUJUOfOYSnOksrB6sRbvILViKr6CinPiUiZATvSNXD8PrYUtwMLociom1JOM6QyB3SClOB1tG6fCI3qeFMCWvRJdUlwDRJw/wh29mLviW1+kcbYWvOB9+m2jaCumNYcIY3hL6J2BUYnMKdk5+MQvk12mM+Y
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 510c3bfa-c59d-4c95-c5ac-08db353a8631
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4705.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2023 18:29:28.0165
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: DNVXSj6+a85Qp5gUDaVEWDMOmDzQGlttU1kQNcxEgIstWyXEn9IrqbqPSFojTPm2dGIOdnNmCEGOv7n/WwPikg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7065
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-04_10,2023-04-04_05,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0
 mlxlogscore=999 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2304040167
X-Proofpoint-ORIG-GUID: pCgr0Ucsdo0oew-x2fRO67ExGb1HtHk9
X-Proofpoint-GUID: pCgr0Ucsdo0oew-x2fRO67ExGb1HtHk9
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,
        SPF_HELO_NONE,SPF_NONE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit 6419265899d9 ("sched/fair: Fix division by zero
sysctl_numa_balancing_scan_size") prevented a divide by zero by using
sysctl mechanisms to return EINVAL for a sysctl_numa_balancing_scan_size
value of zero. When moved from a sysctl to a debugfs file, this checking
was lost.

This patch puts zero checking back in place.

Signed-off-by: Chris Hyser <chris.hyser@oracle.com>
---
 kernel/sched/debug.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 1637b65ba07a..cc6a0172a598 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -278,6 +278,48 @@ static const struct file_operations sched_dynamic_fops = {
 
 #endif /* CONFIG_PREEMPT_DYNAMIC */
 
+#ifdef CONFIG_NUMA_BALANCING
+
+static ssize_t sched_numa_scan_write(struct file *filp, const char __user *ubuf,
+				     size_t cnt, loff_t *ppos)
+{
+	int err;
+	unsigned int scan_size;
+
+	err = kstrtouint_from_user(ubuf, cnt, 10, &scan_size);
+	if (err)
+		return err;
+
+	if (!scan_size)
+		return -EINVAL;
+
+	sysctl_numa_balancing_scan_size = scan_size;
+
+	*ppos += cnt;
+	return cnt;
+}
+
+static int sched_numa_scan_show(struct seq_file *m, void *v)
+{
+	seq_printf(m, "%d\n", sysctl_numa_balancing_scan_size);
+	return 0;
+}
+
+static int sched_numa_scan_open(struct inode *inode, struct file *filp)
+{
+	return single_open(filp, sched_numa_scan_show, NULL);
+}
+
+static const struct file_operations sched_numa_scan_fops = {
+	.open		= sched_numa_scan_open,
+	.write		= sched_numa_scan_write,
+	.read		= seq_read,
+	.llseek		= seq_lseek,
+	.release	= single_release,
+};
+
+#endif /* CONFIG_NUMA_BALANCING */
+
 __read_mostly bool sched_debug_verbose;
 
 static const struct seq_operations sched_debug_sops;
@@ -332,7 +374,7 @@ static __init int sched_init_debug(void)
 	debugfs_create_u32("scan_delay_ms", 0644, numa, &sysctl_numa_balancing_scan_delay);
 	debugfs_create_u32("scan_period_min_ms", 0644, numa, &sysctl_numa_balancing_scan_period_min);
 	debugfs_create_u32("scan_period_max_ms", 0644, numa, &sysctl_numa_balancing_scan_period_max);
-	debugfs_create_u32("scan_size_mb", 0644, numa, &sysctl_numa_balancing_scan_size);
+	debugfs_create_file("scan_size_mb", 0644, numa, NULL, &sched_numa_scan_fops);
 	debugfs_create_u32("hot_threshold_ms", 0644, numa, &sysctl_numa_balancing_hot_threshold);
 #endif
 
-- 
2.31.1