DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
@ 2017-09-25  6:50 Andrew Rybchenko
  2017-09-25  8:42 ` Ferruh Yigit
  2017-09-25 12:52 ` Ferruh Yigit
  0 siblings, 2 replies; 11+ messages in thread
From: Andrew Rybchenko @ 2017-09-25  6:50 UTC (permalink / raw)
  To: dev; +Cc: Ferruh Yigit, Chas Williams

Failure happens on build using:
gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)

Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
May be the right solution in fact remove PACKET_QDISC_BYPASS conditional
completely. If below solution is accepted, feel free to squash it into
the original patch.

 drivers/net/af_packet/rte_eth_af_packet.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 8089eda..541302c 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -707,6 +707,8 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 			        pair->value);
 			goto error;
 		}
+#else
+		RTE_SET_USED(qdisc_bypass);
 #endif
 
 		rc = setsockopt(qsockfd, SOL_PACKET, PACKET_RX_RING, req, sizeof(*req));
-- 
2.7.4

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25  6:50 [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter Andrew Rybchenko
@ 2017-09-25  8:42 ` Ferruh Yigit
  2017-09-25  9:04   ` Andrew Rybchenko
  2017-09-25  9:40   ` Bruce Richardson
  2017-09-25 12:52 ` Ferruh Yigit
  1 sibling, 2 replies; 11+ messages in thread
From: Ferruh Yigit @ 2017-09-25  8:42 UTC (permalink / raw)
  To: Andrew Rybchenko, dev; +Cc: Chas Williams

On 9/25/2017 7:50 AM, Andrew Rybchenko wrote:
> Failure happens on build using:
> gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)

Yes, that case is missed. What do you think about following one:

  @@ -561,7 +561,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
                          unsigned int blockcnt,
                          unsigned int framesize,
                          unsigned int framecnt,
  -                      unsigned int qdisc_bypass,
  +                      unsigned int qdisc_bypass __rte_unused,
                          struct pmd_internals **internals,
                          struct rte_eth_dev **eth_dev,
                          struct rte_kvargs *kvlist)

> 
> Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")
> 
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> ---
> May be the right solution in fact remove PACKET_QDISC_BYPASS conditional
> completely. If below solution is accepted, feel free to squash it into
> the original patch.

It is a little to late for this, I already sent a pull-request with this
patch. So fix will need to be a separate patch.

<...>

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25  8:42 ` Ferruh Yigit
@ 2017-09-25  9:04   ` Andrew Rybchenko
  2017-09-25  9:40   ` Bruce Richardson
  1 sibling, 0 replies; 11+ messages in thread
From: Andrew Rybchenko @ 2017-09-25  9:04 UTC (permalink / raw)
  To: Ferruh Yigit, dev; +Cc: Chas Williams

On 09/25/2017 11:42 AM, Ferruh Yigit wrote:
> On 9/25/2017 7:50 AM, Andrew Rybchenko wrote:
>> Failure happens on build using:
>> gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)
> Yes, that case is missed. What do you think about following one:
>
>    @@ -561,7 +561,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
>                            unsigned int blockcnt,
>                            unsigned int framesize,
>                            unsigned int framecnt,
>    -                      unsigned int qdisc_bypass,
>    +                      unsigned int qdisc_bypass __rte_unused,
>                            struct pmd_internals **internals,
>                            struct rte_eth_dev **eth_dev,
>                            struct rte_kvargs *kvlist)

It is OK for me as well, but I've not chosen it since it could be treated as
always unused.

>> Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")
>>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>> ---
>> May be the right solution in fact remove PACKET_QDISC_BYPASS conditional
>> completely. If below solution is accepted, feel free to squash it into
>> the original patch.
> It is a little to late for this, I already sent a pull-request with this
> patch. So fix will need to be a separate patch.

Sad, if it means that the build will be broken in main DPDK repo as well.
Not critical, but a bit inconvenient.

> <...>

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25  8:42 ` Ferruh Yigit
  2017-09-25  9:04   ` Andrew Rybchenko
@ 2017-09-25  9:40   ` Bruce Richardson
  2017-09-25  9:53     ` Ferruh Yigit
  1 sibling, 1 reply; 11+ messages in thread
From: Bruce Richardson @ 2017-09-25  9:40 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Andrew Rybchenko, dev, Chas Williams

On Mon, Sep 25, 2017 at 09:42:56AM +0100, Ferruh Yigit wrote:
> On 9/25/2017 7:50 AM, Andrew Rybchenko wrote:
> > Failure happens on build using:
> > gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)
> 
> Yes, that case is missed. What do you think about following one:
> 
>   @@ -561,7 +561,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
>                           unsigned int blockcnt,
>                           unsigned int framesize,
>                           unsigned int framecnt,
>   -                      unsigned int qdisc_bypass,
>   +                      unsigned int qdisc_bypass __rte_unused,
>                           struct pmd_internals **internals,
>                           struct rte_eth_dev **eth_dev,
>                           struct rte_kvargs *kvlist)
> 
> > 
> > Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")
> > 
> > Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> > ---
> > May be the right solution in fact remove PACKET_QDISC_BYPASS conditional
> > completely. If below solution is accepted, feel free to squash it into
> > the original patch.
> 
> It is a little to late for this, I already sent a pull-request with this
> patch. So fix will need to be a separate patch.
> 
Pull request hasn't actually been pulled yet, so you should be able to
supercede it by a later one, right?

/Bruce

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25  9:40   ` Bruce Richardson
@ 2017-09-25  9:53     ` Ferruh Yigit
  2017-09-25 10:06       ` Ferruh Yigit
  0 siblings, 1 reply; 11+ messages in thread
From: Ferruh Yigit @ 2017-09-25  9:53 UTC (permalink / raw)
  To: Bruce Richardson, Thomas Monjalon; +Cc: Andrew Rybchenko, dev, Chas Williams

On 9/25/2017 10:40 AM, Bruce Richardson wrote:
> On Mon, Sep 25, 2017 at 09:42:56AM +0100, Ferruh Yigit wrote:
>> On 9/25/2017 7:50 AM, Andrew Rybchenko wrote:
>>> Failure happens on build using:
>>> gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)
>>
>> Yes, that case is missed. What do you think about following one:
>>
>>   @@ -561,7 +561,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
>>                           unsigned int blockcnt,
>>                           unsigned int framesize,
>>                           unsigned int framecnt,
>>   -                      unsigned int qdisc_bypass,
>>   +                      unsigned int qdisc_bypass __rte_unused,
>>                           struct pmd_internals **internals,
>>                           struct rte_eth_dev **eth_dev,
>>                           struct rte_kvargs *kvlist)
>>
>>>
>>> Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")
>>>
>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>>> ---
>>> May be the right solution in fact remove PACKET_QDISC_BYPASS conditional
>>> completely. If below solution is accepted, feel free to squash it into
>>> the original patch.
>>
>> It is a little to late for this, I already sent a pull-request with this
>> patch. So fix will need to be a separate patch.
>>
> Pull request hasn't actually been pulled yet, so you should be able to
> supercede it by a later one, right?

Technically yes, and easy to do, but it will be confusing. I was taking
pull-request as code freeze in sub-tree.

If there are multiple pull-request for a tree, how can one be sure which
ones has been pulled and what to expect in main repo, and verify what
has been merged?

As above said, if Thomas thinks this is OK, I can send another pull request?

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25  9:53     ` Ferruh Yigit
@ 2017-09-25 10:06       ` Ferruh Yigit
  2017-09-25 12:49         ` Ferruh Yigit
  2017-09-25 14:24         ` Thomas Monjalon
  0 siblings, 2 replies; 11+ messages in thread
From: Ferruh Yigit @ 2017-09-25 10:06 UTC (permalink / raw)
  To: Bruce Richardson, Thomas Monjalon; +Cc: Andrew Rybchenko, dev, Chas Williams

On 9/25/2017 10:53 AM, Ferruh Yigit wrote:
> On 9/25/2017 10:40 AM, Bruce Richardson wrote:
>> On Mon, Sep 25, 2017 at 09:42:56AM +0100, Ferruh Yigit wrote:
>>> On 9/25/2017 7:50 AM, Andrew Rybchenko wrote:
>>>> Failure happens on build using:
>>>> gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)
>>>
>>> Yes, that case is missed. What do you think about following one:
>>>
>>>   @@ -561,7 +561,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
>>>                           unsigned int blockcnt,
>>>                           unsigned int framesize,
>>>                           unsigned int framecnt,
>>>   -                      unsigned int qdisc_bypass,
>>>   +                      unsigned int qdisc_bypass __rte_unused,
>>>                           struct pmd_internals **internals,
>>>                           struct rte_eth_dev **eth_dev,
>>>                           struct rte_kvargs *kvlist)
>>>
>>>>
>>>> Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")
>>>>
>>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>>>> ---
>>>> May be the right solution in fact remove PACKET_QDISC_BYPASS conditional
>>>> completely. If below solution is accepted, feel free to squash it into
>>>> the original patch.
>>>
>>> It is a little to late for this, I already sent a pull-request with this
>>> patch. So fix will need to be a separate patch.
>>>
>> Pull request hasn't actually been pulled yet, so you should be able to
>> supercede it by a later one, right?
> 
> Technically yes, and easy to do, but it will be confusing. I was taking
> pull-request as code freeze in sub-tree.
> 
> If there are multiple pull-request for a tree, how can one be sure which
> ones has been pulled and what to expect in main repo, and verify what
> has been merged?
> 
> As above said, if Thomas thinks this is OK, I can send another pull request?

What about Thomas doing the squash while applying to the main repo, so
that main repo won't be broken and there won't be multiple pull requests
around?

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25 10:06       ` Ferruh Yigit
@ 2017-09-25 12:49         ` Ferruh Yigit
  2017-09-25 14:24         ` Thomas Monjalon
  1 sibling, 0 replies; 11+ messages in thread
From: Ferruh Yigit @ 2017-09-25 12:49 UTC (permalink / raw)
  To: Bruce Richardson, Thomas Monjalon; +Cc: Andrew Rybchenko, dev, Chas Williams

On 9/25/2017 11:06 AM, Ferruh Yigit wrote:
> On 9/25/2017 10:53 AM, Ferruh Yigit wrote:
>> On 9/25/2017 10:40 AM, Bruce Richardson wrote:
>>> On Mon, Sep 25, 2017 at 09:42:56AM +0100, Ferruh Yigit wrote:
>>>> On 9/25/2017 7:50 AM, Andrew Rybchenko wrote:
>>>>> Failure happens on build using:
>>>>> gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)
>>>>
>>>> Yes, that case is missed. What do you think about following one:
>>>>
>>>>   @@ -561,7 +561,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
>>>>                           unsigned int blockcnt,
>>>>                           unsigned int framesize,
>>>>                           unsigned int framecnt,
>>>>   -                      unsigned int qdisc_bypass,
>>>>   +                      unsigned int qdisc_bypass __rte_unused,
>>>>                           struct pmd_internals **internals,
>>>>                           struct rte_eth_dev **eth_dev,
>>>>                           struct rte_kvargs *kvlist)
>>>>
>>>>>
>>>>> Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")
>>>>>
>>>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>>>>> ---
>>>>> May be the right solution in fact remove PACKET_QDISC_BYPASS conditional
>>>>> completely. If below solution is accepted, feel free to squash it into
>>>>> the original patch.
>>>>
>>>> It is a little to late for this, I already sent a pull-request with this
>>>> patch. So fix will need to be a separate patch.
>>>>
>>> Pull request hasn't actually been pulled yet, so you should be able to
>>> supercede it by a later one, right?
>>
>> Technically yes, and easy to do, but it will be confusing. I was taking
>> pull-request as code freeze in sub-tree.
>>
>> If there are multiple pull-request for a tree, how can one be sure which
>> ones has been pulled and what to expect in main repo, and verify what
>> has been merged?
>>
>> As above said, if Thomas thinks this is OK, I can send another pull request?
> 
> What about Thomas doing the squash while applying to the main repo, so
> that main repo won't be broken and there won't be multiple pull requests
> around?

I will get this patch to next-net, so next-net won't be broken anymore
(thanks to Nelio for suggesting). And this leaves the decision to Thomas
to squash the fix (so main repo won't be broken) or get as separate
patch while merging.

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25  6:50 [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter Andrew Rybchenko
  2017-09-25  8:42 ` Ferruh Yigit
@ 2017-09-25 12:52 ` Ferruh Yigit
  2017-09-25 12:53   ` Ferruh Yigit
  1 sibling, 1 reply; 11+ messages in thread
From: Ferruh Yigit @ 2017-09-25 12:52 UTC (permalink / raw)
  To: Andrew Rybchenko, dev; +Cc: Chas Williams

On 9/25/2017 7:50 AM, Andrew Rybchenko wrote:
> Failure happens on build using:
> gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)
> 
> Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")
> 
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25 12:52 ` Ferruh Yigit
@ 2017-09-25 12:53   ` Ferruh Yigit
  2017-10-05 18:05     ` Ferruh Yigit
  0 siblings, 1 reply; 11+ messages in thread
From: Ferruh Yigit @ 2017-09-25 12:53 UTC (permalink / raw)
  To: Andrew Rybchenko, dev; +Cc: Chas Williams

On 9/25/2017 1:52 PM, Ferruh Yigit wrote:
> On 9/25/2017 7:50 AM, Andrew Rybchenko wrote:
>> Failure happens on build using:
>> gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)
>>
>> Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")
>>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> 
> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied to dpdk-next-net/master, thanks.

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25 10:06       ` Ferruh Yigit
  2017-09-25 12:49         ` Ferruh Yigit
@ 2017-09-25 14:24         ` Thomas Monjalon
  1 sibling, 0 replies; 11+ messages in thread
From: Thomas Monjalon @ 2017-09-25 14:24 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Bruce Richardson, Andrew Rybchenko, dev, Chas Williams

25/09/2017 12:06, Ferruh Yigit:
> On 9/25/2017 10:53 AM, Ferruh Yigit wrote:
> > On 9/25/2017 10:40 AM, Bruce Richardson wrote:
> >> On Mon, Sep 25, 2017 at 09:42:56AM +0100, Ferruh Yigit wrote:
> >>> It is a little to late for this, I already sent a pull-request with this
> >>> patch. So fix will need to be a separate patch.
> >>>
> >> Pull request hasn't actually been pulled yet, so you should be able to
> >> supercede it by a later one, right?
> > 
> > Technically yes, and easy to do, but it will be confusing. I was taking
> > pull-request as code freeze in sub-tree.
> > 
> > If there are multiple pull-request for a tree, how can one be sure which
> > ones has been pulled and what to expect in main repo, and verify what
> > has been merged?
> > 
> > As above said, if Thomas thinks this is OK, I can send another pull request?
> 
> What about Thomas doing the squash while applying to the main repo, so
> that main repo won't be broken and there won't be multiple pull requests
> around?

Yes, no need of sending a new pull request.

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

* Re: [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter
  2017-09-25 12:53   ` Ferruh Yigit
@ 2017-10-05 18:05     ` Ferruh Yigit
  0 siblings, 0 replies; 11+ messages in thread
From: Ferruh Yigit @ 2017-10-05 18:05 UTC (permalink / raw)
  To: Andrew Rybchenko, dev; +Cc: Chas Williams

On 9/25/2017 1:53 PM, Ferruh Yigit wrote:
> On 9/25/2017 1:52 PM, Ferruh Yigit wrote:
>> On 9/25/2017 7:50 AM, Andrew Rybchenko wrote:
>>> Failure happens on build using:
>>> gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-4)
>>>
>>> Fixes: 0d16c17ae7a4 ("net/af_packet: make qdisc bypass configurable")
>>>
>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>>
>> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 
> Applied to dpdk-next-net/master, thanks.

Squashed into relevant commit in next-net, thanks.

(since waiting pull-request invalidated, squashed in next-net)

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

end of thread, other threads:[~2017-10-05 18:05 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-25  6:50 [dpdk-dev] [PATCH] net/af_packet: fix build failure because of unused parameter Andrew Rybchenko
2017-09-25  8:42 ` Ferruh Yigit
2017-09-25  9:04   ` Andrew Rybchenko
2017-09-25  9:40   ` Bruce Richardson
2017-09-25  9:53     ` Ferruh Yigit
2017-09-25 10:06       ` Ferruh Yigit
2017-09-25 12:49         ` Ferruh Yigit
2017-09-25 14:24         ` Thomas Monjalon
2017-09-25 12:52 ` Ferruh Yigit
2017-09-25 12:53   ` Ferruh Yigit
2017-10-05 18:05     ` Ferruh Yigit

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).