From patchwork Tue Oct 9 11:12:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matias Bjorling X-Patchwork-Id: 10632269 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5561D112B for ; Tue, 9 Oct 2018 11:15:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3522428A5E for ; Tue, 9 Oct 2018 11:15:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2965D28A6E; Tue, 9 Oct 2018 11:15:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE13628A5E for ; Tue, 9 Oct 2018 11:15:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726907AbeJISbq (ORCPT ); Tue, 9 Oct 2018 14:31:46 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:45000 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726693AbeJISbq (ORCPT ); Tue, 9 Oct 2018 14:31:46 -0400 Received: by mail-pg1-f196.google.com with SMTP id g2-v6so641225pgu.11 for ; Tue, 09 Oct 2018 04:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j5hzm3iNy1IojUsUtFYt//hQMq7pvONkwQcInQj0DBM=; b=o9a0T1rkRbt1vWq5JnM7tta0EmOhmjIAb0/cGcO59LfEJw56DgRpYVPfZ/15pp+WL9 eJsl4/ePaNikFQbXn9dhcPJixJfB1sdepN3vv0CXC135/ev4myN5aHttjZQ8Cc9lpnXZ TUtIvswj1IqrKvMhuYwWlT3Qo+yAwUKb3B0CIyz7lq+HdZ2aQbT4x+NL2tS7Wa5qq9Tx aSHojxCPpDoO2a467jY9Ptt3fxylg8gN5vp+ZTAyxIZX1XijbINFCR2di/A81CE6+Rpw zyGkzhZBdnne9sA5JNdJ+wt9Z9xN0j28epAW7fnb3CgD4D+XzuZP34u+Ev/NPPI5zITQ tTbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j5hzm3iNy1IojUsUtFYt//hQMq7pvONkwQcInQj0DBM=; b=C/t1TdCcPWdFrsP2G0o5JFK/LToXnF+E3qGlKeNktViL11Bp00N1ayGHC9bolvsN/w xFY9+Cx6fWQO4SVQTpuGLDzdPM6p1G+0l7AFbtq0poA4cle277A0kp4truJvfl+TSOew mSnrZlTtU2eP3hAVC+9jV1sHgcyG6wVQyi/nV+FCQDknAcb0G2nDfEumYpJS8WjoxFOR zAq15RMhbNyYRDJ/dK7dVFnlC4Tirs8WSOlOYzA0uqUAtZanenJIi7b0l33u2SNJpMf8 ODDhenYZ3U2tyT8ez4N+4xHNehr36p+UzhaXaNYRqWMoas3UzbQyga+mDyjxL3FswjKh ro4A== X-Gm-Message-State: ABuFfogssTnvGUlZIeO4B+xe4iaItQL3642ARROwLgYAYFXqT/FgiGAN zrqPH4QCuSBLDjx4EEPuuPAqrA== X-Google-Smtp-Source: ACcGV63ozpXGW/RbIAiA9KClASyAFHw989JGh4oQVLuSRc9GhdMDSkfB9Z5a8kOQm+iQbEyzTqPThQ== X-Received: by 2002:aa7:8643:: with SMTP id a3-v6mr29605086pfo.247.1539083719175; Tue, 09 Oct 2018 04:15:19 -0700 (PDT) Received: from skyninja.hgst.com (rap-us.hgst.com. [199.255.44.250]) by smtp.gmail.com with ESMTPSA id p1-v6sm25342380pff.128.2018.10.09.04.15.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Oct 2018 04:15:17 -0700 (PDT) From: =?utf-8?q?Matias_Bj=C3=B8rling?= To: axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Jav?= =?utf-8?q?ier_Gonz=C3=A1lez?= , =?utf-8?q?Javier_Gonz?= =?utf-8?q?=C3=A1lez?= , =?utf-8?q?Matias_Bj=C3=B8rling?= Subject: [GIT PULL 37/45] lightnvm: pblk: fix race on sysfs line state Date: Tue, 9 Oct 2018 13:12:07 +0200 Message-Id: <20181009111215.7653-38-mb@lightnvm.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181009111215.7653-1-mb@lightnvm.io> References: <20181009111215.7653-1-mb@lightnvm.io> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Javier González pblk exposes a sysfs interface that represents its internal state. Part of this state is the map bitmap for the current open line, which should be protected by the line lock to avoid a race when freeing the line metadata. Currently, it is not. This patch makes sure that the line state is consistent and NULL bitmap pointers are not dereferenced. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 5 +++-- drivers/lightnvm/pblk-sysfs.c | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index 4045a9b1ee74..6944aac43b01 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -1611,13 +1611,14 @@ struct pblk_line *pblk_line_replace_data(struct pblk *pblk) struct pblk_line *cur, *new = NULL; unsigned int left_seblks; - cur = l_mg->data_line; new = l_mg->data_next; if (!new) goto out; + + spin_lock(&l_mg->free_lock); + cur = l_mg->data_line; l_mg->data_line = new; - spin_lock(&l_mg->free_lock); pblk_line_setup_metadata(new, l_mg, &pblk->lm); spin_unlock(&l_mg->free_lock); diff --git a/drivers/lightnvm/pblk-sysfs.c b/drivers/lightnvm/pblk-sysfs.c index cba83ac43e62..2d2818155aa8 100644 --- a/drivers/lightnvm/pblk-sysfs.c +++ b/drivers/lightnvm/pblk-sysfs.c @@ -263,8 +263,14 @@ static ssize_t pblk_sysfs_lines(struct pblk *pblk, char *page) sec_in_line = l_mg->data_line->sec_in_line; meta_weight = bitmap_weight(&l_mg->meta_bitmap, PBLK_DATA_LINES); - map_weight = bitmap_weight(l_mg->data_line->map_bitmap, + + spin_lock(&l_mg->data_line->lock); + if (l_mg->data_line->map_bitmap) + map_weight = bitmap_weight(l_mg->data_line->map_bitmap, lm->sec_per_line); + else + map_weight = 0; + spin_unlock(&l_mg->data_line->lock); } spin_unlock(&l_mg->free_lock);