Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3187579pxb; Mon, 9 Nov 2020 05:09:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJy50Ohl7mRRi059KW5SisT2F9Mou+VppbTsdU6xBhzRZ+BvOZnpsTPAzwOQbkBqKB1nm2qs X-Received: by 2002:a05:6402:3056:: with SMTP id bu22mr14955869edb.252.1604927374022; Mon, 09 Nov 2020 05:09:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604927374; cv=none; d=google.com; s=arc-20160816; b=yIvke9kYXccy/OLDOTi+KYt3PGqR6SA2sNOpSyIrdIg8bMxF2EOk8NySkltazI5rXs hrrvHEKwMLx72Os4jc6XS86cnitdj6UvbmhuLPt3vSedxK+AQbmXfR0tX2lhIjD3GMvJ S4ZforLkvqhxBWHg+vIziO/ooWMz5ORAo494afd3oNmOyIEapWII7iGhflnyH94KoA+S 2Tk4qfMzpBGcqhRE+J3Egd/So1kBdFq+qKYkIFdgg3t+OjC1GSrAeV+ZSDsPNbZB65S7 2IZQXBbhsu6Kk8KR8fQdqsppwrdOK6YMjL6iXRPVCwbDAiDhYWzVGjt9KNroHNuBVvUF OVxg== 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=b9vpQ+GEa32SGeY6ZdDMyvgUasnVcz8CHk9yCPKA/Q8=; b=uj+gusHbsXmTdiya+yPeSXQK4fBeBz7CtrJYnr3+awCLecSDm15/sYzuXk9OYfCWYI c/IzBIy8ka46QwE+NGe2sEj0Px6l9R9vbsX4ApS6Q67KJNS837FlQMh9ADQPB+LBhl3/ 0PR5687gnJSjxJlbDEj5PO9Mh5BYXvS35VMySG5AKo+xGyh6tQDse9v6aGXxwvYvqxvt FPVlUQQ6xhpUFnxY04o8ZCnTzwSrObGsf6rU7spi2lzkzpQtLL9IxwJmJyKew4YX05Gt /6D8To7PxNhFc2ZEx2sb9QkqWATa5+vTcYONbSgi81QeX62HN/x2PnGDcOvDnqGPENOn Xh0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GuQ6b3jU; 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 m15si8210399edl.269.2020.11.09.05.08.43; Mon, 09 Nov 2020 05:09:34 -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=GuQ6b3jU; 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 S1730433AbgKINFV (ORCPT + 99 others); Mon, 9 Nov 2020 08:05:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:56932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729958AbgKINDr (ORCPT ); Mon, 9 Nov 2020 08:03:47 -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 B898120663; Mon, 9 Nov 2020 13:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927026; bh=EYRumyErUTxrVqHqK8oQl1eUV8edC0J4Y1cYCFAVQIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GuQ6b3jUt9ByLnzk/90Z0VJTXz2VnzvW2//WQf6+bN1rMrzDgHzcTqfIgC2hzo3lK TiQJe+cDC+e/aqIfAMfByuRgvdsKhPkWBFppubV8IcI5nUSWcQ4P5C51PaoeSAL5BK vkWgYNskN9/fVoYV8aIEW/4xqXo+ROdz40O70NjQ= 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.9 045/117] md/raid5: fix oops during stripe resizing Date: Mon, 9 Nov 2020 13:54:31 +0100 Message-Id: <20201109125027.802650252@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125025.630721781@linuxfoundation.org> References: <20201109125025.630721781@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 @@ -2259,8 +2259,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; @@ -2283,6 +2281,8 @@ static int resize_stripes(struct r5conf if (!err) conf->pool_size = newsize; + mutex_unlock(&conf->cache_size_mutex); + return err; }