From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 555937D3A for ; Wed, 23 Aug 2017 14:28:43 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Aug 2017 05:28:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,416,1498546800"; d="scan'208";a="1165402204" Received: from irsmsx106.ger.corp.intel.com ([163.33.3.31]) by orsmga001.jf.intel.com with ESMTP; 23 Aug 2017 05:28:41 -0700 Received: from irsmsx105.ger.corp.intel.com ([169.254.7.25]) by IRSMSX106.ger.corp.intel.com ([169.254.8.174]) with mapi id 14.03.0319.002; Wed, 23 Aug 2017 13:28:40 +0100 From: "Ananyev, Konstantin" To: Shahaf Shuler , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [RFC PATCH 4/4] ethdev: add helpers to move to the new offloads API Thread-Index: AQHTD2vAsavtP2XuMkuwCed+kyyKsKKR9qdg Date: Wed, 23 Aug 2017 12:28:39 +0000 Message-ID: <2601191342CEEE43887BDE71AB977258489B5073@irsmsx105.ger.corp.intel.com> References: <1e9c5ead0fbd92a3e7fb4c76397cb3dc369eca89.1502096064.git.shahafs@mellanox.com> In-Reply-To: <1e9c5ead0fbd92a3e7fb4c76397cb3dc369eca89.1502096064.git.shahafs@mellanox.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [RFC PATCH 4/4] ethdev: add helpers to move to the new offloads API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2017 12:28:44 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Shahaf Shuler > Sent: Monday, August 7, 2017 1:55 PM > To: dev@dpdk.org > Subject: [dpdk-dev] [RFC PATCH 4/4] ethdev: add helpers to move to the ne= w offloads API >=20 > A new offloads API was introduced by commits: >=20 > commit 8b07fcae6061 ("ethdev: introduce Tx queue offloads API") > commit c6504557763e ("ethdev: introduce Rx queue offloads API") >=20 > In order to enable PMDs to support only one of the APIs, > and applications to avoid branching according to the underlying device > a copy functions to/from the old/new APIs were added. >=20 > Signed-off-by: Shahaf Shuler > --- > lib/librte_ether/rte_ethdev.c | 140 ++++++++++++++++++++++++++++++++++++= + > 1 file changed, 140 insertions(+) >=20 > diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.= c > index f73307e99..2b4a28c97 100644 > --- a/lib/librte_ether/rte_ethdev.c > +++ b/lib/librte_ether/rte_ethdev.c > @@ -1003,6 +1003,63 @@ rte_eth_dev_close(uint8_t port_id) > dev->data->tx_queues =3D NULL; > } >=20 > +/** > + * A copy function from rxmode offloads API to rte_eth_rxq_conf > + * offloads API, to enable PMDs to support only one of the APIs. > + */ > +static void > +rte_eth_copy_rxmode_offloads(struct rte_eth_rxmode *rxmode, > + struct rte_eth_rxq_conf *rxq_conf) > +{ > + if (rxmode->header_split =3D=3D 1) > + rxq_conf->offloads |=3D DEV_RX_OFFLOAD_HEADER_SPLIT; > + if (rxmode->hw_ip_checksum =3D=3D 1) > + rxq_conf->offloads |=3D DEV_RX_OFFLOAD_CHECKSUM; > + if (rxmode->hw_vlan_filter =3D=3D 1) > + rxq_conf->offloads |=3D DEV_RX_OFFLOAD_VLAN_FILTER; > + if (rxmode->hw_vlan_strip =3D=3D 1) > + rxq_conf->offloads |=3D DEV_RX_OFFLOAD_VLAN_STRIP; > + if (rxmode->hw_vlan_extend =3D=3D 1) > + rxq_conf->offloads |=3D DEV_RX_OFFLOAD_VLAN_EXTEND; > + if (rxmode->jumbo_frame =3D=3D 1) > + rxq_conf->offloads |=3D DEV_RX_OFFLOAD_JUMBO_FRAME; > + if (rxmode->hw_strip_crc =3D=3D 1) > + rxq_conf->offloads |=3D DEV_RX_OFFLOAD_CRC_STRIP; > + if (rxmode->enable_scatter =3D=3D 1) > + rxq_conf->offloads |=3D DEV_RX_OFFLOAD_SCATTER; > + if (rxmode->enable_lro =3D=3D 1) > + rxq_conf->offloads |=3D DEV_RX_OFFLOAD_LRO; > +} > + > +/** > + * A copy function between rte_eth_rxq_conf offloads API to rxmode > + * offloads API, to enable application to be agnostic to the PMD support= ed > + * offload API. > + */ > +static void > +rte_eth_copy_rxq_offloads(struct rte_eth_rxmode *rxmode, > + struct rte_eth_rxq_conf *rxq_conf) > +{ > + if (rxq_conf->offloads & DEV_RX_OFFLOAD_HEADER_SPLIT) > + rxmode->header_split =3D 1; > + if (rxq_conf->offloads & DEV_RX_OFFLOAD_CHECKSUM) > + rxmode->hw_ip_checksum =3D 1; > + if (rxq_conf->offloads & DEV_RX_OFFLOAD_VLAN_FILTER) > + rxmode->hw_vlan_filter =3D 1; > + if (rxq_conf->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) > + rxmode->hw_vlan_strip =3D 1; > + if (rxq_conf->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND) > + rxmode->hw_vlan_extend =3D 1; > + if (rxq_conf->offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) > + rxmode->jumbo_frame =3D 1; > + if (rxq_conf->offloads & DEV_RX_OFFLOAD_CRC_STRIP) > + rxmode->hw_strip_crc =3D 1; > + if (rxq_conf->offloads & DEV_RX_OFFLOAD_SCATTER) > + rxmode->enable_scatter =3D 1; > + if (rxq_conf->offloads & DEV_RX_OFFLOAD_LRO) > + rxmode->enable_lro =3D 1; > +} > + > int > rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id, > uint16_t nb_rx_desc, unsigned int socket_id, > @@ -1083,6 +1140,37 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t r= x_queue_id, > if (rx_conf =3D=3D NULL) > rx_conf =3D &dev_info.default_rxconf; >=20 > + if ((dev->data->dev_flags & RTE_ETH_DEV_RXQ_OFFLOAD) && > + (dev->data->dev_conf.rxmode.ignore =3D=3D 0)) { > + rte_eth_copy_rxmode_offloads(&dev->data->dev_conf.rxmode, > + rx_conf); > + } else if ((!(dev->data->dev_flags & RTE_ETH_DEV_RXQ_OFFLOAD)) && > + (dev->data->dev_conf.rxmode.ignore =3D=3D 1)) { > + int ret; > + struct rte_eth_rxmode rxmode; > + > + rte_eth_copy_rxq_offloads(&rxmode, rx_conf); > + if (memcmp(&rxmode, &dev->data->dev_conf.rxmode, > + sizeof(rxmode))) { > + /* > + * device which work with rxmode offloads API requires > + * a re-configuration in order to apply the new offloads > + * configuration. > + */ > + dev->data->dev_conf.rxmode =3D rxmode; > + ret =3D rte_eth_dev_configure(port_id, > + dev->data->nb_rx_queues, > + dev->data->nb_tx_queues, > + &dev->data->dev_conf); Hmm, and why we would need to reconfigure our device in the middle of rx qu= eue setup?=20 > + if (ret < 0) { > + RTE_PMD_DEBUG_TRACE( > + "unable to re-configure port %d " > + "in order to apply rxq offloads " > + "configuration\n", port_id); > + } > + } > + } > + > ret =3D (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc, > socket_id, rx_conf, mp); BTW, I don't see changes in any PMD for new offload flags? Is it because it is just a n RFC and full patch would contain such changes? > if (!ret) { > @@ -1094,6 +1182,51 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t r= x_queue_id, > return ret; > } >=20 > +/** > + * A copy function from txq_flags to rte_eth_txq_conf offloads API, > + * to enable PMDs to support only one of the APIs. > + */ > +static void > +rte_eth_copy_txq_flags(struct rte_eth_txq_conf *txq_conf) > +{ > + uint32_t txq_flags =3D txq_conf->txq_flags > + uint64_t *offloads =3D &txq_conf->offloads; > + > + if (!(txq_flags & ETH_TXQ_FLAGS_NOMULTSEGS)) > + *offloads |=3D DEV_TX_OFFLOAD_MULTI_SEGS; > + if (!(txq_flags & ETH_TXQ_FLAGS_NOVLANOFFL)) > + *offloads |=3D DEV_TX_OFFLOAD_VLAN_INSERT; > + if (!(txq_flags & ETH_TXQ_FLAGS_NOXSUMSCTP)) > + *offloads |=3D DEV_TX_OFFLOAD_SCTP_CKSUM; > + if (!(txq_flags & ETH_TXQ_FLAGS_NOXSUMUDP)) > + *offloads |=3D DEV_TX_OFFLOAD_UDP_CKSUM; > + if (!(txq_flags & ETH_TXQ_FLAGS_NOXSUMTCP)) > + *offloads |=3D DEV_TX_OFFLOAD_TCP_CKSUM; > +} > + > +/** > + * A copy function between rte_eth_txq_conf offloads API to txq_flags > + * offloads API, to enable application to be agnostic to the PMD support= ed > + * API. > + */ > +static void > +rte_eth_copy_txq_offloads(struct rte_eth_txq_conf *txq_conf) > +{ > + uint32_t *txq_flags =3D &txq_conf->txq_flags > + uint64_t offloads =3D txq_conf->offloads; > + > + if (!(offloads & DEV_TX_OFFLOAD_MULTI_SEGS)) > + *txq_flags |=3D ETH_TXQ_FLAGS_NOMULTSEGS; > + if (!(offloads & DEV_TX_OFFLOAD_VLAN_INSERT)) > + *txq_flags |=3D ETH_TXQ_FLAGS_NOVLANOFFL; > + if (!(offloads & DEV_TX_OFFLOAD_SCTP_CKSUM)) > + *txq_flags |=3D ETH_TXQ_FLAGS_NOXSUMSCTP; > + if (!(offloads & DEV_TX_OFFLOAD_UDP_CKSUM)) > + *txq_flags |=3D ETH_TXQ_FLAGS_NOXSUMUDP; > + if (!(offloads & DEV_TX_OFFLOAD_TCP_CKSUM)) > + *txq_flags |=3D ETH_TXQ_FLAGS_NOXSUMTCP; > +} > + > int > rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id, > uint16_t nb_tx_desc, unsigned int socket_id, > @@ -1145,6 +1278,13 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t t= x_queue_id, > if (tx_conf =3D=3D NULL) > tx_conf =3D &dev_info.default_txconf; >=20 > + if ((dev->data->dev_flags & RTE_ETH_DEV_TXQ_OFFLOAD) && > + (!(tx_conf->txq_flags & ETH_TXQ_FLAGS_IGNORE))) > + rte_eth_copy_txq_flags(tx_conf); > + else if (!(dev->data->dev_flags & RTE_ETH_DEV_TXQ_OFFLOAD) && > + (tx_conf->txq_flags & ETH_TXQ_FLAGS_IGNORE)) > + rte_eth_copy_txq_offloads(tx_conf); > + As I said in my previous mail - I think better to always convrert from old = txq_flags to new TX offload flags and make each PMD to understand new offload values = only. Konstantin > return (*dev->dev_ops->tx_queue_setup)(dev, tx_queue_id, nb_tx_desc, > socket_id, tx_conf); > } > -- > 2.12.0