From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6248EC56201 for ; Wed, 11 Nov 2020 14:53:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D364A2068D for ; Wed, 11 Nov 2020 14:53:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KpPZCt4J" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D364A2068D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 56ABE6B0083; Wed, 11 Nov 2020 09:53:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F1F96B0087; Wed, 11 Nov 2020 09:53:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3BAD86B0085; Wed, 11 Nov 2020 09:53:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0245.hostedemail.com [216.40.44.245]) by kanga.kvack.org (Postfix) with ESMTP id 1187D6B0082 for ; Wed, 11 Nov 2020 09:53:43 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B580F1EE6 for ; Wed, 11 Nov 2020 14:53:42 +0000 (UTC) X-FDA: 77472431484.17.kick67_220c045272fe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 96EA8180D0181 for ; Wed, 11 Nov 2020 14:53:42 +0000 (UTC) X-HE-Tag: kick67_220c045272fe X-Filterd-Recvd-Size: 4541 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 14:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605106421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HauqxgXColeqjprPbUc0JmWW3cRk97A/ix3dTNECW2k=; b=KpPZCt4JBTik3HGu/InAtfDKWKpzPUPcxhQpZRvc33BkEfv/tA0mWx29qWMxHkn1viA5kR lVewmc/E1QJ3PHLqgJNyPc2xn8XOqclwh2hfx/o8bBxLQcKCOgljvcdk1Yntwim68L3izi yT83UxlicaT04Q8OvD5T4aykPKPG71s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-548-lQFt9juWPYGtGkNOXol1zQ-1; Wed, 11 Nov 2020 09:53:37 -0500 X-MC-Unique: lQFt9juWPYGtGkNOXol1zQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6B0B879539; Wed, 11 Nov 2020 14:53:35 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-151.ams2.redhat.com [10.36.114.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id D95D1380; Wed, 11 Nov 2020 14:53:33 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, David Hildenbrand , stable@vger.kernel.org, Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Rashmica Gupta Subject: [PATCH v2 2/8] powernv/memtrace: fix crashing the kernel when enabling concurrently Date: Wed, 11 Nov 2020 15:53:16 +0100 Message-Id: <20201111145322.15793-3-david@redhat.com> In-Reply-To: <20201111145322.15793-1-david@redhat.com> References: <20201111145322.15793-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: It's very easy to crash the kernel right now by simply trying to enable memtrace concurrently, hammering on the "enable" interface loop.sh: #!/bin/bash dmesg --console-off while true; do echo 0x40000000 > /sys/kernel/debug/powerpc/memtrace/enable done [root@localhost ~]# loop.sh & [root@localhost ~]# loop.sh & Resulting quickly in a kernel crash. Let's properly protect using a mutex. Fixes: 9d5171a8f248 ("powerpc/powernv: Enable removal of memory for in me= mory tracing") Cc: stable@vger.kernel.org# v4.14+ Cc: Michael Ellerman Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Rashmica Gupta Signed-off-by: David Hildenbrand --- arch/powerpc/platforms/powernv/memtrace.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/platforms/powernv/memtrace.c b/arch/powerpc/pla= tforms/powernv/memtrace.c index eea1f94482ff..0e42fe2d7b6a 100644 --- a/arch/powerpc/platforms/powernv/memtrace.c +++ b/arch/powerpc/platforms/powernv/memtrace.c @@ -30,6 +30,7 @@ struct memtrace_entry { char name[16]; }; =20 +static DEFINE_MUTEX(memtrace_mutex); static u64 memtrace_size; =20 static struct memtrace_entry *memtrace_array; @@ -279,6 +280,7 @@ static int memtrace_online(void) =20 static int memtrace_enable_set(void *data, u64 val) { + int rc =3D -EAGAIN; u64 bytes; =20 /* @@ -291,25 +293,31 @@ static int memtrace_enable_set(void *data, u64 val) return -EINVAL; } =20 + mutex_lock(&memtrace_mutex); + /* Re-add/online previously removed/offlined memory */ if (memtrace_size) { if (memtrace_online()) - return -EAGAIN; + goto out_unlock; } =20 - if (!val) - return 0; + if (!val) { + rc =3D 0; + goto out_unlock; + } =20 /* Offline and remove memory */ if (memtrace_init_regions_runtime(val)) - return -EINVAL; + goto out_unlock; =20 if (memtrace_init_debugfs()) - return -EINVAL; + goto out_unlock; =20 memtrace_size =3D val; - - return 0; + rc =3D 0; +out_unlock: + mutex_unlock(&memtrace_mutex); + return rc; } =20 static int memtrace_enable_get(void *data, u64 *val) --=20 2.26.2