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=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 A6498C32771 for ; Thu, 9 Jan 2020 12:32:09 +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 6F8B02072A for ; Thu, 9 Jan 2020 12:32:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="OjCULiV7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F8B02072A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipWyt-0000Qm-I7 for qemu-devel@archiver.kernel.org; Thu, 09 Jan 2020 07:32:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44494) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipWxV-0007wK-Oj for qemu-devel@nongnu.org; Thu, 09 Jan 2020 07:30:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipWxU-0004Aa-JU for qemu-devel@nongnu.org; Thu, 09 Jan 2020 07:30:41 -0500 Received: from fanzine.igalia.com ([178.60.130.6]:60502) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipWxT-000417-RF; Thu, 09 Jan 2020 07:30:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=TLFzwgFK3HIhNEGwPP8fQKt3sd1WXxycke16ZeDkLDI=; b=OjCULiV7kLJz8u+sAbVz93TDy1HwM0kG0EQkCSB+l25zTwghylPiF1tcRA3k2oWW1cgX3v3ZcJBbSldf26xvIeNR+7QxBUGwXYT4GTHl7uXtVxIQ7u7STeY1n5jWUxnMQNMc41NyWOetThDHrjHCuwIL+Uv0BCmDmp+w0Q7bTZ6RCJQwBXZGzbDNhis3OhKwjMNPeW85P3GAPZHtC9WBo53JyYVq6sX1L5fJGZCn8TMnAQg/GpUDeMVdddpgTeXiRm9kr5BQIB+bGSvS3xiwV2JnGEZ2HMXQ8jFkoKMHVmicovExVdiXPGtIpJgPXeVG3I1V++k3sWBD+jfpw0UzUQ==; Received: from maestria.local.igalia.com ([192.168.10.14] helo=mail.igalia.com) by fanzine.igalia.com with esmtps (Cipher TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim) id 1ipWxQ-0006ry-N2; Thu, 09 Jan 2020 13:30:36 +0100 Received: from berto by mail.igalia.com with local (Exim) id 1ipWxQ-0001kO-7K; Thu, 09 Jan 2020 13:30:36 +0100 From: Alberto Garcia To: Kevin Wolf Subject: Re: [PATCH 3/3] qcow2: Use BDRV_SECTOR_SIZE instead of the hardcoded value In-Reply-To: <20200109121900.GF9504@linux.fritz.box> References: <20200109121900.GF9504@linux.fritz.box> User-Agent: Notmuch/0.18.2 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Thu, 09 Jan 2020 13:30:36 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 178.60.130.6 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: qemu-devel@nongnu.org, qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu 09 Jan 2020 01:19:00 PM CET, Kevin Wolf wrote: >> diff --git a/block/qcow2.c b/block/qcow2.c >> index e8ce966f7f..6427c75409 100644 >> --- a/block/qcow2.c >> +++ b/block/qcow2.c >> @@ -2175,7 +2175,7 @@ static coroutine_fn int qcow2_co_preadv_task(BlockDriverState *bs, >> offset, bytes, qiov, qiov_offset); >> >> case QCOW2_CLUSTER_NORMAL: >> - if ((file_cluster_offset & 511) != 0) { >> + if ((file_cluster_offset % BDRV_SECTOR_SIZE) != 0) { >> return -EIO; >> } > > Hm, unrelated to your change, but why do we test for 512 byte > alignment here? file_cluster_offset should certainly be cluster > aligned for normal clusters. And if the check fails, that's actually > an image corruption and not just an I/O error. Am I missing something? I actually suspect that this is just an old, obsolete check that we have kept during these years. file_cluster_offset should be not just sector aligned but also cluster aligned if I'm not wrong, and if not then qcow2_alloc_cluster_offset() and qcow2_get_cluster_offset() should return an error. I can simply remove that check, or replace it with an assertion. Berto