From nobody Fri Dec 19 12:34:36 2025 Received: from www262.sakura.ne.jp (www262.sakura.ne.jp [202.181.97.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7ABE44175A for ; Sat, 27 Apr 2024 06:52:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.181.97.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714200772; cv=none; b=l5lXfwCF+0Jncp0TjSJlJ/tStFWtFfgxrUaee0cjW+hN3cDEQq9AG3O0/h/D/xdU7QEHagQDAb4L4N610VRU4l0L/CVHpXdbWNnYBxEFz7xNWNXXg1oIqK/CszcmNSCuWL3EInRlK0I+iMQRrshXwEMRBkj0ODXUo18EV2tNzTs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714200772; c=relaxed/simple; bh=5CX/9QAtraxLq6lMppaOvlZdBJ5klUnsB4dyvoVffO0=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=bOdlrJ66AKHIgGeMcfwb1cX26WQ8u9CsL6wyrC7TKB4p15/sTeskivKFXrLSnhXns7SdFKab3IJZROI43O9k2hr45gIZTFshTxYqzBZJwjzCip7XVPBpEluyvqgSCl/2qWRA1G+a2sns0/DwONmBVtelGz2VHX6xJM3aHrg2ET8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=I-love.SAKURA.ne.jp; spf=pass smtp.mailfrom=I-love.SAKURA.ne.jp; arc=none smtp.client-ip=202.181.97.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=I-love.SAKURA.ne.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=I-love.SAKURA.ne.jp Received: from fsav313.sakura.ne.jp (fsav313.sakura.ne.jp [153.120.85.144]) by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTP id 43R6plrn001923; Sat, 27 Apr 2024 15:51:47 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Received: from www262.sakura.ne.jp (202.181.97.72) by fsav313.sakura.ne.jp (F-Secure/fsigk_smtp/550/fsav313.sakura.ne.jp); Sat, 27 Apr 2024 15:51:47 +0900 (JST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/fsav313.sakura.ne.jp) Received: from [192.168.1.6] (M106072142033.v4.enabler.ne.jp [106.72.142.33]) (authenticated bits=0) by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTPSA id 43R6plc4001920 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NO); Sat, 27 Apr 2024 15:51:47 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Message-ID: <239eadaf-d694-4dff-89b9-b476be35f4e9@I-love.SAKURA.ne.jp> Date: Sat, 27 Apr 2024 15:51:47 +0900 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH (REPOST)] profiling: initialize prof_cpu_mask from profile_online_cpu() From: Tetsuo Handa To: Hugh Dickins , Ingo Molnar , akpm@linux-foundation.org Cc: tglx@linutronix.de, paskripkin@gmail.com, rostedt@goodmis.org, glider@google.com, ebiederm@xmission.com, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com, syzbot , Linus Torvalds References: <000000000000d6b55e060d6bc390@google.com> <7227c8d1-08f6-4f95-ad0f-d5c3e47d874d@I-love.SAKURA.ne.jp> <85edf211-aa30-4671-93e0-5173b3f7adf2@I-love.SAKURA.ne.jp> Content-Language: en-US In-Reply-To: <85edf211-aa30-4671-93e0-5173b3f7adf2@I-love.SAKURA.ne.jp> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" syzbot is reporting uninit-value at profile_hits(), for commit acd895795d35 ("profiling: fix broken profiling regression") by error initialized prof_cpu_mask too early. do_profile_hits() is called from profile_tick() from timer interrupt only if cpumask_test_cpu(smp_processor_id(), prof_cpu_mask) is true and prof_buffer is not NULL. But the syzbot's report says that profile_hits() was called while current thread is still doing vzalloc(buffer_bytes) where prof_buffer is NULL at this moment. This indicates two things. One is that cpumask_set_cpu(cpu, prof_cpu_mask) should have been called from profile_online_cpu() from cpuhp_setup_state() only after profile_init() completed. Fix this by explicitly calling cpumask_copy() from create_proc_profile() on only UP kernels. The other is that multiple threads concurrently tried to write to /sys/kernel/profiling interface, which caused that somebody else tried to re-initialize prof_buffer despite somebody has already initialized prof_buffer. Fix this by using serialization. Reported-by: syzbot+b1a83ab2a9eb9321fbdd@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=3Db1a83ab2a9eb9321fbdd Fixes: acd895795d35 ("profiling: fix broken profiling regression") Tested-by: syzbot+b1a83ab2a9eb9321fbdd@syzkaller.appspotmail.com Signed-off-by: Tetsuo Handa --- Can somebody test this patch? I don't know how not using cpu_possible_mask affects expected profile data collection (especially when written to /sys/kernel/profiling interface when some of CPUs are offline). kernel/ksysfs.c | 27 ++++++++++++++++++++++----- kernel/profile.c | 6 +++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index 495b69a71a5d..0540483ae7f0 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c @@ -91,10 +91,23 @@ static ssize_t profiling_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count) { + static DEFINE_MUTEX(lock); int ret; =20 - if (prof_on) - return -EEXIST; + /* + * We need serialization, for profile_setup() initializes prof_on + * value. Also, use killable wait in case memory allocation from + * profile_init() triggered the OOM killer and chose current thread + * blocked here. + */ + if (mutex_lock_killable(&lock)) + return -EINTR; + + if (prof_on) { + count =3D -EEXIST; + goto out; + } + /* * This eventually calls into get_option() which * has a ton of callers and is not const. It is @@ -102,11 +115,15 @@ static ssize_t profiling_store(struct kobject *kobj, */ profile_setup((char *)buf); ret =3D profile_init(); - if (ret) - return ret; + if (ret) { + count =3D ret; + goto out; + } ret =3D create_proc_profile(); if (ret) - return ret; + count =3D ret; +out: + mutex_unlock(&lock); return count; } KERNEL_ATTR_RW(profiling); diff --git a/kernel/profile.c b/kernel/profile.c index 2b775cc5c28f..1a6c1cf98485 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -114,11 +114,9 @@ int __ref profile_init(void) =20 buffer_bytes =3D prof_len*sizeof(atomic_t); =20 - if (!alloc_cpumask_var(&prof_cpu_mask, GFP_KERNEL)) + if (!zalloc_cpumask_var(&prof_cpu_mask, GFP_KERNEL)) return -ENOMEM; =20 - cpumask_copy(prof_cpu_mask, cpu_possible_mask); - prof_buffer =3D kzalloc(buffer_bytes, GFP_KERNEL|__GFP_NOWARN); if (prof_buffer) return 0; @@ -438,6 +436,8 @@ int __ref create_proc_profile(void) goto err_state_prep; online_state =3D err; err =3D 0; +#else + cpumask_copy(prof_cpu_mask, cpu_possible_mask); #endif entry =3D proc_create("profile", S_IWUSR | S_IRUGO, NULL, &profile_proc_ops); --=20 2.18.4