From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C40E2A0589; Fri, 27 Mar 2020 12:30:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 034291C0CB; Fri, 27 Mar 2020 12:30:04 +0100 (CET) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 70C1B1C0CA for ; Fri, 27 Mar 2020 12:30:02 +0100 (CET) Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.61]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id A77FF60081; Fri, 27 Mar 2020 11:30:01 +0000 (UTC) Received: from us4-mdac16-54.ut7.mdlocal (unknown [10.7.66.25]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 9CF388009E; Fri, 27 Mar 2020 11:30:01 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.66.32]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 1647980052; Fri, 27 Mar 2020 11:30:01 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 87A2FB40060; Fri, 27 Mar 2020 11:30:00 +0000 (UTC) Received: from [192.168.38.17] (10.17.10.39) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 27 Mar 2020 11:29:52 +0000 To: Michal Krawczyk , CC: , , , , References: <20200327101823.12646-1-mk@semihalf.com> <20200327101823.12646-27-mk@semihalf.com> From: Andrew Rybchenko Autocrypt: addr=arybchenko@solarflare.com; keydata= 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 Znk9 Message-ID: Date: Fri, 27 Mar 2020 14:29:40 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200327101823.12646-27-mk@semihalf.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.17.10.39] X-ClientProxiedBy: ocex03.SolarFlarecom.com (10.20.40.36) To ukex01.SolarFlarecom.com (10.17.10.4) X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1020-25316.002 X-TM-AS-Result: No-6.075100-8.000000-10 X-TMASE-MatchedRID: C/snMIRQLS34ECMHJTM/ufZvT2zYoYOwC/ExpXrHizzLkl8e9W70iz7F nCrEJ7NNNk1GcmpNXFLL39zEuXyhcdpsFVyqUNwXuwdUMMznEA9LXPA26IG0hN9RlPzeVuQQ1EP 2Wxlu2pZ1dhrfxQhtO4SFqnarmibK+pktsfD0b6Zuh7qwx+D6T3tNLiqAGZdpVBCP1jvnj8056G dZxUF9VgzMuGtnHNViypxQqRKtgUD0nMCL2lyVdoEU1kn9F/MZZcb74JzUUhoR34ro7k23ncBEI wuSccklYBSAIERqajzsO3yROPZRp+vV11lepJ0ajpyluct2Nr1+tO36GYDlsnzDfgQ25o4mujw9 BXXmuOA2wRZMiNYfRPrX3HUSpSJtKXGXWv7oGoiTCCj1265aFweCHewokHM/D5cyUgWQb9URhla vr61wtDZwK2vBEQnBGAGAqWxbZUQeE1UKp3NAeWpjhlm7EiBXfS0Ip2eEHny+qryzYw2E8LLn+0 Vm71Lcq7rFUcuGp/FYF3qW3Je6+/WV/R8q68TtD9XDcp4lzkMADzswuv3+Ge23ekUswe9mWoFxA N1bvAoSy5QgBd5SyXX/MMBNmu0WCK3H+whmFw7/hVAm3wXuh/Adfn5DyOPDXC6uJnc/p0Ssglkl tB8xdGpozkualSTDO6clcnPxfVB+3BndfXUhXQ== X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--6.075100-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1020-25316.002 X-MDID: 1585308601-csMvb3XXSc1P Subject: Re: [dpdk-dev] [PATCH 26/29] net/ena: reuse 0 length Rx descriptor 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 3/27/20 1:18 PM, Michal Krawczyk wrote: > Some ENA devices can pass to the driver descriptor with length 0. To > avoid extra allocation, the descriptor can be reused by simply putting > it back to the device. > > Signed-off-by: Michal Krawczyk > Reviewed-by: Igor Chauskin > Reviewed-by: Guy Tzalik > --- > drivers/net/ena/ena_ethdev.c | 74 ++++++++++++++++++++++++++++-------- > 1 file changed, 59 insertions(+), 15 deletions(-) > > diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c > index 54bd2760e5..9b95772e9e 100644 > --- a/drivers/net/ena/ena_ethdev.c > +++ b/drivers/net/ena/ena_ethdev.c > @@ -191,6 +191,8 @@ static struct rte_mbuf *ena_rx_mbuf(struct ena_ring *rx_ring, > uint8_t offset); > static uint16_t eth_ena_recv_pkts(void *rx_queue, > struct rte_mbuf **rx_pkts, uint16_t nb_pkts); > +static int ena_add_single_rx_desc(struct ena_com_io_sq *io_sq, > + struct rte_mbuf *mbuf, uint16_t id); > static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count); > static void ena_init_rings(struct ena_adapter *adapter, > bool disable_meta_caching); > @@ -1403,6 +1405,24 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev, > return 0; > } > > +static int ena_add_single_rx_desc(struct ena_com_io_sq *io_sq, > + struct rte_mbuf *mbuf, uint16_t id) > +{ > + struct ena_com_buf ebuf; > + int rc; > + > + /* prepare physical address for DMA transaction */ > + ebuf.paddr = mbuf->buf_iova + RTE_PKTMBUF_HEADROOM; > + ebuf.len = mbuf->buf_len - RTE_PKTMBUF_HEADROOM; > + > + /* pass resource to device */ > + rc = ena_com_add_single_rx_desc(io_sq, &ebuf, id); > + if (unlikely(rc)) DPDK style says to compare to 0 [1] and [2]. [1] https://doc.dpdk.org/guides/contributing /coding_style.html#function-calls [2] https://doc.dpdk.org/guides/contributing/coding_style.html#null-pointers > + PMD_DRV_LOG(WARNING, "failed adding rx desc\n"); > + > + return rc; > +} > + > static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count) > { > unsigned int i; > @@ -1430,7 +1450,6 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count) > > for (i = 0; i < count; i++) { > struct rte_mbuf *mbuf = mbufs[i]; > - struct ena_com_buf ebuf; > struct ena_rx_buffer *rx_info; > > if (likely((i + 4) < count)) > @@ -1443,16 +1462,10 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count) > > rx_info = &rxq->rx_buffer_info[req_id]; > > - /* prepare physical address for DMA transaction */ > - ebuf.paddr = mbuf->buf_iova + RTE_PKTMBUF_HEADROOM; > - ebuf.len = mbuf->buf_len - RTE_PKTMBUF_HEADROOM; > - /* pass resource to device */ > - rc = ena_com_add_single_rx_desc(rxq->ena_com_io_sq, > - &ebuf, req_id); > - if (unlikely(rc)) { > - PMD_DRV_LOG(WARNING, "failed adding rx desc\n"); > + rc = ena_add_single_rx_desc(rxq->ena_com_io_sq, mbuf, req_id); > + if (unlikely(rc)) same here > break; > - } > + > rx_info->mbuf = mbuf; > next_to_use = ENA_IDX_NEXT_MASKED(next_to_use, rxq->size_mask); > } > @@ -2105,13 +2118,44 @@ static struct rte_mbuf *ena_rx_mbuf(struct ena_ring *rx_ring, > rx_info = &rx_ring->rx_buffer_info[req_id]; > RTE_ASSERT(rx_info->mbuf != NULL); > > - /* Create an mbuf chain. */ > - mbuf->next = rx_info->mbuf; > - mbuf = mbuf->next; > + if (unlikely(len == 0)) { > + /* > + * Some devices can pass descriptor with the length 0. > + * To avoid confusion, the PMD is simply putting the > + * descriptor back, as it was never used. We'll avoid > + * mbuf allocation that way. > + */ > + int rc = ena_add_single_rx_desc(rx_ring->ena_com_io_sq, > + rx_info->mbuf, req_id); > + if (unlikely(rc)) { same here > + /* Free the mbuf in case of an error. */ > + rte_mbuf_raw_free(rx_info->mbuf); > + } else { > + /* > + * If there was no error, just exit the loop as > + * 0 length descriptor is always the last one. > + */ > + break; > + } > + } else { > + /* Create an mbuf chain. */ > + mbuf->next = rx_info->mbuf; > + mbuf = mbuf->next; > > - ena_init_rx_mbuf(mbuf, len); > - mbuf_head->pkt_len += len; > + ena_init_rx_mbuf(mbuf, len); > + mbuf_head->pkt_len += len; > + } > > + /* > + * Mark the descriptor as depleted and perform necessary > + * cleanup. > + * This code will execute in two cases: > + * 1. Descriptor len was greater than 0 - normal situation. > + * 2. Descriptor len was 0 and we failed to add the descriptor > + * to the device. In that situation, we should try to add > + * the mbuf again in the populate routine and mark the > + * descriptor as used up by the device. > + */ > rx_info->mbuf = NULL; > rx_ring->empty_rx_reqs[ntc] = req_id; > ntc = ENA_IDX_NEXT_MASKED(ntc, rx_ring->size_mask); >