From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D4E4A0A0C; Thu, 15 Apr 2021 07:54:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C47B1615DC; Thu, 15 Apr 2021 07:54:26 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 1E430161229 for ; Thu, 15 Apr 2021 07:54:23 +0200 (CEST) IronPort-SDR: z0A4TFY1czKIZn/xIuSYBgrmzClQ9w6b9fbhDze1+AIP1FeFaK66B1cNJuVll/yOp3KcHJVM8Y 8gJqqmezHSIA== X-IronPort-AV: E=McAfee;i="6200,9189,9954"; a="182292734" X-IronPort-AV: E=Sophos;i="5.82,223,1613462400"; d="scan'208";a="182292734" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2021 22:54:22 -0700 IronPort-SDR: V1mGNmpTAdUwxFfUmzIn0w9qyDpTHDRxK95RCZaAbw06GDZpnbV/OXmlvy19VahlXodPEt3t/g zbl459UCAraA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,223,1613462400"; d="scan'208";a="452776438" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga002.fm.intel.com with ESMTP; 14 Apr 2021 22:54:21 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 14 Apr 2021 22:54:21 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 14 Apr 2021 22:54:21 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Wed, 14 Apr 2021 22:54:21 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.170) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Wed, 14 Apr 2021 22:54:20 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JYJULxzN2LbrKgOn2HCWbq792lxZvIZPyWtqSMwEQ9hiPwsi1z8nqFoUpGGscLoHOvmwc2z4Mxh3SQRXBu+xEJC+HjYFHlBCjC599jfRLMLWqlNAP8E5MJv6sVCSRpN7f466Rxq5VRHlvvCL16QMNa+ys3caUFUGoEM5+7/icsvuPJZNg66GdsnVDLUihxm7oO44oGl8Lxdn5WgZ0e8WAoaZuf71zX83RXGVCDfTG0GN2MwjzolrMC5WRkPZh3UiGcamjMoApUQ43SSWGEQ7fGMdUVbpIbUgJkjU8W8O3juzyDgv0QN7Wsg7pQLoWxGHdOkQdAsmiR6W5raIPlOkSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OGG25y/ihBOsVE4sCSvaK56OpTIogIY7A/zC/aIcjF0=; b=h1OuSM1anNJoDpaQXHCmspASYljtH/NS2ByjASPScKwuvzVauyzZcZN0r5qpuOe4RhJpMR5x2ywrZHDxhEV869HxLaLaIZy1t9tWN0lyDcvM4jUVZB427yfD55UtCPjUqaj/zbhco4fKTIjm8GWW0DzC5CY93CAKztNxx5TiYoaiUOcCVI2vJdcOU2qbDz4h+YOWaKbKlxkjf3NZSlV2LMEpwiPcXpc+Z2RZoD714q18ltWWxVyz1OzQgsJmuPTnlHS2UhRFTaElKT9TZccwNiZEz9EgGVMl16UanEtPCXKsJNLAUaAnp+8I8yjvFoukGrWzvBlTzxgXgNMBQERu7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OGG25y/ihBOsVE4sCSvaK56OpTIogIY7A/zC/aIcjF0=; b=Vut4U0wFMjgAAkAvhifTiQXQeDe+3EwV41fwU5ykzI3UJFP7okTlhM8RVXe5KMoBtwTTUvm77e+Vs2KR6Q8dxIk6/fRNGIYzQx8peJvoW6ET5cn4F5BSVVn9OmRxyssB2iU1ae/TmHUyof3f3FeqqXcFD/YOmBRMg1fhVLtw4yI= Received: from SJ0PR11MB5006.namprd11.prod.outlook.com (2603:10b6:a03:2db::22) by BY5PR11MB4225.namprd11.prod.outlook.com (2603:10b6:a03:1ba::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Thu, 15 Apr 2021 05:54:15 +0000 Received: from SJ0PR11MB5006.namprd11.prod.outlook.com ([fe80::522:5b2:4210:a4b3]) by SJ0PR11MB5006.namprd11.prod.outlook.com ([fe80::522:5b2:4210:a4b3%7]) with mapi id 15.20.4020.023; Thu, 15 Apr 2021 05:54:15 +0000 From: "Jiang, Cheng1" To: "Hu, Jiayu" , "maxime.coquelin@redhat.com" , "Xia, Chenbo" CC: "dev@dpdk.org" , "Yang, YvonneX" , "Wang, Yinan" , "Liu, Yong" Thread-Topic: [PATCH v7 2/4] vhost: add support for packed ring in async vhost Thread-Index: AQHXMPdNDLSXmjETWEqh5gZQ4zwAAaq01O8AgAA+AZA= Date: Thu, 15 Apr 2021 05:54:15 +0000 Message-ID: References: <20210317085426.10119-1-Cheng1.jiang@intel.com> <20210414061343.54919-1-Cheng1.jiang@intel.com> <20210414061343.54919-3-Cheng1.jiang@intel.com> In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.54] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2c637b05-787a-47f9-9dce-08d8ffd2e6f4 x-ms-traffictypediagnostic: BY5PR11MB4225: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:475; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: jM0MGt14YkeeyhIJQk8hX4lbQxUZDs+xodsQRF59fNCEq0ouZ7QUvJuCs+fkSpmW+0c8XCYNabyNA4+Dvw0E9GFIsMEqFq33vImJp+FiJI+IX+ouCSgTKRSsfgFxrGTnWuuAF/WtLpgIT9IVqME1v7PAWWQ8Bh+/IRL7gUjFDaBCyNPQ24yBYxa7xfde5eJ/pERTREo5My4w7eey3IgHZPgL9M2rgbXFVBbfMKHdEl+72KB8DZxBkdXzH5mENEWUQU0u6aOWm/H5Aji7mVqnzp4SDGTs/reH3xOhQXvC6Puw0zXCgvlDvJwywl4Xqvq0uRFZE1savQid8hzyOczyLvHZDaUPa10R24CedJFZjJgzuzlDZRAEEa3XN9mZfkV0/IRA/1QC0e5NHBViYMks1SoUdNoBv3M7z9P6Xu4tXjJhCWK/dho9EpcnCfkIF43MCS2jrB+tFOXG3oH9/XJX9qrHhHMiKKE508JOTZ4eZTrXABe6sKb/aQZ0AKK6t13xxq2+qls86hGU2UqCwTBtwqfN+gnqgliTEIEvX07U1QQHOBkx0BJreP1jh+rzg7DOhj6mYrY9Wa0nNj8/LgDRm993MUoT83385xaaYn53v+0= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR11MB5006.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(346002)(366004)(136003)(376002)(39860400002)(316002)(8676002)(54906003)(4326008)(8936002)(26005)(53546011)(83380400001)(186003)(110136005)(30864003)(55016002)(6506007)(9686003)(76116006)(7696005)(6636002)(66946007)(2906002)(122000001)(52536014)(38100700002)(64756008)(66446008)(66556008)(86362001)(66476007)(107886003)(478600001)(71200400001)(5660300002)(33656002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?plmLOKd4DC52ikHVJI1yMhMY6sbpFI92aV5C5eQzZVYii/IUYWZ6ld16mAs/?= =?us-ascii?Q?Uv74NdgvQzOQZmoGGeU5/RAsCbzWrPcKE7XwXzwKqRzhDVrRmSpv77WwIomF?= =?us-ascii?Q?bdG/KNmEhAih6gJqW/US+X6c0ArqA5lSZxRdGdnGhEqVQoV99KUM/HbgOyZw?= =?us-ascii?Q?qFYKABr8oGOT31Q8kVS4TOe06ISGdh5F0a9H31hNIomMC/vzo0gIfDYuSLsV?= =?us-ascii?Q?L+UQ0mUcdKT7YUe+J8hugrC4LQILjWIQ5pAPXjnP0auieb36a2VliZmEBPKs?= =?us-ascii?Q?vDJKxEfVP5I+URkozn4DboZQlokS/yIYnVugGb5mMvWK14CEFjbzeSrddKNP?= =?us-ascii?Q?Oy23eBRuD3t4keE6szPbNtv2iOIGbptj2NmxmpUMPXABudwfI+EVr/QY/z9g?= =?us-ascii?Q?IhiF5mbwIsL3pj6/B4t61pg5Jsoz2wianMk/WkVoCQeeUSdfUH50ycqA8h8U?= =?us-ascii?Q?q+soRfTXhjnxEuqCC2+IWOAvHb8C7hN332Cq0DU17NQwc0Q25sl+mh3ZO9GT?= =?us-ascii?Q?WhlFsaztHEAMxBaAi+Uc9yWcNGcdNW3h+o4Di0YOELh1Ibq4wFCbzfvAGp/E?= =?us-ascii?Q?afMHODZ9M3hPaGGOgRDD5xyL+BPpIRXPpeEODE1Kanh6gVGE2tpmyiHHe5g8?= =?us-ascii?Q?8oYJ8c+08r3N0ZQs+VoUfokfdxeNmsHrM17tqLdaDO2bSTrGgC2B2bFSKqA7?= =?us-ascii?Q?Zxe7qdueGBGeweXvcdhYiNB5HeIR56LA001PBdob/rdGk3hsILlwQOTdrDhO?= =?us-ascii?Q?9niglKtfwaRjnkMIn+fmsXUcu7hsKKBDViRJYksdbUUUfXSx1i4VVqbR3zF4?= =?us-ascii?Q?IEosxKaQbwlQzlyh9UVF3cXy6BQVtOQK9IXue2MbHw93qdTh3Ge94rZyb/KR?= =?us-ascii?Q?iZjB8KO7kz965KVZBND+hAU0wwxlI3XIC1Ep+BMInxFSaWrwo3RIep5Spwqq?= =?us-ascii?Q?m1X1UoTF+i2uzvcWbdc/To4FFvq/dvuVgtnD8xoHWOlpAQQkcJZwGc/xK+Ll?= =?us-ascii?Q?b02FkYpI7guihn6wdCkAszPbyxoOWWRWc8nH353x/TmOvuudEwyDNO4A8M+5?= =?us-ascii?Q?VC0ogOssGYSoqLchFAQljNVHjie4LalnKD7K5fPB1kqgtN4JT3/4JChZDs8B?= =?us-ascii?Q?pFSjs/bpijR9db5nbxROZrMBMjWtiUPQFCI6vGKK6/gdopIwYVLjQxX+N+am?= =?us-ascii?Q?C6NauU9IkMpe7rjNGcwEUbnF6vZtDFmoFAgGzcv4FqhRcOkc+lZ21w5hQ68p?= =?us-ascii?Q?C6UZBsr3TbtZ/vIu0zHJzJHPZaBBm/MwvT5sPdJe425oezXqPPoC5U/hwswj?= =?us-ascii?Q?hGA=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5006.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c637b05-787a-47f9-9dce-08d8ffd2e6f4 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Apr 2021 05:54:15.4188 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9lC75C1T/KVS38pp8EeEfbssSmcWozMnxe08zqYo6LOEfxeG/BAAJSBnM534vChlhkIqBcPdMZHW3y4yCKg1Yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4225 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v7 2/4] vhost: add support for packed ring in async vhost X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Jiayu, > -----Original Message----- > From: Hu, Jiayu > Sent: Thursday, April 15, 2021 10:03 AM > To: Jiang, Cheng1 ; maxime.coquelin@redhat.com; > Xia, Chenbo > Cc: dev@dpdk.org; Yang, YvonneX ; Wang, Yinan > ; Liu, Yong > Subject: RE: [PATCH v7 2/4] vhost: add support for packed ring in async v= host >=20 > Hi Cheng, >=20 > > -----Original Message----- > > From: Jiang, Cheng1 > > Sent: Wednesday, April 14, 2021 2:14 PM > > To: maxime.coquelin@redhat.com; Xia, Chenbo > > Cc: dev@dpdk.org; Hu, Jiayu ; Yang, YvonneX > > ; Wang, Yinan ; Liu, > > Yong ; Jiang, Cheng1 > > Subject: [PATCH v7 2/4] vhost: add support for packed ring in async > > vhost > > > > For now async vhost data path only supports split ring. This patch > > enables packed ring in async vhost data path to make async vhost > > compatible with virtio 1.1 spec. > > > > Signed-off-by: Cheng Jiang > > --- > > lib/librte_vhost/rte_vhost_async.h | 1 + > > lib/librte_vhost/vhost.c | 49 ++-- > > lib/librte_vhost/vhost.h | 15 +- > > lib/librte_vhost/virtio_net.c | 432 +++++++++++++++++++++++++++-- > > 4 files changed, 456 insertions(+), 41 deletions(-) > > > > diff --git a/lib/librte_vhost/rte_vhost_async.h > > b/lib/librte_vhost/rte_vhost_async.h > > index c855ff875..6faa31f5a 100644 > > --- a/lib/librte_vhost/rte_vhost_async.h > > +++ b/lib/librte_vhost/rte_vhost_async.h > > @@ -89,6 +89,7 @@ struct rte_vhost_async_channel_ops { struct > > async_inflight_info { struct rte_mbuf *mbuf; uint16_t descs; /* num > > of descs inflight */ > > +uint16_t nr_buffers; /* num of buffers inflight for packed ring */ > > }; > > > > /** > > diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index > > a70fe01d8..f509186c6 100644 > > --- a/lib/librte_vhost/vhost.c > > +++ b/lib/librte_vhost/vhost.c > > @@ -338,19 +338,22 @@ cleanup_device(struct virtio_net *dev, int > > destroy) } > > > > static void > > -vhost_free_async_mem(struct vhost_virtqueue *vq) > > +vhost_free_async_mem(struct virtio_net *dev, struct vhost_virtqueue > > +*vq) > > { > > -if (vq->async_pkts_info) > > -rte_free(vq->async_pkts_info); > > -if (vq->async_descs_split) > > +rte_free(vq->async_pkts_info); > > + > > +if (vq_is_packed(dev)) { > > +rte_free(vq->async_buffers_packed); > > +vq->async_buffers_packed =3D NULL; > > +} else { > > rte_free(vq->async_descs_split); > > -if (vq->it_pool) > > -rte_free(vq->it_pool); > > -if (vq->vec_pool) > > -rte_free(vq->vec_pool); > > +vq->async_descs_split =3D NULL; > > +} > > + > > +rte_free(vq->it_pool); > > +rte_free(vq->vec_pool); > > > > vq->async_pkts_info =3D NULL; > > -vq->async_descs_split =3D NULL; > > vq->it_pool =3D NULL; > > vq->vec_pool =3D NULL; > > } > > @@ -360,10 +363,10 @@ free_vq(struct virtio_net *dev, struct > > vhost_virtqueue *vq) { if (vq_is_packed(dev)) > > rte_free(vq->shadow_used_packed); -else { > > +else > > rte_free(vq->shadow_used_split); > > -vhost_free_async_mem(vq); > > -} > > + > > +vhost_free_async_mem(dev, vq); > > rte_free(vq->batch_copy_elems); > > if (vq->iotlb_pool) > > rte_mempool_free(vq->iotlb_pool); > > @@ -1626,10 +1629,9 @@ int rte_vhost_async_channel_register(int vid, > > uint16_t queue_id, if (unlikely(vq =3D=3D NULL || !dev->async_copy)) > > return -1; > > > > -/* packed queue is not supported */ > > -if (unlikely(vq_is_packed(dev) || !f.async_inorder)) { > > +if (unlikely(!f.async_inorder)) { > > VHOST_LOG_CONFIG(ERR, > > -"async copy is not supported on packed queue or non-inorder mode " > > +"async copy is not supported on non-inorder mode " > > "(vid %d, qid: %d)\n", vid, queue_id); return -1; } @@ -1667,12 > > +1669,19 @@ int rte_vhost_async_channel_register(int vid, uint16_t > > queue_id, vq->vec_pool =3D rte_malloc_socket(NULL, > VHOST_MAX_ASYNC_VEC > > * sizeof(struct iovec), RTE_CACHE_LINE_SIZE, node); > > -vq->async_descs_split =3D rte_malloc_socket(NULL, > > +if (vq_is_packed(dev)) { > > +vq->async_buffers_packed =3D rte_malloc_socket(NULL, size * > > +vq->sizeof(struct vring_used_elem_packed), > > +RTE_CACHE_LINE_SIZE, node); > > +} else { > > +vq->async_descs_split =3D rte_malloc_socket(NULL, > > vq->size * sizeof(struct vring_used_elem), RTE_CACHE_LINE_SIZE, > > node); -if (!vq->async_descs_split || !vq->async_pkts_info || > > -!vq->it_pool || !vq->vec_pool) { -vhost_free_async_mem(vq); > > +} > > + > > +if (!vq->async_buffers_packed || !vq->async_descs_split || > async_buffers_packed and async_descs_split are two members of a union. > Like the way processed in vhost_free_async_mem(), do you think it's bette= r > to check if they are NULL in if-else respectively? Sure, make sense to me. I'll fix them together with other async mem check. >=20 > > +!vq->async_pkts_info || !vq->it_pool || !vq->vec_pool) { > > +vhost_free_async_mem(dev, vq); > > VHOST_LOG_CONFIG(ERR, > > "async register failed: cannot allocate memory for vq data " > > "(vid %d, qid: %d)\n", vid, queue_id); @@ -1728,7 +1737,7 @@ int > > rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) goto > > out; } > > > > -vhost_free_async_mem(vq); > > +vhost_free_async_mem(dev, vq); > > > > vq->async_ops.transfer_data =3D NULL; > > vq->async_ops.check_completed_copies =3D NULL; diff --git > > a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index > > f628714c2..673335217 100644 > > --- a/lib/librte_vhost/vhost.h > > +++ b/lib/librte_vhost/vhost.h > > @@ -201,9 +201,18 @@ struct vhost_virtqueue { uint16_tasync_pkts_idx; > > uint16_tasync_pkts_inflight_n; uint16_tasync_last_pkts_n; -struct > > vring_used_elem *async_descs_split; -uint16_t async_desc_idx; > > -uint16_t last_async_desc_idx; > > +union { > > +struct vring_used_elem *async_descs_split; struct > > +vring_used_elem_packed *async_buffers_packed; }; union { uint16_t > > +async_desc_idx; uint16_t async_packed_buffer_idx; }; union { uint16_t > > +last_async_desc_idx; uint16_t last_async_buffer_idx; }; > > > > /* vq async features */ > > boolasync_inorder; > > diff --git a/lib/librte_vhost/virtio_net.c > > b/lib/librte_vhost/virtio_net.c index 438bdafd1..54e11e3a5 100644 > > --- a/lib/librte_vhost/virtio_net.c > > +++ b/lib/librte_vhost/virtio_net.c > > @@ -363,14 +363,14 @@ > > vhost_shadow_dequeue_single_packed_inorder(struct vhost_virtqueue > *vq, > > } > > > > static __rte_always_inline void > > -vhost_shadow_enqueue_single_packed(struct virtio_net *dev, > > - struct vhost_virtqueue *vq, > > - uint32_t len[], > > - uint16_t id[], > > - uint16_t count[], > > +vhost_shadow_enqueue_packed(struct vhost_virtqueue *vq, > > + uint32_t *len, > > + uint16_t *id, > > + uint16_t *count, > > uint16_t num_buffers) > > { > > uint16_t i; > > + > > for (i =3D 0; i < num_buffers; i++) { > > /* enqueue shadow flush action aligned with batch num */ if > > (!vq->shadow_used_idx) @@ -382,6 +382,17 @@ > > vhost_shadow_enqueue_single_packed(struct > > virtio_net *dev, > > vq->shadow_aligned_idx +=3D count[i]; > > vq->shadow_used_idx++; > > } > > +} > > + > > +static __rte_always_inline void > > +vhost_shadow_enqueue_single_packed(struct virtio_net *dev, > > + struct vhost_virtqueue *vq, > > + uint32_t *len, > > + uint16_t *id, > > + uint16_t *count, > > + uint16_t num_buffers) > > +{ > > +vhost_shadow_enqueue_packed(vq, len, id, count, num_buffers); > > > > if (vq->shadow_aligned_idx >=3D PACKED_BATCH_SIZE) { > > do_data_copy_enqueue(dev, vq); @@ -1474,6 +1485,23 @@ > > store_dma_desc_info_split(struct vring_used_elem *s_ring, struct > > vring_used_elem } } > > > > +static __rte_always_inline void > > +store_dma_desc_info_packed(struct vring_used_elem_packed *s_ring, > > +struct vring_used_elem_packed *d_ring, uint16_t ring_size, uint16_t > > +s_idx, uint16_t d_idx, uint16_t > > count) > > +{ > > +uint16_t elem_size =3D sizeof(struct vring_used_elem_packed); > > + > > +if (d_idx + count <=3D ring_size) { > > +rte_memcpy(d_ring + d_idx, s_ring + s_idx, count * > > elem_size); > > +} else { > > +uint16_t size =3D ring_size - d_idx; > > + > > +rte_memcpy(d_ring + d_idx, s_ring + s_idx, size * elem_size); > > +rte_memcpy(d_ring, s_ring + s_idx + size, (count - size) * > > elem_size); > > +} > > +} > > + > > static __rte_noinline uint32_t > > virtio_dev_rx_async_submit_split(struct virtio_net *dev, struct > > vhost_virtqueue *vq, uint16_t queue_id, @@ -1641,6 +1669,330 @@ > > virtio_dev_rx_async_submit_split(struct > > virtio_net *dev, > > return pkt_idx; > > } > > > > +static __rte_always_inline void > > +vhost_update_used_packed(struct vhost_virtqueue *vq, struct > > +vring_used_elem_packed *shadow_ring, uint16_t count) { int i; > > +uint16_t used_idx =3D vq->last_used_idx; uint16_t head_idx =3D > > +vq->last_used_idx; uint16_t head_flags =3D 0; > > + > > +if (count =3D=3D 0) > > +return; > > + > > +/* Split loop in two to save memory barriers */ for (i =3D 0; i < > > +count; i++) { > > +vq->desc_packed[used_idx].id =3D shadow_ring[i].id; > > +vq->desc_packed[used_idx].len =3D shadow_ring[i].len; > > + > > +used_idx +=3D shadow_ring[i].count; > > +if (used_idx >=3D vq->size) > > +used_idx -=3D vq->size; > > +} > > + > > +/* The ordering for storing desc flags needs to be enforced. */ > > +rte_atomic_thread_fence(__ATOMIC_RELEASE); > > + > > +for (i =3D 0; i < count; i++) { > > +uint16_t flags; > > + > > +if (vq->shadow_used_packed[i].len) > > +flags =3D VRING_DESC_F_WRITE; > > +else > > +flags =3D 0; > > + > > +if (vq->used_wrap_counter) { > > +flags |=3D VRING_DESC_F_USED; > > +flags |=3D VRING_DESC_F_AVAIL; > > +} else { > > +flags &=3D ~VRING_DESC_F_USED; > > +flags &=3D ~VRING_DESC_F_AVAIL; > > +} > > + > > +if (i > 0) { > > +vq->desc_packed[vq->last_used_idx].flags =3D flags; > > + > No need a blank line above. Sure, thanks. >=20 > > +} else { > > +head_idx =3D vq->last_used_idx; > > +head_flags =3D flags; > > +} > > + > > +vq_inc_last_used_packed(vq, shadow_ring[i].count); } > > + > > +vq->desc_packed[head_idx].flags =3D head_flags; > > +} > > + > > +static __rte_always_inline int > > +vhost_enqueue_async_single_packed(struct virtio_net *dev, > > + struct vhost_virtqueue *vq, > > + struct rte_mbuf *pkt, > > + struct buf_vector *buf_vec, > > + uint16_t *nr_descs, > > + uint16_t *nr_buffers, > > + struct vring_packed_desc *async_descs, > > + struct iovec *src_iovec, struct iovec *dst_iovec, > > + struct rte_vhost_iov_iter *src_it, > > + struct rte_vhost_iov_iter *dst_it) { uint16_t nr_vec =3D 0; > > +uint16_t avail_idx =3D vq->last_avail_idx; uint16_t max_tries, tries = =3D > > +0; uint16_t buf_id =3D 0; uint32_t len =3D 0; uint16_t desc_count =3D = 0; > > +uint32_t size =3D pkt->pkt_len + sizeof(struct > > virtio_net_hdr_mrg_rxbuf); > > +uint32_t buffer_len[vq->size]; > > +uint16_t buffer_buf_id[vq->size]; > > +uint16_t buffer_desc_count[vq->size]; *nr_buffers =3D 0; > > + > > +if (rxvq_is_mergeable(dev)) > > +max_tries =3D vq->size - 1; > > +else > > +max_tries =3D 1; > > + > > +while (size > 0) { > > +/* > > + * if we tried all available ring items, and still > > + * can't get enough buf, it means something abnormal > > + * happened. > > + */ > > +if (unlikely(++tries > max_tries)) > > +return -1; > > + > > +if (unlikely(fill_vec_buf_packed(dev, vq, avail_idx, > > &desc_count, buf_vec, &nr_vec, > > +&buf_id, &len, > > VHOST_ACCESS_RW) < 0)) > > +return -1; > > + > > +len =3D RTE_MIN(len, size); > > +size -=3D len; > > + > > +buffer_len[*nr_buffers] =3D len; > > +buffer_buf_id[*nr_buffers] =3D buf_id; > > +buffer_desc_count[*nr_buffers] =3D desc_count; *nr_buffers +=3D 1; > > + > > +*nr_descs +=3D desc_count; > > +avail_idx +=3D desc_count; > > +if (avail_idx >=3D vq->size) > > +avail_idx -=3D vq->size; > > +} > > + > > +if (async_mbuf_to_desc(dev, vq, pkt, buf_vec, nr_vec, *nr_buffers, > > src_iovec, dst_iovec, > > +src_it, dst_it) < 0) > > +return -1; > > +/* store descriptors for DMA */ > > +if (avail_idx >=3D *nr_descs) { > > +rte_memcpy(async_descs, &vq->desc_packed[vq- > > >last_avail_idx], > > +*nr_descs * sizeof(struct vring_packed_desc)); } else { uint16_t > > +nr_copy =3D vq->size - vq->last_avail_idx; rte_memcpy(async_descs, > > +&vq->desc_packed[vq- > > >last_avail_idx], > > +nr_copy * sizeof(struct vring_packed_desc)); rte_memcpy(async_descs + > > +nr_copy, vq->desc_packed, (*nr_descs - nr_copy) * sizeof(struct > > vring_packed_desc)); > > +} > > + > > +vhost_shadow_enqueue_packed(vq, buffer_len, buffer_buf_id, > > buffer_desc_count, *nr_buffers); > > + > > +return 0; > > +} > > + > > +static __rte_always_inline int16_t > > +virtio_dev_rx_async_single_packed(struct virtio_net *dev, struct > > vhost_virtqueue *vq, > > + struct rte_mbuf *pkt, uint16_t *nr_descs, uint16_t > > *nr_buffers, > > + struct vring_packed_desc *async_descs, > > + struct iovec *src_iovec, struct iovec *dst_iovec, > > + struct rte_vhost_iov_iter *src_it, struct > > rte_vhost_iov_iter *dst_it) > > +{ > > +struct buf_vector buf_vec[BUF_VECTOR_MAX]; *nr_descs =3D 0; > *nr_buffers > > +=3D 0; > > + > > +if (unlikely(vhost_enqueue_async_single_packed(dev, vq, pkt, > > buf_vec, nr_descs, nr_buffers, > > + async_descs, src_iovec, > > dst_iovec, > > + src_it, dst_it) < 0)) { > > +VHOST_LOG_DATA(DEBUG, "(%d) failed to get enough desc > > from vring\n", dev->vid); > > +return -1; > > +} > > + > > +VHOST_LOG_DATA(DEBUG, "(%d) current index %d | end > > index %d\n", > > +dev->vid, vq->last_avail_idx, vq->last_avail_idx + > > *nr_descs); > > + > > +return 0; > > +} > > + > > +static __rte_always_inline void > > +dma_error_handler_packed(struct vhost_virtqueue *vq, struct > > vring_packed_desc *async_descs, > > +uint16_t async_descs_idx, uint16_t slot_idx, uint32_t > > nr_err, > > +uint32_t *pkt_idx, uint32_t *num_async_pkts, > > uint32_t *num_done_pkts) > > +{ > > +uint16_t descs_err =3D 0; > > +uint16_t buffers_err =3D 0; > > +struct async_inflight_info *pkts_info =3D vq->async_pkts_info; > > + > > +*num_async_pkts -=3D nr_err; > > +*pkt_idx -=3D nr_err; > > +/* calculate the sum of buffers and descs of DMA-error packets. */ > > +while (nr_err-- > 0) { descs_err +=3D pkts_info[slot_idx % > > +vq->size].descs; > I notice there are several parts using "%" to wrap around index, but exis= ted > code uses "& (vq->size - 1)" instead. I think it's better to keep it cons= istent. Unlike split ring, packed ring size is not necessarily a power of 2. So I c= an't use "& (vq->size - 1) in packed ring. Thanks, Cheng >=20 > Thanks, > Jiayu