From nobody Fri Dec 19 06:17:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1745603654; cv=none; d=zohomail.com; s=zohoarc; b=KgcpaLzLpvVUGuykU8/FPN7V2XdFAh61BhXpSfqeV08Z1n9BPFJhpycWOHJwx3/h8Mz9oh7Np4q1YaTUh7rOyvGV79QYTcoiydN3VLkEKvh75MQ9S1APGKu6DDEy8WYgHQEhKBE+yRaP2Q59h6QQxrYbwHxz1e0BOxg6nqLFuqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745603654; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Y4ozch4TBcSxWT6mWofezs7YGXKJYIStqh6TzLVyI/o=; b=Z7ImnsQrt+pZTAysA6UDnYEQWD6Pi5SLU/Im59JyJHlVvNxkLcF+d/fWvG0ULLGTBDrBdTceVeUOUtzElf4qlVzOeYJoXt8AvtxS1Y6jHeEuZBoVPBqPQNhezBxvOkzuOHoUsjtXEjxahB/6LEg8g4jUviifX4Z0o2n064xxFEY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745603654190852.5377367694026; Fri, 25 Apr 2025 10:54:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8NEe-0000xe-Jl; Fri, 25 Apr 2025 13:53:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8NEZ-0000rZ-E1 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 13:53:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8NEW-0007Oj-Mj for qemu-devel@nongnu.org; Fri, 25 Apr 2025 13:53:07 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-391-CCeOqygkNt6DqOdAujA_oQ-1; Fri, 25 Apr 2025 13:52:59 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3DA5D195609F; Fri, 25 Apr 2025 17:52:58 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.45.225.183]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 08B061800378; Fri, 25 Apr 2025 17:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745603581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y4ozch4TBcSxWT6mWofezs7YGXKJYIStqh6TzLVyI/o=; b=XuMOJmfH0oKTfwQq/4DHp038MLfp1x7X/DjkEvrfr6fSkG1gpIylATfFRq+Jq56SqUsXP9 +CgvnTze8bGWg2+qghATP79+eaVlFqNvkHeBf3T5X5oEh/9hL7PEG7y0zyJnB5YFPsF1We dOdkRmUsC3anaQ52rD84tjiYFDiXKw0= X-MC-Unique: CCeOqygkNt6DqOdAujA_oQ-1 X-Mimecast-MFC-AGG-ID: CCeOqygkNt6DqOdAujA_oQ_1745603578 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 1/4] file-posix: probe discard alignment on Linux block devices Date: Fri, 25 Apr 2025 19:52:49 +0200 Message-ID: <20250425175252.316807-2-kwolf@redhat.com> In-Reply-To: <20250425175252.316807-1-kwolf@redhat.com> References: <20250425175252.316807-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1745603656993019100 Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi Populate the pdiscard_alignment block limit so the block layer is able align discard requests correctly. Signed-off-by: Stefan Hajnoczi Message-ID: <20250417150528.76470-2-stefanha@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/file-posix.c | 67 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/block/file-posix.c b/block/file-posix.c index 56d1972d15..0d6e12f880 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1276,10 +1276,10 @@ static int get_sysfs_zoned_model(struct stat *st, B= lockZoneModel *zoned) } #endif /* defined(CONFIG_BLKZONED) */ =20 +#ifdef CONFIG_LINUX /* * Get a sysfs attribute value as a long integer. */ -#ifdef CONFIG_LINUX static long get_sysfs_long_val(struct stat *st, const char *attribute) { g_autofree char *str =3D NULL; @@ -1299,6 +1299,30 @@ static long get_sysfs_long_val(struct stat *st, cons= t char *attribute) } return ret; } + +/* + * Get a sysfs attribute value as a uint32_t. + */ +static int get_sysfs_u32_val(struct stat *st, const char *attribute, + uint32_t *u32) +{ + g_autofree char *str =3D NULL; + const char *end; + unsigned int val; + int ret; + + ret =3D get_sysfs_str_val(st, attribute, &str); + if (ret < 0) { + return ret; + } + + /* The file is ended with '\n', pass 'end' to accept that. */ + ret =3D qemu_strtoui(str, &end, 10, &val); + if (ret =3D=3D 0 && end && *end =3D=3D '\0') { + *u32 =3D val; + } + return ret; +} #endif =20 static int hdev_get_max_segments(int fd, struct stat *st) @@ -1318,6 +1342,23 @@ static int hdev_get_max_segments(int fd, struct stat= *st) #endif } =20 +/* + * Fills in *dalign with the discard alignment and returns 0 on success, + * -errno otherwise. + */ +static int hdev_get_pdiscard_alignment(struct stat *st, uint32_t *dalign) +{ +#ifdef CONFIG_LINUX + /* + * Note that Linux "discard_granularity" is QEMU "discard_alignment". = Linux + * "discard_alignment" is something else. + */ + return get_sysfs_u32_val(st, "discard_granularity", dalign); +#else + return -ENOTSUP; +#endif +} + #if defined(CONFIG_BLKZONED) /* * If the reset_all flag is true, then the wps of zone whose state is @@ -1527,6 +1568,30 @@ static void raw_refresh_limits(BlockDriverState *bs,= Error **errp) } } =20 + if (S_ISBLK(st.st_mode)) { + uint32_t dalign =3D 0; + int ret; + + ret =3D hdev_get_pdiscard_alignment(&st, &dalign); + if (ret =3D=3D 0) { + uint32_t ralign =3D bs->bl.request_alignment; + + /* Probably never happens, but handle it just in case */ + if (dalign < ralign && (ralign % dalign =3D=3D 0)) { + dalign =3D ralign; + } + + /* The block layer requires a multiple of request_alignment */ + if (dalign % ralign !=3D 0) { + error_setg(errp, "Invalid pdiscard_alignment limit %u is n= ot a " + "multiple of request_alignment %u", dalign, ralign= ); + return; + } + + bs->bl.pdiscard_alignment =3D dalign; + } + } + raw_refresh_zoned_limits(bs, &st, errp); } =20 --=20 2.49.0 From nobody Fri Dec 19 06:17:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1745603626; cv=none; d=zohomail.com; s=zohoarc; b=aGn/1DOAtOHTtix6tTiuFv0Lpb/Ax7ZXvv73fSxy//D4b/S+egSq38FjSwsChKLrDj5uzzI4QiaEHeNDGJ+bS0LXFRH8rBGjwriz5MhLX6QUD0diSGurmmtWgLLZDn//9PsVDSjiLnxDb+ft/qEh6dRRjouDvk64vNB93Zc2U4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745603626; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Kv9qDhyGRrIkUDKuFAfwQPGjpFR2P3l+wcvXDRuef2I=; b=CXEZb27u/0gEx1AGhqYD5NHkAZvHoZJJbMqIEF1UcM+Lz5NXJdt9KIBpHsXoclb/eFISwdVEzXKNdfq3tL67zOlmzlrLwSDRPj4jrfce3JvBSNMhtJQDZU76/aw5fnGXKziT4alvx2suEM8TkucA8RVsUf6uuydtVXaeEJ8LukQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17456036266861000.164683688423; Fri, 25 Apr 2025 10:53:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8NEf-00011I-Vj; Fri, 25 Apr 2025 13:53:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8NEZ-0000rY-DO for qemu-devel@nongnu.org; Fri, 25 Apr 2025 13:53:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8NEX-0007PK-1z for qemu-devel@nongnu.org; Fri, 25 Apr 2025 13:53:07 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-519-0mD2A_sCPbimHnQoP3chSg-1; Fri, 25 Apr 2025 13:53:01 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 28DCD180034E; Fri, 25 Apr 2025 17:53:00 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.45.225.183]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C88E81800D97; Fri, 25 Apr 2025 17:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745603584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kv9qDhyGRrIkUDKuFAfwQPGjpFR2P3l+wcvXDRuef2I=; b=XkRv2JLUxmOfpEIoNy/4XjuW8CyfEO4RltNfUQgwO8aZOx2PoitCgHvWgoWmIbAumUZsFf 7xyHONAg1PKLIfk4fRUPF0e4wS7iYN26AcLF71ycVUcsBMAl+Wxu74vIGz18F5GDUF5H/j VHN4dtbBY7RH0i1MX6GqEMIsMmmextQ= X-MC-Unique: 0mD2A_sCPbimHnQoP3chSg-1 X-Mimecast-MFC-AGG-ID: 0mD2A_sCPbimHnQoP3chSg_1745603580 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 2/4] block/io: skip head/tail requests on EINVAL Date: Fri, 25 Apr 2025 19:52:50 +0200 Message-ID: <20250425175252.316807-3-kwolf@redhat.com> In-Reply-To: <20250425175252.316807-1-kwolf@redhat.com> References: <20250425175252.316807-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1745603627309019000 Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi When guests send misaligned discard requests, the block layer breaks them up into a misaligned head, an aligned main body, and a misaligned tail. The file-posix block driver on Linux returns -EINVAL on misaligned discard requests. This causes bdrv_co_pdiscard() to fail and guests configured with werror=3Dstop will pause. Add a special case for misaligned head/tail requests. Simply continue when EINVAL is encountered so that the aligned main body of the request can be completed and the guest is not paused. This is the best we can do when guest discard limits do not match the host discard limits. Fixes: https://issues.redhat.com/browse/RHEL-86032 Signed-off-by: Stefan Hajnoczi Reviewed-by: Hanna Czenczek Message-ID: <20250417150528.76470-3-stefanha@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/io.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/block/io.c b/block/io.c index 1ba8d1aeea..ccec11386b 100644 --- a/block/io.c +++ b/block/io.c @@ -3109,11 +3109,12 @@ int coroutine_fn bdrv_co_pdiscard(BdrvChild *child,= int64_t offset, /* Invalidate the cached block-status data range if this discard overl= aps */ bdrv_bsc_invalidate_range(bs, offset, bytes); =20 - /* Discard is advisory, but some devices track and coalesce + /* + * Discard is advisory, but some devices track and coalesce * unaligned requests, so we must pass everything down rather than - * round here. Still, most devices will just silently ignore - * unaligned requests (by returning -ENOTSUP), so we must fragment - * the request accordingly. */ + * round here. Still, most devices reject unaligned requests with + * -EINVAL or -ENOTSUP, so we must fragment the request accordingly. + */ align =3D MAX(bs->bl.pdiscard_alignment, bs->bl.request_alignment); assert(align % bs->bl.request_alignment =3D=3D 0); head =3D offset % align; @@ -3180,7 +3181,11 @@ int coroutine_fn bdrv_co_pdiscard(BdrvChild *child, = int64_t offset, } } if (ret && ret !=3D -ENOTSUP) { - goto out; + if (ret =3D=3D -EINVAL && (offset % align !=3D 0 || num % alig= n !=3D 0)) { + /* Silently skip rejected unaligned head/tail requests */ + } else { + goto out; /* bail out */ + } } =20 offset +=3D num; --=20 2.49.0 From nobody Fri Dec 19 06:17:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1745603626; cv=none; d=zohomail.com; s=zohoarc; b=MuxgFooR/IIMTJfltc+PXoGObEnY+BDhdW+YnAjV30tEdW/aXzZ9cbeePN2MPNNFRDo1jF/pIzlqaEYkMSB5s7dvVuaKKY/BWZ9zOcxqW6cFSqzg5Epr7HnJNXGGxlI3Lz8GhNmzc9w6dqGrdTTKFkUgLnAcM8MHgKGVkGlDg+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745603626; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j3g0fPuHvk3asu5clMmWIWFWOoC9eZtoZihOH1k2nN0=; b=OOkE3ft7KXxcp80sIIStUeDGsRVrIi2Lvd7u2bs7+sk5J+3fzqxXULuayUqPrpHjh83A2ezzrlHw3ii6vW8fB6SsJeltYdfipPOZv8xYzw7fv+Cj6V2R09UZkXoIHP80IMD+pY/z4PPU36W7oYrjVMwfsTw8eRuck4jFXzxac80= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174560362676555.87365305442779; Fri, 25 Apr 2025 10:53:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8NEi-000139-IE; Fri, 25 Apr 2025 13:53:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8NEd-0000vC-Pu for qemu-devel@nongnu.org; Fri, 25 Apr 2025 13:53:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8NEb-0007QU-6U for qemu-devel@nongnu.org; Fri, 25 Apr 2025 13:53:10 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-533-EU6naOjLP1mMjNxSbWh3bg-1; Fri, 25 Apr 2025 13:53:03 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CCA21180034A; Fri, 25 Apr 2025 17:53:01 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.45.225.183]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 99B52180045C; Fri, 25 Apr 2025 17:53:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745603588; 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=j3g0fPuHvk3asu5clMmWIWFWOoC9eZtoZihOH1k2nN0=; b=I3F7qbOYefNkQJ+AfPnzGe/hpXT9dlyJSxr4MKtzUwUBRT9wOmO57aHosWmDCel01ef2t9 eIKYZGUeW0n5NqhPfCGLoU7GHOt46+H4FExHxNzF9YHKFrwqZ9Okz0nY7gDCGTN2S27jGQ F4WtORK2eK6X+vfaDSzXjGtw296/byY= X-MC-Unique: EU6naOjLP1mMjNxSbWh3bg-1 X-Mimecast-MFC-AGG-ID: EU6naOjLP1mMjNxSbWh3bg_1745603582 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 3/4] block: Remove unused callback function *bdrv_aio_pdiscard Date: Fri, 25 Apr 2025 19:52:51 +0200 Message-ID: <20250425175252.316807-4-kwolf@redhat.com> In-Reply-To: <20250425175252.316807-1-kwolf@redhat.com> References: <20250425175252.316807-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1745603627315019000 From: Sunny Zhu The bytes type in *bdrv_aio_pdiscard should be int64_t rather than int. There are no drivers implementing the *bdrv_aio_pdiscard() callback, it appears to be an unused function. Therefore, we'll simply remove it instead of fixing it. Additionally, coroutine-based callbacks are preferred. If someone needs to implement bdrv_aio_pdiscard, a coroutine-based version would be straightforward to implement. Signed-off-by: Sunny Zhu Message-ID: Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- include/block/block_int-common.h | 4 ---- block/io.c | 22 +++------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index ebb4e56a50..0d8187f656 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -506,10 +506,6 @@ struct BlockDriver { BlockAIOCB * GRAPH_RDLOCK_PTR (*bdrv_aio_flush)( BlockDriverState *bs, BlockCompletionFunc *cb, void *opaque); =20 - BlockAIOCB * GRAPH_RDLOCK_PTR (*bdrv_aio_pdiscard)( - BlockDriverState *bs, int64_t offset, int bytes, - BlockCompletionFunc *cb, void *opaque); - int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_readv)(BlockDriverState *b= s, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); =20 diff --git a/block/io.c b/block/io.c index ccec11386b..6d98b0abb9 100644 --- a/block/io.c +++ b/block/io.c @@ -3102,7 +3102,7 @@ int coroutine_fn bdrv_co_pdiscard(BdrvChild *child, i= nt64_t offset, return 0; } =20 - if (!bs->drv->bdrv_co_pdiscard && !bs->drv->bdrv_aio_pdiscard) { + if (!bs->drv->bdrv_co_pdiscard) { return 0; } =20 @@ -3162,24 +3162,8 @@ int coroutine_fn bdrv_co_pdiscard(BdrvChild *child, = int64_t offset, ret =3D -ENOMEDIUM; goto out; } - if (bs->drv->bdrv_co_pdiscard) { - ret =3D bs->drv->bdrv_co_pdiscard(bs, offset, num); - } else { - BlockAIOCB *acb; - CoroutineIOCompletion co =3D { - .coroutine =3D qemu_coroutine_self(), - }; - - acb =3D bs->drv->bdrv_aio_pdiscard(bs, offset, num, - bdrv_co_io_em_complete, &co); - if (acb =3D=3D NULL) { - ret =3D -EIO; - goto out; - } else { - qemu_coroutine_yield(); - ret =3D co.ret; - } - } + + ret =3D bs->drv->bdrv_co_pdiscard(bs, offset, num); if (ret && ret !=3D -ENOTSUP) { if (ret =3D=3D -EINVAL && (offset % align !=3D 0 || num % alig= n !=3D 0)) { /* Silently skip rejected unaligned head/tail requests */ --=20 2.49.0 From nobody Fri Dec 19 06:17:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1745603631; cv=none; d=zohomail.com; s=zohoarc; b=KAuq23uE2eujJi3T14uZfsncuW/mAMqcEj+oo0t8SrhXZZvZYco9tBtaoU8Aa4NFq+ffZQfC1xVMWoF/7DRAQAq4UB8iakY2H8PD8GWq+vYSxhLNbbQhKWKEIMvmOVwHGI99IYWL3CrhYfdQHQgdAIUpEvwhZQmx93z382WP6hY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745603631; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YiuccxRLu8fqNjoYvByXR1A/ypUE0qohnuPHymM6eZ8=; b=f0qx/Xb6OARVjpICwQ9aMaFh7J4E9MfoUVflqVbrF6nk5IuWyQHp7ekb+d9mCfEyJ/JffeGhVQBOtZzQS/ET4D7tpHByuU2Cam3K5L8I64rZQfxV8v71sIOZFnfHGnGabRDN9nFoBsIF0GHCo5BAHvG0H1OZUYEfgS2Q4GBT3pM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745603631630187.08676785247337; Fri, 25 Apr 2025 10:53:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8NEh-00012n-KR; Fri, 25 Apr 2025 13:53:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8NEa-0000sO-O6 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 13:53:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8NEZ-0007Pd-3P for qemu-devel@nongnu.org; Fri, 25 Apr 2025 13:53:08 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-_Ys1nd8CP8iTvuVYb6_hnA-1; Fri, 25 Apr 2025 13:53:04 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 85191180036E; Fri, 25 Apr 2025 17:53:03 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.45.225.183]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4954C1800D9D; Fri, 25 Apr 2025 17:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745603585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YiuccxRLu8fqNjoYvByXR1A/ypUE0qohnuPHymM6eZ8=; b=OJaWUzuUSTRsRJsCrhJuiqJoBw3YqAXMhqzWPNTozf3+eG7+Okjpy5g6/wvq9GY+Nx+ZyT +6EXV7SFctaNrA+5UsYJ4WytPVBeHneROWHZ9yBwjy95CNpiye3FrVE52CIbmPHpxotlyR EEsU/S4Pcu/GHDsXUL+XDhx5Ps/YFEk= X-MC-Unique: _Ys1nd8CP8iTvuVYb6_hnA-1 X-Mimecast-MFC-AGG-ID: _Ys1nd8CP8iTvuVYb6_hnA_1745603583 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 4/4] qemu-img: improve queue depth validation in img_bench Date: Fri, 25 Apr 2025 19:52:52 +0200 Message-ID: <20250425175252.316807-5-kwolf@redhat.com> In-Reply-To: <20250425175252.316807-1-kwolf@redhat.com> References: <20250425175252.316807-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1745603636976019100 Content-Type: text/plain; charset="utf-8" From: Denis Rastyogin This error was discovered by fuzzing qemu-img. Currently, running `qemu-img bench -d 0` in img_bench is allowed, which is a pointless operation and causes qemu-img to hang. Signed-off-by: Denis Rastyogin Message-ID: <20250327162423.25154-5-gerben@altlinux.org> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- qemu-img.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-img.c b/qemu-img.c index 2044c22a4c..76ac5d3028 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4571,7 +4571,7 @@ static int img_bench(int argc, char **argv) { unsigned long res; =20 - if (qemu_strtoul(optarg, NULL, 0, &res) < 0 || res > INT_MAX) { + if (qemu_strtoul(optarg, NULL, 0, &res) <=3D 0 || res > INT_MA= X) { error_report("Invalid queue depth specified"); return 1; } --=20 2.49.0