From patchwork Mon Jun 26 09:57:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9809039 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 95522603F3 for ; Mon, 26 Jun 2017 10:01:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C6122847B for ; Mon, 26 Jun 2017 10:01:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 914C628536; Mon, 26 Jun 2017 10:01:15 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 193172847B for ; Mon, 26 Jun 2017 10:01:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752006AbdFZKBE (ORCPT ); Mon, 26 Jun 2017 06:01:04 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37311 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751397AbdFZJ6c (ORCPT ); Mon, 26 Jun 2017 05:58:32 -0400 Received: by mail-wm0-f44.google.com with SMTP id i127so3037575wma.0 for ; Mon, 26 Jun 2017 02:58:26 -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=ir4rIm/YHVMQlc84EJE4QW7y0t1EQpv0FQ9+CAb8aKw=; b=lR0N/DiyS+hgx/BFKvEaBL6bpCycXp8RYDFR6qSMbH7O5T+l9qSj+Jz8pX9inATJ1z oqI03jfrXfnJO/cDwPyWNZtd4YX9KVgl3lpNa0w2B2FuAsZaSiaEA1q/HZ/P6XhqIL1v cEw1p1Y0ChFzumRExXOGppNwu3gusEMbiaHtuuYiLGANjYSEdYPdn04hZuYf29yqqIzq 6CdnY9uAr3Fypww3rSSRH+GrqnyPDBXtTlDJo+S7IJzqhhi3znGdx+o0Q1LzEemaUJsx XDW4YcxrdHj8ubC0BsBSWIN4t1ckthAHFDwdcpKdyOLQraxb7tULZipaJNW8B1VDWjVo qBPw== 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=ir4rIm/YHVMQlc84EJE4QW7y0t1EQpv0FQ9+CAb8aKw=; b=b4ZMOvTpbep2J8FhYz91rb7PJPptg9JDQweeuTy2E0USWd/Z3S6lSZYwZYhHWeXsiP bBz4KR++iuaxMQgpNfP/PThAUg5Mt/HtZlQH62CpSbDddmpx+91tHPRmRVUN1epIesoc ucJZ1QLd6x1qqnhS3dwASTept9JldR79wnpdE5KHp0AC2oN3fM+rRyNKUNgKgH9Gkfoe 3XqMUbnr4MJ2mMTmOGFonb46u/RkaLISoJx/pGgLun1t84WGu7ZBMbrwRsfggecsA9nZ pQ1XovUUJbkDiFvaKnQy09inUo47dl4znlbmYFE3FP4aNkOuDaTAJMED+G45CKZdG1vT 8j+w== X-Gm-Message-State: AKS2vOwVamIEgdggHMr/b7iMLo5wrIuH/3EF/1Wzvvxjzy7EG7VFWLLn q8ePJNdNI1mhDdfR X-Received: by 10.80.164.185 with SMTP id w54mr16140388edb.76.1498471105201; Mon, 26 Jun 2017 02:58:25 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id n26sm5212537edd.51.2017.06.26.02.58.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Jun 2017 02:58:24 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io, axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 17/20] lightnvm: pblk: add lock assertions on helpers Date: Mon, 26 Jun 2017 11:57:26 +0200 Message-Id: <1498471049-25505-18-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498471049-25505-1-git-send-email-javier@cnexlabs.com> References: <1498471049-25505-1-git-send-email-javier@cnexlabs.com> 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 Add lockdep assertions on helper functions. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index d815cdad56b8..ed41cd7700b3 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -295,6 +295,8 @@ struct list_head *pblk_line_gc_list(struct pblk *pblk, struct pblk_line *line) struct list_head *move_list = NULL; int vsc = le32_to_cpu(*line->vsc); + lockdep_assert_held(&line->lock); + if (!vsc) { if (line->gc_group != PBLK_LINEGC_FULL) { line->gc_group = PBLK_LINEGC_FULL; @@ -502,6 +504,8 @@ u64 __pblk_alloc_page(struct pblk *pblk, struct pblk_line *line, int nr_secs) u64 addr; int i; + lockdep_assert_held(&line->lock); + /* logic error: ppa out-of-bounds. Prevent generating bad address */ if (line->cur_sec + nr_secs > pblk->lm.sec_per_line) { WARN(1, "pblk: page allocation out of bounds\n");