From nobody Sat May 4 12:20:48 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653033829639427.2672607919193; Fri, 20 May 2022 01:03:49 -0700 (PDT) Received: from localhost ([::1]:59364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrxbu-00059g-SH for importer2@patchew.org; Fri, 20 May 2022 04:03:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrxXy-00039M-5G; Fri, 20 May 2022 03:59:46 -0400 Received: from proxmox-new.maurer-it.com ([94.136.29.106]:20345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrxXv-000158-5U; Fri, 20 May 2022 03:59:40 -0400 Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 812F442F61; Fri, 20 May 2022 09:59:26 +0200 (CEST) From: Fabian Ebner To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, qemu-block@nongnu.org, integration@gluster.org, qemu-stable@nongnu.org, eblake@redhat.com, vsementsov@virtuozzo.com, sgarzare@redhat.com Subject: [PATCH v3] block/gluster: correctly set max_pdiscard Date: Fri, 20 May 2022 09:59:22 +0200 Message-Id: <20220520075922.43972-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.136.29.106; envelope-from=f.ebner@proxmox.com; helo=proxmox-new.maurer-it.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1653033831438100001 Content-Type: text/plain; charset="utf-8" On 64-bit platforms, assigning SIZE_MAX to the int64_t max_pdiscard results in a negative value, and the following assertion would trigger down the line (it's not the same max_pdiscard, but computed from the other one): qemu-system-x86_64: ../block/io.c:3166: bdrv_co_pdiscard: Assertion `max_pdiscard >=3D bs->bl.request_alignment' failed. On 32-bit platforms, it's fine to keep using SIZE_MAX. The assertion in qemu_gluster_co_pdiscard() is checking that the value of 'bytes' can safely be passed to glfs_discard_async(), which takes a size_t for the argument in question, so it is kept as is. And since max_pdiscard is still <=3D SIZE_MAX, relying on max_pdiscard is still fine. Fixes: 0c8022876f ("block: use int64_t instead of int in driver discard han= dlers") Cc: qemu-stable@nongnu.org Signed-off-by: Fabian Ebner Reviewed-by: Eric Blake Reviewed-by: Stefano Garzarella Reviewed-by: Vladimir Sementsov-Ogievskiy --- v2 -> v3: * Keep assertion in qemu_gluster_co_pdiscard() as is. * Improve commit message. v1 -> v2: * Use an expression that works for both 64-bit and 32-bit platforms. block/gluster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/gluster.c b/block/gluster.c index 398976bc66..b60213ab80 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -891,7 +891,7 @@ out: static void qemu_gluster_refresh_limits(BlockDriverState *bs, Error **errp) { bs->bl.max_transfer =3D GLUSTER_MAX_TRANSFER; - bs->bl.max_pdiscard =3D SIZE_MAX; + bs->bl.max_pdiscard =3D MIN(SIZE_MAX, INT64_MAX); } =20 static int qemu_gluster_reopen_prepare(BDRVReopenState *state, --=20 2.30.2