From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by dpdk.org (Postfix) with ESMTP id 2044C1B344 for ; Thu, 18 Jan 2018 16:06:45 +0100 (CET) Received: by mail-qt0-f196.google.com with SMTP id 33so30911693qtv.1 for ; Thu, 18 Jan 2018 07:06:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=TzC7aMS53wMoIpUjxUSpf/v6P1lp5E82EIxyPT3d1dE=; b=Wzq4lsX0qfrZWI0bIJtevXPgM4DHrZTK15/52LRflQQKiHhJc0GHVJJRMThJZ0rRvk khP8g9h5EtSVVUOgw4u7EDLhizzahSvrM5CyOBa0pK4zDzleFrRcceeGYcKlw6aNDiYs lYOh8J0eo9o6mm0n8oAEZztPWEOnwaoJloCpq3sC787KGSIN8M0SB/x/ctzUuQhcvivn /6JGOxu+peaTZbFAvHTMtAa5ywH9OHK4hoSkAQI/R/6+MEzG1d0qzwjEnNp934FYVhQs g2OnxI1w87kJuWtELYGpZivC62rer4lddi+PtxHruKB5DaKMNwHdh01IqpbX3Tw2hSH+ j7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=TzC7aMS53wMoIpUjxUSpf/v6P1lp5E82EIxyPT3d1dE=; b=i92SwRWDUFRuZQq0+IoK77N+OwRC1LOpFwo4DS9RaT4yWTM31ekHZuUeg5DT3YTv8N Z1Yr+sA9zqbj/6lavj+QUf9tne/wbQt4bbZ0YDZ0/9+jHlb3oZ89blunzHUoOrgcEggu 9u5qqd1Jcm31xYrkuGQQpCSSXuy8wfYkcP3zo2/HLvALb/xfqRVsXg1sBRr1y6WmCeMQ mbeMue3pNlbqedLEjABgQLUk3+nbCnQM3m/1MMA2+X8nvgZSwnGo5klHVGp3/fzLn+rJ UiHnCAXqQ4msr6fu9qZnT2ZBlup3OeV+ExuetTdwHfkR49BCyNjfZFBcQnYU7w2trKEm UMZg== X-Gm-Message-State: AKwxytcY1P154u2zw56xfet8JyNre3GV3WrRVgyFfsW7GsjzsijHTC64 OhtveY1JbGxYquZezSExbgXg7hQ6j4EE5HH5FEnrVISS X-Google-Smtp-Source: ACJfBosjwFcWqT5X1KV350WDR0qwFXO0PdvLuTYHW9S2xxvxuIxoShsvzQjoUUuyFrW9dIXK+tYLuVN3jUCxOXNxv70= X-Received: by 10.55.17.143 with SMTP id 15mr32578468qkr.148.1516288005270; Thu, 18 Jan 2018 07:06:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.12.137.218 with HTTP; Thu, 18 Jan 2018 07:06:44 -0800 (PST) In-Reply-To: <1516177560-8690-1-git-send-email-rk@semihalf.com> References: <1516103563-9275-3-git-send-email-rk@semihalf.com> <1516177560-8690-1-git-send-email-rk@semihalf.com> From: =?UTF-8?Q?Micha=C5=82_Krawczyk?= Date: Thu, 18 Jan 2018 16:06:44 +0100 Message-ID: To: Rafal Kozik Cc: dev@dpdk.org, Marcin Wojtas , "Tzalik, Guy" , "Schmeilin, Evgeny" , "Matushevsky, Alexander" , "Chauskin, Igor" Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v2 2/2] net/ena: convert to new Rx 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: Thu, 18 Jan 2018 15:06:46 -0000 Acked-by: Michal Krawczyk 2018-01-17 9:26 GMT+01:00 Rafal Kozik : > Ethdev Rx offloads API has changed since: > > commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API") > > This commit support the new Rx offloads API. > > Signed-off-by: Rafal Kozik > --- > v2: > * Use PRIx64 in printf. > > drivers/net/ena/ena_ethdev.c | 36 ++++++++++++++++++++++++++++++++++-- > drivers/net/ena/ena_ethdev.h | 2 ++ > 2 files changed, 36 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c > index 54ccc3d..1dfbe39 100644 > --- a/drivers/net/ena/ena_ethdev.c > +++ b/drivers/net/ena/ena_ethdev.c > @@ -237,6 +237,8 @@ static int ena_rss_reta_query(struct rte_eth_dev *dev, > static int ena_get_sset_count(struct rte_eth_dev *dev, int sset); > static bool ena_are_tx_queue_offloads_allowed(struct ena_adapter *adapter, > uint64_t offloads); > +static bool ena_are_rx_queue_offloads_allowed(struct ena_adapter *adapter, > + uint64_t offloads); > > static const struct eth_dev_ops ena_dev_ops = { > .dev_configure = ena_dev_configure, > @@ -766,7 +768,8 @@ static uint32_t ena_get_mtu_conf(struct ena_adapter *adapter) > { > uint32_t max_frame_len = adapter->max_mtu; > > - if (adapter->rte_eth_dev_data->dev_conf.rxmode.jumbo_frame == 1) > + if (adapter->rte_eth_dev_data->dev_conf.rxmode.offloads & > + DEV_RX_OFFLOAD_JUMBO_FRAME) > max_frame_len = > adapter->rte_eth_dev_data->dev_conf.rxmode.max_rx_pkt_len; > > @@ -1066,7 +1069,7 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev, > uint16_t queue_idx, > uint16_t nb_desc, > __rte_unused unsigned int socket_id, > - __rte_unused const struct rte_eth_rxconf *rx_conf, > + const struct rte_eth_rxconf *rx_conf, > struct rte_mempool *mp) > { > struct ena_com_create_io_ctx ctx = > @@ -1102,6 +1105,11 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev, > return -EINVAL; > } > > + if (!ena_are_rx_queue_offloads_allowed(adapter, rx_conf->offloads)) { > + RTE_LOG(ERR, PMD, "Unsupported queue offloads\n"); > + return -EINVAL; > + } > + > ena_qid = ENA_IO_RXQ_IDX(queue_idx); > > ctx.qid = ena_qid; > @@ -1406,6 +1414,7 @@ static int ena_dev_configure(struct rte_eth_dev *dev) > struct ena_adapter *adapter = > (struct ena_adapter *)(dev->data->dev_private); > uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads; > + uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads; > > if ((tx_offloads & adapter->tx_supported_offloads) != tx_offloads) { > RTE_LOG(ERR, PMD, "Some Tx offloads are not supported " > @@ -1414,6 +1423,13 @@ static int ena_dev_configure(struct rte_eth_dev *dev) > return -ENOTSUP; > } > > + if ((rx_offloads & adapter->rx_supported_offloads) != rx_offloads) { > + RTE_LOG(ERR, PMD, "Some Rx offloads are not supported " > + "requested 0x%" PRIx64 " supported 0x%" PRIx64 "\n", > + rx_offloads, adapter->rx_supported_offloads); > + return -ENOTSUP; > + } > + > if (!(adapter->state == ENA_ADAPTER_STATE_INIT || > adapter->state == ENA_ADAPTER_STATE_STOPPED)) { > PMD_INIT_LOG(ERR, "Illegal adapter state: %d", > @@ -1435,6 +1451,7 @@ static int ena_dev_configure(struct rte_eth_dev *dev) > } > > adapter->tx_selected_offloads = tx_offloads; > + adapter->rx_selected_offloads = rx_offloads; > return 0; > } > > @@ -1476,6 +1493,19 @@ static bool ena_are_tx_queue_offloads_allowed(struct ena_adapter *adapter, > return true; > } > > +static bool ena_are_rx_queue_offloads_allowed(struct ena_adapter *adapter, > + uint64_t offloads) > +{ > + uint64_t port_offloads = adapter->rx_selected_offloads; > + > + /* Check if port supports all requested offloads. > + * True if all offloads selected for queue are set for port. > + */ > + if ((offloads & port_offloads) != offloads) > + return false; > + return true; > +} > + > static void ena_infos_get(struct rte_eth_dev *dev, > struct rte_eth_dev_info *dev_info) > { > @@ -1530,6 +1560,7 @@ static void ena_infos_get(struct rte_eth_dev *dev, > > /* Inform framework about available features */ > dev_info->rx_offload_capa = rx_feat; > + dev_info->rx_queue_offload_capa = rx_feat; > dev_info->tx_offload_capa = tx_feat; > dev_info->tx_queue_offload_capa = tx_feat; > > @@ -1542,6 +1573,7 @@ static void ena_infos_get(struct rte_eth_dev *dev, > dev_info->reta_size = ENA_RX_RSS_TABLE_SIZE; > > adapter->tx_supported_offloads = tx_feat; > + adapter->rx_supported_offloads = rx_feat; > } > > static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, > diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h > index 3e72777..394d05e 100644 > --- a/drivers/net/ena/ena_ethdev.h > +++ b/drivers/net/ena/ena_ethdev.h > @@ -178,6 +178,8 @@ struct ena_adapter { > > uint64_t tx_supported_offloads; > uint64_t tx_selected_offloads; > + uint64_t rx_supported_offloads; > + uint64_t rx_selected_offloads; > }; > > #endif /* _ENA_ETHDEV_H_ */ > -- > 2.7.4 >