Added BUILD flags to provision for building the kernel with non-upstream patches by vivekrnv · Pull Request #12428 · sonic-net/sonic-buildimage

vivekrnv · 2022-10-18T01:01:25Z

Signed-off-by: Vivek Reddy vkarri@nvidia.com

Why I did it

Provide a way to include non-upstream kernel patches in the kernel build process

Requires sonic-net/sonic-linux-kernel#296 and can be merged in any order

How I did it

Introduced two new environment variables:

EXTERNAL_KERNEL_PATCH_URL = <url to the archive containing patches>, empty by default
INCLUDE_EXTERNAL_PATCH_TAR= <y|n to include the patches under platform/ folder> 'n' by default

Note: For INCLUDE_EXTERNAL_PATCH_TAR to work, the platform has to override EXTERNAL_KERNEL_PATCH_TAR variable. And the variable should be a path pointing to the tarball containing patches

Use SONIC_OVERRIDE_BUILD_VARS to fuse in these env variables:

- NOJESSIE=1 NOSTRETCH=1 NOBUSTER=1 make SONIC_OVERRIDE_BUILD_VARS=' INCLUDE_EXTERNAL_PATCH_TAR=y ' target/debs/bullseye/linux-headers-5.10.0-12-2-common_5.10.103-1_all.deb
- NOJESSIE=1 NOSTRETCH=1 NOBUSTER=1 make SONIC_OVERRIDE_BUILD_VARS=' EXTERNAL_KERNEL_PATCH_URL=http://<url-root>/loc/patches.tar.gz ' target/debs/bullseye/linux-headers-5.10.0-12-2-common_5.10.103-1_all.deb

Structure of the patch tar archive

It should contain a file named series. series should provide an order of which the patches have to be applied
All the patches should be present in the archive in the same folder where series resides.
Developers should make sure patches apply cleanly over the existing patches present in the sonic-linux-kernel/ repo.

admin@build-server:/sonic-buildimage/platform/mellanox/non-upstream-patches$ tar -tf patches.tar.gz
./
./mlx5-Implement-get_module_eeprom_by_page.patch
./mlx5-Add-support-for-DSFP-module-EEPROM-dumps.patch
./series
./mlx5-Refactor-module-EEPROM-query.patch

How to verify it

Build the kernel
Check if the patches are applied on the kernel source

vkarri@build-server:/sonic-buildimage/src/sonic-linux-kernel/linux-5.10.103$ git log --oneline -n 4
a524105fc (HEAD -> master, refs/patches/master/mlx5-Add-support-for-DSFP-module-EEPROM-dumps.patch) From 4c88fa412a100f925b8ab1aa952a672895f69d35 Mon Sep 17 00:00:00 2001 Subject: net/mlx5: Add support for DSFP module EEPROM dumps

8f366b27c (refs/patches/master/mlx5-Implement-get_module_eeprom_by_page.patch) From e109d2b204daa223e6d3cdaa369071c3ea96dcbf Mon Sep 17 00:00:00 2001 Subject: net/mlx5: Implement get_module_eeprom_by_page()

eb9bddfad (refs/patches/master/mlx5-Refactor-module-EEPROM-query.patch) From e19b0a3474ab9ef90dd110af9f39fc87329755f1 Mon Sep 17 00:00:00 2001 Subject: net/mlx5: Refactor module EEPROM query

cf79fff3a (refs/patches/master/armhf_secondary_boot_online.patch) From 500d48948f43d18a07894b5fd4f891afbade1d79 Mon Sep 17 00:00:00 2001

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

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)

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

paulmenzel

Please use imperative mood in git commit messages summaries/titles, and merge/pull request summaries/titles. s/Added/Add/

platform/mellanox/non-upstream-patches/README.md

paulmenzel · 2022-10-18T06:16:39Z

platform/mellanox/non-upstream-patches/README.md

+### Structure of the patch archive
+
+  1. The tarball should be gzip compressed i.e. of extension .tar.gz
+  2. It should contain a file named series. series should provide an order of which the patches have to be applied


Please elaborate, how to create such a series file.

platform/mellanox/non-upstream-patches/README.md

paulmenzel · 2022-10-18T06:20:57Z

platform/mellanox/rules.mk

 TARGET_BOOTLOADER = grub

+# Set y to include non upstream patches for mellanox
+INCLUDE_MLNX_PATCHES = n


Why is this needed? Can’t patches for other subsystems be included?

Other subsystems planning to include non-upstream patches can use EXTERNAL_KERNEL_PATCHES flag to provide a public accessible link to the tarball

liat-grozovik · 2022-10-18T09:08:52Z

@saiarcot895 please review

slave.mk

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

…to mlx_mod_tar

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

vivekrnv · 2022-10-28T19:22:24Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2022-10-28T19:22:26Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2022-10-28T19:22:37Z

Azure Pipelines successfully started running 1 pipeline(s).

vivekrnv · 2022-10-28T23:27:20Z

@saiarcot895, I've updated the pr according to the comments given sonic-net/sonic-linux-kernel#296. Can you also review this?

platform/mellanox/rules.mk

…eam patches (sonic-net#12428) * Added ENV vars for non-upstream patches Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Made MLNX_PATCH_LOC an absolute path Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Added non-upstream-patches dir Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Update README.md * Addressed comments * Env vars updated Signed-off-by: Vivek Reddy <vkarri@nvidia.com> * Readme updated Signed-off-by: Vivek Reddy <vkarri@nvidia.com> Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

vivekrnv and others added 4 commits October 7, 2022 17:46

Added ENV vars for non-upstream patches

9deab98

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

Made MLNX_PATCH_LOC an absolute path

dcffcb5

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

Added non-upstream-patches dir

6eaa75e

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

Update README.md

b751662

vivekrnv mentioned this pull request Oct 18, 2022

Update Makefile to provision the ability of building with non-upstream patches sonic-net/sonic-linux-kernel#296

Merged

vivekrnv changed the title ~~Added BUILD time flags to provision for including Non Upstream kernel patches~~ Added BUILD flags to provision for building the kernel with non-upstream patches Oct 18, 2022

vivekrnv marked this pull request as ready for review October 18, 2022 06:01

vivekrnv requested review from lguohan, qiluo-msft and xumia as code owners October 18, 2022 06:01

paulmenzel reviewed Oct 18, 2022

View reviewed changes

liat-grozovik requested a review from saiarcot895 October 18, 2022 09:08

Merge branch 'sonic-net:master' into mlx_mod_tar

09e3cb4

saiarcot895 reviewed Oct 18, 2022

View reviewed changes

slave.mk Show resolved Hide resolved

Addressed comments

d7488dc

vivekrnv requested a review from saiarcot895 October 18, 2022 22:42

vivekrnv and others added 6 commits October 19, 2022 14:05

Merge branch 'sonic-net:master' into mlx_mod_tar

24a1e06

Env vars updated

58302ff

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

Merge branch 'mlx_mod_tar' of github.com:vivekrnv/sonic-buildimage in…

da16367

…to mlx_mod_tar

Readme updated

69e1690

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

Merge branch 'sonic-net:master' into mlx_mod_tar

c2e36c0

Merge branch 'sonic-net:master' into mlx_mod_tar

55fa9cd

saiarcot895 reviewed Oct 31, 2022

View reviewed changes

platform/mellanox/rules.mk Show resolved Hide resolved

saiarcot895 approved these changes Oct 31, 2022

View reviewed changes

saiarcot895 merged commit 5d83d42 into sonic-net:master Oct 31, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added BUILD flags to provision for building the kernel with non-upstream patches#12428

Added BUILD flags to provision for building the kernel with non-upstream patches#12428
saiarcot895 merged 12 commits intosonic-net:masterfrom
vivekrnv:mlx_mod_tar

vivekrnv commented Oct 18, 2022 •

edited

Loading

Uh oh!

paulmenzel left a comment

Uh oh!

Uh oh!

paulmenzel Oct 18, 2022

Uh oh!

Uh oh!

Uh oh!

paulmenzel Oct 18, 2022

Uh oh!

vivekrnv Oct 21, 2022 •

edited

Loading

Uh oh!

liat-grozovik commented Oct 18, 2022

Uh oh!

Uh oh!

vivekrnv commented Oct 28, 2022

Uh oh!

mssonicbld commented Oct 28, 2022

Uh oh!

azure-pipelines bot commented Oct 28, 2022

Uh oh!

vivekrnv commented Oct 28, 2022

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

vivekrnv commented Oct 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why I did it

How I did it

Structure of the patch tar archive

How to verify it

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

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)

Uh oh!

paulmenzel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

paulmenzel Oct 18, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

paulmenzel Oct 18, 2022

Choose a reason for hiding this comment

Uh oh!

vivekrnv Oct 21, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

liat-grozovik commented Oct 18, 2022

Uh oh!

Uh oh!

vivekrnv commented Oct 28, 2022

Uh oh!

mssonicbld commented Oct 28, 2022

Uh oh!

azure-pipelines bot commented Oct 28, 2022

Uh oh!

vivekrnv commented Oct 28, 2022

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

vivekrnv commented Oct 18, 2022 •

edited

Loading

vivekrnv Oct 21, 2022 •

edited

Loading