From patchwork Fri Jan 22 15:25:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Tsironis X-Patchwork-Id: 12039689 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1487BC433DB for ; Fri, 22 Jan 2021 15:29:31 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4FFA23A84 for ; Fri, 22 Jan 2021 15:29:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4FFA23A84 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arrikto.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-138-kCSa1HlGMu68VcK7b5lgmg-1; Fri, 22 Jan 2021 10:29:26 -0500 X-MC-Unique: kCSa1HlGMu68VcK7b5lgmg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99C1D101F7D9; Fri, 22 Jan 2021 15:29:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 70DFE18993; Fri, 22 Jan 2021 15:29:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3FE034E58E; Fri, 22 Jan 2021 15:29:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10MFQ9Wn028586 for ; Fri, 22 Jan 2021 10:26:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id BEEA3EE847; Fri, 22 Jan 2021 15:26:09 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B7DD4EE84C for ; Fri, 22 Jan 2021 15:26:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CCB05811E76 for ; Fri, 22 Jan 2021 15:26:06 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-452-L0I24-yvOwyAECaizP-fdQ-1; Fri, 22 Jan 2021 10:26:02 -0500 X-MC-Unique: L0I24-yvOwyAECaizP-fdQ-1 Received: by mail-wr1-f47.google.com with SMTP id m1so4760722wrq.12 for ; Fri, 22 Jan 2021 07:26:01 -0800 (PST) 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; bh=UgcTNWE/uk/KcXUXWdLFils+XT6RGm4GOt/51Vobw+c=; b=LosoNa6pXojwHIPItMmQjCyvEU/PG61y5J00VEPZd67U4Cb+kzYnrq7E3X3bk9Ij71 EiZvhtAAO0Y+xZnYQe5Zkdurs2afjnpPVgWPjoGzXF7EW6RCDeKjU3wIlH6/sqS4XIb+ J4Uipcg3NydNVyp6C1Fr1ad6CxOf7KTiZMBj6SxI0iqpMmjox8kn/K4oTrK/tqeRZnim Cu7JpAAS5I3F8MLAbBi8WnxHaOXZ0MpIlwtBwN8ut6TnMFQd6OYAlQCujxL9ZtMzs+5V p8b6yi55AB/ZLs78WLPujcY/3CabrU4JbvY9bF9ZnC2ZY2LcHsVCEHNHBEGb+99FTl/W 6Smw== X-Gm-Message-State: AOAM531IoUuQrqW1q+BSIGk/07xTniJDf78Xg2FjjYs7Qkgy9mcHX38w gC3oyB2dJ5+ZL0G2WEupGNTXHQ== X-Google-Smtp-Source: ABdhPJx+pMdt5El2L1nSbohq3kgqH1hx0SoFFhdFFKLmBED8Hj0k8SGGsWHPlfsDuJ1lPpug+cqlZg== X-Received: by 2002:a05:6000:1374:: with SMTP id q20mr4913106wrz.44.1611329160966; Fri, 22 Jan 2021 07:26:00 -0800 (PST) Received: from snf-864.vm.snf.arr ([31.177.62.212]) by smtp.gmail.com with ESMTPSA id r1sm12685159wrl.95.2021.01.22.07.25.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 07:26:00 -0800 (PST) From: Nikos Tsironis To: snitzer@redhat.com, agk@redhat.com, dm-devel@redhat.com Date: Fri, 22 Jan 2021 17:25:53 +0200 Message-Id: <20210122152556.24822-2-ntsironis@arrikto.com> In-Reply-To: <20210122152556.24822-1-ntsironis@arrikto.com> References: <20210122152556.24822-1-ntsironis@arrikto.com> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: dm-devel@redhat.com Cc: ejt@redhat.com, ntsironis@arrikto.com Subject: [dm-devel] [PATCH 1/4] dm era: Verify the data block size hasn't changed X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com dm-era doesn't support changing the data block size of existing devices, so check explicitly that the requested block size for a new target matches the one stored in the metadata. Fixes: eec40579d84873 ("dm: add era target") Cc: stable@vger.kernel.org # v3.15+ Signed-off-by: Nikos Tsironis --- drivers/md/dm-era-target.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm-era-target.c b/drivers/md/dm-era-target.c index b24e3839bb3a..52e3f63335d3 100644 --- a/drivers/md/dm-era-target.c +++ b/drivers/md/dm-era-target.c @@ -564,6 +564,15 @@ static int open_metadata(struct era_metadata *md) } disk = dm_block_data(sblock); + + /* Verify the data block size hasn't changed */ + if (le32_to_cpu(disk->data_block_size) != md->block_size) { + DMERR("changing the data block size (from %u to %llu) is not supported", + le32_to_cpu(disk->data_block_size), md->block_size); + r = -EINVAL; + goto bad; + } + r = dm_tm_open_with_sm(md->bm, SUPERBLOCK_LOCATION, disk->metadata_space_map_root, sizeof(disk->metadata_space_map_root), @@ -575,7 +584,6 @@ static int open_metadata(struct era_metadata *md) setup_infos(md); - md->block_size = le32_to_cpu(disk->data_block_size); md->nr_blocks = le32_to_cpu(disk->nr_blocks); md->current_era = le32_to_cpu(disk->current_era); From patchwork Fri Jan 22 15:25:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Tsironis X-Patchwork-Id: 12039693 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9165CC433DB for ; Fri, 22 Jan 2021 15:30:14 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EE99523A9A for ; Fri, 22 Jan 2021 15:30:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE99523A9A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arrikto.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-469-m2rLfQ85OoepHmFbY34maw-1; Fri, 22 Jan 2021 10:30:10 -0500 X-MC-Unique: m2rLfQ85OoepHmFbY34maw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 680828066E6; Fri, 22 Jan 2021 15:30:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 420B510429FB; Fri, 22 Jan 2021 15:30:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0DC2C4E590; Fri, 22 Jan 2021 15:30:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10MFQ9kt028585 for ; Fri, 22 Jan 2021 10:26:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id BC43AEE84E; Fri, 22 Jan 2021 15:26:09 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B3CB5EE847 for ; Fri, 22 Jan 2021 15:26:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6C8DD101A564 for ; Fri, 22 Jan 2021 15:26:06 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-247-dUf_8jAfM7Gwg0elE4IJPQ-1; Fri, 22 Jan 2021 10:26:03 -0500 X-MC-Unique: dUf_8jAfM7Gwg0elE4IJPQ-1 Received: by mail-wm1-f50.google.com with SMTP id o10so6880766wmc.1 for ; Fri, 22 Jan 2021 07:26:03 -0800 (PST) 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; bh=d2K/uftEBOdNh1oU3xJTqBSBYuXel+NGzXuIYHjfeSw=; b=B8RvEr+578dEPQGl9E/eHFlt4kAI3IQN7ATE/dzPZwPVY10gNf9K4a69swqhmJHp9y Bfp6HaWlbTH3aGXmHvv2OE99FqtX72puQaqSHVIXQMtxVXwNf2UbC8VkmH2CE1Ip4iTu 3FNoDA19rFjOEr1UQQTbTAuB4Zq5INqfLt003Wj6B6h7reqZ/36G22LLByfy1nvxuwlJ 03wiT+mIciVp/TLiMXizHbADaoTkTF7YQq/hCOmyP2lGFhtVwRsYF5iWavAHNr6hl/RP +PGeht3ev5CQezQLlxrSW574MC1EE6DRBlO1iIYpTuEgc1E+AfvhSlaGv/quI96/aknI COBw== X-Gm-Message-State: AOAM533QjmmzDR7bbVlcPoTpDsmYGifbES1MswfKRlKjTBohgElxjdQA BN11Uq9759smj24AMPSR+lxHJw== X-Google-Smtp-Source: ABdhPJwgdEiFuXsGFLtcyRd7rXwNT2D48qv4ZDbzRZwGyWTZ83whwjPJv8yCjHfxmTT7NXw4Qt8KRQ== X-Received: by 2002:a1c:7413:: with SMTP id p19mr4359391wmc.39.1611329162836; Fri, 22 Jan 2021 07:26:02 -0800 (PST) Received: from snf-864.vm.snf.arr ([31.177.62.212]) by smtp.gmail.com with ESMTPSA id r1sm12685159wrl.95.2021.01.22.07.26.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 07:26:01 -0800 (PST) From: Nikos Tsironis To: snitzer@redhat.com, agk@redhat.com, dm-devel@redhat.com Date: Fri, 22 Jan 2021 17:25:54 +0200 Message-Id: <20210122152556.24822-3-ntsironis@arrikto.com> In-Reply-To: <20210122152556.24822-1-ntsironis@arrikto.com> References: <20210122152556.24822-1-ntsironis@arrikto.com> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: dm-devel@redhat.com Cc: ejt@redhat.com, ntsironis@arrikto.com Subject: [dm-devel] [PATCH 2/4] dm era: Fix bitset memory leaks X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Deallocate the memory allocated for the in-core bitsets when destroying the target and in error paths. Fixes: eec40579d84873 ("dm: add era target") Cc: stable@vger.kernel.org # v3.15+ Signed-off-by: Nikos Tsironis --- drivers/md/dm-era-target.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/md/dm-era-target.c b/drivers/md/dm-era-target.c index 52e3f63335d3..ffbbd8740253 100644 --- a/drivers/md/dm-era-target.c +++ b/drivers/md/dm-era-target.c @@ -47,6 +47,7 @@ struct writeset { static void writeset_free(struct writeset *ws) { vfree(ws->bits); + ws->bits = NULL; } static int setup_on_disk_bitset(struct dm_disk_bitset *info, @@ -810,6 +811,8 @@ static struct era_metadata *metadata_open(struct block_device *bdev, static void metadata_close(struct era_metadata *md) { + writeset_free(&md->writesets[0]); + writeset_free(&md->writesets[1]); destroy_persistent_data_objects(md); kfree(md); } @@ -847,6 +850,7 @@ static int metadata_resize(struct era_metadata *md, void *arg) r = writeset_alloc(&md->writesets[1], *new_size); if (r) { DMERR("%s: writeset_alloc failed for writeset 1", __func__); + writeset_free(&md->writesets[0]); return r; } @@ -857,6 +861,8 @@ static int metadata_resize(struct era_metadata *md, void *arg) &value, &md->era_array_root); if (r) { DMERR("%s: dm_array_resize failed", __func__); + writeset_free(&md->writesets[0]); + writeset_free(&md->writesets[1]); return r; } From patchwork Fri Jan 22 15:25:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Tsironis X-Patchwork-Id: 12039695 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8A54C433DB for ; Fri, 22 Jan 2021 15:30:17 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C900A23A84 for ; Fri, 22 Jan 2021 15:30:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C900A23A84 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arrikto.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-113-q7CVxXk-M5ycKXpSsU5BJw-1; Fri, 22 Jan 2021 10:30:12 -0500 X-MC-Unique: q7CVxXk-M5ycKXpSsU5BJw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D278A8144E3; Fri, 22 Jan 2021 15:30:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B49B860C6B; Fri, 22 Jan 2021 15:30:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8308F1809CA0; Fri, 22 Jan 2021 15:30:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10MFQC8r028611 for ; Fri, 22 Jan 2021 10:26:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 48ED42166B27; Fri, 22 Jan 2021 15:26:12 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42BF02166B2B for ; Fri, 22 Jan 2021 15:26:08 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 366AC811E78 for ; Fri, 22 Jan 2021 15:26:08 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-190-WY5TmLPCOSmraJ4VxYF1uw-1; Fri, 22 Jan 2021 10:26:06 -0500 X-MC-Unique: WY5TmLPCOSmraJ4VxYF1uw-1 Received: by mail-wr1-f43.google.com with SMTP id m4so5452990wrx.9 for ; Fri, 22 Jan 2021 07:26:05 -0800 (PST) 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; bh=oz0drnykatIxvUVv11Ld/Kg9w4bHeert3CCsRVLYUmc=; b=JNzlQ4mfKdOPhLYC6U5nr6Pc7CA+OY7d/qyKHcuOZtz70q5dyLQCH2PFJ99QwnSON/ WnBNNZb8J3bYbZOYJ7qi3332i7t7tGMi5Ve/dGV6MRkJhHRKpPiiK93MX9O7NVqfkYNp dDbTVnP0HBK2DYxS6DAC8urlW9osMgCc1lB3O6LTlS/tkmTHiFC2oBiH27p7WENZOgYa hs9VN9mEuwGu2dLs6adUGoIl2ft1c7EQ5uaX94H7gdkpHTVElL5PLPvf58mNElIOdN1n zVZtvZ8oT7rCjDWdpjJr12tC3OOr8UQswgAct+1nqIyjUhZz3An9YCEo0LB4ci6Emu+T 4WQg== X-Gm-Message-State: AOAM532nVVvPdege3j5I5ZxQ/BtT2NtaWzrE/3UXg37ZLy+1FUTCSozh R1nkIOCUunONr48tGIzjt8ia+Q== X-Google-Smtp-Source: ABdhPJxQryvDV2XR7P3m9EMP193r/WFutDObpjwWGtkm06SRFgFSh5QucOh1xQ1xOPYCfIyHTWboMA== X-Received: by 2002:a05:6000:1803:: with SMTP id m3mr4999358wrh.34.1611329164729; Fri, 22 Jan 2021 07:26:04 -0800 (PST) Received: from snf-864.vm.snf.arr ([31.177.62.212]) by smtp.gmail.com with ESMTPSA id r1sm12685159wrl.95.2021.01.22.07.26.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 07:26:03 -0800 (PST) From: Nikos Tsironis To: snitzer@redhat.com, agk@redhat.com, dm-devel@redhat.com Date: Fri, 22 Jan 2021 17:25:55 +0200 Message-Id: <20210122152556.24822-4-ntsironis@arrikto.com> In-Reply-To: <20210122152556.24822-1-ntsironis@arrikto.com> References: <20210122152556.24822-1-ntsironis@arrikto.com> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: dm-devel@redhat.com Cc: ejt@redhat.com, ntsironis@arrikto.com Subject: [dm-devel] [PATCH 3/4] dm era: Use correct value size in equality function of writeset tree X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Fix the writeset tree equality test function to use the right value size when comparing two btree values. Fixes: eec40579d84873 ("dm: add era target") Cc: stable@vger.kernel.org # v3.15+ Signed-off-by: Nikos Tsironis --- drivers/md/dm-era-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/dm-era-target.c b/drivers/md/dm-era-target.c index ffbbd8740253..104fb110cd4e 100644 --- a/drivers/md/dm-era-target.c +++ b/drivers/md/dm-era-target.c @@ -389,7 +389,7 @@ static void ws_dec(void *context, const void *value) static int ws_eq(void *context, const void *value1, const void *value2) { - return !memcmp(value1, value2, sizeof(struct writeset_metadata)); + return !memcmp(value1, value2, sizeof(struct writeset_disk)); } /*----------------------------------------------------------------*/ From patchwork Fri Jan 22 15:25:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Tsironis X-Patchwork-Id: 12039687 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8E9FC433E0 for ; Fri, 22 Jan 2021 15:27:43 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2C6BC23A84 for ; Fri, 22 Jan 2021 15:27:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C6BC23A84 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arrikto.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-9-Om_nD7j2MceLj1gpHxhELw-1; Fri, 22 Jan 2021 10:27:38 -0500 X-MC-Unique: Om_nD7j2MceLj1gpHxhELw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E784D18C89C4; Fri, 22 Jan 2021 15:27:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B991D5D6CF; Fri, 22 Jan 2021 15:27:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 582544BB40; Fri, 22 Jan 2021 15:27:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10MFQCq1028605 for ; Fri, 22 Jan 2021 10:26:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id DDF2CEE39A; Fri, 22 Jan 2021 15:26:11 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D84D2EE84E for ; Fri, 22 Jan 2021 15:26:11 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5A94101A565 for ; Fri, 22 Jan 2021 15:26:11 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-453-MLu-W6AAOpSdJaRFDQgMuA-1; Fri, 22 Jan 2021 10:26:07 -0500 X-MC-Unique: MLu-W6AAOpSdJaRFDQgMuA-1 Received: by mail-wr1-f53.google.com with SMTP id l12so5466950wry.2 for ; Fri, 22 Jan 2021 07:26:07 -0800 (PST) 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; bh=RKude94Zrh4ADG0Do//PpQ+RSbgumBAyrqGV2UNHdtA=; b=Z6f1XwjGPmS9cuCSd8EmIaGKskWXbE9qYa+S8+dnIYY9LWuOijfFZ2xGn5gHOXa6tY GTsLXzwPpzCgp7nOAC1lHfp9cLa4Gb55D6d5SGNrW+0w7+GwtLPDc0sFEPRKpoLXAe/6 xDguFc7HH2sxuWXOI7PPz+UqLEoOIuVK5cgtGiPJHLQ9fvDFSQGVFXMapbBVmFoEzKB6 W+ccdYH1tgsKN/Tb5QDn1PiXcy33L7NnrAQ7SqtxkSU1mE58GNidWYRrQM+XjKzTV7Ne ZEcIrX3MH95Uf6ql0x9KV/LQinEscvsJDyXGUA0Gl4lZtkpHNQ/h9+gVwrCgWTXgrzXC Otig== X-Gm-Message-State: AOAM532LgzgyhA7iR5i19aGw2AfQHeA8YLv2QywVHwZBCWRC8hF5yjUt A5BOfSuS/Ad8gGDc9BR5a1jh1w== X-Google-Smtp-Source: ABdhPJymlsbgT0j0R/pJwt5MBDGrWK8VaVpqZsVbxk34j+5pdsJr00nj+3m+e02xFKSRfj5B+LCtgQ== X-Received: by 2002:a5d:54cc:: with SMTP id x12mr5094959wrv.132.1611329166676; Fri, 22 Jan 2021 07:26:06 -0800 (PST) Received: from snf-864.vm.snf.arr ([31.177.62.212]) by smtp.gmail.com with ESMTPSA id r1sm12685159wrl.95.2021.01.22.07.26.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 07:26:05 -0800 (PST) From: Nikos Tsironis To: snitzer@redhat.com, agk@redhat.com, dm-devel@redhat.com Date: Fri, 22 Jan 2021 17:25:56 +0200 Message-Id: <20210122152556.24822-5-ntsironis@arrikto.com> In-Reply-To: <20210122152556.24822-1-ntsironis@arrikto.com> References: <20210122152556.24822-1-ntsironis@arrikto.com> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: dm-devel@redhat.com Cc: ejt@redhat.com, ntsironis@arrikto.com Subject: [dm-devel] [PATCH 4/4] dm era: Remove unreachable resize operation in pre-resume function X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com The device metadata are resized in era_ctr(), so the metadata resize operation in era_preresume() never runs. Also, note, that if the operation did ever run it would deadlock, since the worker has not been started at this point. Fixes: eec40579d84873 ("dm: add era target") Cc: stable@vger.kernel.org # v3.15+ Signed-off-by: Nikos Tsironis --- drivers/md/dm-era-target.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/md/dm-era-target.c b/drivers/md/dm-era-target.c index 104fb110cd4e..c40e132e50cd 100644 --- a/drivers/md/dm-era-target.c +++ b/drivers/md/dm-era-target.c @@ -1567,15 +1567,6 @@ static int era_preresume(struct dm_target *ti) { int r; struct era *era = ti->private; - dm_block_t new_size = calc_nr_blocks(era); - - if (era->nr_blocks != new_size) { - r = in_worker1(era, metadata_resize, &new_size); - if (r) - return r; - - era->nr_blocks = new_size; - } start_worker(era);