diff mbox

[dpdk-dev,v3,2/6] net/tap: add speed capabilities

Message ID 1488904298-31395-3-git-send-email-pascal.mazon@6wind.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Pascal Mazon March 7, 2017, 4:31 p.m. UTC 
  Tap PMD is flexible, it supports any speed.

Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
---
 doc/guides/nics/features/tap.ini |  1 +
 drivers/net/tap/rte_eth_tap.c    | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

Comments

Ferruh Yigit March 9, 2017, 2:18 p.m. UTC | #1 
On 3/7/2017 4:31 PM, Pascal Mazon wrote:
> Tap PMD is flexible, it supports any speed.
> 
> Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
> ---
>  doc/guides/nics/features/tap.ini |  1 +
>  drivers/net/tap/rte_eth_tap.c    | 35 +++++++++++++++++++++++++++++++++++
>  2 files changed, 36 insertions(+)
> 
> diff --git a/doc/guides/nics/features/tap.ini b/doc/guides/nics/features/tap.ini
> index d9b47a003654..dad5a0561087 100644
> --- a/doc/guides/nics/features/tap.ini
> +++ b/doc/guides/nics/features/tap.ini
> @@ -9,6 +9,7 @@ Jumbo frame          = Y
>  Promiscuous mode     = Y
>  Allmulticast mode    = Y
>  Basic stats          = Y
> +Speed capabilities   = Y
>  Unicast MAC filter   = Y
>  Other kdrv           = Y
>  ARMv7                = Y
> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
> index 1e46ee36efa2..ef525a3f0826 100644
> --- a/drivers/net/tap/rte_eth_tap.c
> +++ b/drivers/net/tap/rte_eth_tap.c
> @@ -351,6 +351,40 @@ tap_dev_configure(struct rte_eth_dev *dev __rte_unused)
>  	return 0;
>  }
>  
> +static uint32_t
> +tap_dev_speed_capa(void)
> +{
> +	uint32_t speed = pmd_link.link_speed;

link_speed is already hardcoded into PMD, so there is nothing to detect
here. Would it be different if PMD directly return pmd_link.link_speed?

> +	uint32_t capa = 0;
> +
> +	if (speed >= ETH_SPEED_NUM_10M)
> +		capa |= ETH_LINK_SPEED_10M;
> +	if (speed >= ETH_SPEED_NUM_100M)
> +		capa |= ETH_LINK_SPEED_100M;
> +	if (speed >= ETH_SPEED_NUM_1G)
> +		capa |= ETH_LINK_SPEED_1G;
> +	if (speed >= ETH_SPEED_NUM_5G)
> +		capa |= ETH_LINK_SPEED_2_5G;
> +	if (speed >= ETH_SPEED_NUM_5G)
> +		capa |= ETH_LINK_SPEED_5G;
> +	if (speed >= ETH_SPEED_NUM_10G)
> +		capa |= ETH_LINK_SPEED_10G;
> +	if (speed >= ETH_SPEED_NUM_20G)
> +		capa |= ETH_LINK_SPEED_20G;
> +	if (speed >= ETH_SPEED_NUM_25G)
> +		capa |= ETH_LINK_SPEED_25G;
> +	if (speed >= ETH_SPEED_NUM_40G)
> +		capa |= ETH_LINK_SPEED_40G;
> +	if (speed >= ETH_SPEED_NUM_50G)
> +		capa |= ETH_LINK_SPEED_50G;
> +	if (speed >= ETH_SPEED_NUM_56G)
> +		capa |= ETH_LINK_SPEED_56G;
> +	if (speed >= ETH_SPEED_NUM_100G)
> +		capa |= ETH_LINK_SPEED_100G;

I would prefer switch here [1], but functionally both are same, it is
your call.

[1]
switch (speed) {
case ETH_SPEED_NUM_100G:
	capa |= ETH_LINK_SPEED_100G
	/* fallthrough */
case ETH_SPEED_NUM_56G:
	capa |= ETH_LINK_SPEED_56G
	/* fallthrough */
...
};


> +
> +	return capa;
> +}
> +
>  static void
>  tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
>  {
> @@ -363,6 +397,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
>  	dev_info->max_tx_queues = internals->nb_queues;
>  	dev_info->min_rx_bufsize = 0;
>  	dev_info->pci_dev = NULL;
> +	dev_info->speed_capa = tap_dev_speed_capa();
>  }
>  
>  static void
>
Wiles, Keith March 9, 2017, 2:36 p.m. UTC | #2 
> On Mar 9, 2017, at 8:18 AM, Yigit, Ferruh <ferruh.yigit@intel.com> wrote:
> 
> On 3/7/2017 4:31 PM, Pascal Mazon wrote:
>> Tap PMD is flexible, it supports any speed.
>> 
>> Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
>> ---
>> doc/guides/nics/features/tap.ini |  1 +
>> drivers/net/tap/rte_eth_tap.c    | 35 +++++++++++++++++++++++++++++++++++
>> 2 files changed, 36 insertions(+)
>> 
>> diff --git a/doc/guides/nics/features/tap.ini b/doc/guides/nics/features/tap.ini
>> index d9b47a003654..dad5a0561087 100644
>> --- a/doc/guides/nics/features/tap.ini
>> +++ b/doc/guides/nics/features/tap.ini
>> @@ -9,6 +9,7 @@ Jumbo frame          = Y
>> Promiscuous mode     = Y
>> Allmulticast mode    = Y
>> Basic stats          = Y
>> +Speed capabilities   = Y
>> Unicast MAC filter   = Y
>> Other kdrv           = Y
>> ARMv7                = Y
>> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
>> index 1e46ee36efa2..ef525a3f0826 100644
>> --- a/drivers/net/tap/rte_eth_tap.c
>> +++ b/drivers/net/tap/rte_eth_tap.c
>> @@ -351,6 +351,40 @@ tap_dev_configure(struct rte_eth_dev *dev __rte_unused)
>> 	return 0;
>> }
>> 
>> +static uint32_t
>> +tap_dev_speed_capa(void)
>> +{
>> +	uint32_t speed = pmd_link.link_speed;
> 
> link_speed is already hardcoded into PMD, so there is nothing to detect
> here. Would it be different if PMD directly return pmd_link.link_speed?

The link speed is passed into the PMD via the command line, which means it can change per run.
> 
>> +	uint32_t capa = 0;
>> +
>> +	if (speed >= ETH_SPEED_NUM_10M)
>> +		capa |= ETH_LINK_SPEED_10M;
>> +	if (speed >= ETH_SPEED_NUM_100M)
>> +		capa |= ETH_LINK_SPEED_100M;
>> +	if (speed >= ETH_SPEED_NUM_1G)
>> +		capa |= ETH_LINK_SPEED_1G;
>> +	if (speed >= ETH_SPEED_NUM_5G)
>> +		capa |= ETH_LINK_SPEED_2_5G;
>> +	if (speed >= ETH_SPEED_NUM_5G)
>> +		capa |= ETH_LINK_SPEED_5G;
>> +	if (speed >= ETH_SPEED_NUM_10G)
>> +		capa |= ETH_LINK_SPEED_10G;
>> +	if (speed >= ETH_SPEED_NUM_20G)
>> +		capa |= ETH_LINK_SPEED_20G;
>> +	if (speed >= ETH_SPEED_NUM_25G)
>> +		capa |= ETH_LINK_SPEED_25G;
>> +	if (speed >= ETH_SPEED_NUM_40G)
>> +		capa |= ETH_LINK_SPEED_40G;
>> +	if (speed >= ETH_SPEED_NUM_50G)
>> +		capa |= ETH_LINK_SPEED_50G;
>> +	if (speed >= ETH_SPEED_NUM_56G)
>> +		capa |= ETH_LINK_SPEED_56G;
>> +	if (speed >= ETH_SPEED_NUM_100G)
>> +		capa |= ETH_LINK_SPEED_100G;
> 
> I would prefer switch here [1], but functionally both are same, it is
> your call.
> 
> [1]
> switch (speed) {
> case ETH_SPEED_NUM_100G:
> 	capa |= ETH_LINK_SPEED_100G
> 	/* fallthrough */
> case ETH_SPEED_NUM_56G:
> 	capa |= ETH_LINK_SPEED_56G
> 	/* fallthrough */
> ...
> };
> 
> 
>> +
>> +	return capa;
>> +}
>> +
>> static void
>> tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
>> {
>> @@ -363,6 +397,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
>> 	dev_info->max_tx_queues = internals->nb_queues;
>> 	dev_info->min_rx_bufsize = 0;
>> 	dev_info->pci_dev = NULL;
>> +	dev_info->speed_capa = tap_dev_speed_capa();
>> }
>> 
>> static void

Regards,
Keith
Ferruh Yigit March 9, 2017, 4:05 p.m. UTC | #3 
On 3/9/2017 2:36 PM, Wiles, Keith wrote:
> 
>> On Mar 9, 2017, at 8:18 AM, Yigit, Ferruh <ferruh.yigit@intel.com> wrote:
>>
>> On 3/7/2017 4:31 PM, Pascal Mazon wrote:
>>> Tap PMD is flexible, it supports any speed.
>>>
>>> Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
>>> ---
>>> doc/guides/nics/features/tap.ini |  1 +
>>> drivers/net/tap/rte_eth_tap.c    | 35 +++++++++++++++++++++++++++++++++++
>>> 2 files changed, 36 insertions(+)
>>>
>>> diff --git a/doc/guides/nics/features/tap.ini b/doc/guides/nics/features/tap.ini
>>> index d9b47a003654..dad5a0561087 100644
>>> --- a/doc/guides/nics/features/tap.ini
>>> +++ b/doc/guides/nics/features/tap.ini
>>> @@ -9,6 +9,7 @@ Jumbo frame          = Y
>>> Promiscuous mode     = Y
>>> Allmulticast mode    = Y
>>> Basic stats          = Y
>>> +Speed capabilities   = Y
>>> Unicast MAC filter   = Y
>>> Other kdrv           = Y
>>> ARMv7                = Y
>>> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
>>> index 1e46ee36efa2..ef525a3f0826 100644
>>> --- a/drivers/net/tap/rte_eth_tap.c
>>> +++ b/drivers/net/tap/rte_eth_tap.c
>>> @@ -351,6 +351,40 @@ tap_dev_configure(struct rte_eth_dev *dev __rte_unused)
>>> 	return 0;
>>> }
>>>
>>> +static uint32_t
>>> +tap_dev_speed_capa(void)
>>> +{
>>> +	uint32_t speed = pmd_link.link_speed;
>>
>> link_speed is already hardcoded into PMD, so there is nothing to detect
>> here. Would it be different if PMD directly return pmd_link.link_speed?
> 
> The link speed is passed into the PMD via the command line, which means it can change per run.

Right, I missed that.
Pascal Mazon March 10, 2017, 9:03 a.m. UTC | #4 
On Thu, 9 Mar 2017 16:05:47 +0000
Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> On 3/9/2017 2:36 PM, Wiles, Keith wrote:
> > 
> >> On Mar 9, 2017, at 8:18 AM, Yigit, Ferruh <ferruh.yigit@intel.com>
> >> wrote:
> >>
> >> On 3/7/2017 4:31 PM, Pascal Mazon wrote:
> >>> Tap PMD is flexible, it supports any speed.
> >>>
> >>> Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
> >>> ---
> >>> doc/guides/nics/features/tap.ini |  1 +
> >>> drivers/net/tap/rte_eth_tap.c    | 35
> >>> +++++++++++++++++++++++++++++++++++ 2 files changed, 36
> >>> insertions(+)
> >>>
> >>> diff --git a/doc/guides/nics/features/tap.ini
> >>> b/doc/guides/nics/features/tap.ini index
> >>> d9b47a003654..dad5a0561087 100644 ---
> >>> a/doc/guides/nics/features/tap.ini +++
> >>> b/doc/guides/nics/features/tap.ini @@ -9,6 +9,7 @@ Jumbo
> >>> frame          = Y Promiscuous mode     = Y
> >>> Allmulticast mode    = Y
> >>> Basic stats          = Y
> >>> +Speed capabilities   = Y
> >>> Unicast MAC filter   = Y
> >>> Other kdrv           = Y
> >>> ARMv7                = Y
> >>> diff --git a/drivers/net/tap/rte_eth_tap.c
> >>> b/drivers/net/tap/rte_eth_tap.c index 1e46ee36efa2..ef525a3f0826
> >>> 100644 --- a/drivers/net/tap/rte_eth_tap.c
> >>> +++ b/drivers/net/tap/rte_eth_tap.c
> >>> @@ -351,6 +351,40 @@ tap_dev_configure(struct rte_eth_dev *dev
> >>> __rte_unused) return 0;
> >>> }
> >>>
> >>> +static uint32_t
> >>> +tap_dev_speed_capa(void)
> >>> +{
> >>> +	uint32_t speed = pmd_link.link_speed;
> >>
> >> link_speed is already hardcoded into PMD, so there is nothing to
> >> detect here. Would it be different if PMD directly return
> >> pmd_link.link_speed?
> > 
> > The link speed is passed into the PMD via the command line, which
> > means it can change per run.
> 
> Right, I missed that.

I'll use switch/case in the next version in any case.
But yes, as Keith said speed is a runtime option.

Regards,
Pascal
Pascal Mazon March 10, 2017, 9:11 a.m. UTC | #5 
On Fri, 10 Mar 2017 10:03:12 +0100
Pascal Mazon <pascal.mazon@6wind.com> wrote:

> On Thu, 9 Mar 2017 16:05:47 +0000
> Ferruh Yigit <ferruh.yigit@intel.com> wrote:
> 
> > On 3/9/2017 2:36 PM, Wiles, Keith wrote:
> > > 
> > >> On Mar 9, 2017, at 8:18 AM, Yigit, Ferruh
> > >> <ferruh.yigit@intel.com> wrote:
> > >>
> > >> On 3/7/2017 4:31 PM, Pascal Mazon wrote:
> > >>> Tap PMD is flexible, it supports any speed.
> > >>>
> > >>> Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
> > >>> ---
> > >>> doc/guides/nics/features/tap.ini |  1 +
> > >>> drivers/net/tap/rte_eth_tap.c    | 35
> > >>> +++++++++++++++++++++++++++++++++++ 2 files changed, 36
> > >>> insertions(+)
> > >>>
> > >>> diff --git a/doc/guides/nics/features/tap.ini
> > >>> b/doc/guides/nics/features/tap.ini index
> > >>> d9b47a003654..dad5a0561087 100644 ---
> > >>> a/doc/guides/nics/features/tap.ini +++
> > >>> b/doc/guides/nics/features/tap.ini @@ -9,6 +9,7 @@ Jumbo
> > >>> frame          = Y Promiscuous mode     = Y
> > >>> Allmulticast mode    = Y
> > >>> Basic stats          = Y
> > >>> +Speed capabilities   = Y
> > >>> Unicast MAC filter   = Y
> > >>> Other kdrv           = Y
> > >>> ARMv7                = Y
> > >>> diff --git a/drivers/net/tap/rte_eth_tap.c
> > >>> b/drivers/net/tap/rte_eth_tap.c index 1e46ee36efa2..ef525a3f0826
> > >>> 100644 --- a/drivers/net/tap/rte_eth_tap.c
> > >>> +++ b/drivers/net/tap/rte_eth_tap.c
> > >>> @@ -351,6 +351,40 @@ tap_dev_configure(struct rte_eth_dev *dev
> > >>> __rte_unused) return 0;
> > >>> }
> > >>>
> > >>> +static uint32_t
> > >>> +tap_dev_speed_capa(void)
> > >>> +{
> > >>> +	uint32_t speed = pmd_link.link_speed;
> > >>
> > >> link_speed is already hardcoded into PMD, so there is nothing to
> > >> detect here. Would it be different if PMD directly return
> > >> pmd_link.link_speed?
> > > 
> > > The link speed is passed into the PMD via the command line, which
> > > means it can change per run.
> > 
> > Right, I missed that.
> 
> I'll use switch/case in the next version in any case.
> But yes, as Keith said speed is a runtime option.

Sorry, I've sent that mail a little too quick. Of course I can't use
switch/case as we're not checking exact values matching.

> 
> Regards,
> Pascal
diff mbox

Patch

diff --git a/doc/guides/nics/features/tap.ini b/doc/guides/nics/features/tap.ini
index d9b47a003654..dad5a0561087 100644
--- a/doc/guides/nics/features/tap.ini
+++ b/doc/guides/nics/features/tap.ini
@@ -9,6 +9,7 @@  Jumbo frame          = Y
 Promiscuous mode     = Y
 Allmulticast mode    = Y
 Basic stats          = Y
+Speed capabilities   = Y
 Unicast MAC filter   = Y
 Other kdrv           = Y
 ARMv7                = Y
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 1e46ee36efa2..ef525a3f0826 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -351,6 +351,40 @@  tap_dev_configure(struct rte_eth_dev *dev __rte_unused)
 	return 0;
 }
 
+static uint32_t
+tap_dev_speed_capa(void)
+{
+	uint32_t speed = pmd_link.link_speed;
+	uint32_t capa = 0;
+
+	if (speed >= ETH_SPEED_NUM_10M)
+		capa |= ETH_LINK_SPEED_10M;
+	if (speed >= ETH_SPEED_NUM_100M)
+		capa |= ETH_LINK_SPEED_100M;
+	if (speed >= ETH_SPEED_NUM_1G)
+		capa |= ETH_LINK_SPEED_1G;
+	if (speed >= ETH_SPEED_NUM_5G)
+		capa |= ETH_LINK_SPEED_2_5G;
+	if (speed >= ETH_SPEED_NUM_5G)
+		capa |= ETH_LINK_SPEED_5G;
+	if (speed >= ETH_SPEED_NUM_10G)
+		capa |= ETH_LINK_SPEED_10G;
+	if (speed >= ETH_SPEED_NUM_20G)
+		capa |= ETH_LINK_SPEED_20G;
+	if (speed >= ETH_SPEED_NUM_25G)
+		capa |= ETH_LINK_SPEED_25G;
+	if (speed >= ETH_SPEED_NUM_40G)
+		capa |= ETH_LINK_SPEED_40G;
+	if (speed >= ETH_SPEED_NUM_50G)
+		capa |= ETH_LINK_SPEED_50G;
+	if (speed >= ETH_SPEED_NUM_56G)
+		capa |= ETH_LINK_SPEED_56G;
+	if (speed >= ETH_SPEED_NUM_100G)
+		capa |= ETH_LINK_SPEED_100G;
+
+	return capa;
+}
+
 static void
 tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -363,6 +397,7 @@  tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 	dev_info->max_tx_queues = internals->nb_queues;
 	dev_info->min_rx_bufsize = 0;
 	dev_info->pci_dev = NULL;
+	dev_info->speed_capa = tap_dev_speed_capa();
 }
 
 static void