From nobody Fri Apr 26 04:54:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 1638511675034219.36095113708825; Thu, 2 Dec 2021 22:07:55 -0800 (PST) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id DC4B316E3DB4; Fri, 3 Dec 2021 06:07:50 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 2D9F316E3D9A for ; Fri, 3 Dec 2021 06:07:30 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2021 22:07:29 -0800 Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by orsmga008.jf.intel.com with ESMTP; 02 Dec 2021 22:07:27 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10186"; a="323170586" X-IronPort-AV: E=Sophos;i="5.87,283,1631602800"; d="scan'208";a="323170586" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,283,1631602800"; d="scan'208";a="513576723" From: Andy Pei To: seabios@seabios.org Date: Fri, 3 Dec 2021 13:22:42 +0800 Message-Id: <1638508964-115451-2-git-send-email-andy.pei@intel.com> In-Reply-To: <1638508964-115451-1-git-send-email-andy.pei@intel.com> References: <1638508964-115451-1-git-send-email-andy.pei@intel.com> Message-ID-Hash: FKMXHSQCM2WUMCSBK5NMHK55QIPCPAXG X-Message-ID-Hash: FKMXHSQCM2WUMCSBK5NMHK55QIPCPAXG X-MailFrom: andy.pei@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: kraxel@redhat.com, andy.pei@intel.com, Ding Limin X-Mailman-Version: 3.3.5rc1 Precedence: list Subject: [SeaBIOS] [PATCH v3 1/3] virtio-blk: add feature VIRTIO_BLK_F_SIZE_MAX and VIRTIO_BLK_F_SEG_MAX List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org X-Spamd-Bar: ----- X-ZM-MESSAGEID: 1638511675769100001 Content-Type: text/plain; charset="utf-8" according to virtio spec, add feature VIRTIO_BLK_F_SIZE_MAX and VIRTIO_BLK_F_SEG_MAX parse to virtio blk driver. Signed-off-by: Andy Pei Signed-off-by: Ding Limin --- src/block.h | 2 ++ src/hw/virtio-blk.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++= ++-- src/hw/virtio-blk.h | 3 +++ 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/src/block.h b/src/block.h index c1b8d73..3af2d71 100644 --- a/src/block.h +++ b/src/block.h @@ -57,6 +57,8 @@ struct drive_s { u8 translation; // type of translation u16 blksize; // block size struct chs_s pchs; // Physical CHS + u32 max_segment_size; //max_segment_size + u32 max_segments; //max_segments }; =20 #define DISK_SECTOR_SIZE 512 diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c index 3b19896..7935f0f 100644 --- a/src/hw/virtio-blk.c +++ b/src/hw/virtio-blk.c @@ -121,12 +121,16 @@ init_virtio_blk(void *data) u64 version1 =3D 1ull << VIRTIO_F_VERSION_1; u64 iommu_platform =3D 1ull << VIRTIO_F_IOMMU_PLATFORM; u64 blk_size =3D 1ull << VIRTIO_BLK_F_BLK_SIZE; + u64 max_segments =3D 1ull << VIRTIO_BLK_F_SEG_MAX; + u64 max_segment_size =3D 1ull << VIRTIO_BLK_F_SIZE_MAX; + if (!(features & version1)) { dprintf(1, "modern device without virtio_1 feature bit: %pP\n"= , pci); goto fail; } =20 - features =3D features & (version1 | iommu_platform | blk_size); + features =3D features & (version1 | iommu_platform | blk_size + | max_segments | max_segment_size); vp_set_features(vp, features); status |=3D VIRTIO_CONFIG_S_FEATURES_OK; vp_set_status(vp, status); @@ -135,6 +139,22 @@ init_virtio_blk(void *data) goto fail; } =20 + if (features & max_segment_size) + vdrive->drive.max_segment_size =3D + vp_read(&vp->device, struct virtio_blk_config, size_max); + else + vdrive->drive.max_segment_size =3D 0; + dprintf(3, "virtio-blk %pP size_max=3D%u.\n", pci, + vdrive->drive.max_segment_size); + + if (features & max_segments) + vdrive->drive.max_segments =3D + vp_read(&vp->device, struct virtio_blk_config, seg_max); + else + vdrive->drive.max_segments =3D 0; + dprintf(3, "virtio-blk %pP seg_max=3D%u.\n", pci, + vdrive->drive.max_segments); + vdrive->drive.sectors =3D vp_read(&vp->device, struct virtio_blk_config, capacity); if (features & blk_size) { @@ -177,6 +197,21 @@ init_virtio_blk(void *data) vdrive->drive.pchs.cylinder =3D cfg.cylinders; vdrive->drive.pchs.head =3D cfg.heads; vdrive->drive.pchs.sector =3D cfg.sectors; + + if (f & (1 << VIRTIO_BLK_F_SIZE_MAX)) + vdrive->drive.max_segment_size =3D cfg.size_max; + else + vdrive->drive.max_segment_size =3D 0; + dprintf(3, "virtio-blk %pP size_max=3D%u.\n", pci, + vdrive->drive.max_segment_size); + + if (f & (1 << VIRTIO_BLK_F_SEG_MAX)) + vdrive->drive.max_segments =3D cfg.seg_max; + else + vdrive->drive.max_segments =3D 0; + dprintf(3, "virtio-blk %pP seg_max=3D%u.\n", pci, + vdrive->drive.max_segments); + } =20 char *desc =3D znprintf(MAXDESCSIZE, "Virtio disk PCI:%pP", pci); @@ -218,8 +253,11 @@ init_virtio_blk_mmio(void *mmio) u64 features =3D vp_get_features(vp); u64 version1 =3D 1ull << VIRTIO_F_VERSION_1; u64 blk_size =3D 1ull << VIRTIO_BLK_F_BLK_SIZE; + u64 max_segments =3D 1ull << VIRTIO_BLK_F_SEG_MAX; + u64 max_segment_size =3D 1ull << VIRTIO_BLK_F_SIZE_MAX; =20 - features =3D features & (version1 | blk_size); + features =3D features & (version1 | blk_size + | max_segments | max_segment_size); vp_set_features(vp, features); status |=3D VIRTIO_CONFIG_S_FEATURES_OK; vp_set_status(vp, status); @@ -228,6 +266,20 @@ init_virtio_blk_mmio(void *mmio) goto fail; } =20 + if (features & max_segment_size) + vdrive->drive.max_segment_size =3D + vp_read(&vp->device, struct virtio_blk_config, size_max); + else + vdrive->drive.max_segment_size =3D 0; + dprintf(3, "virtio-blk size_max=3D%u.\n", vdrive->drive.max_segment_si= ze); + + if (features & max_segments) + vdrive->drive.max_segments =3D + vp_read(&vp->device, struct virtio_blk_config, seg_max); + else + vdrive->drive.max_segments =3D 0; + dprintf(3, "virtio-blk seg_max=3D%u.\n", vdrive->drive.max_segments); + vdrive->drive.sectors =3D vp_read(&vp->device, struct virtio_blk_config, capacity); if (features & blk_size) { diff --git a/src/hw/virtio-blk.h b/src/hw/virtio-blk.h index d20461a..0294291 100644 --- a/src/hw/virtio-blk.h +++ b/src/hw/virtio-blk.h @@ -16,6 +16,9 @@ struct virtio_blk_config u32 opt_io_size; } __attribute__((packed)); =20 +/* Feature bits */ +#define VIRTIO_BLK_F_SIZE_MAX 1 /* Maximum size of any single segment */ +#define VIRTIO_BLK_F_SEG_MAX 2 /* Maximum number of segments in a reques= t */ #define VIRTIO_BLK_F_BLK_SIZE 6 =20 /* These two define direction. */ --=20 1.8.3.1 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org From nobody Fri Apr 26 04:54:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 1638511686463863.1343832991033; Thu, 2 Dec 2021 22:08:06 -0800 (PST) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id 0ED7716E3DB0; Fri, 3 Dec 2021 06:08:02 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 9311416E3D9C for ; Fri, 3 Dec 2021 06:07:33 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2021 22:07:33 -0800 Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by orsmga008.jf.intel.com with ESMTP; 02 Dec 2021 22:07:31 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10186"; a="323170590" X-IronPort-AV: E=Sophos;i="5.87,283,1631602800"; d="scan'208";a="323170590" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,283,1631602800"; d="scan'208";a="513576785" From: Andy Pei To: seabios@seabios.org Date: Fri, 3 Dec 2021 13:22:43 +0800 Message-Id: <1638508964-115451-3-git-send-email-andy.pei@intel.com> In-Reply-To: <1638508964-115451-1-git-send-email-andy.pei@intel.com> References: <1638508964-115451-1-git-send-email-andy.pei@intel.com> Message-ID-Hash: IG5W7K4YXPJDGQXPRQCJOZAVNK3LNKQI X-Message-ID-Hash: IG5W7K4YXPJDGQXPRQCJOZAVNK3LNKQI X-MailFrom: andy.pei@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: kraxel@redhat.com, andy.pei@intel.com, Ding Limin X-Mailman-Version: 3.3.5rc1 Precedence: list Subject: [SeaBIOS] [PATCH v3 2/3] virtio-blk: abstract a function named virtio_blk_op_one_segment to handle r/w request List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org X-Spamd-Bar: --- X-ZM-MESSAGEID: 1638511687172100001 Content-Type: text/plain; charset="utf-8" abstract virtio-blk queue operation to form a function named virtio_blk_op_= one_segment Signed-off-by: Andy Pei Signed-off-by: Ding Limin Reviewed-by: Gerd Hoffmann --- src/hw/virtio-blk.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c index 7935f0f..0bc8743 100644 --- a/src/hw/virtio-blk.c +++ b/src/hw/virtio-blk.c @@ -30,12 +30,38 @@ struct virtiodrive_s { struct vp_device vp; }; =20 +void +virtio_blk_op_one_segment(struct virtiodrive_s *vdrive, + int write, struct vring_list sg[]) +{ + struct vring_virtqueue *vq =3D vdrive->vq; + + /* Add to virtqueue and kick host */ + if (write) + vring_add_buf(vq, sg, 2, 1, 0, 0); + else + vring_add_buf(vq, sg, 1, 2, 0, 0); + vring_kick(&vdrive->vp, vq, 1); + + /* Wait for reply */ + while (!vring_more_used(vq)) + usleep(5); + + /* Reclaim virtqueue element */ + vring_get_buf(vq, NULL); + + /** + ** Clear interrupt status register. Avoid leaving interrupts stuck + ** if VRING_AVAIL_F_NO_INTERRUPT was ignored and interrupts were raise= d. + **/ + vp_get_isr(&vdrive->vp); +} + static int virtio_blk_op(struct disk_op_s *op, int write) { struct virtiodrive_s *vdrive =3D container_of(op->drive_fl, struct virtiodrive_s, drive); - struct vring_virtqueue *vq =3D vdrive->vq; struct virtio_blk_outhdr hdr =3D { .type =3D write ? VIRTIO_BLK_T_OUT : VIRTIO_BLK_T_IN, .ioprio =3D 0, @@ -57,25 +83,7 @@ virtio_blk_op(struct disk_op_s *op, int write) }, }; =20 - /* Add to virtqueue and kick host */ - if (write) - vring_add_buf(vq, sg, 2, 1, 0, 0); - else - vring_add_buf(vq, sg, 1, 2, 0, 0); - vring_kick(&vdrive->vp, vq, 1); - - /* Wait for reply */ - while (!vring_more_used(vq)) - usleep(5); - - /* Reclaim virtqueue element */ - vring_get_buf(vq, NULL); - - /* Clear interrupt status register. Avoid leaving interrupts stuck if - * VRING_AVAIL_F_NO_INTERRUPT was ignored and interrupts were raised. - */ - vp_get_isr(&vdrive->vp); - + virtio_blk_op_one_segment(vdrive, write, sg); return status =3D=3D VIRTIO_BLK_S_OK ? DISK_RET_SUCCESS : DISK_RET_EBA= DTRACK; } =20 --=20 1.8.3.1 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org From nobody Fri Apr 26 04:54:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 1638511700173755.4869277565414; Thu, 2 Dec 2021 22:08:20 -0800 (PST) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id 8826216E3DB9; Fri, 3 Dec 2021 06:08:16 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 6111916E3D9C for ; Fri, 3 Dec 2021 06:07:36 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2021 22:07:35 -0800 Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by orsmga008.jf.intel.com with ESMTP; 02 Dec 2021 22:07:34 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10186"; a="323170597" X-IronPort-AV: E=Sophos;i="5.87,283,1631602800"; d="scan'208";a="323170597" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,283,1631602800"; d="scan'208";a="513576837" From: Andy Pei To: seabios@seabios.org Date: Fri, 3 Dec 2021 13:22:44 +0800 Message-Id: <1638508964-115451-4-git-send-email-andy.pei@intel.com> In-Reply-To: <1638508964-115451-1-git-send-email-andy.pei@intel.com> References: <1638508964-115451-1-git-send-email-andy.pei@intel.com> Message-ID-Hash: NAZT35TYBNS6ME6OZ2GPRJO56JFL2JXN X-Message-ID-Hash: NAZT35TYBNS6ME6OZ2GPRJO56JFL2JXN X-MailFrom: andy.pei@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: kraxel@redhat.com, andy.pei@intel.com, Ding Limin X-Mailman-Version: 3.3.5rc1 Precedence: list Subject: [SeaBIOS] [PATCH v3 3/3] virtio-blk.: split large IO according to size_max List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org X-Spamd-Bar: --- X-ZM-MESSAGEID: 1638511700700100001 Content-Type: text/plain; charset="utf-8" if driver reads data larger than VIRTIO_BLK_F_SIZE_MAX, it will cause some issue to the DMA engine. So when upper software wants to read data larger than VIRTIO_BLK_F_SIZE_MAX, virtio-blk driver split one large request into multiple smaller ones. Signed-off-by: Andy Pei Signed-off-by: Ding Limin --- src/hw/virtio-blk.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c index 0bc8743..664396c 100644 --- a/src/hw/virtio-blk.c +++ b/src/hw/virtio-blk.c @@ -82,8 +82,46 @@ virtio_blk_op(struct disk_op_s *op, int write) .length =3D sizeof(status), }, }; + u32 max_io_size =3D + vdrive->drive.max_segment_size * vdrive->drive.max_segments; + u16 blk_num_max; =20 - virtio_blk_op_one_segment(vdrive, write, sg); + if (vdrive->drive.blksize !=3D 0 && max_io_size !=3D 0) + blk_num_max =3D (u16)max_io_size / vdrive->drive.blksize; + else + /* default blk_num_max if hardware doesnot advise a proper value */ + blk_num_max =3D 8; + + if (op->count <=3D blk_num_max) { + virtio_blk_op_one_segment(vdrive, write, sg); + } else { + struct vring_list *p_sg =3D &sg[1]; + void *p =3D op->buf_fl; + u16 count =3D op->count; + + while (count > blk_num_max) { + p_sg->addr =3D p; + p_sg->length =3D vdrive->drive.blksize * blk_num_max; + virtio_blk_op_one_segment(vdrive, write, sg); + if (status =3D=3D VIRTIO_BLK_S_OK) { + hdr.sector +=3D blk_num_max; + p +=3D p_sg->length; + count -=3D blk_num_max; + } else { + break; + } + } + + if (status !=3D VIRTIO_BLK_S_OK) + return DISK_RET_EBADTRACK; + + if (count > 0) { + p_sg->addr =3D p; + p_sg->length =3D vdrive->drive.blksize * count; + virtio_blk_op_one_segment(vdrive, write, sg); + } + + } return status =3D=3D VIRTIO_BLK_S_OK ? DISK_RET_SUCCESS : DISK_RET_EBA= DTRACK; } =20 --=20 1.8.3.1 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org