From patchwork Thu Jul 16 14:25:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 11667719 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0EF8060D for ; Thu, 16 Jul 2020 14:28:59 +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 D9189206F4 for ; Thu, 16 Jul 2020 14:28:58 +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="FfobNvR2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9189206F4 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jw4sc-0003rj-5l for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jul 2020 10:28:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jw4qo-0002A6-RM for qemu-devel@nongnu.org; Thu, 16 Jul 2020 10:27:06 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:24095 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jw4qm-0005gA-6f for qemu-devel@nongnu.org; Thu, 16 Jul 2020 10:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594909623; 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; bh=Rc4qla+LstdHHRZGlJ1DRlaDwDdEvQexguhEsz+T3+s=; b=FfobNvR2iVsqgpPhgURBGBXkJPnUh80/XujKYkNNmILM3JVH6urPHG58cA8jkOEHypEx4v 6+x4xJhJPUvNuhF+m3Xd8b/0cOZwB0TCTzb2/UOnEOAwuTcHVS+bUuIV39ielCCE2OzkLw Jyb11UulUaM6LCYsMXWCrtH02QViCW4= 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-321-eoAxteSyPWuCGKfK0vx3Qw-1; Thu, 16 Jul 2020 10:26:20 -0400 X-MC-Unique: eoAxteSyPWuCGKfK0vx3Qw-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 2D5901085; Thu, 16 Jul 2020 14:26:19 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-172.ams2.redhat.com [10.36.114.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00C16710A0; Thu, 16 Jul 2020 14:26:17 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH for-5.1 v2 0/2] qemu-img convert: Fix abort with unaligned image size Date: Thu, 16 Jul 2020 16:25:59 +0200 Message-Id: <20200716142601.111237-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/16 09:29:31 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1834646 Patch 1 fixes the assertion failure by failing gracefully when opening an image whose size isn't aligned to the required request alignment. Patch 2 relaxes the restrictions for NFS, which actually supports byte alignment, but incorrectly gets a 4k request alignment in the file-posix block driver. v2: - Don't fail opening unaligned images, but requesting WRITE permission without RESIZE. This keeps qcow2 images with unaligned metadata at EOF working. [Max] Kevin Wolf (2): block: Require aligned image size to avoid assertion failure file-posix: Allow byte-aligned O_DIRECT with NFS block.c | 16 ++++++++++++++++ block/file-posix.c | 26 +++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-)