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
Subject: [PATCH v1] sched/numa: Fix divide by zero for sysctl_numa_balancing_scan_size.
Date:   Wed, 29 Mar 2023 14:22:48 -0400
Message-Id: <20230329182248.4155546-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?4JDKkCsd9dl982cu8WiseVFB6Pl/8IQvZ58+UorddvsgH2tz3v1y7Zl4vT7i?=
 =?us-ascii?Q?X03271LIMHJHPXW0DkHuxnEGLwutuZgU7WyxyWdPytwRO4/Y4x4h7KCkHuE6?=
 =?us-ascii?Q?1bAZ6OeaI8vq6rz+4vh9tLBUxMdU5PubtI4QAasDsh6oxzrXtB1dIrWBeauZ?=
 =?us-ascii?Q?RtiWmDaNztDMBtKstKISMYY7y0eto4YU6Mrvwz9+3K3j7ZGHtZPfoO9kFLOk?=
 =?us-ascii?Q?AAXpDfe1B7Y7EYjUNXMWLX1XXbPQ/sctIzpzld8SeYsvGRWCqZIzbhIszsd/?=
 =?us-ascii?Q?1swJM3i8PcWl3rvHeK61DtCZFQQRPQoRCOC9W67BSiCAu6qV/LZg5quBpx9w?=
 =?us-ascii?Q?YGzPHBM7yVACPMqtmVwpQ+Z2CRZA96zdLVWWtFHSZFBgbZsvjg8MQgemOP/8?=
 =?us-ascii?Q?nUNEdD3SYjHA+KPVJVwmZYOjwvOpNg+txBUktcABOq9JOEAfm7plUpT4bocp?=
 =?us-ascii?Q?NGZekryQB2sOQwmWdWmWEPWQ4lYt9vf3C0Bp4zqMmXMwWUKsWSIHeVCZXKUK?=
 =?us-ascii?Q?kdtNx+jjF9SSszte1CJpbf1kYHOimZOPEE4ysMSKvnHfquLIKX0b7RO8TMWC?=
 =?us-ascii?Q?kf8wUZM0xZgwAo/tWrIgNSmprfjPmYyd9apIDnB4b4jeIgFgFN/jhLqBt7IM?=
 =?us-ascii?Q?Z9idktQnP+82mZMAgwCMZtz6tOCK68mmmlLkQ1dfBT9uNSeLdsJiktoPc22j?=
 =?us-ascii?Q?236Or3vPyJ6eGs+kZ2nfvMgFeu8O8OWPi6zIvmVXyQomyBlISq/jK1BDdt2T?=
 =?us-ascii?Q?X3ZrhmPZDxbXnAg+zxM0OwkpM/+jaRMejot0C/dp4r4yySc1f5xgNke93Q12?=
 =?us-ascii?Q?vkvE7Izbi2NW+edsbTc4XSNzYFtgH9USQ2p18joufRWn4epEZGQOQ8vIP6NE?=
 =?us-ascii?Q?ajGhwmh69SBxHWfiNj+hZaduTcmdtDTRWWmQbO7vO1makMmH6qP1ZFML8YrZ?=
 =?us-ascii?Q?BgTC+nEOub+4hNCzD36m5nKbGFUyPi9syCHQJ8RxJz91mbxB/F0cR8SjUwaN?=
 =?us-ascii?Q?MJhft+AjM/iCvkPCPItkMK/Qefuu7UZpz9NSt2bkmsDuUi9sP25DLgMUL52/?=
 =?us-ascii?Q?KZAVtN1tc5PQYYBXoI45zlDQnXpuDxs67qqKgt9ZtqfKqSVA0H1b9GUR8wY0?=
 =?us-ascii?Q?lS5Ur+Lc5PNKK0X9b7cPOWVZMXK25pvYIr7ZTU2OwKFTlcksaO2uP/uBt6zI?=
 =?us-ascii?Q?rncv8UxlWc5vXWfGmknXV6NWX6TbZhE6aKQfk789yITfxmw9F4tnxTa2RTiR?=
 =?us-ascii?Q?g3vW+MwIV1O0ZmMP0s5l/cxZNdUpKkYbStz7IA7GaiKBabasc9sYwKnPeV/R?=
 =?us-ascii?Q?tSfnXy17KKDEqq1yaBRbKfWRy+FTGGAKZh5noOSjkZyNvYB9c+EEq4lNQP76?=
 =?us-ascii?Q?Up0xIcYwKpy0fwO96Bx2F1rZ9B9Eh+RTZZC5EUWH6FHsos+J2sTuPrU8zFqz?=
 =?us-ascii?Q?kTulin+4a6B3uOuzFoBJjY6x+Y2DAAZGKll4cEzBcPrH2H0DizTvcLHiR9M9?=
 =?us-ascii?Q?v/0E9pC1ZeOFXMw36/ldXByKYHmRjTvW7OaNvn7jFcHmpKfeFLTKjXELgzng?=
 =?us-ascii?Q?08EVOjZOuC9G0D8kZLcWkCjA6+mPO13iwCxEslAU?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: sNLJ0z4cwV1ivdLDaJYB/JznYuB68BxpjEeF/sOl9wyLUXdgvDLZ9aDLGeWoEb9HQFqlgDlsojpz+cPlOPh2OmWeOPk6VuGRVupPdSuol9OTsy1he4KqtRwLBDSuhmoKFnBpKf0wSFRb0lQ5+uqVEm+e60QCOoD+LojzoICANBKxcg8ByyUL9OYKtuGn9m7msUCNA2fK/8g/CgX1AgpC1ha5HduH2l0LIRTUxF22IImRzUkeqkbY3yOHoA9QIL9hdlbtHK+bzarNr7MoF/4twrdZkGWhP70yzQHj9ASFHM5dygqn1p5rbW9Ze8ZUIgSd7ReH3fh/qDtMSFj/Dz8r6EiiWlHDXmP/i+oz164eq0HHr7MWPREARzKGWFlOODck2o0p33bqmHsm77sdtBi62GhAXaDKoZJ75ajINzngiJAuO4LU7eXMwzFL73AqdqvIx5ZNa/UH7kDTUs8Y8v6KV0tsZFTLVL1IlVbzyETjP7rFUERW2pd3ZIpAvQFqcGcFsIRbSKoSezSvnyGWodltAT0WiLrczWICE5Vpn4O7hxzEduTY+uGRVT72JqSsLBw/Cfldbj5C+OrbXfpjGND/o/wBhC+QkodDH6JvwX+YY9eK4pdz/9Xf3AL3iJ7sxGZ6KT6/j4/M6q3Ddm8U5Nro0xvghl7LCbjM+t5Bjk0h3R68emzsmGiA19t7Mzq45bysCPmLblpt9/mkqNXa3mMPpkkaBN2oiWgcwAPr5InXyVEoyfz9VDjHAgFHkjCBS9UHqXSNXnCFs9xvtSX6ngR7qrywrmH1gDdwawkng0CCJfVhP8A0MSkreEajfDfP1ypP6sI786pNYRv8/ssmuKkhaIiZKq/FUlj1XgEUPfQVPwI=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fab12366-f9bc-45d5-5186-08db30829a95
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4705.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2023 18:22:50.1722
 (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: Gj2BA8J2GXLLlqMJ+sUeuXRlwVD0xMwvOuqtXOJ+ICg4nCdMfLFT/QkaeAEiZFtPm4c1uSprqj2kQe3S7tBW3g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6330
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-03-29_12,2023-03-28_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 malwarescore=0
 mlxlogscore=999 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2303290141
X-Proofpoint-GUID: Y_IK79m5B_JISEAUWMjhsItN1tEOZ1lz
X-Proofpoint-ORIG-GUID: Y_IK79m5B_JISEAUWMjhsItN1tEOZ1lz
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 | 50 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 1637b65ba07a..dfd0fe6123ec 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -278,6 +278,54 @@ 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)
+{
+	char buf[16];
+	unsigned int scan_size;
+
+	if (cnt > 15)
+		cnt = 15;
+
+	if (copy_from_user(&buf, ubuf, cnt))
+		return -EFAULT;
+	buf[cnt] = '\0';
+
+	if (kstrtouint(buf, 10, &scan_size))
+		return -EINVAL;
+
+	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 +380,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