Netdev Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 0/1] Fix broken build of mlx5
@ 2019-06-25 15:27 Jes Sorensen
  2019-06-25 15:27 ` [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled Jes Sorensen
  2019-06-25 17:54 ` [PATCH 0/1] Fix broken build of mlx5 Saeed Mahameed
  0 siblings, 2 replies; 11+ messages in thread
From: Jes Sorensen @ 2019-06-25 15:27 UTC (permalink / raw)
  To: saeedm; +Cc: netdev, kernel-team, Jes Sorensen

From: Jes Sorensen <jsorensen@fb.com>

This fixes an obvious build error that could have been caught by
simply building the code before pushing out the patch.

Cheers,
Jes


Jes Sorensen (1):
  mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled

 drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.21.0


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled
  2019-06-25 15:27 [PATCH 0/1] Fix broken build of mlx5 Jes Sorensen
@ 2019-06-25 15:27 ` Jes Sorensen
  2019-06-25 18:00   ` Saeed Mahameed
  2019-06-25 20:34   ` David Miller
  2019-06-25 17:54 ` [PATCH 0/1] Fix broken build of mlx5 Saeed Mahameed
  1 sibling, 2 replies; 11+ messages in thread
From: Jes Sorensen @ 2019-06-25 15:27 UTC (permalink / raw)
  To: saeedm; +Cc: netdev, kernel-team, Jes Sorensen

From: Jes Sorensen <jsorensen@fb.com>

The previous patch broke the build with a static declaration for
a public function.

Fixes: 8f0916c6dc5c (net/mlx5e: Fix ethtool rxfh commands when CONFIG_MLX5_EN_RXNFC is disabled)
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index dd764e0471f2..776040d91bd4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -1905,7 +1905,8 @@ static int mlx5e_flash_device(struct net_device *dev,
 /* When CONFIG_MLX5_EN_RXNFC=n we only support ETHTOOL_GRXRINGS
  * otherwise this function will be defined from en_fs_ethtool.c
  */
-static int mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, u32 *rule_locs)
+int mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
+		    u32 *rule_locs)
 {
 	struct mlx5e_priv *priv = netdev_priv(dev);
 
-- 
2.21.0


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 0/1] Fix broken build of mlx5
  2019-06-25 15:27 [PATCH 0/1] Fix broken build of mlx5 Jes Sorensen
  2019-06-25 15:27 ` [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled Jes Sorensen
@ 2019-06-25 17:54 ` Saeed Mahameed
  2019-06-25 18:01   ` Jes Sorensen
  1 sibling, 1 reply; 11+ messages in thread
From: Saeed Mahameed @ 2019-06-25 17:54 UTC (permalink / raw)
  To: jes.sorensen; +Cc: kernel-team, jsorensen, netdev

On Tue, 2019-06-25 at 11:27 -0400, Jes Sorensen wrote:
> From: Jes Sorensen <jsorensen@fb.com>
> 
> This fixes an obvious build error that could have been caught by
> simply building the code before pushing out the patch.
> 

Hi Jes,

Just tested again, as I have tested before submitting the blamed patch,
and as we test on every single new patch in our build automation.

both combinations CONFIG_MLX5_EN_RXNFC=y/n work on latest net-next,
what am i missing ?

> Cheers,
> Jes
> 
> 
> Jes Sorensen (1):
>   mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled
> 
>  drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled
  2019-06-25 15:27 ` [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled Jes Sorensen
@ 2019-06-25 18:00   ` Saeed Mahameed
  2019-07-02 15:00     ` Jes Sorensen
  2019-06-25 20:34   ` David Miller
  1 sibling, 1 reply; 11+ messages in thread
From: Saeed Mahameed @ 2019-06-25 18:00 UTC (permalink / raw)
  To: jes.sorensen; +Cc: kernel-team, jsorensen, netdev

On Tue, 2019-06-25 at 11:27 -0400, Jes Sorensen wrote:
> From: Jes Sorensen <jsorensen@fb.com>
> 
> The previous patch broke the build with a static declaration for
> a public function.
> 
> Fixes: 8f0916c6dc5c (net/mlx5e: Fix ethtool rxfh commands when
> CONFIG_MLX5_EN_RXNFC is disabled)
> Signed-off-by: Jes Sorensen <jsorensen@fb.com>
> ---
>  drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> index dd764e0471f2..776040d91bd4 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> @@ -1905,7 +1905,8 @@ static int mlx5e_flash_device(struct net_device
> *dev,
>  /* When CONFIG_MLX5_EN_RXNFC=n we only support ETHTOOL_GRXRINGS
>   * otherwise this function will be defined from en_fs_ethtool.c
>   */

As the above comment states, when CONFIG_MLX5_EN_RXNFC is disabled,
mlx5e_get_rxnfc is only defined, declared and used in this file, so it
must be static. Otherwise it will be defined in another file which
provides much much more functionality for ethtool flow steering.

can you please provide more information of what went wrong on your
build machine ?

> -static int mlx5e_get_rxnfc(struct net_device *dev, struct
> ethtool_rxnfc *info, u32 *rule_locs)
> +int mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc
> *info,
> +		    u32 *rule_locs)
>  {
>  	struct mlx5e_priv *priv = netdev_priv(dev);
>  


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 0/1] Fix broken build of mlx5
  2019-06-25 17:54 ` [PATCH 0/1] Fix broken build of mlx5 Saeed Mahameed
@ 2019-06-25 18:01   ` Jes Sorensen
  2019-06-25 21:11     ` Saeed Mahameed
  0 siblings, 1 reply; 11+ messages in thread
From: Jes Sorensen @ 2019-06-25 18:01 UTC (permalink / raw)
  To: Saeed Mahameed; +Cc: kernel-team, jsorensen, netdev

On 6/25/19 1:54 PM, Saeed Mahameed wrote:
> On Tue, 2019-06-25 at 11:27 -0400, Jes Sorensen wrote:
>> From: Jes Sorensen <jsorensen@fb.com>
>>
>> This fixes an obvious build error that could have been caught by
>> simply building the code before pushing out the patch.
>>
> 
> Hi Jes,
> 
> Just tested again, as I have tested before submitting the blamed patch,
> and as we test on every single new patch in our build automation.
> 
> both combinations CONFIG_MLX5_EN_RXNFC=y/n work on latest net-next,
> what am i missing ?

Linus' tree:

[jes@xpeas linux.git]$ grep mlx5e_get_rxnfc
drivers/net/ethernet/mellanox/mlx5/core/*.c
drivers/net/ethernet/mellanox/mlx5/core/en/*.h
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:static int
mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, u32
*rule_locs)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:	.get_rxnfc
= mlx5e_get_rxnfc,
drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c:int
mlx5e_get_rxnfc(struct net_device *dev,
drivers/net/ethernet/mellanox/mlx5/core/en/fs.h:int
mlx5e_get_rxnfc(struct net_device *dev,

static vs non static functions, with a prototype that is non static.

Jes

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled
  2019-06-25 15:27 ` [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled Jes Sorensen
  2019-06-25 18:00   ` Saeed Mahameed
@ 2019-06-25 20:34   ` David Miller
  2019-06-25 21:01     ` Saeed Mahameed
  1 sibling, 1 reply; 11+ messages in thread
From: David Miller @ 2019-06-25 20:34 UTC (permalink / raw)
  To: jes.sorensen; +Cc: saeedm, netdev, kernel-team, jsorensen

From: Jes Sorensen <jes.sorensen@gmail.com>
Date: Tue, 25 Jun 2019 11:27:08 -0400

> From: Jes Sorensen <jsorensen@fb.com>
> 
> The previous patch broke the build with a static declaration for
> a public function.
> 
> Fixes: 8f0916c6dc5c (net/mlx5e: Fix ethtool rxfh commands when CONFIG_MLX5_EN_RXNFC is disabled)
> Signed-off-by: Jes Sorensen <jsorensen@fb.com>

Saeed, I'm assuming I will get this via your next pull request once things
are sorted.

Thanks.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled
  2019-06-25 20:34   ` David Miller
@ 2019-06-25 21:01     ` Saeed Mahameed
  2019-06-25 21:08       ` David Miller
  0 siblings, 1 reply; 11+ messages in thread
From: Saeed Mahameed @ 2019-06-25 21:01 UTC (permalink / raw)
  To: jes.sorensen, davem; +Cc: kernel-team, jsorensen, netdev

On Tue, 2019-06-25 at 13:34 -0700, David Miller wrote:
> From: Jes Sorensen <jes.sorensen@gmail.com>
> Date: Tue, 25 Jun 2019 11:27:08 -0400
> 
> > From: Jes Sorensen <jsorensen@fb.com>
> > 
> > The previous patch broke the build with a static declaration for
> > a public function.
> > 
> > Fixes: 8f0916c6dc5c (net/mlx5e: Fix ethtool rxfh commands when
> > CONFIG_MLX5_EN_RXNFC is disabled)
> > Signed-off-by: Jes Sorensen <jsorensen@fb.com>
> 
> Saeed, I'm assuming I will get this via your next pull request once
> things
> are sorted.
> 

Well, i think there is no issue in upstream, but yes basically you can
delegate this to me.

BTW is there a way to clear up "Awaiting Upstream" clutter [1] for mlx5
patches that are already pulled ?

[1] 
https://patchwork.ozlabs.org/project/netdev/list/?series=&submitter=&state=8&q=mlx5&archive=&delegate=

> Thanks.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled
  2019-06-25 21:01     ` Saeed Mahameed
@ 2019-06-25 21:08       ` David Miller
  2019-06-26 19:08         ` Saeed Mahameed
  0 siblings, 1 reply; 11+ messages in thread
From: David Miller @ 2019-06-25 21:08 UTC (permalink / raw)
  To: saeedm; +Cc: jes.sorensen, kernel-team, jsorensen, netdev

From: Saeed Mahameed <saeedm@mellanox.com>
Date: Tue, 25 Jun 2019 21:01:58 +0000

> BTW is there a way to clear up "Awaiting Upstream" clutter [1] for mlx5
> patches that are already pulled ?
> 
> [1] 
> https://patchwork.ozlabs.org/project/netdev/list/?series=&submitter=&state=8&q=mlx5&archive=&delegate=

I don't understand what the problem is.  Everything there is in the
appropriate state.

When something hits netdev that doesn't go directly to my tree, that's
the approprate state forever.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 0/1] Fix broken build of mlx5
  2019-06-25 18:01   ` Jes Sorensen
@ 2019-06-25 21:11     ` Saeed Mahameed
  0 siblings, 0 replies; 11+ messages in thread
From: Saeed Mahameed @ 2019-06-25 21:11 UTC (permalink / raw)
  To: jes.sorensen; +Cc: kernel-team, jsorensen, netdev

On Tue, 2019-06-25 at 14:01 -0400, Jes Sorensen wrote:
> On 6/25/19 1:54 PM, Saeed Mahameed wrote:
> > On Tue, 2019-06-25 at 11:27 -0400, Jes Sorensen wrote:
> > > From: Jes Sorensen <jsorensen@fb.com>
> > > 
> > > This fixes an obvious build error that could have been caught by
> > > simply building the code before pushing out the patch.
> > > 
> > 
> > Hi Jes,
> > 
> > Just tested again, as I have tested before submitting the blamed
> > patch,
> > and as we test on every single new patch in our build automation.
> > 
> > both combinations CONFIG_MLX5_EN_RXNFC=y/n work on latest net-next,
> > what am i missing ?
> 
> Linus' tree:
> 
> [jes@xpeas linux.git]$ grep mlx5e_get_rxnfc
> drivers/net/ethernet/mellanox/mlx5/core/*.c
> drivers/net/ethernet/mellanox/mlx5/core/en/*.h
> drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:static int
> mlx5e_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
> u32
> *rule_locs)
> drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:	.get_rxnfc
> = mlx5e_get_rxnfc,
> drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c:int
> mlx5e_get_rxnfc(struct net_device *dev,
> drivers/net/ethernet/mellanox/mlx5/core/en/fs.h:int
> mlx5e_get_rxnfc(struct net_device *dev,
> 
> static vs non static functions, with a prototype that is non static.

But only one prototype can be selected and it is according
CONFIG_MLX5_EN_RXNFC

when CONFIG_MLX5_EN_RXNFC=n then the static prototype will be selected
and the other one will be compiled out.

when CONFIG_MLX5_EN_RXNFC=y the non static prototype will be selected
and the static one will be compiled out.

So no issue here.

> 
> Jes

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled
  2019-06-25 21:08       ` David Miller
@ 2019-06-26 19:08         ` Saeed Mahameed
  0 siblings, 0 replies; 11+ messages in thread
From: Saeed Mahameed @ 2019-06-26 19:08 UTC (permalink / raw)
  To: davem; +Cc: jes.sorensen, kernel-team, jsorensen, netdev

On Tue, 2019-06-25 at 14:08 -0700, David Miller wrote:
> From: Saeed Mahameed <saeedm@mellanox.com>
> Date: Tue, 25 Jun 2019 21:01:58 +0000
> 
> > BTW is there a way to clear up "Awaiting Upstream" clutter [1] for
> > mlx5
> > patches that are already pulled ?
> > 
> > [1] 
> > https://patchwork.ozlabs.org/project/netdev/list/?series=&submitter=&state=8&q=mlx5&archive=&delegate=
> 
> I don't understand what the problem is.  Everything there is in the
> appropriate state.
> 
> When something hits netdev that doesn't go directly to my tree,
> that's
> the approprate state forever.
> 

I see, Thanks for clarifying. 


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled
  2019-06-25 18:00   ` Saeed Mahameed
@ 2019-07-02 15:00     ` Jes Sorensen
  0 siblings, 0 replies; 11+ messages in thread
From: Jes Sorensen @ 2019-07-02 15:00 UTC (permalink / raw)
  To: Saeed Mahameed; +Cc: kernel-team, jsorensen, netdev

On 6/25/19 2:00 PM, Saeed Mahameed wrote:
> On Tue, 2019-06-25 at 11:27 -0400, Jes Sorensen wrote:
>> From: Jes Sorensen <jsorensen@fb.com>
>>
>> The previous patch broke the build with a static declaration for
>> a public function.
>>
>> Fixes: 8f0916c6dc5c (net/mlx5e: Fix ethtool rxfh commands when
>> CONFIG_MLX5_EN_RXNFC is disabled)
>> Signed-off-by: Jes Sorensen <jsorensen@fb.com>
>> ---
>>  drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
>> b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
>> index dd764e0471f2..776040d91bd4 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
>> @@ -1905,7 +1905,8 @@ static int mlx5e_flash_device(struct net_device
>> *dev,
>>  /* When CONFIG_MLX5_EN_RXNFC=n we only support ETHTOOL_GRXRINGS
>>   * otherwise this function will be defined from en_fs_ethtool.c
>>   */
> 
> As the above comment states, when CONFIG_MLX5_EN_RXNFC is disabled,
> mlx5e_get_rxnfc is only defined, declared and used in this file, so it
> must be static. Otherwise it will be defined in another file which
> provides much much more functionality for ethtool flow steering.
> 
> can you please provide more information of what went wrong on your
> build machine ?

Sorry was swamped here!

Looks like you're right, it only triggers in our build due to some
patches we don't have from upstream. I did the patch against upstream
and applied it to our tree, so should have checked further there.

Cheers,
Jes


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, back to index

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-25 15:27 [PATCH 0/1] Fix broken build of mlx5 Jes Sorensen
2019-06-25 15:27 ` [PATCH 1/1] mlx5: Fix build when CONFIG_MLX5_EN_RXNFC is disabled Jes Sorensen
2019-06-25 18:00   ` Saeed Mahameed
2019-07-02 15:00     ` Jes Sorensen
2019-06-25 20:34   ` David Miller
2019-06-25 21:01     ` Saeed Mahameed
2019-06-25 21:08       ` David Miller
2019-06-26 19:08         ` Saeed Mahameed
2019-06-25 17:54 ` [PATCH 0/1] Fix broken build of mlx5 Saeed Mahameed
2019-06-25 18:01   ` Jes Sorensen
2019-06-25 21:11     ` Saeed Mahameed

Netdev Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/netdev/0 netdev/git/0.git
	git clone --mirror https://lore.kernel.org/netdev/1 netdev/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 netdev netdev/ https://lore.kernel.org/netdev \
		netdev@vger.kernel.org netdev@archiver.kernel.org
	public-inbox-index netdev


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.netdev


AGPL code for this site: git clone https://public-inbox.org/ public-inbox