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 D0E56A0A0E; Wed, 12 May 2021 05:30:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9123F4003F; Wed, 12 May 2021 05:30:17 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 4501D4003E; Wed, 12 May 2021 05:30:15 +0200 (CEST) IronPort-SDR: 9AgggzZJOj6Si3iScbhAOGaGIA677dE0YshZNsccBroia8yBFjNsq3MqKLI9vEGWXgLSoYTluy 1N8eo1EfqEYg== X-IronPort-AV: E=McAfee;i="6200,9189,9981"; a="220574511" X-IronPort-AV: E=Sophos;i="5.82,292,1613462400"; d="scan'208";a="220574511" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2021 20:30:14 -0700 IronPort-SDR: 2LakBV4uBuEYmlny85KBu+NEQ/+XEUslhVRlk9sRdsnv60m3w/sb4cZL/xNofP+j8DjExXQU1h vaRrDW71Ym8Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,292,1613462400"; d="scan'208";a="409081527" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga002.jf.intel.com with ESMTP; 11 May 2021 20:30:13 -0700 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 11 May 2021 20:30:13 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Tue, 11 May 2021 20:30:13 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.173) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Tue, 11 May 2021 20:30:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E2jnmDKEjMB8Zm+4y1cRpQeRIGFS4250O84glz36F9eC1DLRwkvjAWT0qmITheqNzmR/aepsSb2ClViXVgJRb11izSmZskXmm2tSPwgEBP81nO8DoE6HRHRp8A74AvI8BCsVzScTkDWD1gnRW2F3Q0kpbNlzeloUk8YCb9GL0UwZkq1Si3zhqU83MNu7m9m30BkOIsUHyblgSusH9wet+r1UhNTyJ0WrDCvveNScF9Ju/5hTMX3jzxtkWVJQGda2v2EelN72rm0kkBPU29HAianD3lEVPFkP+5ptj7jc9cvCYwjIZAaqLJj0pHD3dDbqMmsspbsHnjlX8byBT0YgPQ== 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=ahqe7LsnTQLTQcmBsNRfWa7z1+sOCorFG1TYJHHLmaY=; b=Wg5RJz0t0LdEqvd1PNqwewVXxN6XAjrMD8McILyUtrsF6h87f/UHh34MdWVREDqY/Z78t5yEUTVlz3LE3lwwBTu7gxFVgUbzIWAtWcdwygq5mkEBEUcpyhSCwsxVwBHf2W0tb3KoqJTDHa30EBuO9lG7QVg+fIZiqXhwaurMboZMEz89ztEE7VlbfHnbLfHmZYFAGWUKF17goDRqu8NJbTtQWaGBg6FYQMAY5lnTaeHM7HJOXC6jfBKA9znWzj2z8qYj+7edfnylxPT9PRV3CtJQvwOL0TTNojI3kJT/mD7RtxpwCyq9X7f0q/KLz640/y+nzuVEP8KW5+qMU/lthw== 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=ahqe7LsnTQLTQcmBsNRfWa7z1+sOCorFG1TYJHHLmaY=; b=gih796vIND5XJtmf7Iq5OU26i0jTwyVM2s3hR98ggklVdDc8OkMdgowACVjXAkwYWzitnZ1WhAa9KUofZlCBWDvC2uYDM2ZHkoGyl11JuEFlstavHGPCjX5ra6n4BnG2DFg1r+ijtlXOIjMIF3quXJLEf7KfPJs0MS6kSSUwzSw= Received: from BYAPR11MB2648.namprd11.prod.outlook.com (2603:10b6:a02:c7::10) by BY5PR11MB4054.namprd11.prod.outlook.com (2603:10b6:a03:189::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Wed, 12 May 2021 03:29:57 +0000 Received: from BYAPR11MB2648.namprd11.prod.outlook.com ([fe80::f4a4:3591:faa3:9668]) by BYAPR11MB2648.namprd11.prod.outlook.com ([fe80::f4a4:3591:faa3:9668%3]) with mapi id 15.20.4108.031; Wed, 12 May 2021 03:29:57 +0000 From: "Wang, Yinan" To: "Wang, Yinan" , David Marchand , "dev@dpdk.org" CC: "maxime.coquelin@redhat.com" , "olivier.matz@6wind.com" , "fbl@sysclose.org" , "i.maximets@ovn.org" , "Xia, Chenbo" , "Stokes, Ian" , "stable@dpdk.org" , Jijiang Liu , Yuanhan Liu Thread-Topic: [dpdk-dev] [PATCH v4 3/3] vhost: fix offload flags in Rx path Thread-Index: AQHXQDulapoCk2qKMky163ry0DYlIqrZIvcAgAYJQ0A= Date: Wed, 12 May 2021 03:29:57 +0000 Message-ID: References: <20210401095243.18211-1-david.marchand@redhat.com> <20210503164344.27916-1-david.marchand@redhat.com> <20210503164344.27916-4-david.marchand@redhat.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows 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.102.204.53] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 078ceae2-c7bc-46fe-0181-08d914f6375c x-ms-traffictypediagnostic: BY5PR11MB4054: 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:8882; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: arYy3GpD/vstoxsiknAysPQYf8VNJYIirTlqLvNlo/1G6ItP/Pmj2VNwahWVXMIp70dT40kdXDtXoCZPD07D40K2WlWyfdSSxQsK2mhbNol1T2UOSgafXTRv+qFetCwQXiVGqzJqwwDEQ7rpXSpP7KRwi4Ath63XrfQds9jmkarcEkBwzycbj7kDPA8AD9lFmt2nAoB9UzmtQLW6F+9Ww51cKpnUG7nFwYQSe+lDg3g+KrqDiONmKJ/87jKLHRB60jTeUJ7eopd9Pr6SILC3FLcz6stgnR7USxumjAV+xJGM6vRLHRn4nIaZ8YDlmbO7EnDRXzbMuUbSMlDDOSd7SFU/69k1+2uEHAzYkAeWzLPBRqv7jp07LvAUMC6KR0PziZGdt30mcoe/b+Y5gx/iLKXBods3pFvZolcPGSCWH7TJp312CD7qLAsOvc4LtPXsKfLUtOkXelZrXkwrQiXhP6kPRuqwCyTWvG7JbLGVrIK74Go3Rz9v7J6/b6aDCPBtO1mWYQNxI0zO8xrjR+Rl7gG+ndlGy7gO6eq0XdaOgN2d22MNPVdfwQLSy7O/+4/4M3WAhK3NhAI9yH/U5j/N+VbiGj4BcGCdQcl14ydgbePt5D1U5Bdz2eAVLAcjD1uIPHKGaGB94s3E9b2HKUOhsn3UAlFYZc3SW3fXrEprKvvGnYBXt4Mly+ze0kBOfFVV x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB2648.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(376002)(346002)(366004)(396003)(39860400002)(110136005)(71200400001)(8676002)(8936002)(83380400001)(26005)(186003)(966005)(64756008)(2906002)(33656002)(54906003)(66556008)(9686003)(6506007)(4326008)(316002)(66946007)(53546011)(7696005)(66476007)(86362001)(30864003)(52536014)(76116006)(122000001)(66446008)(5660300002)(478600001)(55016002)(38100700002)(579004)(559001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: =?Windows-1252?Q?+/yeQ5syNqwgvogQgaUsF7mvnWaQkOjlOTzxPB5tzApAAqoA9lKMFVrj?= =?Windows-1252?Q?YM+b+8Qb840mGKCWgpLOGkQJPXTzLgLTgf1Nl+zxjQAUtyvKZQLTzq5r?= =?Windows-1252?Q?n0iY/l0RF5zLXOaGqqdMN763w2RMM5QhjPwcvjUMF5AnBvm3jLBxekb9?= =?Windows-1252?Q?R/YRguPoewJarJ1Bnf07+R7PzbTF/o37n79TneW5A7ydsmSJ61iXI+Gp?= =?Windows-1252?Q?sTiZ0EeAsvH3tZ80e6Tg3j9ZeKqTFWM8qNV+KFhD14KDLRi/VPrTdrZX?= =?Windows-1252?Q?X0yWBVoDB8cUr9wer9wyYqUNucBygLDdfqaP0t/K4MxmCf0TF/mw04JF?= =?Windows-1252?Q?eq7Gs9L372OiRZD3LwreSvDJJUOPzZaxHtvqJBlZsdzZSaQGUsvw15iR?= =?Windows-1252?Q?8DoyALbLoXoOcubP0nDXSF9XlE7c+oFglSGTVSRmD09pDDyRaGxJjyCt?= =?Windows-1252?Q?rjwxHedimpd0CO9Jw3dCZi9w1fl2V6MhwoKKUn+af0TLYblaIqakPa57?= =?Windows-1252?Q?E9TF8Tbow0uQVXZ/h2z9WSQWKjjBHceEXQCgXxnJy/jfXb71A6wn1RzD?= =?Windows-1252?Q?6Flx9EmfKdLdqwWMAXVqbjvfsQCtCsbmjOlWbWj4ItoobkL+3gb+9k3p?= =?Windows-1252?Q?YRIBW8vVKDa5hnGBCFqRSwBnM/E3LTHDMqtgjAQk+bk4HcG7NZYuigfX?= =?Windows-1252?Q?4S07fNtq6H21E+Hdb63AzgzGvFyW0y9Qy3iohN6bAnkuGMURwuU3QSG6?= =?Windows-1252?Q?Xr3EtaNxU3HujXdAB7thftjq43A/C7RVXNSYSgbuO2rhdLQxLvV1xXDc?= =?Windows-1252?Q?j0CFnBc2zvCGBDvTCsBNlREFb2Z+hp9G/zTOMmggmqBYaqtKbDCWVZ+F?= =?Windows-1252?Q?FKaPbh/Thk5Hi4ubUhFR+MLRjIDFtHGBRs0v7U4WDfJJhJ8Q+F6cl7Gj?= =?Windows-1252?Q?9V/Cu9DADpwp7dCbD+147Snd5DBZGKu+/ofnIwwVVc7Evh8+FdrIy2K3?= =?Windows-1252?Q?IEPj59N3xpMWZ0OIpdZ66hZunRxxVLhdgKQCryN9VqPq+9D41deVUGZw?= =?Windows-1252?Q?D9DdSqagQpuUo7oXBntoR2crlaL3fLEKwE/L4S1N145gla5JO0kbHq1S?= =?Windows-1252?Q?y9o5JKJ3I5CzYn/JlRvtg9mZpvJXeOChrmohAx6AVmxXNhnNycjoxJG3?= =?Windows-1252?Q?gv4AaredmMRl2eeDJGWyRpJidV8j5kqMLqSbgI2LnymCyfiIJDobvTaO?= =?Windows-1252?Q?txR+zN6tOq9C/zSXlyhG8+IMnPTmrkrCBiYlKLcQXzCcY6kp4hIWqyt7?= =?Windows-1252?Q?Kpglyhro5y22PUO6myfLHr9+L1JV++Lts3UBF27tq1X0xdaJ3xFeSiyF?= =?Windows-1252?Q?A6fQHVM6ehRoCEOi8PMPbp++WHa+ST4XEt3HHv48ScUTeOiHRxPYxqtm?= Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2648.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 078ceae2-c7bc-46fe-0181-08d914f6375c X-MS-Exchange-CrossTenant-originalarrivaltime: 12 May 2021 03:29:57.1273 (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: UJo/bUcOb4Qoxb9k2zj5uFVEgZJB/pDmxVAK4G+2gzBn3kFyHlb5M7spIqZBhhuy4spt22cUrpTAx5Wdvf3Z+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4054 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v4 3/3] vhost: fix offload flags in Rx path 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 David, Since vhost tx offload can=92t work now, we report a Bugzilla as below, cou= ld you help to take a look? https://bugs.dpdk.org/show_bug.cgi?id=3D702 We also tried vhost example with VM2VM iperf test, large pkts also can't fo= rwarding. BR, Yinan > -----Original Message----- > From: dev On Behalf Of Wang, Yinan > Sent: 2021?5?8? 14:24 > To: David Marchand ; dev@dpdk.org > Cc: maxime.coquelin@redhat.com; olivier.matz@6wind.com; > fbl@sysclose.org; i.maximets@ovn.org; Xia, Chenbo > ; Stokes, Ian ; > stable@dpdk.org; Jijiang Liu ; Yuanhan Liu > > Subject: Re: [dpdk-dev] [PATCH v4 3/3] vhost: fix offload flags in Rx pat= h >=20 > Hi David, >=20 > May I know how to configures Tx offloading by testpmd, could you help to > provide an example case? > I add a case which need vhost tx offload (TSO/cksum) function, this case > can't work with the patch, could you use this case as the example if poss= ible? >=20 > For example: VM2VM split ring vhost-user/virtio-net test with tcp traffic > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > 1. Launch the Vhost sample on socket 0 by below commands:: >=20 > rm -rf vhost-net* > ./dpdk-testpmd -l 2-4 -n 4 --no-pci --file-prefix=3Dvhost --vdev > 'net_vhost0,iface=3Dvhost-net0,queues=3D1' \ > --vdev 'net_vhost1,iface=3Dvhost-net1,queues=3D1' -- -i --nb-cores= =3D2 -- > txd=3D1024 --rxd=3D1024 > testpmd>start >=20 > 2. Launch VM1 and VM2 on socket 1:: >=20 > taskset -c 32 qemu-system-x86_64 -name vm1 -enable-kvm -cpu host - > smp 1 -m 4096 \ > -object memory-backend-file,id=3Dmem,size=3D4096M,mem- > path=3D/mnt/huge,share=3Don \ > -numa node,memdev=3Dmem -mem-prealloc -drive > file=3D/home/osimg/ubuntu20-04.img \ > -chardev socket,path=3D/tmp/vm2_qga0.sock,server,nowait,id=3Dvm2_qga0 > -device virtio-serial \ > -device virtserialport,chardev=3Dvm2_qga0,name=3Dorg.qemu.guest_agent= .2 > -daemonize \ > -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device > e1000,netdev=3Dnttsip1 \ > -netdev user,id=3Dnttsip1,hostfwd=3Dtcp:127.0.0.1:6002-:22 \ > -chardev socket,id=3Dchar0,path=3D./vhost-net0 \ > -netdev type=3Dvhost-user,id=3Dnetdev0,chardev=3Dchar0,vhostforce \ > -device virtio-net-pci,netdev=3Dnetdev0,mac=3D52:54:00:00:00:01,disab= le- > modern=3Dfalse,mrg_rxbuf=3Don,csum=3Don,guest_csum=3Don,host_tso4=3Don,gu= est > _tso4=3Don,guest_ecn=3Don -vnc :10 >=20 > taskset -c 33 qemu-system-x86_64 -name vm2 -enable-kvm -cpu host - > smp 1 -m 4096 \ > -object memory-backend-file,id=3Dmem,size=3D4096M,mem- > path=3D/mnt/huge,share=3Don \ > -numa node,memdev=3Dmem -mem-prealloc -drive > file=3D/home/osimg/ubuntu20-04-2.img \ > -chardev socket,path=3D/tmp/vm2_qga0.sock,server,nowait,id=3Dvm2_qga0 > -device virtio-serial \ > -device virtserialport,chardev=3Dvm2_qga0,name=3Dorg.qemu.guest_agent= .2 > -daemonize \ > -monitor unix:/tmp/vm2_monitor.sock,server,nowait -device > e1000,netdev=3Dnttsip1 \ > -netdev user,id=3Dnttsip1,hostfwd=3Dtcp:127.0.0.1:6003-:22 \ > -chardev socket,id=3Dchar0,path=3D./vhost-net1 \ > -netdev type=3Dvhost-user,id=3Dnetdev0,chardev=3Dchar0,vhostforce \ > -device virtio-net-pci,netdev=3Dnetdev0,mac=3D52:54:00:00:00:02,disab= le- > modern=3Dfalse,mrg_rxbuf=3Don,csum=3Don,guest_csum=3Don,host_tso4=3Don,gu= est > _tso4=3Don,guest_ecn=3Don -vnc :12 >=20 > 3. On VM1, set virtio device IP and run arp protocal:: >=20 > ifconfig ens5 1.1.1.2 > arp -s 1.1.1.8 52:54:00:00:00:02 >=20 > 4. On VM2, set virtio device IP and run arp protocal:: >=20 > ifconfig ens5 1.1.1.8 > arp -s 1.1.1.2 52:54:00:00:00:01 >=20 > 5. Check the iperf performance with different packet size between two VMs > by below commands:: >=20 > Under VM1, run: `iperf -s -i 1` > Under VM2, run: `iperf -c 1.1.1.2 -i 1 -t 60` >=20 > BR, > Yinan >=20 > > -----Original Message----- > > From: dev On Behalf Of David Marchand > > Sent: 2021?5?4? 0:44 > > To: dev@dpdk.org > > Cc: maxime.coquelin@redhat.com; olivier.matz@6wind.com; > > fbl@sysclose.org; i.maximets@ovn.org; Xia, Chenbo > > ; Stokes, Ian ; > > stable@dpdk.org; Jijiang Liu ; Yuanhan Liu > > > > Subject: [dpdk-dev] [PATCH v4 3/3] vhost: fix offload flags in Rx path > > > > The vhost library currently configures Tx offloading (PKT_TX_*) on any > > packet received from a guest virtio device which asks for some offloadi= ng. > > > > This is problematic, as Tx offloading is something that the application > > must ask for: the application needs to configure devices > > to support every used offloads (ip, tcp checksumming, tso..), and the > > various l2/l3/l4 lengths must be set following any processing that > > happened in the application itself. > > > > On the other hand, the received packets are not marked wrt current > > packet l3/l4 checksumming info. > > > > Copy virtio rx processing to fix those offload flags with some > > differences: > > - accept VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP, > > - ignore anything but the VIRTIO_NET_HDR_F_NEEDS_CSUM flag (to > comply > > with > > the virtio spec), > > > > Some applications might rely on the current behavior, so it is left > > untouched by default. > > A new RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS flag is added to > > enable the > > new behavior. > > > > The vhost example has been updated for the new behavior: TSO is applied > > to > > any packet marked LRO. > > > > Fixes: 859b480d5afd ("vhost: add guest offload setting") > > Cc: stable@dpdk.org > > > > Signed-off-by: David Marchand > > Reviewed-by: Maxime Coquelin > > --- > > Changes since v3: > > - rebased on next-virtio, > > > > Changes since v2: > > - introduced a new flag to keep existing behavior as the default, > > - packets with unrecognised offload are passed to the application with = no > > offload metadata rather than dropped, > > - ignored VIRTIO_NET_HDR_F_DATA_VALID since the virtio spec states > that > > the virtio driver is not allowed to use this flag when transmitting > > packets, > > > > Changes since v1: > > - updated vhost example, > > - restored VIRTIO_NET_HDR_GSO_ECN and VIRTIO_NET_HDR_GSO_UDP > > support, > > - restored log on buggy offload request, > > > > --- > > doc/guides/prog_guide/vhost_lib.rst | 12 ++ > > doc/guides/rel_notes/release_21_05.rst | 6 + > > drivers/net/vhost/rte_eth_vhost.c | 2 +- > > examples/vhost/main.c | 44 +++--- > > lib/vhost/rte_vhost.h | 1 + > > lib/vhost/socket.c | 5 +- > > lib/vhost/vhost.c | 6 +- > > lib/vhost/vhost.h | 14 +- > > lib/vhost/virtio_net.c | 185 ++++++++++++++++++++++--- > > 9 files changed, 222 insertions(+), 53 deletions(-) > > > > diff --git a/doc/guides/prog_guide/vhost_lib.rst > > b/doc/guides/prog_guide/vhost_lib.rst > > index 7afa351675..d18fb98910 100644 > > --- a/doc/guides/prog_guide/vhost_lib.rst > > +++ b/doc/guides/prog_guide/vhost_lib.rst > > @@ -118,6 +118,18 @@ The following is an overview of some key Vhost > > API functions: > > > > It is disabled by default. > > > > + - ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` > > + > > + Since v16.04, the vhost library forwards checksum and gso requests > for > > + packets received from a virtio driver by filling Tx offload metada= ta in > > + the mbuf. This behavior is inconsistent with other drivers but it = is left > > + untouched for existing applications that might rely on it. > > + > > + This flag disables the legacy behavior and instead ask vhost to si= mply > > + populate Rx offload metadata in the mbuf. > > + > > + It is disabled by default. > > + > > * ``rte_vhost_driver_set_features(path, features)`` > > > > This function sets the feature bits the vhost-user driver supports. = The > > diff --git a/doc/guides/rel_notes/release_21_05.rst > > b/doc/guides/rel_notes/release_21_05.rst > > index a5f21f8425..6b7b0810a5 100644 > > --- a/doc/guides/rel_notes/release_21_05.rst > > +++ b/doc/guides/rel_notes/release_21_05.rst > > @@ -337,6 +337,12 @@ API Changes > > ``policer_action_recolor_supported`` and > > ``policer_action_drop_supported`` > > have been removed. > > > > +* vhost: The vhost library currently populates received mbufs from a > virtio > > + driver with Tx offload flags while not filling Rx offload flags. > > + While this behavior is arguable, it is kept untouched. > > + A new flag ``RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS`` has been > > added to ask > > + for a behavior compliant with to the mbuf offload API. > > + > > > > ABI Changes > > ----------- > > diff --git a/drivers/net/vhost/rte_eth_vhost.c > > b/drivers/net/vhost/rte_eth_vhost.c > > index d198fc8a8e..281379d6a3 100644 > > --- a/drivers/net/vhost/rte_eth_vhost.c > > +++ b/drivers/net/vhost/rte_eth_vhost.c > > @@ -1505,7 +1505,7 @@ rte_pmd_vhost_probe(struct rte_vdev_device > > *dev) > > int ret =3D 0; > > char *iface_name; > > uint16_t queues; > > - uint64_t flags =3D 0; > > + uint64_t flags =3D RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS; > > uint64_t disable_flags =3D 0; > > int client_mode =3D 0; > > int iommu_support =3D 0; > > diff --git a/examples/vhost/main.c b/examples/vhost/main.c > > index 0bee1f3321..d2179eadb9 100644 > > --- a/examples/vhost/main.c > > +++ b/examples/vhost/main.c > > @@ -19,6 +19,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -1029,33 +1030,34 @@ find_local_dest(struct vhost_dev *vdev, > > struct rte_mbuf *m, > > return 0; > > } > > > > -static uint16_t > > -get_psd_sum(void *l3_hdr, uint64_t ol_flags) > > -{ > > - if (ol_flags & PKT_TX_IPV4) > > - return rte_ipv4_phdr_cksum(l3_hdr, ol_flags); > > - else /* assume ethertype =3D=3D RTE_ETHER_TYPE_IPV6 */ > > - return rte_ipv6_phdr_cksum(l3_hdr, ol_flags); > > -} > > - > > static void virtio_tx_offload(struct rte_mbuf *m) > > { > > + struct rte_net_hdr_lens hdr_lens; > > + struct rte_ipv4_hdr *ipv4_hdr; > > + struct rte_tcp_hdr *tcp_hdr; > > + uint32_t ptype; > > void *l3_hdr; > > - struct rte_ipv4_hdr *ipv4_hdr =3D NULL; > > - struct rte_tcp_hdr *tcp_hdr =3D NULL; > > - struct rte_ether_hdr *eth_hdr =3D > > - rte_pktmbuf_mtod(m, struct rte_ether_hdr *); > > > > - l3_hdr =3D (char *)eth_hdr + m->l2_len; > > + ptype =3D rte_net_get_ptype(m, &hdr_lens, RTE_PTYPE_ALL_MASK); > > + m->l2_len =3D hdr_lens.l2_len; > > + m->l3_len =3D hdr_lens.l3_len; > > + m->l4_len =3D hdr_lens.l4_len; > > > > - if (m->ol_flags & PKT_TX_IPV4) { > > + l3_hdr =3D rte_pktmbuf_mtod_offset(m, void *, m->l2_len); > > + tcp_hdr =3D rte_pktmbuf_mtod_offset(m, struct rte_tcp_hdr *, > > + m->l2_len + m->l3_len); > > + > > + m->ol_flags |=3D PKT_TX_TCP_SEG; > > + if ((ptype & RTE_PTYPE_L3_MASK) =3D=3D RTE_PTYPE_L3_IPV4) { > > + m->ol_flags |=3D PKT_TX_IPV4; > > + m->ol_flags |=3D PKT_TX_IP_CKSUM; > > ipv4_hdr =3D l3_hdr; > > ipv4_hdr->hdr_checksum =3D 0; > > - m->ol_flags |=3D PKT_TX_IP_CKSUM; > > + tcp_hdr->cksum =3D rte_ipv4_phdr_cksum(l3_hdr, m- > > >ol_flags); > > + } else { /* assume ethertype =3D=3D RTE_ETHER_TYPE_IPV6 */ > > + m->ol_flags |=3D PKT_TX_IPV6; > > + tcp_hdr->cksum =3D rte_ipv6_phdr_cksum(l3_hdr, m- > > >ol_flags); > > } > > - > > - tcp_hdr =3D (struct rte_tcp_hdr *)((char *)l3_hdr + m->l3_len); > > - tcp_hdr->cksum =3D get_psd_sum(l3_hdr, m->ol_flags); > > } > > > > static __rte_always_inline void > > @@ -1148,7 +1150,7 @@ virtio_tx_route(struct vhost_dev *vdev, struct > > rte_mbuf *m, uint16_t vlan_tag) > > m->vlan_tci =3D vlan_tag; > > } > > > > - if (m->ol_flags & PKT_TX_TCP_SEG) > > + if (m->ol_flags & PKT_RX_LRO) > > virtio_tx_offload(m); > > > > tx_q->m_table[tx_q->len++] =3D m; > > @@ -1633,7 +1635,7 @@ main(int argc, char *argv[]) > > int ret, i; > > uint16_t portid; > > static pthread_t tid; > > - uint64_t flags =3D 0; > > + uint64_t flags =3D RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS; > > > > signal(SIGINT, sigint_handler); > > > > diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h > > index d0a8ae31f2..8d875e9322 100644 > > --- a/lib/vhost/rte_vhost.h > > +++ b/lib/vhost/rte_vhost.h > > @@ -36,6 +36,7 @@ extern "C" { > > /* support only linear buffers (no chained mbufs) */ > > #define RTE_VHOST_USER_LINEARBUF_SUPPORT (1ULL << 6) > > #define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7) > > +#define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) > > > > /* Features. */ > > #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE > > diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c > > index 0169d36481..5d0d728d52 100644 > > --- a/lib/vhost/socket.c > > +++ b/lib/vhost/socket.c > > @@ -42,6 +42,7 @@ struct vhost_user_socket { > > bool extbuf; > > bool linearbuf; > > bool async_copy; > > + bool net_compliant_ol_flags; > > > > /* > > * The "supported_features" indicates the feature bits the > > @@ -224,7 +225,8 @@ vhost_user_add_connection(int fd, struct > > vhost_user_socket *vsocket) > > size =3D strnlen(vsocket->path, PATH_MAX); > > vhost_set_ifname(vid, vsocket->path, size); > > > > - vhost_set_builtin_virtio_net(vid, vsocket->use_builtin_virtio_net); > > + vhost_setup_virtio_net(vid, vsocket->use_builtin_virtio_net, > > + vsocket->net_compliant_ol_flags); > > > > vhost_attach_vdpa_device(vid, vsocket->vdpa_dev); > > > > @@ -877,6 +879,7 @@ rte_vhost_driver_register(const char *path, > > uint64_t flags) > > vsocket->extbuf =3D flags & RTE_VHOST_USER_EXTBUF_SUPPORT; > > vsocket->linearbuf =3D flags & > > RTE_VHOST_USER_LINEARBUF_SUPPORT; > > vsocket->async_copy =3D flags & RTE_VHOST_USER_ASYNC_COPY; > > + vsocket->net_compliant_ol_flags =3D flags & > > RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS; > > > > if (vsocket->async_copy && > > (flags & (RTE_VHOST_USER_IOMMU_SUPPORT | > > diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c > > index c9b6379f73..9abfc0bfe7 100644 > > --- a/lib/vhost/vhost.c > > +++ b/lib/vhost/vhost.c > > @@ -752,7 +752,7 @@ vhost_set_ifname(int vid, const char *if_name, > > unsigned int if_len) > > } > > > > void > > -vhost_set_builtin_virtio_net(int vid, bool enable) > > +vhost_setup_virtio_net(int vid, bool enable, bool compliant_ol_flags) > > { > > struct virtio_net *dev =3D get_device(vid); > > > > @@ -763,6 +763,10 @@ vhost_set_builtin_virtio_net(int vid, bool > enable) > > dev->flags |=3D VIRTIO_DEV_BUILTIN_VIRTIO_NET; > > else > > dev->flags &=3D ~VIRTIO_DEV_BUILTIN_VIRTIO_NET; > > + if (!compliant_ol_flags) > > + dev->flags |=3D VIRTIO_DEV_LEGACY_OL_FLAGS; > > + else > > + dev->flags &=3D ~VIRTIO_DEV_LEGACY_OL_FLAGS; > > } > > > > void > > diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h > > index b303635645..8078ddff79 100644 > > --- a/lib/vhost/vhost.h > > +++ b/lib/vhost/vhost.h > > @@ -27,15 +27,17 @@ > > #include "rte_vhost_async.h" > > > > /* Used to indicate that the device is running on a data core */ > > -#define VIRTIO_DEV_RUNNING 1 > > +#define VIRTIO_DEV_RUNNING ((uint32_t)1 << 0) > > /* Used to indicate that the device is ready to operate */ > > -#define VIRTIO_DEV_READY 2 > > +#define VIRTIO_DEV_READY ((uint32_t)1 << 1) > > /* Used to indicate that the built-in vhost net device backend is enab= led > */ > > -#define VIRTIO_DEV_BUILTIN_VIRTIO_NET 4 > > +#define VIRTIO_DEV_BUILTIN_VIRTIO_NET ((uint32_t)1 << 2) > > /* Used to indicate that the device has its own data path and configur= ed > */ > > -#define VIRTIO_DEV_VDPA_CONFIGURED 8 > > +#define VIRTIO_DEV_VDPA_CONFIGURED ((uint32_t)1 << 3) > > /* Used to indicate that the feature negotiation failed */ > > -#define VIRTIO_DEV_FEATURES_FAILED 16 > > +#define VIRTIO_DEV_FEATURES_FAILED ((uint32_t)1 << 4) > > +/* Used to indicate that the virtio_net tx code should fill TX ol_flag= s */ > > +#define VIRTIO_DEV_LEGACY_OL_FLAGS ((uint32_t)1 << 5) > > > > /* Backend value set by guest. */ > > #define VIRTIO_DEV_STOPPED -1 > > @@ -683,7 +685,7 @@ int alloc_vring_queue(struct virtio_net *dev, > > uint32_t vring_idx); > > void vhost_attach_vdpa_device(int vid, struct rte_vdpa_device *dev); > > > > void vhost_set_ifname(int, const char *if_name, unsigned int if_len); > > -void vhost_set_builtin_virtio_net(int vid, bool enable); > > +void vhost_setup_virtio_net(int vid, bool enable, bool legacy_ol_flags= ); > > void vhost_enable_extbuf(int vid); > > void vhost_enable_linearbuf(int vid); > > int vhost_enable_guest_notification(struct virtio_net *dev, > > diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c > > index 1a34867f3c..8e36f4c340 100644 > > --- a/lib/vhost/virtio_net.c > > +++ b/lib/vhost/virtio_net.c > > @@ -8,6 +8,7 @@ > > > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -2303,15 +2304,12 @@ parse_ethernet(struct rte_mbuf *m, > uint16_t > > *l4_proto, void **l4_hdr) > > } > > > > static __rte_always_inline void > > -vhost_dequeue_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *m) > > +vhost_dequeue_offload_legacy(struct virtio_net_hdr *hdr, struct > > rte_mbuf *m) > > { > > uint16_t l4_proto =3D 0; > > void *l4_hdr =3D NULL; > > struct rte_tcp_hdr *tcp_hdr =3D NULL; > > > > - if (hdr->flags =3D=3D 0 && hdr->gso_type =3D=3D > > VIRTIO_NET_HDR_GSO_NONE) > > - return; > > - > > parse_ethernet(m, &l4_proto, &l4_hdr); > > if (hdr->flags =3D=3D VIRTIO_NET_HDR_F_NEEDS_CSUM) { > > if (hdr->csum_start =3D=3D (m->l2_len + m->l3_len)) { > > @@ -2356,6 +2354,94 @@ vhost_dequeue_offload(struct virtio_net_hdr > > *hdr, struct rte_mbuf *m) > > } > > } > > > > +static __rte_always_inline void > > +vhost_dequeue_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *m, > > + bool legacy_ol_flags) > > +{ > > + struct rte_net_hdr_lens hdr_lens; > > + int l4_supported =3D 0; > > + uint32_t ptype; > > + > > + if (hdr->flags =3D=3D 0 && hdr->gso_type =3D=3D > > VIRTIO_NET_HDR_GSO_NONE) > > + return; > > + > > + if (legacy_ol_flags) { > > + vhost_dequeue_offload_legacy(hdr, m); > > + return; > > + } > > + > > + m->ol_flags |=3D PKT_RX_IP_CKSUM_UNKNOWN; > > + > > + ptype =3D rte_net_get_ptype(m, &hdr_lens, RTE_PTYPE_ALL_MASK); > > + m->packet_type =3D ptype; > > + if ((ptype & RTE_PTYPE_L4_MASK) =3D=3D RTE_PTYPE_L4_TCP || > > + (ptype & RTE_PTYPE_L4_MASK) =3D=3D RTE_PTYPE_L4_UDP || > > + (ptype & RTE_PTYPE_L4_MASK) =3D=3D RTE_PTYPE_L4_SCTP) > > + l4_supported =3D 1; > > + > > + /* According to Virtio 1.1 spec, the device only needs to look at > > + * VIRTIO_NET_HDR_F_NEEDS_CSUM in the packet transmission > > path. > > + * This differs from the processing incoming packets path where the > > + * driver could rely on VIRTIO_NET_HDR_F_DATA_VALID flag set by > > the > > + * device. > > + * > > + * 5.1.6.2.1 Driver Requirements: Packet Transmission > > + * The driver MUST NOT set the VIRTIO_NET_HDR_F_DATA_VALID > > and > > + * VIRTIO_NET_HDR_F_RSC_INFO bits in flags. > > + * > > + * 5.1.6.2.2 Device Requirements: Packet Transmission > > + * The device MUST ignore flag bits that it does not recognize. > > + */ > > + if (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) { > > + uint32_t hdrlen; > > + > > + hdrlen =3D hdr_lens.l2_len + hdr_lens.l3_len + hdr_lens.l4_len; > > + if (hdr->csum_start <=3D hdrlen && l4_supported !=3D 0) { > > + m->ol_flags |=3D PKT_RX_L4_CKSUM_NONE; > > + } else { > > + /* Unknown proto or tunnel, do sw cksum. We can > > assume > > + * the cksum field is in the first segment since the > > + * buffers we provided to the host are large enough. > > + * In case of SCTP, this will be wrong since it's a CRC > > + * but there's nothing we can do. > > + */ > > + uint16_t csum =3D 0, off; > > + > > + if (rte_raw_cksum_mbuf(m, hdr->csum_start, > > + rte_pktmbuf_pkt_len(m) - hdr- > > >csum_start, &csum) < 0) > > + return; > > + if (likely(csum !=3D 0xffff)) > > + csum =3D ~csum; > > + off =3D hdr->csum_offset + hdr->csum_start; > > + if (rte_pktmbuf_data_len(m) >=3D off + 1) > > + *rte_pktmbuf_mtod_offset(m, uint16_t *, > > off) =3D csum; > > + } > > + } > > + > > + if (hdr->gso_type !=3D VIRTIO_NET_HDR_GSO_NONE) { > > + if (hdr->gso_size =3D=3D 0) > > + return; > > + > > + switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) { > > + case VIRTIO_NET_HDR_GSO_TCPV4: > > + case VIRTIO_NET_HDR_GSO_TCPV6: > > + if ((ptype & RTE_PTYPE_L4_MASK) !=3D > > RTE_PTYPE_L4_TCP) > > + break; > > + m->ol_flags |=3D PKT_RX_LRO | > > PKT_RX_L4_CKSUM_NONE; > > + m->tso_segsz =3D hdr->gso_size; > > + break; > > + case VIRTIO_NET_HDR_GSO_UDP: > > + if ((ptype & RTE_PTYPE_L4_MASK) !=3D > > RTE_PTYPE_L4_UDP) > > + break; > > + m->ol_flags |=3D PKT_RX_LRO | > > PKT_RX_L4_CKSUM_NONE; > > + m->tso_segsz =3D hdr->gso_size; > > + break; > > + default: > > + break; > > + } > > + } > > +} > > + > > static __rte_noinline void > > copy_vnet_hdr_from_desc(struct virtio_net_hdr *hdr, > > struct buf_vector *buf_vec) > > @@ -2380,7 +2466,8 @@ copy_vnet_hdr_from_desc(struct > virtio_net_hdr > > *hdr, > > static __rte_always_inline int > > copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq, > > struct buf_vector *buf_vec, uint16_t nr_vec, > > - struct rte_mbuf *m, struct rte_mempool *mbuf_pool) > > + struct rte_mbuf *m, struct rte_mempool *mbuf_pool, > > + bool legacy_ol_flags) > > { > > uint32_t buf_avail, buf_offset; > > uint64_t buf_addr, buf_len; > > @@ -2513,7 +2600,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, > > struct vhost_virtqueue *vq, > > m->pkt_len +=3D mbuf_offset; > > > > if (hdr) > > - vhost_dequeue_offload(hdr, m); > > + vhost_dequeue_offload(hdr, m, legacy_ol_flags); > > > > out: > > > > @@ -2606,9 +2693,11 @@ virtio_dev_pktmbuf_alloc(struct virtio_net > > *dev, struct rte_mempool *mp, > > return pkt; > > } > > > > -static __rte_noinline uint16_t > > +__rte_always_inline > > +static uint16_t > > virtio_dev_tx_split(struct virtio_net *dev, struct vhost_virtqueue *vq= , > > - struct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t > > count) > > + struct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t > > count, > > + bool legacy_ol_flags) > > { > > uint16_t i; > > uint16_t free_entries; > > @@ -2668,7 +2757,7 @@ virtio_dev_tx_split(struct virtio_net *dev, > struct > > vhost_virtqueue *vq, > > } > > > > err =3D copy_desc_to_mbuf(dev, vq, buf_vec, nr_vec, pkts[i], > > - mbuf_pool); > > + mbuf_pool, legacy_ol_flags); > > if (unlikely(err)) { > > rte_pktmbuf_free(pkts[i]); > > if (!allocerr_warned) { > > @@ -2696,6 +2785,24 @@ virtio_dev_tx_split(struct virtio_net *dev, > > struct vhost_virtqueue *vq, > > return (i - dropped); > > } > > > > +__rte_noinline > > +static uint16_t > > +virtio_dev_tx_split_legacy(struct virtio_net *dev, > > + struct vhost_virtqueue *vq, struct rte_mempool *mbuf_pool, > > + struct rte_mbuf **pkts, uint16_t count) > > +{ > > + return virtio_dev_tx_split(dev, vq, mbuf_pool, pkts, count, true); > > +} > > + > > +__rte_noinline > > +static uint16_t > > +virtio_dev_tx_split_compliant(struct virtio_net *dev, > > + struct vhost_virtqueue *vq, struct rte_mempool *mbuf_pool, > > + struct rte_mbuf **pkts, uint16_t count) > > +{ > > + return virtio_dev_tx_split(dev, vq, mbuf_pool, pkts, count, false); > > +} > > + > > static __rte_always_inline int > > vhost_reserve_avail_batch_packed(struct virtio_net *dev, > > struct vhost_virtqueue *vq, > > @@ -2770,7 +2877,8 @@ vhost_reserve_avail_batch_packed(struct > > virtio_net *dev, > > static __rte_always_inline int > > virtio_dev_tx_batch_packed(struct virtio_net *dev, > > struct vhost_virtqueue *vq, > > - struct rte_mbuf **pkts) > > + struct rte_mbuf **pkts, > > + bool legacy_ol_flags) > > { > > uint16_t avail_idx =3D vq->last_avail_idx; > > uint32_t buf_offset =3D sizeof(struct virtio_net_hdr_mrg_rxbuf); > > @@ -2794,7 +2902,7 @@ virtio_dev_tx_batch_packed(struct virtio_net > > *dev, > > if (virtio_net_with_host_offload(dev)) { > > vhost_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) { > > hdr =3D (struct virtio_net_hdr *)(desc_addrs[i]); > > - vhost_dequeue_offload(hdr, pkts[i]); > > + vhost_dequeue_offload(hdr, pkts[i], legacy_ol_flags); > > } > > } > > > > @@ -2815,7 +2923,8 @@ vhost_dequeue_single_packed(struct > virtio_net > > *dev, > > struct rte_mempool *mbuf_pool, > > struct rte_mbuf *pkts, > > uint16_t *buf_id, > > - uint16_t *desc_count) > > + uint16_t *desc_count, > > + bool legacy_ol_flags) > > { > > struct buf_vector buf_vec[BUF_VECTOR_MAX]; > > uint32_t buf_len; > > @@ -2841,7 +2950,7 @@ vhost_dequeue_single_packed(struct > virtio_net > > *dev, > > } > > > > err =3D copy_desc_to_mbuf(dev, vq, buf_vec, nr_vec, pkts, > > - mbuf_pool); > > + mbuf_pool, legacy_ol_flags); > > if (unlikely(err)) { > > if (!allocerr_warned) { > > VHOST_LOG_DATA(ERR, > > @@ -2859,14 +2968,15 @@ static __rte_always_inline int > > virtio_dev_tx_single_packed(struct virtio_net *dev, > > struct vhost_virtqueue *vq, > > struct rte_mempool *mbuf_pool, > > - struct rte_mbuf *pkts) > > + struct rte_mbuf *pkts, > > + bool legacy_ol_flags) > > { > > > > uint16_t buf_id, desc_count =3D 0; > > int ret; > > > > ret =3D vhost_dequeue_single_packed(dev, vq, mbuf_pool, pkts, > > &buf_id, > > - &desc_count); > > + &desc_count, legacy_ol_flags); > > > > if (likely(desc_count > 0)) { > > if (virtio_net_is_inorder(dev)) > > @@ -2882,12 +2992,14 @@ virtio_dev_tx_single_packed(struct > virtio_net > > *dev, > > return ret; > > } > > > > -static __rte_noinline uint16_t > > +__rte_always_inline > > +static uint16_t > > virtio_dev_tx_packed(struct virtio_net *dev, > > struct vhost_virtqueue *__rte_restrict vq, > > struct rte_mempool *mbuf_pool, > > struct rte_mbuf **__rte_restrict pkts, > > - uint32_t count) > > + uint32_t count, > > + bool legacy_ol_flags) > > { > > uint32_t pkt_idx =3D 0; > > > > @@ -2899,14 +3011,16 @@ virtio_dev_tx_packed(struct virtio_net *dev, > > > > if (count - pkt_idx >=3D PACKED_BATCH_SIZE) { > > if (!virtio_dev_tx_batch_packed(dev, vq, > > - &pkts[pkt_idx])) { > > + &pkts[pkt_idx], > > + legacy_ol_flags)) { > > pkt_idx +=3D PACKED_BATCH_SIZE; > > continue; > > } > > } > > > > if (virtio_dev_tx_single_packed(dev, vq, mbuf_pool, > > - pkts[pkt_idx])) > > + pkts[pkt_idx], > > + legacy_ol_flags)) > > break; > > pkt_idx++; > > } while (pkt_idx < count); > > @@ -2924,6 +3038,24 @@ virtio_dev_tx_packed(struct virtio_net *dev, > > return pkt_idx; > > } > > > > +__rte_noinline > > +static uint16_t > > +virtio_dev_tx_packed_legacy(struct virtio_net *dev, > > + struct vhost_virtqueue *__rte_restrict vq, struct rte_mempool > > *mbuf_pool, > > + struct rte_mbuf **__rte_restrict pkts, uint32_t count) > > +{ > > + return virtio_dev_tx_packed(dev, vq, mbuf_pool, pkts, count, true); > > +} > > + > > +__rte_noinline > > +static uint16_t > > +virtio_dev_tx_packed_compliant(struct virtio_net *dev, > > + struct vhost_virtqueue *__rte_restrict vq, struct rte_mempool > > *mbuf_pool, > > + struct rte_mbuf **__rte_restrict pkts, uint32_t count) > > +{ > > + return virtio_dev_tx_packed(dev, vq, mbuf_pool, pkts, count, false); > > +} > > + > > uint16_t > > rte_vhost_dequeue_burst(int vid, uint16_t queue_id, > > struct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t > > count) > > @@ -2999,10 +3131,17 @@ rte_vhost_dequeue_burst(int vid, uint16_t > > queue_id, > > count -=3D 1; > > } > > > > - if (vq_is_packed(dev)) > > - count =3D virtio_dev_tx_packed(dev, vq, mbuf_pool, pkts, > > count); > > - else > > - count =3D virtio_dev_tx_split(dev, vq, mbuf_pool, pkts, count); > > + if (vq_is_packed(dev)) { > > + if (dev->flags & VIRTIO_DEV_LEGACY_OL_FLAGS) > > + count =3D virtio_dev_tx_packed_legacy(dev, vq, > > mbuf_pool, pkts, count); > > + else > > + count =3D virtio_dev_tx_packed_compliant(dev, vq, > > mbuf_pool, pkts, count); > > + } else { > > + if (dev->flags & VIRTIO_DEV_LEGACY_OL_FLAGS) > > + count =3D virtio_dev_tx_split_legacy(dev, vq, > > mbuf_pool, pkts, count); > > + else > > + count =3D virtio_dev_tx_split_compliant(dev, vq, > > mbuf_pool, pkts, count); > > + } > > > > out: > > if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) > > -- > > 2.23.0