From mboxrd@z Thu Jan 1 00:00:00 1970 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=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 AD784C4742C for ; Thu, 5 Nov 2020 14:36:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CF65120786 for ; Thu, 5 Nov 2020 14:36:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YIgk3Sk+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF65120786 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kagN9-0003Gd-FE for qemu-devel@archiver.kernel.org; Thu, 05 Nov 2020 09:36:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kagL2-0001sk-PF for qemu-devel@nongnu.org; Thu, 05 Nov 2020 09:34:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49134) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kagL0-00066a-TT for qemu-devel@nongnu.org; Thu, 05 Nov 2020 09:34:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604586845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8DbGP/RYzLSNB2OXtHsvVx5Ii6ZXW+VnGuHD2uCUF+g=; b=YIgk3Sk+yIiEliiep/0E/Zez5dnHufWhS4jYrJtzpSQaOpuHYDBRx8U/6T7PcABlZnsA4R pvmFaJJQXUqSvst2QdC/h28vevPX0Y099LQEi0jbK7ln6fQ2y0S9Lv1gqLTVKwLgxWRk1P 5n0LSmqBv5VvwZFbHQ4/dQ4SbufrSNU= 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-12-9jHrhJGrM1OtCe7UyukWSw-1; Thu, 05 Nov 2020 09:34:04 -0500 X-MC-Unique: 9jHrhJGrM1OtCe7UyukWSw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E9C011074643; Thu, 5 Nov 2020 14:34:02 +0000 (UTC) Received: from dresden.str.redhat.com (ovpn-114-31.ams2.redhat.com [10.36.114.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7C851A268; Thu, 5 Nov 2020 14:34:01 +0000 (UTC) Subject: Re: [PATCH 2/2] block: assert that permission commit sets same permissions To: Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org References: <20201031123502.4558-1-vsementsov@virtuozzo.com> <20201031123502.4558-3-vsementsov@virtuozzo.com> From: Max Reitz Message-ID: Date: Thu, 5 Nov 2020 15:34:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201031123502.4558-3-vsementsov@virtuozzo.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/04 22:46:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, den@openvz.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 31.10.20 13:35, Vladimir Sementsov-Ogievskiy wrote: > On permission update commit we must set same permissions as on _check_. > Let's add assertions. Next step may be to drop permission parameters > from _set_. > > Note that prior to previous commit, fixing bdrv_drop_intermediate(), > new assertion in bdrv_child_set_perm() crashes on iotests 30 and 40. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > block.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/block.c b/block.c > index bd9f4e534b..0f4da59a6c 100644 > --- a/block.c > +++ b/block.c [...] > @@ -2301,6 +2306,8 @@ static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared) > > c->has_backup_perm = false; > > + assert(c->perm == perm); > + assert(c->shared_perm == shared); > c->perm = perm; > c->shared_perm = shared; Then we can drop the assignments, no? (And, as you write, in the future potentially drop the parameters.) Anyway: Reviewed-by: Max Reitz