From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
To: "Ananyev, Konstantin" <konstantin.ananyev@intel.com>,
"dev@dpdk.org" <dev@dpdk.org>
Cc: "Li, Xiaoyun" <xiaoyun.li@intel.com>,
"anoobj@marvell.com" <anoobj@marvell.com>,
"jerinj@marvell.com" <jerinj@marvell.com>,
"ndabilpuram@marvell.com" <ndabilpuram@marvell.com>,
"adwivedi@marvell.com" <adwivedi@marvell.com>,
"shepard.siegel@atomicrules.com" <shepard.siegel@atomicrules.com>,
"ed.czeck@atomicrules.com" <ed.czeck@atomicrules.com>,
"john.miller@atomicrules.com" <john.miller@atomicrules.com>,
"irusskikh@marvell.com" <irusskikh@marvell.com>,
"ajit.khaparde@broadcom.com" <ajit.khaparde@broadcom.com>,
"somnath.kotur@broadcom.com" <somnath.kotur@broadcom.com>,
"rahul.lakkireddy@chelsio.com" <rahul.lakkireddy@chelsio.com>,
"hemant.agrawal@nxp.com" <hemant.agrawal@nxp.com>,
"sachin.saxena@oss.nxp.com" <sachin.saxena@oss.nxp.com>,
"Wang, Haiyue" <haiyue.wang@intel.com>,
"Daley, John" <johndale@cisco.com>,
"hyonkim@cisco.com" <hyonkim@cisco.com>,
"Zhang, Qi Z" <qi.z.zhang@intel.com>,
"Wang, Xiao W" <xiao.w.wang@intel.com>,
"humin29@huawei.com" <humin29@huawei.com>,
"yisen.zhuang@huawei.com" <yisen.zhuang@huawei.com>,
"oulijun@huawei.com" <oulijun@huawei.com>,
"Xing, Beilei" <beilei.xing@intel.com>,
"Wu, Jingjing" <jingjing.wu@intel.com>,
"Yang, Qiming" <qiming.yang@intel.com>,
"matan@nvidia.com" <matan@nvidia.com>,
"viacheslavo@nvidia.com" <viacheslavo@nvidia.com>,
"sthemmin@microsoft.com" <sthemmin@microsoft.com>,
"longli@microsoft.com" <longli@microsoft.com>,
"heinrich.kuhn@corigine.com" <heinrich.kuhn@corigine.com>,
"kirankumark@marvell.com" <kirankumark@marvell.com>,
"mczekaj@marvell.com" <mczekaj@marvell.com>,
"jiawenwu@trustnetic.com" <jiawenwu@trustnetic.com>,
"jianwang@trustnetic.com" <jianwang@trustnetic.com>,
"maxime.coquelin@redhat.com" <maxime.coquelin@redhat.com>,
"Xia, Chenbo" <chenbo.xia@intel.com>,
"thomas@monjalon.net" <thomas@monjalon.net>,
"Yigit, Ferruh" <ferruh.yigit@intel.com>,
"mdr@ashroe.eu" <mdr@ashroe.eu>,
"Jayatheerthan, Jay" <jay.jayatheerthan@intel.com>
Subject: Re: [dpdk-dev] [PATCH v5 5/7] ethdev: make fast-path functions to use new flat array
Date: Mon, 11 Oct 2021 20:03:10 +0300 [thread overview]
Message-ID: <cce8080d-f7ac-f11a-1713-94f9b2879663@oktetlabs.ru> (raw)
In-Reply-To: <DM6PR11MB4491FC578F6CC43D2AB48C079AB59@DM6PR11MB4491.namprd11.prod.outlook.com>
On 10/11/21 6:47 PM, Ananyev, Konstantin wrote:
>
>>
>> On 10/7/21 2:27 PM, Konstantin Ananyev wrote:
>>> Rework fast-path ethdev functions to use rte_eth_fp_ops[].
>>> While it is an API/ABI breakage, this change is intended to be
>>> transparent for both users (no changes in user app is required) and
>>> PMD developers (no changes in PMD is required).
>>> One extra thing to note - RX/TX callback invocation will cause extra
>>> function call with these changes. That might cause some insignificant
>>> slowdown for code-path where RX/TX callbacks are heavily involved.
>>
>> I'm sorry for nit picking here and below:
>>
>> RX -> Rx, TX -> Tx everywhere above.
>>
>>>
>>> Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
>>> ---
>>> lib/ethdev/ethdev_private.c | 31 +++++
>>> lib/ethdev/rte_ethdev.h | 242 ++++++++++++++++++++++++++----------
>>> lib/ethdev/version.map | 3 +
>>> 3 files changed, 208 insertions(+), 68 deletions(-)
>>>
>>> diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
>>> index 3eeda6e9f9..1222c6f84e 100644
>>> --- a/lib/ethdev/ethdev_private.c
>>> +++ b/lib/ethdev/ethdev_private.c
>>> @@ -226,3 +226,34 @@ eth_dev_fp_ops_setup(struct rte_eth_fp_ops *fpo,
>>> fpo->txq.data = dev->data->tx_queues;
>>> fpo->txq.clbk = (void **)(uintptr_t)dev->pre_tx_burst_cbs;
>>> }
>>> +
>>> +uint16_t
>>> +rte_eth_call_rx_callbacks(uint16_t port_id, uint16_t queue_id,
>>> + struct rte_mbuf **rx_pkts, uint16_t nb_rx, uint16_t nb_pkts,
>>> + void *opaque)
>>> +{
>>> + const struct rte_eth_rxtx_callback *cb = opaque;
>>> +
>>> + while (cb != NULL) {
>>> + nb_rx = cb->fn.rx(port_id, queue_id, rx_pkts, nb_rx,
>>> + nb_pkts, cb->param);
>>> + cb = cb->next;
>>> + }
>>> +
>>> + return nb_rx;
>>> +}
>>> +
>>> +uint16_t
>>> +rte_eth_call_tx_callbacks(uint16_t port_id, uint16_t queue_id,
>>> + struct rte_mbuf **tx_pkts, uint16_t nb_pkts, void *opaque)
>>> +{
>>> + const struct rte_eth_rxtx_callback *cb = opaque;
>>> +
>>> + while (cb != NULL) {
>>> + nb_pkts = cb->fn.tx(port_id, queue_id, tx_pkts, nb_pkts,
>>> + cb->param);
>>> + cb = cb->next;
>>> + }
>>> +
>>> + return nb_pkts;
>>> +}
>>> diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
>>> index cdd16d6e57..c0e1a40681 100644
>>> --- a/lib/ethdev/rte_ethdev.h
>>> +++ b/lib/ethdev/rte_ethdev.h
>>> @@ -4904,6 +4904,33 @@ int rte_eth_representor_info_get(uint16_t port_id,
>>>
>>> #include <rte_ethdev_core.h>
>>>
>>> +/**
>>> + * @internal
>>> + * Helper routine for eth driver rx_burst API.
>>
>> rx -> Rx
>>
>>> + * Should be called at exit from PMD's rte_eth_rx_bulk implementation.
>>> + * Does necessary post-processing - invokes RX callbacks if any, etc.
>>
>> RX -> Rx
>>
>>> + *
>>> + * @param port_id
>>> + * The port identifier of the Ethernet device.
>>> + * @param queue_id
>>> + * The index of the receive queue from which to retrieve input packets.
>>
>> Isn't:
>> The index of the queue from which packets are received from?
>
> I copied it from comments from rte_eth_rx_burst().
> I suppose it is just two ways to say the same thing.
May be it is just my problem that I don't understand the
initial description.
>
>>
>>> + * @param rx_pkts
>>> + * The address of an array of pointers to *rte_mbuf* structures that
>>> + * have been retrieved from the device.
>>> + * @param nb_pkts
>>
>> Should be @param nb_rx
>
> Ack, will fix.
>
>>
>>> + * The number of packets that were retrieved from the device.
>>> + * @param nb_pkts
>>> + * The number of elements in *rx_pkts* array.
>>
>> @p should be used to refer to a paramter.
>
> To be more precise you are talking about:
> s/*rx_pkts*/@ rx_pkts/
s/"rx_pkts"/@p rx_pkts/
> ?
>
>>
>> The description does not help to understand why both nb_rx and
>> nb_pkts are necessary. Isn't nb_pkts >= nb_rx and nb_rx
>> sufficient?
>
> Nope, that's for callbacks call.
> Will update the comment.
Thanks.
>>> + * @param opaque
>>> + * Opaque pointer of RX queue callback related data.
>>
>> RX -> Rx
>>
>>> + *
>>> + * @return
>>> + * The number of packets effectively supplied to the *rx_pkts* array.
>>
>> @p should be used to refer to a parameter.
>>
>>> + */
>>> +uint16_t rte_eth_call_rx_callbacks(uint16_t port_id, uint16_t queue_id,
>>> + struct rte_mbuf **rx_pkts, uint16_t nb_rx, uint16_t nb_pkts,
>>> + void *opaque);
>>> +
>>> /**
>>> *
>>> * Retrieve a burst of input packets from a receive queue of an Ethernet
>>> @@ -4995,23 +5022,37 @@ static inline uint16_t
>>> rte_eth_rx_burst(uint16_t port_id, uint16_t queue_id,
>>> struct rte_mbuf **rx_pkts, const uint16_t nb_pkts)
>>> {
>>> - struct rte_eth_dev *dev = &rte_eth_devices[port_id];
>>> uint16_t nb_rx;
>>> + struct rte_eth_fp_ops *p;
>>
>> p is typically a very bad name in a funcion with
>> many pointer variables etc. May be "fpo" as in previous
>> patch?
>>
>>> + void *cb, *qd;
>>
>> Please, avoid variable, expecially pointers, declaration in
>> one line.
>
> Here and in other places, I think local variable names and placement,
> is just a matter of personal preference.
Of course you can drop my notes as long as I'm alone.
I've started my comment from "Please" :)
May be I'm asking too much.
Also, I'm sorry, but I stricly against 'p' name since such
naming makes code harder to read.
>
>>
>> I'd suggest to use 'rxq' instead of 'qd'. The first paramter
>> of the rx_pkt_burst is 'rxq'.
>>
>> Also 'cb' seems to be used under RTE_ETHDEV_RXTX_CALLBACKS
>> only. If so, it could be unused variable warning if
>> RTE_ETHDEV_RXTX_CALLBACKS is not defined.
>
> Good point, will move it back under #ifdef RTE_ETHDEV_RXTX_CALLBACKS.
>
>>> +
>>> +#ifdef RTE_ETHDEV_DEBUG_RX
>>> + if (port_id >= RTE_MAX_ETHPORTS ||
>>> + queue_id >= RTE_MAX_QUEUES_PER_PORT) {
>>> + RTE_ETHDEV_LOG(ERR,
>>> + "Invalid port_id=%u or queue_id=%u\n",
>>> + port_id, queue_id);
>>> + return 0;
>>> + }
>>> +#endif
>>> +
>>> + /* fetch pointer to queue data */
>>> + p = &rte_eth_fp_ops[port_id];
>>> + qd = p->rxq.data[queue_id];
>>>
>>> #ifdef RTE_ETHDEV_DEBUG_RX
>>> RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0);
>>> - RTE_FUNC_PTR_OR_ERR_RET(*dev->rx_pkt_burst, 0);
>>>
>>> - if (queue_id >= dev->data->nb_rx_queues) {
>>> - RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u\n", queue_id);
>>> + if (qd == NULL) {
>>> + RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u for port_id=%u\n",
>>
>> RX -> Rx
>>
>>> + queue_id, port_id);
>>> return 0;
>>> }
>>> #endif
>>> - nb_rx = (*dev->rx_pkt_burst)(dev->data->rx_queues[queue_id],
>>> - rx_pkts, nb_pkts);
>>> +
>>> + nb_rx = p->rx_pkt_burst(qd, rx_pkts, nb_pkts);
>>>
>>> #ifdef RTE_ETHDEV_RXTX_CALLBACKS
>>> - struct rte_eth_rxtx_callback *cb;
>>>
>>> /* __ATOMIC_RELEASE memory order was used when the
>>> * call back was inserted into the list.
>>> @@ -5019,16 +5060,10 @@ rte_eth_rx_burst(uint16_t port_id, uint16_t queue_id,
>>> * cb and cb->fn/cb->next, __ATOMIC_ACQUIRE memory order is
>>> * not required.
>>> */
>>> - cb = __atomic_load_n(&dev->post_rx_burst_cbs[queue_id],
>>> - __ATOMIC_RELAXED);
>>> -
>>> - if (unlikely(cb != NULL)) {
>>> - do {
>>> - nb_rx = cb->fn.rx(port_id, queue_id, rx_pkts, nb_rx,
>>> - nb_pkts, cb->param);
>>> - cb = cb->next;
>>> - } while (cb != NULL);
>>> - }
>>> + cb = __atomic_load_n((void **)&p->rxq.clbk[queue_id], __ATOMIC_RELAXED);
>>> + if (unlikely(cb != NULL))
>>> + nb_rx = rte_eth_call_rx_callbacks(port_id, queue_id, rx_pkts,
>>> + nb_rx, nb_pkts, cb);
>>> #endif
>>>
>>> rte_ethdev_trace_rx_burst(port_id, queue_id, (void **)rx_pkts, nb_rx);
>>> @@ -5051,16 +5086,27 @@ rte_eth_rx_burst(uint16_t port_id, uint16_t queue_id,
>>> static inline int
>>> rte_eth_rx_queue_count(uint16_t port_id, uint16_t queue_id)
>>> {
>>> - struct rte_eth_dev *dev;
>>> + struct rte_eth_fp_ops *p;
>>> + void *qd;
>>
>> p -> fpo, qd -> rxq
>>
>>> +
>>> + if (port_id >= RTE_MAX_ETHPORTS ||
>>> + queue_id >= RTE_MAX_QUEUES_PER_PORT) {
>>> + RTE_ETHDEV_LOG(ERR,
>>> + "Invalid port_id=%u or queue_id=%u\n",
>>> + port_id, queue_id);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + /* fetch pointer to queue data */
>>> + p = &rte_eth_fp_ops[port_id];
>>> + qd = p->rxq.data[queue_id];
>>>
>>> RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
>>> - dev = &rte_eth_devices[port_id];
>>> - RTE_FUNC_PTR_OR_ERR_RET(*dev->rx_queue_count, -ENOTSUP);
>>> - if (queue_id >= dev->data->nb_rx_queues ||
>>> - dev->data->rx_queues[queue_id] == NULL)
>>> + RTE_FUNC_PTR_OR_ERR_RET(*p->rx_queue_count, -ENOTSUP);
>>> + if (qd == NULL)
>>> return -EINVAL;
>>>
>>> - return (int)(*dev->rx_queue_count)(dev->data->rx_queues[queue_id]);
>>> + return (int)(*p->rx_queue_count)(qd);
>>> }
>>>
>>> /**@{@name Rx hardware descriptor states
>>> @@ -5108,21 +5154,30 @@ static inline int
>>> rte_eth_rx_descriptor_status(uint16_t port_id, uint16_t queue_id,
>>> uint16_t offset)
>>> {
>>> - struct rte_eth_dev *dev;
>>> - void *rxq;
>>> + struct rte_eth_fp_ops *p;
>>> + void *qd;
>>
>> p -> fpo, qd -> rxq
>>
>>>
>>> #ifdef RTE_ETHDEV_DEBUG_RX
>>> - RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
>>> + if (port_id >= RTE_MAX_ETHPORTS ||
>>> + queue_id >= RTE_MAX_QUEUES_PER_PORT) {
>>> + RTE_ETHDEV_LOG(ERR,
>>> + "Invalid port_id=%u or queue_id=%u\n",
>>> + port_id, queue_id);
>>> + return -EINVAL;
>>> + }
>>> #endif
>>> - dev = &rte_eth_devices[port_id];
>>> +
>>> + /* fetch pointer to queue data */
>>> + p = &rte_eth_fp_ops[port_id];
>>> + qd = p->rxq.data[queue_id];
>>> +
>>> #ifdef RTE_ETHDEV_DEBUG_RX
>>> - if (queue_id >= dev->data->nb_rx_queues)
>>> + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
>>> + if (qd == NULL)
>>> return -ENODEV;
>>> #endif
>>> - RTE_FUNC_PTR_OR_ERR_RET(*dev->rx_descriptor_status, -ENOTSUP);
>>> - rxq = dev->data->rx_queues[queue_id];
>>> -
>>> - return (*dev->rx_descriptor_status)(rxq, offset);
>>> + RTE_FUNC_PTR_OR_ERR_RET(*p->rx_descriptor_status, -ENOTSUP);
>>> + return (*p->rx_descriptor_status)(qd, offset);
>>> }
>>>
>>> /**@{@name Tx hardware descriptor states
>>> @@ -5169,23 +5224,54 @@ rte_eth_rx_descriptor_status(uint16_t port_id, uint16_t queue_id,
>>> static inline int rte_eth_tx_descriptor_status(uint16_t port_id,
>>> uint16_t queue_id, uint16_t offset)
>>> {
>>> - struct rte_eth_dev *dev;
>>> - void *txq;
>>> + struct rte_eth_fp_ops *p;
>>> + void *qd;
>>
>> p -> fpo, qd -> txq
>>
>>>
>>> #ifdef RTE_ETHDEV_DEBUG_TX
>>> - RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
>>> + if (port_id >= RTE_MAX_ETHPORTS ||
>>> + queue_id >= RTE_MAX_QUEUES_PER_PORT) {
>>> + RTE_ETHDEV_LOG(ERR,
>>> + "Invalid port_id=%u or queue_id=%u\n",
>>> + port_id, queue_id);
>>> + return -EINVAL;
>>> + }
>>> #endif
>>> - dev = &rte_eth_devices[port_id];
>>> +
>>> + /* fetch pointer to queue data */
>>> + p = &rte_eth_fp_ops[port_id];
>>> + qd = p->txq.data[queue_id];
>>> +
>>> #ifdef RTE_ETHDEV_DEBUG_TX
>>> - if (queue_id >= dev->data->nb_tx_queues)
>>> + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
>>> + if (qd == NULL)
>>> return -ENODEV;
>>> #endif
>>> - RTE_FUNC_PTR_OR_ERR_RET(*dev->tx_descriptor_status, -ENOTSUP);
>>> - txq = dev->data->tx_queues[queue_id];
>>> -
>>> - return (*dev->tx_descriptor_status)(txq, offset);
>>> + RTE_FUNC_PTR_OR_ERR_RET(*p->tx_descriptor_status, -ENOTSUP);
>>> + return (*p->tx_descriptor_status)(qd, offset);
>>> }
>>>
>>> +/**
>>> + * @internal
>>> + * Helper routine for eth driver tx_burst API.
>>> + * Should be called before entry PMD's rte_eth_tx_bulk implementation.
>>> + * Does necessary pre-processing - invokes TX callbacks if any, etc.
>>
>> TX -> Tx
>>
>>> + *
>>> + * @param port_id
>>> + * The port identifier of the Ethernet device.
>>> + * @param queue_id
>>> + * The index of the transmit queue through which output packets must be
>>> + * sent.
>>> + * @param tx_pkts
>>> + * The address of an array of *nb_pkts* pointers to *rte_mbuf* structures
>>> + * which contain the output packets.
>>
>> *nb_pkts* -> @p nb_pkts
>>
>>> + * @param nb_pkts
>>> + * The maximum number of packets to transmit.
>>> + * @return
>>> + * The number of output packets to transmit.
>>> + */
>>> +uint16_t rte_eth_call_tx_callbacks(uint16_t port_id, uint16_t queue_id,
>>> + struct rte_mbuf **tx_pkts, uint16_t nb_pkts, void *opaque);
>>> +
>>> /**
>>> * Send a burst of output packets on a transmit queue of an Ethernet device.
>>> *
>>> @@ -5256,20 +5342,34 @@ static inline uint16_t
>>> rte_eth_tx_burst(uint16_t port_id, uint16_t queue_id,
>>> struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
>>> {
>>> - struct rte_eth_dev *dev = &rte_eth_devices[port_id];
>>> + struct rte_eth_fp_ops *p;
>>> + void *cb, *qd;
>>
>> Same as above
>>
>>> +
>>> +#ifdef RTE_ETHDEV_DEBUG_TX
>>> + if (port_id >= RTE_MAX_ETHPORTS ||
>>> + queue_id >= RTE_MAX_QUEUES_PER_PORT) {
>>> + RTE_ETHDEV_LOG(ERR,
>>> + "Invalid port_id=%u or queue_id=%u\n",
>>> + port_id, queue_id);
>>> + return 0;
>>> + }
>>> +#endif
>>> +
>>> + /* fetch pointer to queue data */
>>> + p = &rte_eth_fp_ops[port_id];
>>> + qd = p->txq.data[queue_id];
>>>
>>> #ifdef RTE_ETHDEV_DEBUG_TX
>>> RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0);
>>> - RTE_FUNC_PTR_OR_ERR_RET(*dev->tx_pkt_burst, 0);
>>>
>>> - if (queue_id >= dev->data->nb_tx_queues) {
>>> - RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", queue_id);
>>> + if (qd == NULL) {
>>> + RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u for port_id=%u\n",
>>
>> TX -> Tx
>>
>>> + queue_id, port_id);
>>> return 0;
>>> }
>>> #endif
>>>
>>> #ifdef RTE_ETHDEV_RXTX_CALLBACKS
>>> - struct rte_eth_rxtx_callback *cb;
>>>
>>> /* __ATOMIC_RELEASE memory order was used when the
>>> * call back was inserted into the list.
>>> @@ -5277,21 +5377,16 @@ rte_eth_tx_burst(uint16_t port_id, uint16_t queue_id,
>>> * cb and cb->fn/cb->next, __ATOMIC_ACQUIRE memory order is
>>> * not required.
>>> */
>>> - cb = __atomic_load_n(&dev->pre_tx_burst_cbs[queue_id],
>>> - __ATOMIC_RELAXED);
>>> -
>>> - if (unlikely(cb != NULL)) {
>>> - do {
>>> - nb_pkts = cb->fn.tx(port_id, queue_id, tx_pkts, nb_pkts,
>>> - cb->param);
>>> - cb = cb->next;
>>> - } while (cb != NULL);
>>> - }
>>> + cb = __atomic_load_n((void **)&p->txq.clbk[queue_id], __ATOMIC_RELAXED);
>>> + if (unlikely(cb != NULL))
>>> + nb_pkts = rte_eth_call_tx_callbacks(port_id, queue_id, tx_pkts,
>>> + nb_pkts, cb);
>>> #endif
>>>
>>> - rte_ethdev_trace_tx_burst(port_id, queue_id, (void **)tx_pkts,
>>> - nb_pkts);
>>> - return (*dev->tx_pkt_burst)(dev->data->tx_queues[queue_id], tx_pkts, nb_pkts);
>>> + nb_pkts = p->tx_pkt_burst(qd, tx_pkts, nb_pkts);
>>> +
>>> + rte_ethdev_trace_tx_burst(port_id, queue_id, (void **)tx_pkts, nb_pkts);
>>> + return nb_pkts;
>>> }
>>>
>>> /**
>>> @@ -5354,31 +5449,42 @@ static inline uint16_t
>>> rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id,
>>> struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
>>> {
>>> - struct rte_eth_dev *dev;
>>> + struct rte_eth_fp_ops *p;
>>> + void *qd;
>>
>> p->fpo, qd->txq
>>
>>>
>>> #ifdef RTE_ETHDEV_DEBUG_TX
>>> - if (!rte_eth_dev_is_valid_port(port_id)) {
>>> - RTE_ETHDEV_LOG(ERR, "Invalid TX port_id=%u\n", port_id);
>>> + if (port_id >= RTE_MAX_ETHPORTS ||
>>> + queue_id >= RTE_MAX_QUEUES_PER_PORT) {
>>> + RTE_ETHDEV_LOG(ERR,
>>> + "Invalid port_id=%u or queue_id=%u\n",
>>> + port_id, queue_id);
>>> rte_errno = ENODEV;
>>> return 0;
>>> }
>>> #endif
>>>
>>> - dev = &rte_eth_devices[port_id];
>>> + /* fetch pointer to queue data */
>>> + p = &rte_eth_fp_ops[port_id];
>>> + qd = p->txq.data[queue_id];
>>>
>>> #ifdef RTE_ETHDEV_DEBUG_TX
>>> - if (queue_id >= dev->data->nb_tx_queues) {
>>> - RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", queue_id);
>>> + if (!rte_eth_dev_is_valid_port(port_id)) {
>>> + RTE_ETHDEV_LOG(ERR, "Invalid TX port_id=%u\n", port_id);
>>
>> TX -> Tx
>>
>>> + rte_errno = ENODEV;
>>> + return 0;
>>> + }
>>> + if (qd == NULL) {
>>> + RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u for port_id=%u\n",
>>
>> TX -> Tx
>>
>>> + queue_id, port_id);
>>> rte_errno = EINVAL;
>>> return 0;
>>> }
>>> #endif
>>>
>>> - if (!dev->tx_pkt_prepare)
>>> + if (!p->tx_pkt_prepare)
>>
>> Please, change it to compare vs NULL since you touch the line.
>> Just to be consistent with DPDK coding style and lines above.
>
> Ok, I am also fond of explicit comparisons :)
Thanks.
>
>
>>> return nb_pkts;
>>>
>>> - return (*dev->tx_pkt_prepare)(dev->data->tx_queues[queue_id],
>>> - tx_pkts, nb_pkts);
>>> + return p->tx_pkt_prepare(qd, tx_pkts, nb_pkts);
>>> }
>>>
>>> #else
>>> diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map
>>> index 904bce6ea1..79e62dcf61 100644
>>> --- a/lib/ethdev/version.map
>>> +++ b/lib/ethdev/version.map
>>> @@ -7,6 +7,8 @@ DPDK_22 {
>>> rte_eth_allmulticast_disable;
>>> rte_eth_allmulticast_enable;
>>> rte_eth_allmulticast_get;
>>> + rte_eth_call_rx_callbacks;
>>> + rte_eth_call_tx_callbacks;
>>> rte_eth_dev_adjust_nb_rx_tx_desc;
>>> rte_eth_dev_callback_register;
>>> rte_eth_dev_callback_unregister;
>>> @@ -76,6 +78,7 @@ DPDK_22 {
>>> rte_eth_find_next_of;
>>> rte_eth_find_next_owned_by;
>>> rte_eth_find_next_sibling;
>>> + rte_eth_fp_ops;
>>> rte_eth_iterator_cleanup;
>>> rte_eth_iterator_init;
>>> rte_eth_iterator_next;
>>>
>
next prev parent reply other threads:[~2021-10-11 17:03 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-20 16:28 [dpdk-dev] [RFC 0/7] hide eth dev related structures Konstantin Ananyev
2021-08-20 16:28 ` [dpdk-dev] [RFC 1/7] eth: move ethdev 'burst' API into separate structure Konstantin Ananyev
2021-08-20 16:28 ` [dpdk-dev] [RFC 2/7] eth: make drivers to use new API for Rx Konstantin Ananyev
2021-09-06 18:41 ` Ferruh Yigit
2021-09-14 14:28 ` Ananyev, Konstantin
2021-08-20 16:28 ` [dpdk-dev] [RFC 3/7] eth: make drivers to use new API for Tx Konstantin Ananyev
2021-08-20 16:28 ` [dpdk-dev] [RFC 4/7] eth: make drivers to use new API for Tx prepare Konstantin Ananyev
2021-08-20 16:28 ` [dpdk-dev] [RFC 5/7] eth: make drivers to use new API to obtain descriptor status Konstantin Ananyev
2021-08-20 16:28 ` [dpdk-dev] [RFC 6/7] eth: make drivers to use new API for Rx queue count Konstantin Ananyev
2021-08-20 16:28 ` [dpdk-dev] [RFC 7/7] eth: hide eth dev related structures Konstantin Ananyev
2021-08-26 12:37 ` [dpdk-dev] [RFC 0/7] " Jerin Jacob
2021-09-06 18:09 ` Ferruh Yigit
2021-09-14 13:33 ` Ananyev, Konstantin
2021-09-15 9:45 ` Jerin Jacob
2021-09-22 15:08 ` Ananyev, Konstantin
2021-09-27 16:14 ` Jerin Jacob
2021-09-28 9:37 ` Ananyev, Konstantin
2021-09-22 14:09 ` [dpdk-dev] [RFC v2 0/5] " Konstantin Ananyev
2021-09-22 14:09 ` [dpdk-dev] [RFC v2 1/5] ethdev: allocate max space for internal queue array Konstantin Ananyev
2021-09-22 14:09 ` [dpdk-dev] [RFC v2 2/5] ethdev: change input parameters for rx_queue_count Konstantin Ananyev
2021-09-23 5:51 ` Wang, Haiyue
2021-09-22 14:09 ` [dpdk-dev] [RFC v2 3/5] ethdev: copy ethdev 'burst' API into separate structure Konstantin Ananyev
2021-09-23 5:58 ` Wang, Haiyue
2021-09-27 18:01 ` Jerin Jacob
2021-09-28 9:42 ` Ananyev, Konstantin
2021-09-22 14:09 ` [dpdk-dev] [RFC v2 4/5] ethdev: make burst functions to use new flat array Konstantin Ananyev
2021-09-22 14:09 ` [dpdk-dev] [RFC v2 5/5] ethdev: hide eth dev related structures Konstantin Ananyev
2021-10-01 14:02 ` [dpdk-dev] [PATCH v3 0/7] " Konstantin Ananyev
2021-10-01 14:02 ` [dpdk-dev] [PATCH v3 1/7] ethdev: allocate max space for internal queue array Konstantin Ananyev
2021-10-01 16:48 ` Ferruh Yigit
2021-10-01 14:02 ` [dpdk-dev] [PATCH v3 2/7] ethdev: change input parameters for rx_queue_count Konstantin Ananyev
2021-10-01 14:02 ` [dpdk-dev] [PATCH v3 3/7] ethdev: copy ethdev 'fast' API into separate structure Konstantin Ananyev
2021-10-01 14:02 ` [dpdk-dev] [PATCH v3 4/7] ethdev: make burst functions to use new flat array Konstantin Ananyev
2021-10-01 16:46 ` Ferruh Yigit
2021-10-01 17:40 ` Ananyev, Konstantin
2021-10-04 8:46 ` Ferruh Yigit
2021-10-04 9:20 ` Ananyev, Konstantin
2021-10-04 10:13 ` Ferruh Yigit
2021-10-04 11:17 ` Ananyev, Konstantin
2021-10-01 14:02 ` [dpdk-dev] [PATCH v3 5/7] ethdev: add API to retrieve multiple ethernet addresses Konstantin Ananyev
2021-10-01 14:02 ` [dpdk-dev] [PATCH v3 6/7] ethdev: remove legacy Rx descriptor done API Konstantin Ananyev
2021-10-01 14:02 ` [dpdk-dev] [PATCH v3 7/7] ethdev: hide eth dev related structures Konstantin Ananyev
2021-10-01 16:53 ` Ferruh Yigit
2021-10-01 17:04 ` Ferruh Yigit
2021-10-01 17:02 ` [dpdk-dev] [PATCH v3 0/7] " Ferruh Yigit
2021-10-04 13:55 ` [dpdk-dev] [PATCH v4 " Konstantin Ananyev
2021-10-04 13:55 ` [dpdk-dev] [PATCH v4 1/7] ethdev: allocate max space for internal queue array Konstantin Ananyev
2021-10-05 12:09 ` Thomas Monjalon
2021-10-05 16:45 ` Ananyev, Konstantin
2021-10-05 16:49 ` Thomas Monjalon
2021-10-05 12:21 ` Thomas Monjalon
2021-10-04 13:55 ` [dpdk-dev] [PATCH v4 2/7] ethdev: change input parameters for rx_queue_count Konstantin Ananyev
2021-10-04 13:55 ` [dpdk-dev] [PATCH v4 3/7] ethdev: copy ethdev 'fast' API into separate structure Konstantin Ananyev
2021-10-05 13:09 ` Thomas Monjalon
2021-10-05 16:41 ` Ananyev, Konstantin
2021-10-05 16:48 ` Thomas Monjalon
2021-10-05 17:04 ` Ananyev, Konstantin
2021-10-04 13:56 ` [dpdk-dev] [PATCH v4 4/7] ethdev: make burst functions to use new flat array Konstantin Ananyev
2021-10-05 9:54 ` David Marchand
2021-10-05 10:13 ` Ananyev, Konstantin
2021-10-04 13:56 ` [dpdk-dev] [PATCH v4 5/7] ethdev: add API to retrieve multiple ethernet addresses Konstantin Ananyev
2021-10-05 13:13 ` Thomas Monjalon
2021-10-05 16:35 ` Ananyev, Konstantin
2021-10-05 16:45 ` Thomas Monjalon
2021-10-05 17:12 ` Ananyev, Konstantin
2021-10-05 17:41 ` Thomas Monjalon
2021-10-04 13:56 ` [dpdk-dev] [PATCH v4 6/7] ethdev: remove legacy Rx descriptor done API Konstantin Ananyev
2021-10-05 13:14 ` Thomas Monjalon
2021-10-05 16:21 ` Ananyev, Konstantin
2021-10-04 13:56 ` [dpdk-dev] [PATCH v4 7/7] ethdev: hide eth dev related structures Konstantin Ananyev
2021-10-05 10:04 ` David Marchand
2021-10-05 10:43 ` Ferruh Yigit
2021-10-05 11:37 ` David Marchand
2021-10-05 15:57 ` Ananyev, Konstantin
2021-10-05 13:24 ` Thomas Monjalon
2021-10-05 16:19 ` Ananyev, Konstantin
2021-10-05 16:25 ` Thomas Monjalon
2021-10-06 16:42 ` [dpdk-dev] [PATCH v4 0/7] " Ali Alnubani
2021-10-06 17:26 ` Ali Alnubani
2021-10-07 11:27 ` [dpdk-dev] [PATCH v5 " Konstantin Ananyev
2021-10-07 11:27 ` [dpdk-dev] [PATCH v5 1/7] ethdev: remove legacy Rx descriptor done API Konstantin Ananyev
2021-10-07 11:27 ` [dpdk-dev] [PATCH v5 2/7] ethdev: allocate max space for internal queue array Konstantin Ananyev
2021-10-11 9:20 ` Andrew Rybchenko
2021-10-11 16:25 ` Ananyev, Konstantin
2021-10-11 17:15 ` Andrew Rybchenko
2021-10-11 23:06 ` Ananyev, Konstantin
2021-10-12 5:47 ` Andrew Rybchenko
2021-10-07 11:27 ` [dpdk-dev] [PATCH v5 3/7] ethdev: change input parameters for rx_queue_count Konstantin Ananyev
2021-10-11 8:06 ` Andrew Rybchenko
2021-10-12 17:59 ` Hyong Youb Kim (hyonkim)
2021-10-07 11:27 ` [dpdk-dev] [PATCH v5 4/7] ethdev: copy fast-path API into separate structure Konstantin Ananyev
2021-10-09 12:05 ` fengchengwen
2021-10-11 1:18 ` fengchengwen
2021-10-11 8:39 ` Andrew Rybchenko
2021-10-11 15:24 ` Ananyev, Konstantin
2021-10-11 8:35 ` Andrew Rybchenko
2021-10-11 15:15 ` Ananyev, Konstantin
2021-10-11 8:25 ` Andrew Rybchenko
2021-10-11 16:52 ` Ananyev, Konstantin
2021-10-11 17:22 ` Andrew Rybchenko
2021-10-07 11:27 ` [dpdk-dev] [PATCH v5 5/7] ethdev: make fast-path functions to use new flat array Konstantin Ananyev
2021-10-11 9:02 ` Andrew Rybchenko
2021-10-11 15:47 ` Ananyev, Konstantin
2021-10-11 17:03 ` Andrew Rybchenko [this message]
2021-10-07 11:27 ` [dpdk-dev] [PATCH v5 6/7] ethdev: add API to retrieve multiple ethernet addresses Konstantin Ananyev
2021-10-11 9:09 ` Andrew Rybchenko
2021-10-07 11:27 ` [dpdk-dev] [PATCH v5 7/7] ethdev: hide eth dev related structures Konstantin Ananyev
2021-10-11 9:20 ` Andrew Rybchenko
2021-10-11 15:54 ` Ananyev, Konstantin
2021-10-11 17:04 ` Andrew Rybchenko
2021-10-08 18:13 ` [dpdk-dev] [PATCH v5 0/7] " Slava Ovsiienko
2021-10-11 9:22 ` Andrew Rybchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cce8080d-f7ac-f11a-1713-94f9b2879663@oktetlabs.ru \
--to=andrew.rybchenko@oktetlabs.ru \
--cc=adwivedi@marvell.com \
--cc=ajit.khaparde@broadcom.com \
--cc=anoobj@marvell.com \
--cc=beilei.xing@intel.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=ed.czeck@atomicrules.com \
--cc=ferruh.yigit@intel.com \
--cc=haiyue.wang@intel.com \
--cc=heinrich.kuhn@corigine.com \
--cc=hemant.agrawal@nxp.com \
--cc=humin29@huawei.com \
--cc=hyonkim@cisco.com \
--cc=irusskikh@marvell.com \
--cc=jay.jayatheerthan@intel.com \
--cc=jerinj@marvell.com \
--cc=jianwang@trustnetic.com \
--cc=jiawenwu@trustnetic.com \
--cc=jingjing.wu@intel.com \
--cc=john.miller@atomicrules.com \
--cc=johndale@cisco.com \
--cc=kirankumark@marvell.com \
--cc=konstantin.ananyev@intel.com \
--cc=longli@microsoft.com \
--cc=matan@nvidia.com \
--cc=maxime.coquelin@redhat.com \
--cc=mczekaj@marvell.com \
--cc=mdr@ashroe.eu \
--cc=ndabilpuram@marvell.com \
--cc=oulijun@huawei.com \
--cc=qi.z.zhang@intel.com \
--cc=qiming.yang@intel.com \
--cc=rahul.lakkireddy@chelsio.com \
--cc=sachin.saxena@oss.nxp.com \
--cc=shepard.siegel@atomicrules.com \
--cc=somnath.kotur@broadcom.com \
--cc=sthemmin@microsoft.com \
--cc=thomas@monjalon.net \
--cc=viacheslavo@nvidia.com \
--cc=xiao.w.wang@intel.com \
--cc=xiaoyun.li@intel.com \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).