From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 07463341650; Tue, 26 Aug 2025 13:31:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756215099; cv=none; b=OcwhV/8SJr5XSAha6o5HxRXe/dUx4qQZIOrS0ET9nXZTfuDq8lCogPYiclJFyzLg7iao2Attf85EKm7RIErdCm2lDyuh+pXq1IrvI2KULdK8t1NiLjzLw0GUqoOYFpc19hXjC8EDuf9kUIHsHfV/PUUzBjPpr9vu3dmBhVtlOpw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756215099; c=relaxed/simple; bh=9v9clRWBc46xBEqsjv1TRhCzlHEJsMvbkAl0fLiPQsg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kljF1jlrIqeg3cBswASA8m1QQwWd3tTNXrO6a5763h/kIF0cx/DbtOeZxSp/YlEBv5i5+Ox+6Hk9kIJlfIK9qrVKk5AMp3l1ZDYM/Ib2BIX8oP9+iBGp39YjZd2dJ45ra6aKkuB6GS48yNFe1vdRsV599WCeBksjXvEd0xBxKT0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=trZv2vjx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="trZv2vjx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C866C113D0; Tue, 26 Aug 2025 13:31:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756215098; bh=9v9clRWBc46xBEqsjv1TRhCzlHEJsMvbkAl0fLiPQsg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=trZv2vjxe8Vsh+6hCd6aC1C2grvf0mKnc1F0pa3m0UvXB+3OMoyeVRYU5lxH1awGl pi9mg901n189d9IRaImilq+02lKpzfTP08PRNG9ZCGl8Blp1jsqqpmroFrT6UyOJOS nc2xF/wxZM/zKvG6DnM0McMSrGJLQha5AHVlCIQ4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Damien Le Moal , Bart Van Assche , Johannes Thumshirn , Christoph Hellwig , Jens Axboe , Sasha Levin Subject: [PATCH 6.1 356/482] block: Make REQ_OP_ZONE_FINISH a write operation Date: Tue, 26 Aug 2025 13:10:09 +0200 Message-ID: <20250826110939.629395774@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Damien Le Moal [ Upstream commit 3f66ccbaaef3a0c5bd844eab04e3207b4061c546 ] REQ_OP_ZONE_FINISH is defined as "12", which makes op_is_write(REQ_OP_ZONE_FINISH) return false, despite the fact that a zone finish operation is an operation that modifies a zone (transition it to full) and so should be considered as a write operation (albeit one that does not transfer any data to the device). Fix this by redefining REQ_OP_ZONE_FINISH to be an odd number (13), and redefine REQ_OP_ZONE_RESET and REQ_OP_ZONE_RESET_ALL using sequential odd numbers from that new value. Fixes: 6c1b1da58f8c ("block: add zone open, close and finish operations") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal Reviewed-by: Bart Van Assche Reviewed-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20250625093327.548866-2-dlemoal@kernel.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- include/linux/blk_types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -375,11 +375,11 @@ enum req_op { /* Close a zone */ REQ_OP_ZONE_CLOSE = (__force blk_opf_t)11, /* Transition a zone to full */ - REQ_OP_ZONE_FINISH = (__force blk_opf_t)12, + REQ_OP_ZONE_FINISH = (__force blk_opf_t)13, /* reset a zone write pointer */ - REQ_OP_ZONE_RESET = (__force blk_opf_t)13, + REQ_OP_ZONE_RESET = (__force blk_opf_t)15, /* reset all the zone present on the device */ - REQ_OP_ZONE_RESET_ALL = (__force blk_opf_t)15, + REQ_OP_ZONE_RESET_ALL = (__force blk_opf_t)17, /* Driver private requests */ REQ_OP_DRV_IN = (__force blk_opf_t)34,