From patchwork Wed Jan 31 14:06:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuo Handa X-Patchwork-Id: 194767 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1912705dyb; Wed, 31 Jan 2024 06:09:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IEy2DR4Dvwv0nw7oiySCEn7EfLRRrnYncyxKIzC3izsqf/kavMZaobqHEzOPnJWUXnIAM5O X-Received: by 2002:a17:906:bce5:b0:a36:7816:8f9a with SMTP id op5-20020a170906bce500b00a3678168f9amr1392662ejb.9.1706710190872; Wed, 31 Jan 2024 06:09:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706710190; cv=pass; d=google.com; s=arc-20160816; b=HPYc6Z5UQXpBeB484z+9+TUXxewUf0YCTLgQmPcAOql1Dw4pRHbXfas118PGaBY8HM F8OrEvyvpvgoqEnwJ+EZt2TeSYyTacTXHv76YepxIEYgLZGX9FFn+cXXtcDX94gOd+yY azHPsiL2UzEljHaLZAdWVu0hgLqDJdt6jhTK0E7EqOHG4O0wlYS9+7ReuxY4FJq1WNMW TmOlaRPYcWsdkgd43GYip239AP8j2dTvE78JXUng10Mhll7+RMYXNASVsAXZU0mPkwld fgQcracFMcXma1xPs4gDaQSZyEI6DXNf3OQsv4YaqA2TfQr/pogZsmQ62UUKM9bccgPl XuBQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id; bh=Z30yYV1xufifEhXee83AQJgNg4XdY67jwrkh+sCtJpg=; fh=naY9T1hQ+GUTvXp0XtLjWlNqk2xKBV/D9w6h0yQxMVA=; b=SeS2gZtkivcg8poQiB6bHeEZxeF88WwsvPDfCvb2HvMnGWB5iSSDy7ygy/79mvfoIj luAOepSygq93PBDrJD8QIR8qdtL5P0h5jo3ToS/6bv+qEiNOFjggzrSVrSrP3gGayiLP 9dFnu8Q4nolQTCDqhEv1GQRZgbNvlg+L1Nz2NYZ3Hgerr1MZBUO5+vpkAo9yjX8T/6ua 5aMYjIkdfvtyeoqEzBiJ7kHSZjFXyLnMx6dkcBB/H1BTXHt/t3bG/+SuUelGt3X9R8e4 7eW1Qi+6QlPOzkSW1pm7l5OaQHULPaN7/00LKDbV17n7jBqKDm+P0Yy4PAbCFEibrMdn Oiew==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=i-love.sakura.ne.jp); spf=pass (google.com: domain of linux-kernel+bounces-46565-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46565-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCXQoAiq9RuazrPfVTc26qdDPETxdh8CIwlYhERIxq6tq3Tjxa1ScSWRIaMOz8rreOJZy23dNmOsko0ynVGGbuEZ++6DGw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id i22-20020a1709061cd600b00a3672f5742bsi650380ejh.543.2024.01.31.06.09.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 06:09:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-46565-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=i-love.sakura.ne.jp); spf=pass (google.com: domain of linux-kernel+bounces-46565-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46565-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A0AE61F25EFF for ; Wed, 31 Jan 2024 14:09:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6E84583CA8; Wed, 31 Jan 2024 14:08:01 +0000 (UTC) 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 99DED82860 for ; Wed, 31 Jan 2024 14:07:56 +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=1706710079; cv=none; b=JqsOHieAZ6+ATE8GMVeUrMTA9LtbUDDXe456/de9HsWNaWs+TOmwnj8BZ6QWg4HowU1v2lVVApoV5S3usIZi/UnVfc1I5ZDrQpovQSZPOJNPLPFFb08cWkqJjAYIIlZQiUnJuyXeLpZfPtvYIFFgRJTet5Y2xjTV5jd8ZGzEH44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706710079; c=relaxed/simple; bh=HBnhiTX1ZAjmz11Az5cLtRA/VquaN6ubm7OV+ybWEQ0=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=TgNKyMfnAMRFIpgD+BSTmg/CAv23r67/eFZRC6a2mvPWSjr9q73WOJURGz6CJDr79qpR5eNH8+t7gLomIGH7whbS5LjtC1Qu3hXSTJXfwkNO1l0tCywYJhHpAz3YKQhz2SSYzRXABpsv+af1t7x9smsI/N1IrLyAB4vGvHLTwjU= 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 fsav315.sakura.ne.jp (fsav315.sakura.ne.jp [153.120.85.146]) by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTP id 40VE6laE028134; Wed, 31 Jan 2024 23:06:47 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Received: from www262.sakura.ne.jp (202.181.97.72) by fsav315.sakura.ne.jp (F-Secure/fsigk_smtp/550/fsav315.sakura.ne.jp); Wed, 31 Jan 2024 23:06:47 +0900 (JST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/fsav315.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 40VE6b1p028082 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NO); Wed, 31 Jan 2024 23:06:47 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Message-ID: <85edf211-aa30-4671-93e0-5173b3f7adf2@I-love.SAKURA.ne.jp> Date: Wed, 31 Jan 2024 23:06:38 +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] 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 References: <000000000000d6b55e060d6bc390@google.com> <7227c8d1-08f6-4f95-ad0f-d5c3e47d874d@I-love.SAKURA.ne.jp> Content-Language: en-US In-Reply-To: <7227c8d1-08f6-4f95-ad0f-d5c3e47d874d@I-love.SAKURA.ne.jp> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789615345031221011 X-GMAIL-MSGID: 1789615345031221011 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=b1a83ab2a9eb9321fbdd Fixes: acd895795d35 ("profiling: fix broken profiling regression") Tested-by: syzbot+b1a83ab2a9eb9321fbdd@syzkaller.appspotmail.com Signed-off-by: Tetsuo Handa --- 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 1d4bc493b2f4..66bc712f590c 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; - 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 = -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 = profile_init(); - if (ret) - return ret; + if (ret) { + count = ret; + goto out; + } ret = create_proc_profile(); if (ret) - return ret; + count = ret; +out: + mutex_unlock(&lock); return count; } KERNEL_ATTR_RW(profiling); diff --git a/kernel/profile.c b/kernel/profile.c index 8a77769bc4b4..7575747e2ac6 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -114,11 +114,9 @@ int __ref profile_init(void) buffer_bytes = prof_len*sizeof(atomic_t); - if (!alloc_cpumask_var(&prof_cpu_mask, GFP_KERNEL)) + if (!zalloc_cpumask_var(&prof_cpu_mask, GFP_KERNEL)) return -ENOMEM; - cpumask_copy(prof_cpu_mask, cpu_possible_mask); - prof_buffer = kzalloc(buffer_bytes, GFP_KERNEL|__GFP_NOWARN); if (prof_buffer) return 0; @@ -481,6 +479,8 @@ int __ref create_proc_profile(void) goto err_state_prep; online_state = err; err = 0; +#else + cpumask_copy(prof_cpu_mask, cpu_possible_mask); #endif entry = proc_create("profile", S_IWUSR | S_IRUGO, NULL, &profile_proc_ops);