From nobody Wed Apr 16 12:47:13 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682685767; cv=none; d=zohomail.com; s=zohoarc; b=llj4s9E88/q7HbDyWqcTPeq4p3Bx+lvGCfuligdJrjbTenffvQfeJtHwdaGCL4zGX5emQMsq2zdh/S/8ClxQfdAkIWmv0Kgvx8VeQ/1YpVmoI/PwIwi+RnjPyQBEympbrkr4iZWordGsT4bZgFIbcm+SYsN+TpweEpi8aCEHIVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682685767; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n9hx8swNthm3d9dHaInRN+HJ/JBUo8h7dHzzksYBthw=; b=kFj73NUB21GvzuWUWovGhb1meUHIYkW657k+Hwc9SbpJGoDc/W4StS6modCdxXfRkhsglluniimitjxpzK0vUE70KyAiufLvMt+cJUZ6oTdgNuLjoQyazX55ayIxQ+g4+1TheTjzuNaiTO2JYWSXK+ZIpDbgsGfuGpp0FGgdpOA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682685767821693.9742796996878; Fri, 28 Apr 2023 05:42:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psNPy-0000cL-GF; Fri, 28 Apr 2023 08:41:42 -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 1psNOz-0006rU-3H for qemu-devel@nongnu.org; Fri, 28 Apr 2023 08:40:43 -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 1psNOq-0000jG-3e for qemu-devel@nongnu.org; Fri, 28 Apr 2023 08:40:40 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-636-dN8BKPE_O1W573ABrpvVdw-1; Fri, 28 Apr 2023 08:40:21 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 159253C0E44F; Fri, 28 Apr 2023 12:40:21 +0000 (UTC) Received: from localhost (unknown [10.39.192.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id 248EF2027043; Fri, 28 Apr 2023 12:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682685626; 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=n9hx8swNthm3d9dHaInRN+HJ/JBUo8h7dHzzksYBthw=; b=T9RMUkA1SYK7aErOU3NM+oRaPeEx9vVkrYSpYHPWLbHtsisr10zQEb9+KIoAmnpxbFcjwM 5vsn5eWfIlvuFaIfvCo4kpSnRLfcRGz4veDqdqdH3rVOU1/rfIY8qrFZ9FgmgbSL3bM7KG x6mpfYEKxQOWkHoJiJwbshFT/4l/8fo= X-MC-Unique: dN8BKPE_O1W573ABrpvVdw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Raphael Norwitz , Julia Suvorova , Cornelia Huck , Eric Blake , Paolo Bonzini , Aarushi Mehta , Stefan Hajnoczi , Richard Henderson , Kevin Wolf , Markus Armbruster , Stefano Garzarella , qemu-block@nongnu.org, Hanna Reitz , Fam Zheng , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Sam Li Subject: [PULL 09/17] file-posix: add tracking of the zone write pointers Date: Fri, 28 Apr 2023 08:39:46 -0400 Message-Id: <20230428123954.179035-10-stefanha@redhat.com> In-Reply-To: <20230428123954.179035-1-stefanha@redhat.com> References: <20230428123954.179035-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682685769920100005 Content-Type: text/plain; charset="utf-8" From: Sam Li Since Linux doesn't have a user API to issue zone append operations to zoned devices from user space, the file-posix driver is modified to add zone append emulation using regular writes. To do this, the file-posix driver tracks the wp location of all zones of the device. It uses an array of uint64_t. The most significant bit of each wp location indicates if the zone type is conventional zones. The zones wp can be changed due to the following operations issued: - zone reset: change the wp to the start offset of that zone - zone finish: change to the end location of that zone - write to a zone - zone append Signed-off-by: Sam Li Message-id: 20230427172339.3709-2-faithilikerun@gmail.com [Fix errno propagation from handle_aiocb_zone_mgmt() --Stefan] Signed-off-by: Stefan Hajnoczi --- include/block/block-common.h | 14 +++ include/block/block_int-common.h | 5 + block/file-posix.c | 178 ++++++++++++++++++++++++++++++- 3 files changed, 193 insertions(+), 4 deletions(-) diff --git a/include/block/block-common.h b/include/block/block-common.h index 1576fcf2ed..93196229ac 100644 --- a/include/block/block-common.h +++ b/include/block/block-common.h @@ -118,6 +118,14 @@ typedef struct BlockZoneDescriptor { BlockZoneState state; } BlockZoneDescriptor; =20 +/* + * Track write pointers of a zone in bytes. + */ +typedef struct BlockZoneWps { + CoMutex colock; + uint64_t wp[]; +} BlockZoneWps; + typedef struct BlockDriverInfo { /* in bytes, 0 if irrelevant */ int cluster_size; @@ -240,6 +248,12 @@ typedef enum { #define BDRV_SECTOR_BITS 9 #define BDRV_SECTOR_SIZE (1ULL << BDRV_SECTOR_BITS) =20 +/* + * Get the first most significant bit of wp. If it is zero, then + * the zone type is SWR. + */ +#define BDRV_ZT_IS_CONV(wp) (wp & (1ULL << 63)) + #define BDRV_REQUEST_MAX_SECTORS MIN_CONST(SIZE_MAX >> BDRV_SECTOR_BITS, \ INT_MAX >> BDRV_SECTOR_BITS) #define BDRV_REQUEST_MAX_BYTES (BDRV_REQUEST_MAX_SECTORS << BDRV_SECTOR_BI= TS) diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index 3482cfa79e..d138a399c7 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -890,6 +890,8 @@ typedef struct BlockLimits { =20 /* maximum number of active zones */ int64_t max_active_zones; + + int64_t write_granularity; } BlockLimits; =20 typedef struct BdrvOpBlocker BdrvOpBlocker; @@ -1251,6 +1253,9 @@ struct BlockDriverState { CoMutex bsc_modify_lock; /* Always non-NULL, but must only be dereferenced under an RCU read gu= ard */ BdrvBlockStatusCache *block_status_cache; + + /* array of write pointers' location of each zone in the zoned device.= */ + BlockZoneWps *wps; }; =20 struct BlockBackendRootState { diff --git a/block/file-posix.c b/block/file-posix.c index 701acddbca..e7ad6bb4e7 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1327,9 +1327,93 @@ static int hdev_get_max_segments(int fd, struct stat= *st) } =20 #if defined(CONFIG_BLKZONED) +/* + * If the reset_all flag is true, then the wps of zone whose state is + * not readonly or offline should be all reset to the start sector. + * Else, take the real wp of the device. + */ +static int get_zones_wp(BlockDriverState *bs, int fd, int64_t offset, + unsigned int nrz, bool reset_all) +{ + struct blk_zone *blkz; + size_t rep_size; + uint64_t sector =3D offset >> BDRV_SECTOR_BITS; + BlockZoneWps *wps =3D bs->wps; + unsigned int j =3D offset / bs->bl.zone_size; + unsigned int n =3D 0, i =3D 0; + int ret; + rep_size =3D sizeof(struct blk_zone_report) + nrz * sizeof(struct blk_= zone); + g_autofree struct blk_zone_report *rep =3D NULL; + + rep =3D g_malloc(rep_size); + blkz =3D (struct blk_zone *)(rep + 1); + while (n < nrz) { + memset(rep, 0, rep_size); + rep->sector =3D sector; + rep->nr_zones =3D nrz - n; + + do { + ret =3D ioctl(fd, BLKREPORTZONE, rep); + } while (ret !=3D 0 && errno =3D=3D EINTR); + if (ret !=3D 0) { + error_report("%d: ioctl BLKREPORTZONE at %" PRId64 " failed %d= ", + fd, offset, errno); + return -errno; + } + + if (!rep->nr_zones) { + break; + } + + for (i =3D 0; i < rep->nr_zones; ++i, ++n, ++j) { + /* + * The wp tracking cares only about sequential writes required= and + * sequential write preferred zones so that the wp can advance= to + * the right location. + * Use the most significant bit of the wp location to indicate= the + * zone type: 0 for SWR/SWP zones and 1 for conventional zones. + */ + if (blkz[i].type =3D=3D BLK_ZONE_TYPE_CONVENTIONAL) { + wps->wp[j] |=3D 1ULL << 63; + } else { + switch(blkz[i].cond) { + case BLK_ZONE_COND_FULL: + case BLK_ZONE_COND_READONLY: + /* Zone not writable */ + wps->wp[j] =3D (blkz[i].start + blkz[i].len) << BDRV_S= ECTOR_BITS; + break; + case BLK_ZONE_COND_OFFLINE: + /* Zone not writable nor readable */ + wps->wp[j] =3D (blkz[i].start) << BDRV_SECTOR_BITS; + break; + default: + if (reset_all) { + wps->wp[j] =3D blkz[i].start << BDRV_SECTOR_BITS; + } else { + wps->wp[j] =3D blkz[i].wp << BDRV_SECTOR_BITS; + } + break; + } + } + } + sector =3D blkz[i - 1].start + blkz[i - 1].len; + } + + return 0; +} + +static void update_zones_wp(BlockDriverState *bs, int fd, int64_t offset, + unsigned int nrz) +{ + if (get_zones_wp(bs, fd, offset, nrz, 0) < 0) { + error_report("update zone wp failed"); + } +} + static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st, Error **errp) { + BDRVRawState *s =3D bs->opaque; BlockZoneModel zoned; int ret; =20 @@ -1380,6 +1464,23 @@ static void raw_refresh_zoned_limits(BlockDriverStat= e *bs, struct stat *st, if (ret > 0) { bs->bl.max_append_sectors =3D ret >> BDRV_SECTOR_BITS; } + + ret =3D get_sysfs_long_val(st, "physical_block_size"); + if (ret >=3D 0) { + bs->bl.write_granularity =3D ret; + } + + /* The refresh_limits() function can be called multiple times. */ + g_free(bs->wps); + bs->wps =3D g_malloc(sizeof(BlockZoneWps) + + sizeof(int64_t) * bs->bl.nr_zones); + ret =3D get_zones_wp(bs, s->fd, 0, bs->bl.nr_zones, 0); + if (ret < 0) { + error_setg_errno(errp, -ret, "report wps failed"); + bs->wps =3D NULL; + return; + } + qemu_co_mutex_init(&bs->wps->colock); } #else /* !defined(CONFIG_BLKZONED) */ static void raw_refresh_zoned_limits(BlockDriverState *bs, struct stat *st, @@ -2065,7 +2166,7 @@ static int handle_aiocb_zone_mgmt(void *opaque) ret =3D ioctl(fd, aiocb->zone_mgmt.op, &range); } while (ret !=3D 0 && errno =3D=3D EINTR); =20 - return ret; + return ret < 0 ? -errno : ret; } #endif =20 @@ -2351,9 +2452,15 @@ static int coroutine_fn raw_co_prw(BlockDriverState = *bs, uint64_t offset, { BDRVRawState *s =3D bs->opaque; RawPosixAIOData acb; + int ret; =20 if (fd_open(bs) < 0) return -EIO; +#if defined(CONFIG_BLKZONED) + if (type & QEMU_AIO_WRITE && bs->wps) { + qemu_co_mutex_lock(&bs->wps->colock); + } +#endif =20 /* * When using O_DIRECT, the request must be aligned to be able to use @@ -2366,12 +2473,15 @@ static int coroutine_fn raw_co_prw(BlockDriverState= *bs, uint64_t offset, #ifdef CONFIG_LINUX_IO_URING } else if (s->use_linux_io_uring) { assert(qiov->size =3D=3D bytes); - return luring_co_submit(bs, s->fd, offset, qiov, type); + ret =3D luring_co_submit(bs, s->fd, offset, qiov, type); + goto out; #endif #ifdef CONFIG_LINUX_AIO } else if (s->use_linux_aio) { assert(qiov->size =3D=3D bytes); - return laio_co_submit(s->fd, offset, qiov, type, s->aio_max_batch); + ret =3D laio_co_submit(s->fd, offset, qiov, type, + s->aio_max_batch); + goto out; #endif } =20 @@ -2388,7 +2498,35 @@ static int coroutine_fn raw_co_prw(BlockDriverState = *bs, uint64_t offset, }; =20 assert(qiov->size =3D=3D bytes); - return raw_thread_pool_submit(handle_aiocb_rw, &acb); + ret =3D raw_thread_pool_submit(handle_aiocb_rw, &acb); + goto out; /* Avoid the compiler err of unused label */ + +out: +#if defined(CONFIG_BLKZONED) +{ + BlockZoneWps *wps =3D bs->wps; + if (ret =3D=3D 0) { + if (type & QEMU_AIO_WRITE && wps && bs->bl.zone_size) { + uint64_t *wp =3D &wps->wp[offset / bs->bl.zone_size]; + if (!BDRV_ZT_IS_CONV(*wp)) { + /* Advance the wp if needed */ + if (offset + bytes > *wp) { + *wp =3D offset + bytes; + } + } + } + } else { + if (type & QEMU_AIO_WRITE) { + update_zones_wp(bs, s->fd, 0, 1); + } + } + + if (type & QEMU_AIO_WRITE && wps) { + qemu_co_mutex_unlock(&wps->colock); + } +} +#endif + return ret; } =20 static int coroutine_fn raw_co_preadv(BlockDriverState *bs, int64_t offset, @@ -2491,6 +2629,9 @@ static void raw_close(BlockDriverState *bs) BDRVRawState *s =3D bs->opaque; =20 if (s->fd >=3D 0) { +#if defined(CONFIG_BLKZONED) + g_free(bs->wps); +#endif qemu_close(s->fd); s->fd =3D -1; } @@ -3288,6 +3429,7 @@ static int coroutine_fn raw_co_zone_mgmt(BlockDriverS= tate *bs, BlockZoneOp op, const char *op_name; unsigned long zo; int ret; + BlockZoneWps *wps =3D bs->wps; int64_t capacity =3D bs->total_sectors << BDRV_SECTOR_BITS; =20 zone_size =3D bs->bl.zone_size; @@ -3305,6 +3447,14 @@ static int coroutine_fn raw_co_zone_mgmt(BlockDriver= State *bs, BlockZoneOp op, return -EINVAL; } =20 + uint32_t i =3D offset / bs->bl.zone_size; + uint32_t nrz =3D len / bs->bl.zone_size; + uint64_t *wp =3D &wps->wp[i]; + if (BDRV_ZT_IS_CONV(*wp) && len !=3D capacity) { + error_report("zone mgmt operations are not allowed for conventiona= l zones"); + return -EIO; + } + switch (op) { case BLK_ZO_OPEN: op_name =3D "BLKOPENZONE"; @@ -3342,7 +3492,27 @@ static int coroutine_fn raw_co_zone_mgmt(BlockDriver= State *bs, BlockZoneOp op, len >> BDRV_SECTOR_BITS); ret =3D raw_thread_pool_submit(handle_aiocb_zone_mgmt, &acb); if (ret !=3D 0) { + update_zones_wp(bs, s->fd, offset, i); error_report("ioctl %s failed %d", op_name, ret); + return ret; + } + + if (zo =3D=3D BLKRESETZONE && len =3D=3D capacity) { + ret =3D get_zones_wp(bs, s->fd, 0, bs->bl.nr_zones, 1); + if (ret < 0) { + error_report("reporting single wp failed"); + return ret; + } + } else if (zo =3D=3D BLKRESETZONE) { + for (unsigned int j =3D 0; j < nrz; ++j) { + wp[j] =3D offset + j * zone_size; + } + } else if (zo =3D=3D BLKFINISHZONE) { + for (unsigned int j =3D 0; j < nrz; ++j) { + /* The zoned device allows the last zone smaller that the + * zone size. */ + wp[j] =3D MIN(offset + (j + 1) * zone_size, offset + len); + } } =20 return ret; --=20 2.40.0