Received: by 2002:a05:6622:f08:0:0:0:0 with SMTP id l8csp4480730ivc; Tue, 3 Nov 2020 13:09:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxr/Xx4VMLhww3Cmm/QlavYUFuwnKZ6pV7heajQivOBj/jAvuaCUPsZPxTifBA4LmBQJSO1 X-Received: by 2002:a17:906:3a1a:: with SMTP id z26mr21406926eje.519.1604437749361; Tue, 03 Nov 2020 13:09:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604437749; cv=none; d=google.com; s=arc-20160816; b=keBGhbfs2AbFq5pMRx5dd0fpGcYc0qc+hb7YoG7KjWjN+hQKVu0VwV8rD1OQuEaxXo SCxW9NQ6tV8OxDRImRzcNWoGMyPT8lQyjSSkOIJN8nMohuqnP8eONcbWcPHcheIzkWkv AmAt7IlqMruwV3O8vPu6xh+IsdTw5WnbY4BJffWSYTroKRVtM3Kvyz3EULrzuxFl1a6C bdbhw/IBIaqCIZ/ayUseQ6sYvITRQ2hI83snDmuphHwOIETMogw+OCK0oNpZLFDbUtHg bjZMfGLg3SSVj/77Ly8KiOAoB868lC1350ehpPXudlKXwiKuH+WQCUKkp9mZ+Nkz98Kb fZlg== 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=O1UFu7qkwX8c2Pyuihk3qu7tLW6/PKJFeWGbE9h8AmU=; b=UMcqoc2IjRzrq3E99hSU/KTvPOcE4sWMt8AqGr7Wh0x+uikDE+h4wp9opxRX0zl5wX quY3+Tpa46nMnKIdAQO8fuLlyXpOg47Gr37dGmpRpoCWbSLJGEBBW4nsxwwi4ShdG8aw O+/TzPjs+hCI4FIG1ww0a2XuynllwJ3zNmjP0a/ZFGQuI7j83cJTgXKDYWqEy2RxabGC jctZUU/EYaEnLh3fytqmso7sVcmfV/rlFEBy4nUQ5tz/aH/VXH0nR/xtreq1PXrODSJz wiNznotWWtjIQMWsbemKoihp49DwTLnwjOk9HJKbVkivcJL8KDmGh3sfE601DQ0wt8zm o2Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=C0I0WRon; 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=fail (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 j7si13172635edy.250.2020.11.03.13.08.46; Tue, 03 Nov 2020 13:09:09 -0800 (PST) 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=@kernel.org header.s=default header.b=C0I0WRon; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387759AbgKCVFY (ORCPT + 99 others); Tue, 3 Nov 2020 16:05:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:43858 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387735AbgKCVFW (ORCPT ); Tue, 3 Nov 2020 16:05:22 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1806A206B5; Tue, 3 Nov 2020 21:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437521; bh=JWzxfpresqJOYZvRPnd/oNGVemC7vMtT3zNCqZzwwl4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C0I0WRonbwWI1C5wKefACejLbTRj+aWEGIVKHaYzDNnqfJpNTC/D8TYBliCdZj4W0 3QRv/tDOUgW4ugkLPhDvSlSgQmhmQHZLbRFyrMHlAGtKqXy7zOPDCrn/nYe7UP9Z4m kjjLZWWbcWE7JBCBImsbrAbmblEbeJt4ZIogDoJE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, KoWei Sung , Song Liu Subject: [PATCH 4.19 112/191] md/raid5: fix oops during stripe resizing Date: Tue, 3 Nov 2020 21:36:44 +0100 Message-Id: <20201103203243.946879005@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@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: Song Liu commit b44c018cdf748b96b676ba09fdbc5b34fc443ada upstream. KoWei reported crash during raid5 reshape: [ 1032.252932] Oops: 0002 [#1] SMP PTI [...] [ 1032.252943] RIP: 0010:memcpy_erms+0x6/0x10 [...] [ 1032.252947] RSP: 0018:ffffba1ac0c03b78 EFLAGS: 00010286 [ 1032.252949] RAX: 0000784ac0000000 RBX: ffff91bec3d09740 RCX: 0000000000001000 [ 1032.252951] RDX: 0000000000001000 RSI: ffff91be6781c000 RDI: 0000784ac0000000 [ 1032.252953] RBP: ffffba1ac0c03bd8 R08: 0000000000001000 R09: ffffba1ac0c03bf8 [ 1032.252954] R10: 0000000000000000 R11: 0000000000000000 R12: ffffba1ac0c03bf8 [ 1032.252955] R13: 0000000000001000 R14: 0000000000000000 R15: 0000000000000000 [ 1032.252958] FS: 0000000000000000(0000) GS:ffff91becf500000(0000) knlGS:0000000000000000 [ 1032.252959] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1032.252961] CR2: 0000784ac0000000 CR3: 000000031780a002 CR4: 00000000001606e0 [ 1032.252962] Call Trace: [ 1032.252969] ? async_memcpy+0x179/0x1000 [async_memcpy] [ 1032.252977] ? raid5_release_stripe+0x8e/0x110 [raid456] [ 1032.252982] handle_stripe_expansion+0x15a/0x1f0 [raid456] [ 1032.252988] handle_stripe+0x592/0x1270 [raid456] [ 1032.252993] handle_active_stripes.isra.0+0x3cb/0x5a0 [raid456] [ 1032.252999] raid5d+0x35c/0x550 [raid456] [ 1032.253002] ? schedule+0x42/0xb0 [ 1032.253006] ? schedule_timeout+0x10e/0x160 [ 1032.253011] md_thread+0x97/0x160 [ 1032.253015] ? wait_woken+0x80/0x80 [ 1032.253019] kthread+0x104/0x140 [ 1032.253022] ? md_start_sync+0x60/0x60 [ 1032.253024] ? kthread_park+0x90/0x90 [ 1032.253027] ret_from_fork+0x35/0x40 This is because cache_size_mutex was unlocked too early in resize_stripes, which races with grow_one_stripe() that grow_one_stripe() allocates a stripe with wrong pool_size. Fix this issue by unlocking cache_size_mutex after updating pool_size. Cc: # v4.4+ Reported-by: KoWei Sung Signed-off-by: Song Liu Signed-off-by: Greg Kroah-Hartman --- drivers/md/raid5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -2417,8 +2417,6 @@ static int resize_stripes(struct r5conf } else err = -ENOMEM; - mutex_unlock(&conf->cache_size_mutex); - conf->slab_cache = sc; conf->active_name = 1-conf->active_name; @@ -2441,6 +2439,8 @@ static int resize_stripes(struct r5conf if (!err) conf->pool_size = newsize; + mutex_unlock(&conf->cache_size_mutex); + return err; }