Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp3732430pxb; Mon, 4 Oct 2021 08:27:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5dc+zY18AOQ05ZiWmdFCeFHoS845qdgeDmBBgjLli+W6loYdrvPMnLPLVv4vgF6IwVIjZ X-Received: by 2002:a17:90b:3581:: with SMTP id mm1mr12172051pjb.93.1633361233168; Mon, 04 Oct 2021 08:27:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633361233; cv=none; d=google.com; s=arc-20160816; b=liobZLAMNlC6KWPWYuWVf8WWhujjg9TJY18hix9HFf78XeLgeKIkRy6o5DDCtYlbNg wog5k+VHQsIS7l6pUbO7VYXmTCYvY3RK/jNi+R/Zo446L1nJXV/V+uuhllDKMpKk49iz r48RIbv23jMMK2JbfEAR7kHKdnenwDkbt6xBHeNTwOt36iw63MOcJujNpzK7iaPGyP9T qRChA1/SEnSjnFjQUgsDBKbKDBSYvQaOpXKareqTz99N+JK3st4tsGpVxeAKOxbU1CCA F+MQYRij0ok6qkWsW5ngmEESGYKpxL6YJU322Tolp7ubHoXXUuTP+LIS4D1CwXWCgnBe 3Nyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7P/Famu2zDL3k4zy4bFG5PAP1lXmaWfeT82r7nCmia4=; b=aFafGALp3vUG6unqfY39s7a0kLWgK1AWM99n7Ym/JT8eRbJJFbXyEFXAnJXTgwgKjn YvjqhkvrvI2JnGYLo9JDp8r+4uJdCNx6Mshb8U32p0Uq1EKlrxADjXxy0/rxeyRFZKaQ /LwhlMYs8Z0Z0uvkNoF0EqM6W8PWILrZmqZH8RTn6jHeGpa3oPayVFuWAT93mHEphbc+ jSYNdGp3STDUF9UUS4/+byTTL5+163i6ytaKgiVr9lP6ly02WM+H+n3XK+0SbkVMLzfU zcuP8EDLVoeSDYr15r6BJv14gSSqrEwvSYOeWggl9Ju2xdaYQCjq2R2YddMdJcBZJqSj YHSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KYhFaYW0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j4si19210855pjv.119.2021.10.04.08.26.58; Mon, 04 Oct 2021 08:27:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KYhFaYW0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235259AbhJDNPS (ORCPT + 99 others); Mon, 4 Oct 2021 09:15:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:47394 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235874AbhJDNLn (ORCPT ); Mon, 4 Oct 2021 09:11:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 227ED61B6F; Mon, 4 Oct 2021 13:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633352668; bh=OCfoDgZA22Ou7+PqGJu7iFeST6hFCL3+nTaHZB+tMZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KYhFaYW0G+H42OeSGdo0Mx+efvfMhkKk0ZGwnE5rEuWTs67jLP//w9ONfRfwIj5C9 memdcrLvqvi0by1hbpww6EtKlqsmiCngGIXeDpjz17wU0BbZ8MkHBcjP4dL0Wxc5ln DAgCAd7vCznkhFZCVXnm3aWX9/TxbbRmGbhLZ3Ew= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kevin Hao , Viresh Kumar , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 4.19 57/95] cpufreq: schedutil: Use kobject release() method to free sugov_tunables Date: Mon, 4 Oct 2021 14:52:27 +0200 Message-Id: <20211004125035.432411192@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211004125033.572932188@linuxfoundation.org> References: <20211004125033.572932188@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kevin Hao [ Upstream commit e5c6b312ce3cc97e90ea159446e6bfa06645364d ] The struct sugov_tunables is protected by the kobject, so we can't free it directly. Otherwise we would get a call trace like this: ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x30 WARNING: CPU: 3 PID: 720 at lib/debugobjects.c:505 debug_print_object+0xb8/0x100 Modules linked in: CPU: 3 PID: 720 Comm: a.sh Tainted: G W 5.14.0-rc1-next-20210715-yocto-standard+ #507 Hardware name: Marvell OcteonTX CN96XX board (DT) pstate: 40400009 (nZcv daif +PAN -UAO -TCO BTYPE=--) pc : debug_print_object+0xb8/0x100 lr : debug_print_object+0xb8/0x100 sp : ffff80001ecaf910 x29: ffff80001ecaf910 x28: ffff00011b10b8d0 x27: ffff800011043d80 x26: ffff00011a8f0000 x25: ffff800013cb3ff0 x24: 0000000000000000 x23: ffff80001142aa68 x22: ffff800011043d80 x21: ffff00010de46f20 x20: ffff800013c0c520 x19: ffff800011d8f5b0 x18: 0000000000000010 x17: 6e6968207473696c x16: 5f72656d6974203a x15: 6570797420746365 x14: 6a626f2029302065 x13: 303378302f307830 x12: 2b6e665f72656d69 x11: ffff8000124b1560 x10: ffff800012331520 x9 : ffff8000100ca6b0 x8 : 000000000017ffe8 x7 : c0000000fffeffff x6 : 0000000000000001 x5 : ffff800011d8c000 x4 : ffff800011d8c740 x3 : 0000000000000000 x2 : ffff0001108301c0 x1 : ab3c90eedf9c0f00 x0 : 0000000000000000 Call trace: debug_print_object+0xb8/0x100 __debug_check_no_obj_freed+0x1c0/0x230 debug_check_no_obj_freed+0x20/0x88 slab_free_freelist_hook+0x154/0x1c8 kfree+0x114/0x5d0 sugov_exit+0xbc/0xc0 cpufreq_exit_governor+0x44/0x90 cpufreq_set_policy+0x268/0x4a8 store_scaling_governor+0xe0/0x128 store+0xc0/0xf0 sysfs_kf_write+0x54/0x80 kernfs_fop_write_iter+0x128/0x1c0 new_sync_write+0xf0/0x190 vfs_write+0x2d4/0x478 ksys_write+0x74/0x100 __arm64_sys_write+0x24/0x30 invoke_syscall.constprop.0+0x54/0xe0 do_el0_svc+0x64/0x158 el0_svc+0x2c/0xb0 el0t_64_sync_handler+0xb0/0xb8 el0t_64_sync+0x198/0x19c irq event stamp: 5518 hardirqs last enabled at (5517): [] console_unlock+0x554/0x6c8 hardirqs last disabled at (5518): [] el1_dbg+0x28/0xa0 softirqs last enabled at (5504): [] __do_softirq+0x4d0/0x6c0 softirqs last disabled at (5483): [] irq_exit+0x1b0/0x1b8 So split the original sugov_tunables_free() into two functions, sugov_clear_global_tunables() is just used to clear the global_tunables and the new sugov_tunables_free() is used as kobj_type::release to release the sugov_tunables safely. Fixes: 9bdcb44e391d ("cpufreq: schedutil: New governor based on scheduler utilization data") Cc: 4.7+ # 4.7+ Signed-off-by: Kevin Hao Acked-by: Viresh Kumar Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- kernel/sched/cpufreq_schedutil.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index 1b7ec822dc75..60f0e0e048f0 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -591,9 +591,17 @@ static struct attribute *sugov_attributes[] = { NULL }; +static void sugov_tunables_free(struct kobject *kobj) +{ + struct gov_attr_set *attr_set = container_of(kobj, struct gov_attr_set, kobj); + + kfree(to_sugov_tunables(attr_set)); +} + static struct kobj_type sugov_tunables_ktype = { .default_attrs = sugov_attributes, .sysfs_ops = &governor_sysfs_ops, + .release = &sugov_tunables_free, }; /********************** cpufreq governor interface *********************/ @@ -693,12 +701,10 @@ static struct sugov_tunables *sugov_tunables_alloc(struct sugov_policy *sg_polic return tunables; } -static void sugov_tunables_free(struct sugov_tunables *tunables) +static void sugov_clear_global_tunables(void) { if (!have_governor_per_policy()) global_tunables = NULL; - - kfree(tunables); } static int sugov_init(struct cpufreq_policy *policy) @@ -761,7 +767,7 @@ out: fail: kobject_put(&tunables->attr_set.kobj); policy->governor_data = NULL; - sugov_tunables_free(tunables); + sugov_clear_global_tunables(); stop_kthread: sugov_kthread_stop(sg_policy); @@ -788,7 +794,7 @@ static void sugov_exit(struct cpufreq_policy *policy) count = gov_attr_set_put(&tunables->attr_set, &sg_policy->tunables_hook); policy->governor_data = NULL; if (!count) - sugov_tunables_free(tunables); + sugov_clear_global_tunables(); mutex_unlock(&global_tunables_lock); -- 2.33.0