diff mbox series

net/failsafe: limit device capabilities to really supported

Message ID 1535528736-31325-1-git-send-email-arybchenko@solarflare.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers
Series net/failsafe: limit device capabilities to really supported |

Checks

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

Commit Message

Andrew Rybchenko Aug. 29, 2018, 7:45 a.m. UTC 
  From: Igor Romanov <Igor.Romanov@oktetlabs.ru>

Failsafe driver does not support any device capabilities yet.
Make fs_dev_infos_get() consider default ones to limit advertised
device capabilities to really supported instead of unconditional
inheritance from sub-devices.

Fixes: cac923cfea47 ("ethdev: support runtime queue setup")
Cc: stable@dpdk.org

Signed-off-by: Igor Romanov <Igor.Romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/failsafe/failsafe_ops.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Gaëtan Rivet Sept. 25, 2018, 3:48 p.m. UTC | #1 
Hi,

Sorry I had forgotten this one.
I would rename the title, something like:

net/failsafe: report actual device capabilities

And a few edits in the commit log:

On Wed, Aug 29, 2018 at 08:45:36AM +0100, Andrew Rybchenko wrote:
> From: Igor Romanov <Igor.Romanov@oktetlabs.ru>
> 
> Failsafe driver does not support any device capabilities yet.
> Make fs_dev_infos_get() consider default ones to limit advertised
                          ^^^^^^^^=report
> device capabilities to really supported instead of unconditional
                        | ^^^^^=actually? ^^^^^^^^^^^^^^^^^^^^^^^^
                        ^ +those?
> inheritance from sub-devices.
  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -> whole end of sentence can be removed.
> 
> Fixes: cac923cfea47 ("ethdev: support runtime queue setup")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Igor Romanov <Igor.Romanov@oktetlabs.ru>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Otherwise

Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>

> ---
>  drivers/net/failsafe/failsafe_ops.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
> index 24e91c931..2df8b55d9 100644
> --- a/drivers/net/failsafe/failsafe_ops.c
> +++ b/drivers/net/failsafe/failsafe_ops.c
> @@ -716,6 +716,8 @@ fs_stats_reset(struct rte_eth_dev *dev)
>   *      all sub_devices and the default capabilities.
>   *      Uses a logical AND of TX capabilities among
>   *      the active probed sub_device and the default capabilities.
> + *      Uses a logical AND of device capabilities among
> + *      all sub_devices and the default capabilities.
>   *
>   */
>  static void
> @@ -734,10 +736,12 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
>  		uint64_t rx_offload_capa;
>  		uint64_t rxq_offload_capa;
>  		uint64_t rss_hf_offload_capa;
> +		uint64_t dev_capa;
>  
>  		rx_offload_capa = default_infos.rx_offload_capa;
>  		rxq_offload_capa = default_infos.rx_queue_offload_capa;
>  		rss_hf_offload_capa = default_infos.flow_type_rss_offloads;
> +		dev_capa = default_infos.dev_capa;
>  		FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
>  			rte_eth_dev_info_get(PORT_ID(sdev),
>  					&PRIV(dev)->infos);
> @@ -746,12 +750,14 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
>  					PRIV(dev)->infos.rx_queue_offload_capa;
>  			rss_hf_offload_capa &=
>  					PRIV(dev)->infos.flow_type_rss_offloads;
> +			dev_capa &= PRIV(dev)->infos.dev_capa;
>  		}
>  		sdev = TX_SUBDEV(dev);
>  		rte_eth_dev_info_get(PORT_ID(sdev), &PRIV(dev)->infos);
>  		PRIV(dev)->infos.rx_offload_capa = rx_offload_capa;
>  		PRIV(dev)->infos.rx_queue_offload_capa = rxq_offload_capa;
>  		PRIV(dev)->infos.flow_type_rss_offloads = rss_hf_offload_capa;
> +		PRIV(dev)->infos.dev_capa = dev_capa;
>  		PRIV(dev)->infos.tx_offload_capa &=
>  					default_infos.tx_offload_capa;
>  		PRIV(dev)->infos.tx_queue_offload_capa &=
> -- 
> 2.17.1
>
Andrew Rybchenko Sept. 26, 2018, 6:36 a.m. UTC | #2 
On 9/25/18 6:48 PM, Gaëtan Rivet wrote:
> Hi,
>
> Sorry I had forgotten this one.
> I would rename the title, something like:
>
> net/failsafe: report actual device capabilities
>
> And a few edits in the commit log:
>
> On Wed, Aug 29, 2018 at 08:45:36AM +0100, Andrew Rybchenko wrote:
>> From: Igor Romanov <Igor.Romanov@oktetlabs.ru>
>>
>> Failsafe driver does not support any device capabilities yet.

In fact above statement was valid at the moment of initial submission,
but it is invalid now since run-time queue setup support added.

>> Make fs_dev_infos_get() consider default ones to limit advertised
>                            ^^^^^^^^=report

We do not blindly report so-called default capabilities. We take
capabilities reported by sub-devices as well. I think that "default"
can confuse unaware reader here (since default is the failsafe device
capabilities and "default" is just a part of variable name). So, I suggest
to reword it.

I'll send v2 shortly.

>> device capabilities to really supported instead of unconditional
>                          | ^^^^^=actually? ^^^^^^^^^^^^^^^^^^^^^^^^
>                          ^ +those?
>> inheritance from sub-devices.
>    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -> whole end of sentence can be removed.
>> Fixes: cac923cfea47 ("ethdev: support runtime queue setup")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Igor Romanov <Igor.Romanov@oktetlabs.ru>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> Otherwise
>
> Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>
>
>> ---
>>   drivers/net/failsafe/failsafe_ops.c | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
>> index 24e91c931..2df8b55d9 100644
>> --- a/drivers/net/failsafe/failsafe_ops.c
>> +++ b/drivers/net/failsafe/failsafe_ops.c
>> @@ -716,6 +716,8 @@ fs_stats_reset(struct rte_eth_dev *dev)
>>    *      all sub_devices and the default capabilities.
>>    *      Uses a logical AND of TX capabilities among
>>    *      the active probed sub_device and the default capabilities.
>> + *      Uses a logical AND of device capabilities among
>> + *      all sub_devices and the default capabilities.
>>    *
>>    */
>>   static void
>> @@ -734,10 +736,12 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
>>   		uint64_t rx_offload_capa;
>>   		uint64_t rxq_offload_capa;
>>   		uint64_t rss_hf_offload_capa;
>> +		uint64_t dev_capa;
>>   
>>   		rx_offload_capa = default_infos.rx_offload_capa;
>>   		rxq_offload_capa = default_infos.rx_queue_offload_capa;
>>   		rss_hf_offload_capa = default_infos.flow_type_rss_offloads;
>> +		dev_capa = default_infos.dev_capa;
>>   		FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
>>   			rte_eth_dev_info_get(PORT_ID(sdev),
>>   					&PRIV(dev)->infos);
>> @@ -746,12 +750,14 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
>>   					PRIV(dev)->infos.rx_queue_offload_capa;
>>   			rss_hf_offload_capa &=
>>   					PRIV(dev)->infos.flow_type_rss_offloads;
>> +			dev_capa &= PRIV(dev)->infos.dev_capa;
>>   		}
>>   		sdev = TX_SUBDEV(dev);
>>   		rte_eth_dev_info_get(PORT_ID(sdev), &PRIV(dev)->infos);
>>   		PRIV(dev)->infos.rx_offload_capa = rx_offload_capa;
>>   		PRIV(dev)->infos.rx_queue_offload_capa = rxq_offload_capa;
>>   		PRIV(dev)->infos.flow_type_rss_offloads = rss_hf_offload_capa;
>> +		PRIV(dev)->infos.dev_capa = dev_capa;
>>   		PRIV(dev)->infos.tx_offload_capa &=
>>   					default_infos.tx_offload_capa;
>>   		PRIV(dev)->infos.tx_queue_offload_capa &=
>> -- 
>> 2.17.1
>>
diff mbox series

Patch

diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index 24e91c931..2df8b55d9 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -716,6 +716,8 @@  fs_stats_reset(struct rte_eth_dev *dev)
  *      all sub_devices and the default capabilities.
  *      Uses a logical AND of TX capabilities among
  *      the active probed sub_device and the default capabilities.
+ *      Uses a logical AND of device capabilities among
+ *      all sub_devices and the default capabilities.
  *
  */
 static void
@@ -734,10 +736,12 @@  fs_dev_infos_get(struct rte_eth_dev *dev,
 		uint64_t rx_offload_capa;
 		uint64_t rxq_offload_capa;
 		uint64_t rss_hf_offload_capa;
+		uint64_t dev_capa;
 
 		rx_offload_capa = default_infos.rx_offload_capa;
 		rxq_offload_capa = default_infos.rx_queue_offload_capa;
 		rss_hf_offload_capa = default_infos.flow_type_rss_offloads;
+		dev_capa = default_infos.dev_capa;
 		FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
 			rte_eth_dev_info_get(PORT_ID(sdev),
 					&PRIV(dev)->infos);
@@ -746,12 +750,14 @@  fs_dev_infos_get(struct rte_eth_dev *dev,
 					PRIV(dev)->infos.rx_queue_offload_capa;
 			rss_hf_offload_capa &=
 					PRIV(dev)->infos.flow_type_rss_offloads;
+			dev_capa &= PRIV(dev)->infos.dev_capa;
 		}
 		sdev = TX_SUBDEV(dev);
 		rte_eth_dev_info_get(PORT_ID(sdev), &PRIV(dev)->infos);
 		PRIV(dev)->infos.rx_offload_capa = rx_offload_capa;
 		PRIV(dev)->infos.rx_queue_offload_capa = rxq_offload_capa;
 		PRIV(dev)->infos.flow_type_rss_offloads = rss_hf_offload_capa;
+		PRIV(dev)->infos.dev_capa = dev_capa;
 		PRIV(dev)->infos.tx_offload_capa &=
 					default_infos.tx_offload_capa;
 		PRIV(dev)->infos.tx_queue_offload_capa &=