Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mellanox] Facilitate automatic integration of new hw-mgmt #43

Closed
wants to merge 33 commits into from

Conversation

vivekrnv
Copy link
Owner

@vivekrnv vivekrnv commented Mar 15, 2023

Why I did it

Facilitate Automatic integration of new hw-mgmt version into SONiC.

Inputs to the Script:

  1. MLNX_HW_MANAGEMENT_VERSION Eg: 7.0040.5202
  2. CREATE_BRANCH: (y|n) Creates a branch instead of a commit (optional, default: n)
  3. BRANCH_SONIC: Only relevant when CREATE_BRANCH is y. Default: master.

Note: These should be provided through SONIC_OVERRIDE_BUILD_VARS parameter

Output:

  1. Script creates a commit (in each of sonic-buildimage, sonic-linux-kernel) with all the changes required for upgrading the hw-management version to a version provided by MLNX_HW_MANAGEMENT_VERSION

Brief Summary of the changes made:

  1. MLNX_HW_MANAGEMENT_VERSION flag in the hw-management.mk file
  2. hw-mgmt submodule is updated to the corresponding version
  3. Updates are made to non-upstream-patches/patches and series.patch file
  4. series, kconfig-inclusion and kconfig-exclusion files can be updated in the sonic-linux-kernel repo
  5. sonic-linux-kernel/patches folder is updated with the corresponding upstream patches
  6. Based on the inputs, there could be a branch seen in the local for each of the repo's. Branch is named as <branch>_<parent_commit>_integrate_<hw_mgmt_version>

How I did it

  1. Added a new make target which can be invoked by calling make integrate-mlnx-hw-mgmt
user@server:/sonic-buildimage$ git rev-parse --abbrev-ref HEAD
master_23193446a_integrate_7.0020.5052
user@server:/sonic-buildimage$ git log --oneline -n 2
f66e01867 (HEAD -> master_23193446a_integrate_V.7.0020.5052, show) Intgerate HW-MGMT V.7.0020.5052 Changes
23193446a (master_intg_hw_mgmt) Update logic

user@server:/sonic-buildimage/src/sonic-linux-kernel$ git rev-parse --abbrev-ref HEAD
master_6847319_integrate_7.0020.4104
user@server:/sonic-buildimage/src/sonic-linux-kernel$ git log --oneline -n 2
6094f71 (HEAD -> master_6847319_integrate_V.7.0020.5052) Intgerate HW-MGMT V.7.0020.5052 Changes
6847319 (origin/master, origin/HEAD) Read ID register for optoe1 to find pageable bit in optoe driver  (#308)

Changes made will be summarized under sonic-buildimage/integrate-mlnx-hw-mgmt_user.out file. Debugging and troubleshooting output is written to sonic-buildimage/integrate-mlnx-hw-mgmt.log files

Jenkins output file:
http://nbu-nfs.mellanox.com/auto/mtrsysgwork/vkarri/integrate-mlnx-hw-mgmt_user.out

stdout for debugging:
http://nbu-nfs.mellanox.com/auto/mtrsysgwork/vkarri/integrate-mlnx-hw-mgmt.log

Limitations:

  1. Assumes the changes would only work for amd64
  2. Assumes the non-upstream patches in mellanox only belong to hw-mgmt

How to verify it

Build the Kernel

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@vivekrnv vivekrnv force-pushed the master_intg_hw_mgmt branch 10 times, most recently from 4ae21c5 to 5d61ab7 Compare March 18, 2023 02:46
@vivekrnv vivekrnv marked this pull request as ready for review March 18, 2023 02:51
@vivekrnv vivekrnv force-pushed the master_intg_hw_mgmt branch 5 times, most recently from 35d763e to e5c7cc1 Compare March 20, 2023 18:13
platform/mellanox/hw-management.mk Outdated Show resolved Hide resolved
@vivekrnv vivekrnv force-pushed the master_intg_hw_mgmt branch from e5c7cc1 to 179247c Compare March 21, 2023 20:14
@vivekrnv vivekrnv force-pushed the master_intg_hw_mgmt branch from 179247c to 3874307 Compare March 21, 2023 23:03
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
vivekrnv added 11 commits March 29, 2023 21:59
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
@vivekrnv vivekrnv changed the title Integrated hw-mgmt automation script into SONiC [mellanox] Facilitate automatic integration of new hw-management version Mar 30, 2023
@vivekrnv vivekrnv changed the title [mellanox] Facilitate automatic integration of new hw-management version [mellanox] Facilitate automatic integration of new hw-mgmt Mar 31, 2023
vivekrnv added 4 commits April 3, 2023 23:08
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
@vivekrnv vivekrnv requested a review from dgsudharsan April 3, 2023 23:43
@vivekrnv
Copy link
Owner Author

vivekrnv commented Apr 3, 2023

Handled all the comments, updated description to document limitations and update makefile to only commit when there are changes

Copy link
Collaborator

@dgsudharsan dgsudharsan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please address the remaining unresolved comments

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
@vivekrnv
Copy link
Owner Author

vivekrnv commented Apr 4, 2023

Please address the remaining unresolved comments

Addressed

vivekrnv added 2 commits April 5, 2023 21:39
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
@vivekrnv vivekrnv closed this Apr 10, 2023
vivekrnv pushed a commit that referenced this pull request Sep 23, 2023
…ly (sonic-net#16566)

#### Why I did it
src/dhcprelay
```
* 2b33d76 - (HEAD -> master, origin/master, origin/HEAD) dhcpv6 per interface counter support (#43) (7 days ago) [jcaiMR]
```
#### How I did it
#### How to verify it
#### Description for the changelog
vivekrnv added a commit that referenced this pull request Oct 19, 2023
2b33d76 dhcpv6 per interface counter support (#43)
6a6ce24 fix dhcpv6 relay dual tor source interface selection issue (#42)
c36b8e3 [actions] Support Semgrep by Github Actions (#39)

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants