From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752042AbcFTFMT (ORCPT ); Mon, 20 Jun 2016 01:12:19 -0400 Received: from LGEAMRELO13.lge.com ([156.147.23.53]:37811 "EHLO lgeamrelo13.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751307AbcFTFLw (ORCPT ); Mon, 20 Jun 2016 01:11:52 -0400 X-Original-SENDERIP: 156.147.1.127 X-Original-MAILFROM: byungchul.park@lge.com X-Original-SENDERIP: 10.177.222.33 X-Original-MAILFROM: byungchul.park@lge.com From: Byungchul Park To: peterz@infradead.org, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, npiggin@suse.de, sergey.senozhatsky@gmail.com, gregkh@linuxfoundation.org, minchan@kernel.org Subject: [PATCH 3/5] lockdep: Apply bit_spin_lock lockdep to zram Date: Mon, 20 Jun 2016 13:55:13 +0900 Message-Id: <1466398515-1005-4-git-send-email-byungchul.park@lge.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466398515-1005-1-git-send-email-byungchul.park@lge.com> References: <1466398515-1005-1-git-send-email-byungchul.park@lge.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to use lockdep-enabled bit_spin_lock, we have to call bit_spin_init() when a instance including the bit used as lock creates, and bit_spin_free() when the instance including the bit destroys. The zram is one of bit_spin_lock users. And this patch adds bit_spin_init() and bit_spin_free() properly to apply the lock correctness validator to bit_spin_lock the rzam is using. Signed-off-by: Byungchul Park --- drivers/block/zram/zram_drv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 370c2f7..2bc3bde 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -495,6 +495,11 @@ static void zram_meta_free(struct zram_meta *meta, u64 disksize) } zs_destroy_pool(meta->mem_pool); + + for (index = 0; index < num_pages; index++) { + bit_spin_free(ZRAM_ACCESS, &meta->table[index].value); + } + vfree(meta->table); kfree(meta); } @@ -503,6 +508,7 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize) { size_t num_pages; struct zram_meta *meta = kmalloc(sizeof(*meta), GFP_KERNEL); + int index; if (!meta) return NULL; @@ -520,6 +526,10 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize) goto out_error; } + for (index = 0; index < num_pages; index++) { + bit_spin_init(ZRAM_ACCESS, &meta->table[index].value); + } + return meta; out_error: -- 1.9.1