Juniper Openstack

contrail-vrouter build fails on EL 7.2

Bug #1531237 reported by Martin Millnert
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Juniper Openstack
Status tracked in Trunk
R2.20
Fix Committed
Undecided
Unassigned
Juniper Openstack r2.23 "r2.23"
R2.21.x
Fix Committed
Undecided
Unassigned
Juniper Openstack r2.21.3
R2.22.x
Fix Committed
Undecided
Unassigned
Juniper Openstack r2.22.3
Trunk
Fix Committed
Undecided
Unassigned

Bug Description

In EL 7.2, and since upstream commit https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=61b905da33ae25edb6b9d2a5de21e34c3a77efe3 , include/linux/skbuff.h has renamed skbuff struct member 'rxhash' to 'hash'.

contrail-vrouter/linux/vr_host_interface.c compiles against these structs and already tests for kernel between 2.6.32 and 3.15.0, as well as RHEL 6.4.

This patch extends those tests for EL7.2 and above, which now integrates the upstream commit.

Tags: vrouter
Martin Millnert (r-martin-5)
information type: Proprietary → Public
tags: added: vrouter
Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : [Review update] master

Review in progress for https://review.opencontrail.org/16091
Submitter: Martin Millnert (<email address hidden>)

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : A change has been merged

Reviewed: https://review.opencontrail.org/16091
Committed: http://github.org/Juniper/contrail-vrouter/commit/1ea018fff6030e217f25b00a460a67b8048142d1
Submitter: Zuul
Branch: master

commit 1ea018fff6030e217f25b00a460a67b8048142d1
Author: Martin Millnert <email address hidden>
Date: Tue Jan 5 19:42:57 2016 +0100

vr_host_interface.c: skb->rxhash renamed in EL7.2

EL7.2 has integrated the upstream (torvalds/linux.git) commit 61b905da33
that renames skbuff's "rxhash" member into "hash".

There are two functions in vr_host_interface.c that relies on the
skb->rxhash member: vr_skb_set_rxhash and vr_skb_get_rxhash.

These two functions already carry tests:
- tests that Linux version is between 2.6.32 and 3.15.0
(skb->rxhash is the correct name in this region)
- tests that, when the above is true, RHEL (major,minor) is at least (6,4)

We're adding another test to declare that when Linux version is greater
than 3.15.0, and:
- a) RHEL (major,minor) is greater than (7,2), use skb->hash,
- b) else, use skb->rxhash.

Compilation of vrouter then succeeds on EL 7.2 again, and sends
packets.

Change-Id: Id70126356293bc08058db10f3ef5005bbd1a1899
Closes-Bug: #1531237
Signed-off-by: Martin Millnert <email address hidden>

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : [Review update] R2.21.x

Review in progress for https://review.opencontrail.org/25276
Submitter: RAVI KIRAN (<email address hidden>)

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : [Review update] R2.22.x

Review in progress for https://review.opencontrail.org/25425
Submitter: RAVI KIRAN (<email address hidden>)

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : [Review update] R2.20

Review in progress for https://review.opencontrail.org/25427
Submitter: RAVI KIRAN (<email address hidden>)

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : A change has been merged

Reviewed: https://review.opencontrail.org/25427
Committed: http://github.org/Juniper/contrail-vrouter/commit/a3b0d87569d4304e0d6fcdc47c9495d98afa8c1a
Submitter: Zuul
Branch: R2.20

commit a3b0d87569d4304e0d6fcdc47c9495d98afa8c1a
Author: Martin Millnert <email address hidden>
Date: Tue Jan 5 19:42:57 2016 +0100

vr_host_interface.c: skb->rxhash renamed in EL7.2

EL7.2 has integrated the upstream (torvalds/linux.git) commit 61b905da33
that renames skbuff's "rxhash" member into "hash".

There are two functions in vr_host_interface.c that relies on the
skb->rxhash member: vr_skb_set_rxhash and vr_skb_get_rxhash.

These two functions already carry tests:
- tests that Linux version is between 2.6.32 and 3.15.0
(skb->rxhash is the correct name in this region)
- tests that, when the above is true, RHEL (major,minor) is at least (6,4)

We're adding another test to declare that when Linux version is greater
than 3.15.0, and:
- a) RHEL (major,minor) is greater than (7,2), use skb->hash,
- b) else, use skb->rxhash.

Compilation of vrouter then succeeds on EL 7.2 again, and sends
packets.

Change-Id: Id70126356293bc08058db10f3ef5005bbd1a1899
Closes-Bug: #1531237
Signed-off-by: Martin Millnert <email address hidden>

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote :

Reviewed: https://review.opencontrail.org/25276
Committed: http://github.org/Juniper/contrail-vrouter/commit/b7abbd8d766fc0cc4880e77c1f1bc55c737630be
Submitter: Zuul
Branch: R2.21.x

commit b7abbd8d766fc0cc4880e77c1f1bc55c737630be
Author: Martin Millnert <email address hidden>
Date: Tue Jan 5 19:42:57 2016 +0100

vr_host_interface.c: skb->rxhash renamed in EL7.2

EL7.2 has integrated the upstream (torvalds/linux.git) commit 61b905da33
that renames skbuff's "rxhash" member into "hash".

There are two functions in vr_host_interface.c that relies on the
skb->rxhash member: vr_skb_set_rxhash and vr_skb_get_rxhash.

These two functions already carry tests:
- tests that Linux version is between 2.6.32 and 3.15.0
(skb->rxhash is the correct name in this region)
- tests that, when the above is true, RHEL (major,minor) is at least (6,4)

We're adding another test to declare that when Linux version is greater
than 3.15.0, and:
- a) RHEL (major,minor) is greater than (7,2), use skb->hash,
- b) else, use skb->rxhash.

Compilation of vrouter then succeeds on EL 7.2 again, and sends
packets.

Change-Id: Id70126356293bc08058db10f3ef5005bbd1a1899
Closes-Bug: #1531237
Signed-off-by: Martin Millnert <email address hidden>

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote :

Reviewed: https://review.opencontrail.org/25425
Committed: http://github.org/Juniper/contrail-vrouter/commit/237901ac210cfd7c3e3d11f00c8b86d9d1c96eaa
Submitter: Zuul
Branch: R2.22.x

commit 237901ac210cfd7c3e3d11f00c8b86d9d1c96eaa
Author: Martin Millnert <email address hidden>
Date: Tue Jan 5 19:42:57 2016 +0100

vr_host_interface.c: skb->rxhash renamed in EL7.2

EL7.2 has integrated the upstream (torvalds/linux.git) commit 61b905da33
that renames skbuff's "rxhash" member into "hash".

There are two functions in vr_host_interface.c that relies on the
skb->rxhash member: vr_skb_set_rxhash and vr_skb_get_rxhash.

These two functions already carry tests:
- tests that Linux version is between 2.6.32 and 3.15.0
(skb->rxhash is the correct name in this region)
- tests that, when the above is true, RHEL (major,minor) is at least (6,4)

We're adding another test to declare that when Linux version is greater
than 3.15.0, and:
- a) RHEL (major,minor) is greater than (7,2), use skb->hash,
- b) else, use skb->rxhash.

Compilation of vrouter then succeeds on EL 7.2 again, and sends
packets.

Change-Id: Id70126356293bc08058db10f3ef5005bbd1a1899
Closes-Bug: #1531237
Signed-off-by: Martin Millnert <email address hidden>

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : [Review update] R2.21.x

Review in progress for https://review.opencontrail.org/26091
Submitter: RAVI KIRAN (<email address hidden>)

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : [Review update] R2.22.x

Review in progress for https://review.opencontrail.org/26126
Submitter: RAVI KIRAN (<email address hidden>)

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : [Review update] R2.20

Review in progress for https://review.opencontrail.org/26127
Submitter: RAVI KIRAN (<email address hidden>)

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote : A change has been merged

Reviewed: https://review.opencontrail.org/26091
Committed: http://github.org/Juniper/contrail-vrouter/commit/ddd0c0aa2baa2d109679c534cbdbade914f8048a
Submitter: Zuul
Branch: R2.21.x

commit ddd0c0aa2baa2d109679c534cbdbade914f8048a
Author: Ravi BK <email address hidden>
Date: Tue Nov 15 16:08:49 2016 +0530

Fixing build errors observed in centos65/R2.21.x

Removing the redundant code which also fixes the compilation
error observed while building vrouter on centos65 machine for R2.21.x
branch

Change-Id: I8645e9d7b4e7d6c675909ac66556f4c2bbd4eff1
Closes-Bug: #1531237

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote :

Reviewed: https://review.opencontrail.org/26127
Committed: http://github.org/Juniper/contrail-vrouter/commit/8ae351c3a6db421f63ff229f845ba70a768aa5bc
Submitter: Zuul
Branch: R2.20

commit 8ae351c3a6db421f63ff229f845ba70a768aa5bc
Author: Ravi BK <email address hidden>
Date: Tue Nov 15 16:08:49 2016 +0530

Fixing build errors observed in centos65/R2.21.x

Removing the redundant code which also fixes the compilation
error observed while building vrouter on centos65 machine for R2.21.x
branch

Change-Id: I8645e9d7b4e7d6c675909ac66556f4c2bbd4eff1
Closes-Bug: #1531237

Revision history for this message
OpenContrail Admin (ci-admin-f) wrote :

Reviewed: https://review.opencontrail.org/26126
Committed: http://github.org/Juniper/contrail-vrouter/commit/27a0b8f9d07b000e5359f4076247f6dafad41feb
Submitter: Zuul
Branch: R2.22.x

commit 27a0b8f9d07b000e5359f4076247f6dafad41feb
Author: Ravi BK <email address hidden>
Date: Tue Nov 15 16:08:49 2016 +0530

Fixing build errors observed in centos65/R2.21.x

Removing the redundant code which also fixes the compilation
error observed while building vrouter on centos65 machine for R2.21.x
branch

Change-Id: I8645e9d7b4e7d6c675909ac66556f4c2bbd4eff1
Closes-Bug: #1531237

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.