From 8daf2e9daf19ff9a38ae3b51acf75eddf3fb74b2 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Feb 12 2022 16:09:03 +0000 Subject: Add initial Hyperscale 9 kernel rebase script and infrastructure This is the start of scripts and infrastructure for supporting derivative CentOS Stream Hyperscale kernels based on the CentOS Stream 9 kernel. There are still bits and pieces not plumbed through yet, but this handles a lot of the grunt work of working with the kernel sources. --- diff --git a/kernel-rebase/README.md b/kernel-rebase/README.md new file mode 100644 index 0000000..df3da15 --- /dev/null +++ b/kernel-rebase/README.md @@ -0,0 +1,6 @@ +# CentOS Stream Hyperscale kernel rebase scripts + +These scripts assist with handling rebases of the CentOS Stream Hyperscale kernel. + +The process is not fully automated yet, but it helps with producing the tree so that +we can wire up CI and more easily release new kernels as upstream releases them. diff --git a/kernel-rebase/c9s/COPYING b/kernel-rebase/c9s/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/kernel-rebase/c9s/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/kernel-rebase/c9s/README.md b/kernel-rebase/c9s/README.md new file mode 100644 index 0000000..794fc61 --- /dev/null +++ b/kernel-rebase/c9s/README.md @@ -0,0 +1,6 @@ +# CentOS Stream Hyperscale 9 kernel rebase scripts + +These scripts assist with handling rebases of the CentOS Stream Hyperscale 9 kernel. + +The process is not fully automated yet, but it helps with producing the tree so that +we can wire up CI and more easily release new kernels as upstream releases them. diff --git a/kernel-rebase/c9s/c8s-legacy-overlay/.gitkeep b/kernel-rebase/c9s/c8s-legacy-overlay/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/kernel-rebase/c9s/c8s-legacy-overlay/.gitkeep diff --git a/kernel-rebase/c9s/hyperscale-base/.gitkeep b/kernel-rebase/c9s/hyperscale-base/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/kernel-rebase/c9s/hyperscale-base/.gitkeep diff --git a/kernel-rebase/c9s/hyperscale-base/0001-redhat-Add-Hyperscale-kernel-subrelease-version.patch b/kernel-rebase/c9s/hyperscale-base/0001-redhat-Add-Hyperscale-kernel-subrelease-version.patch new file mode 100644 index 0000000..54c5921 --- /dev/null +++ b/kernel-rebase/c9s/hyperscale-base/0001-redhat-Add-Hyperscale-kernel-subrelease-version.patch @@ -0,0 +1,43 @@ +From ad0753fcc6b9e2c146eddf822cd2c898e896475b Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Sat, 15 Jan 2022 13:14:58 -0500 +Subject: [PATCH] [redhat] Add Hyperscale kernel subrelease version + +This lets us indicate the version of our kernel on top of the base +RHEL kernel version. + +Signed-off-by: Neal Gompa +--- + Makefile.rhelver | 3 +++ + redhat/Makefile.common | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Makefile.rhelver b/Makefile.rhelver +index d07a5cec4761..c274a1aaa9e2 100644 +--- a/Makefile.rhelver ++++ b/Makefile.rhelver +@@ -43,3 +43,6 @@ ifneq ("$(ZSTREAM)", "yes") + RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE) + endif + endif ++ ++# Hyperscale build suffix ++HSBUILD = .hs0 +diff --git a/redhat/Makefile.common b/redhat/Makefile.common +index 19050cd84c7d..dfa1d30a6c9c 100644 +--- a/redhat/Makefile.common ++++ b/redhat/Makefile.common +@@ -137,8 +137,8 @@ else + $(info BUILDID is "$(BUILDID)".) + endif + +-PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)$(SOURCE_DIST) +-SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist} ++PKGRELEASE:=$(PREBUILD)$(BUILD)$(HSBUILD)$(BUILDID)$(SOURCE_DIST) ++SPECRELEASE:=$(PREBUILD)$(BUILD)$(HSBUILD)%{?buildid}%{?dist} + + ifeq ("$(SINGLE_TARBALL)", "0") + TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME) +-- +2.34.1 + diff --git a/kernel-rebase/c9s/hyperscale-base/0002-redhat-configs-Enable-the-Btrfs-file-system.patch b/kernel-rebase/c9s/hyperscale-base/0002-redhat-configs-Enable-the-Btrfs-file-system.patch new file mode 100644 index 0000000..55e68d9 --- /dev/null +++ b/kernel-rebase/c9s/hyperscale-base/0002-redhat-configs-Enable-the-Btrfs-file-system.patch @@ -0,0 +1,118 @@ +From 61216a1fb0fb1d0cc6117ba6ebb7fef6f4837512 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Sat, 15 Jan 2022 13:14:46 -0500 +Subject: [PATCH] redhat/configs: Enable the Btrfs file system + +Bugzilla: INTERNAL + +Upstream Status: N/A (RHEL only) + +This enables the Btrfs file system as a module, based on the +the configuration from Fedora. + +Signed-off-by: Neal Gompa +--- + redhat/configs/custom-overrides/debug/CONFIG_BTRFS_ASSERT | 1 + + redhat/configs/custom-overrides/generic/CONFIG_BTRFS_ASSERT | 1 + + redhat/configs/custom-overrides/generic/CONFIG_BTRFS_DEBUG | 1 + + redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS | 1 + + .../custom-overrides/generic/CONFIG_BTRFS_FS_CHECK_INTEGRITY | 1 + + .../configs/custom-overrides/generic/CONFIG_BTRFS_FS_POSIX_ACL | 1 + + .../configs/custom-overrides/generic/CONFIG_BTRFS_FS_REF_VERIFY | 1 + + .../custom-overrides/generic/CONFIG_BTRFS_FS_RUN_SANITY_TESTS | 1 + + .../custom-overrides/generic/s390x/zfcpdump/CONFIG_BTRFS_FS | 1 + + .../custom-overrides/generic/s390x/zfcpdump/CONFIG_FS_POSIX_ACL | 1 + + .../custom-overrides/generic/s390x/zfcpdump/CONFIG_LIBCRC32C | 1 + + 11 files changed, 11 insertions(+) + create mode 100644 redhat/configs/custom-overrides/debug/CONFIG_BTRFS_ASSERT + create mode 100644 redhat/configs/custom-overrides/generic/CONFIG_BTRFS_ASSERT + create mode 100644 redhat/configs/custom-overrides/generic/CONFIG_BTRFS_DEBUG + create mode 100644 redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS + create mode 100644 redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_CHECK_INTEGRITY + create mode 100644 redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_POSIX_ACL + create mode 100644 redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_REF_VERIFY + create mode 100644 redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_RUN_SANITY_TESTS + create mode 100644 redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_BTRFS_FS + create mode 100644 redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_FS_POSIX_ACL + create mode 100644 redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_LIBCRC32C + +diff --git a/redhat/configs/custom-overrides/debug/CONFIG_BTRFS_ASSERT b/redhat/configs/custom-overrides/debug/CONFIG_BTRFS_ASSERT +new file mode 100644 +index 000000000000..bfb600a25d5e +--- /dev/null ++++ b/redhat/configs/custom-overrides/debug/CONFIG_BTRFS_ASSERT +@@ -0,0 +1 @@ ++CONFIG_BTRFS_ASSERT=y +diff --git a/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_ASSERT b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_ASSERT +new file mode 100644 +index 000000000000..a4f8b08173a8 +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_ASSERT +@@ -0,0 +1 @@ ++# CONFIG_BTRFS_ASSERT is not set +diff --git a/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_DEBUG b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_DEBUG +new file mode 100644 +index 000000000000..3e69c0f7dfef +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_DEBUG +@@ -0,0 +1 @@ ++# CONFIG_BTRFS_DEBUG is not set +diff --git a/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS +new file mode 100644 +index 000000000000..3b4d4254c153 +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS +@@ -0,0 +1 @@ ++CONFIG_BTRFS_FS=m +diff --git a/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_CHECK_INTEGRITY b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_CHECK_INTEGRITY +new file mode 100644 +index 000000000000..018480b8bc38 +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_CHECK_INTEGRITY +@@ -0,0 +1 @@ ++# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +diff --git a/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_POSIX_ACL b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_POSIX_ACL +new file mode 100644 +index 000000000000..a4a1406d6508 +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_POSIX_ACL +@@ -0,0 +1 @@ ++CONFIG_BTRFS_FS_POSIX_ACL=y +diff --git a/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_REF_VERIFY b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_REF_VERIFY +new file mode 100644 +index 000000000000..2fb0f884e4b4 +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_REF_VERIFY +@@ -0,0 +1 @@ ++# CONFIG_BTRFS_FS_REF_VERIFY is not set +diff --git a/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_RUN_SANITY_TESTS b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_RUN_SANITY_TESTS +new file mode 100644 +index 000000000000..b3ae62702352 +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/CONFIG_BTRFS_FS_RUN_SANITY_TESTS +@@ -0,0 +1 @@ ++# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +diff --git a/redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_BTRFS_FS b/redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_BTRFS_FS +new file mode 100644 +index 000000000000..605c1837e10d +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_BTRFS_FS +@@ -0,0 +1 @@ ++CONFIG_BTRFS_FS=y +diff --git a/redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_FS_POSIX_ACL b/redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_FS_POSIX_ACL +new file mode 100644 +index 000000000000..ac587b8e48d2 +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_FS_POSIX_ACL +@@ -0,0 +1 @@ ++CONFIG_FS_POSIX_ACL=y +diff --git a/redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_LIBCRC32C b/redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_LIBCRC32C +new file mode 100644 +index 000000000000..887fe16f50df +--- /dev/null ++++ b/redhat/configs/custom-overrides/generic/s390x/zfcpdump/CONFIG_LIBCRC32C +@@ -0,0 +1 @@ ++CONFIG_LIBCRC32C=y +-- +2.34.1 + diff --git a/kernel-rebase/c9s/kernel-rebase.sh b/kernel-rebase/c9s/kernel-rebase.sh new file mode 100755 index 0000000..311516a --- /dev/null +++ b/kernel-rebase/c9s/kernel-rebase.sh @@ -0,0 +1,166 @@ +#!/bin/bash +set -euo pipefail + +# Automate the process of kernel rebases +# Author: Neal Gompa +# +# Fedora-License-Identifier: GPLv2+ +# SPDX-2.0-License-Identifier: GPL-2.0+ +# SPDX-3.0-License-Identifier: GPL-2.0-or-later +# +# This program is free software. +# For more information on the license, see COPYING or visit +# . +# For more information on free software, see +# . + + +set -eu -o pipefail + +kernelrebasesh="$(basename "$0")" + +usage() { + echo >&2 "usage: $kernelrebasesh --kernel-srcdir=DIR [--only-stage=STAGE] [--release-build] [--debug]" + echo >&2 " eg: $kernelrebasesh --kernel-srcdir=/var/tmp/work --only-stage=prep --debug" + echo >&2 " eg: $kernelrebasesh --kernel-srcdir=/var/tmp/work --only-stage=prep" + echo >&2 " eg: $kernelrebasesh --kernel-srcdir=/var/tmp/work --release-build" + echo >&2 " eg: $kernelrebasesh --kernel-srcdir=/var/tmp/work" + exit 255 +} + +optTemp=$(getopt --options '+k:,s:,r,d,h' --longoptions 'kernel-srcdir:,only-stage:,release-build,debug,help' --name "$kernelrebasesh" -- "$@") +eval set -- "$optTemp" +unset optTemp + +current_dir="$PWD" +kernel_srcdir= +only_stage="all" +release_build= +debug= + +while true; do + case "$1" in + -k|--kernel-srcdir) kernel_srcdir="$2" ; shift 2 ;; + -s|--only-stage) only_stage="$2" ; shift 2 ;; + -r|--release-build) release_build="yes" ; shift ;; + -d|--debug) debug="yes" ; shift ;; + -h|--help) usage ;; + --) shift ; break ;; + esac +done + +if [ -z "$kernel_srcdir" ]; then + echo "Options not set!" + usage +fi + +if [ -n "$only_stage" ]; then + valid_stages=("prep" "rebase" "buildsrpm" "all") + stage_found= + for valid_stage in "${valid_stages[@]}"; do + if [ "$valid_stage" = "$only_stage" ]; then + stage_found="yes" + break + fi + done + if [ -z "$stage_found" ]; then + echo "Invalid stage selected!" + usage + fi +fi + +if [ "$debug" = "yes" ]; then + set -x +fi + +# Define stage as the prep stage +current_stage="prep" + +# Flags for kernel source directory logic +kerneltree_origin_remote= +kerneltree_redhat_cs9_remote= + +echo "[*] STAGE: $current_stage" +echo "Checking for existing checkout of Hyperscale kernel tree..." +if [ -d "${kernel_srcdir}" ]; then + pushd "${kernel_srcdir}" + kerneltree_origin_remote=$(git remote get-url origin) + [ "$kerneltree_origin_remote" != "ssh://git@pagure.io/centos-sig-hyperscale/linux.git" ] && \ + echo "Invalid repository, exiting!" && exit 10 + kerneltree_redhat_cs9_remote=$(git remote get-url redhat-cs9) + [ "$kerneltree_redhat_cs9_remote" != "error: No such remote 'redhat-cs9'" ] && \ + [ "$kerneltree_redhat_cs9_remote" != "https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git" ] && \ + echo "Invalid repository, exiting!" && exit 10 + [ "$kerneltree_redhat_cs9_remote" = "error: No such remote 'redhat-cs9'" ] && \ + echo "Missing redhat-cs9 remote, adding!" && \ + git remote add redhat-cs9 "https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git" + echo "Existing checkout found and configured!" + popd +else + echo "No existing checkout of the Hyperscale kernel tree found!" + echo "Setting up new checkout at ${kernel_srcdir}..." + git clone ssh://git@pagure.io/centos-sig-hyperscale/linux.git "${kernel_srcdir}" + pushd "${kernel_srcdir}" + git remote add redhat-cs9 "https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git" + popd + echo "New checkout configured!" +fi +echo "Fetching code from Git remotes..." +pushd "${kernel_srcdir}" +git fetch --all +popd + +# Define stage as the rebase stage +current_stage="rebase" + +[ "$only_stage" = "prep" ] && echo "Short-circuiting and exiting early, per user request!" && exit 0 + +echo "[*] STAGE: $current_stage" +pushd "${kernel_srcdir}" +echo "Determining latest EL9 kernel tag..." +kerneltree_latestcs9tag=$(git tag -l --sort=-version:refname "kernel-5.14.0-*.el9" | head -1) +kerneltree_latestcs9ver=${kerneltree_latestcs9tag#*-} +kerneltree_latestcs9ver=${kerneltree_latestcs9ver%.el9} +kerneltree_latestcs9tag_ishstag= +[[ "$kerneltree_latestcs9tag" =~ ".hs" ]] && kerneltree_latestcs9tag_ishstag="yes" && echo "Latest tag is a Hyperscale build, no rebase work to do!" + +echo "Setting up checkout for rebase..." +if [ -z "${kerneltree_latestcs9tag_ishstag}" ]; then + git checkout "${kerneltree_latestcs9tag}" + if [ "$release_build" = "yes" ]; then + git checkout -b "centos-hyperscale-v${kerneltree_latestcs9ver}" + fi + echo "Applying baseline Hyperscale commits..." + git am --keep-non-patch -3 "${current_dir}"/hyperscale-base/*.patch + echo "Applying merge request commits..." + while IFS= read -r kerneltree_mergerequest + do + git am --keep-non-patch -3 "${current_dir}"/merge-requests/"${kerneltree_mergerequest}"/*.patch + done < "${current_dir}/merge-requests/series" + if [ "$release_build" = "yes" ]; then + echo "Bump Hyperscale release value..." + sed -e "s/HSBUILD = .hs0/HSBUILD = .hs1/" -i "Makefile.rhelver" + echo "Committing rebase..." + make dist-release-finish BUILDID="" + make dist-release-tag BUILDID="" + git push origin "centos-hyperscale-v${kerneltree_latestcs9ver}" + git push origin "kernel-${kerneltree_latestcs9ver}.hs1.el9" + fi +fi +popd + + +# Define stage as the build SRPM stage +current_stage="buildsrpm" + +[ "$only_stage" = "prep" ] || [ "$only_stage" = "rebase" ] && echo "Short-circuiting and exiting early, per user request!" && exit 0 + +echo "[*] STAGE: $current_stage" +pushd "${kernel_srcdir}" +echo "Generate kernel SRPM..." +if [ "$release_build" = "yes" ]; then + make dist-srpm BUILDID="" +else + make dist-srpm BUILDID=".test.$(date +'%Y%m%d%H%m' --utc)" +fi +popd diff --git a/kernel-rebase/c9s/merge-requests/.gitkeep b/kernel-rebase/c9s/merge-requests/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/kernel-rebase/c9s/merge-requests/.gitkeep diff --git a/kernel-rebase/c9s/merge-requests/297/0001-drivers-firmware-move-x86-Generic-System-Framebuffer.patch b/kernel-rebase/c9s/merge-requests/297/0001-drivers-firmware-move-x86-Generic-System-Framebuffer.patch new file mode 100644 index 0000000..b16b586 --- /dev/null +++ b/kernel-rebase/c9s/merge-requests/297/0001-drivers-firmware-move-x86-Generic-System-Framebuffer.patch @@ -0,0 +1,244 @@ +From e74963015d78d2d2b346100347158049d7f2bdbc Mon Sep 17 00:00:00 2001 +From: Javier Martinez Canillas +Date: Tue, 28 Dec 2021 01:20:12 +0100 +Subject: [PATCH 1/7] drivers/firmware: move x86 Generic System Framebuffers + support + +Bugzilla: http://bugzilla.redhat.com/1986223 + +commit d391c58271072d0b0fad93c82018d495b2633448 +Author: Javier Martinez Canillas +Date: Fri Jun 25 15:09:46 2021 +0200 + + drivers/firmware: move x86 Generic System Framebuffers support + + The x86 architecture has generic support to register a system framebuffer + platform device. It either registers a "simple-framebuffer" if the config + option CONFIG_X86_SYSFB is enabled, or a legacy VGA/VBE/EFI FB device. + + But the code is generic enough to be reused by other architectures and can + be moved out of the arch/x86 directory. + + This will allow to also support the simple{fb,drm} drivers on non-x86 EFI + platforms, such as aarch64 where these drivers are only supported with DT. + + Signed-off-by: Javier Martinez Canillas + Acked-by: Borislav Petkov + Acked-by: Greg Kroah-Hartman + Acked-by: Daniel Vetter + Signed-off-by: Thomas Zimmermann + Link: https://patchwork.freedesktop.org/patch/msgid/20210625130947.1803678-2-javierm@redhat.com + +Signed-off-by: Javier Martinez Canillas +--- + arch/x86/Kconfig | 26 --------------- + arch/x86/kernel/Makefile | 3 -- + drivers/firmware/Kconfig | 32 +++++++++++++++++++ + drivers/firmware/Makefile | 2 ++ + drivers/firmware/efi/Makefile | 2 ++ + .../firmware/efi}/sysfb_efi.c | 2 +- + {arch/x86/kernel => drivers/firmware}/sysfb.c | 2 +- + .../firmware}/sysfb_simplefb.c | 2 +- + .../x86/include/asm => include/linux}/sysfb.h | 6 ++-- + 9 files changed, 42 insertions(+), 35 deletions(-) + rename {arch/x86/kernel => drivers/firmware/efi}/sysfb_efi.c (99%) + rename {arch/x86/kernel => drivers/firmware}/sysfb.c (98%) + rename {arch/x86/kernel => drivers/firmware}/sysfb_simplefb.c (99%) + rename {arch/x86/include/asm => include/linux}/sysfb.h (95%) + +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index d7893d94ec16..3aa8766679cc 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -2793,32 +2793,6 @@ config AMD_NB + def_bool y + depends on CPU_SUP_AMD && PCI + +-config X86_SYSFB +- bool "Mark VGA/VBE/EFI FB as generic system framebuffer" +- help +- Firmwares often provide initial graphics framebuffers so the BIOS, +- bootloader or kernel can show basic video-output during boot for +- user-guidance and debugging. Historically, x86 used the VESA BIOS +- Extensions and EFI-framebuffers for this, which are mostly limited +- to x86. +- This option, if enabled, marks VGA/VBE/EFI framebuffers as generic +- framebuffers so the new generic system-framebuffer drivers can be +- used on x86. If the framebuffer is not compatible with the generic +- modes, it is advertised as fallback platform framebuffer so legacy +- drivers like efifb, vesafb and uvesafb can pick it up. +- If this option is not selected, all system framebuffers are always +- marked as fallback platform framebuffers as usual. +- +- Note: Legacy fbdev drivers, including vesafb, efifb, uvesafb, will +- not be able to pick up generic system framebuffers if this option +- is selected. You are highly encouraged to enable simplefb as +- replacement if you select this option. simplefb can correctly deal +- with generic system framebuffers. But you should still keep vesafb +- and others enabled as fallback if a system framebuffer is +- incompatible with simplefb. +- +- If unsure, say Y. +- + endmenu + + +diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile +index 3e625c61f008..8f4e8fa6ed75 100644 +--- a/arch/x86/kernel/Makefile ++++ b/arch/x86/kernel/Makefile +@@ -136,9 +136,6 @@ obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o + obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o + obj-$(CONFIG_OF) += devicetree.o + obj-$(CONFIG_UPROBES) += uprobes.o +-obj-y += sysfb.o +-obj-$(CONFIG_X86_SYSFB) += sysfb_simplefb.o +-obj-$(CONFIG_EFI) += sysfb_efi.o + + obj-$(CONFIG_PERF_EVENTS) += perf_regs.o + obj-$(CONFIG_TRACING) += tracepoint.o +diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig +index 1db738d5b301..5991071e9d7f 100644 +--- a/drivers/firmware/Kconfig ++++ b/drivers/firmware/Kconfig +@@ -251,6 +251,38 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT + + Say Y here to enable "download mode" by default. + ++config SYSFB ++ bool ++ default y ++ depends on X86 || COMPILE_TEST ++ ++config X86_SYSFB ++ bool "Mark VGA/VBE/EFI FB as generic system framebuffer" ++ depends on SYSFB ++ help ++ Firmwares often provide initial graphics framebuffers so the BIOS, ++ bootloader or kernel can show basic video-output during boot for ++ user-guidance and debugging. Historically, x86 used the VESA BIOS ++ Extensions and EFI-framebuffers for this, which are mostly limited ++ to x86. ++ This option, if enabled, marks VGA/VBE/EFI framebuffers as generic ++ framebuffers so the new generic system-framebuffer drivers can be ++ used on x86. If the framebuffer is not compatible with the generic ++ modes, it is advertised as fallback platform framebuffer so legacy ++ drivers like efifb, vesafb and uvesafb can pick it up. ++ If this option is not selected, all system framebuffers are always ++ marked as fallback platform framebuffers as usual. ++ ++ Note: Legacy fbdev drivers, including vesafb, efifb, uvesafb, will ++ not be able to pick up generic system framebuffers if this option ++ is selected. You are highly encouraged to enable simplefb as ++ replacement if you select this option. simplefb can correctly deal ++ with generic system framebuffers. But you should still keep vesafb ++ and others enabled as fallback if a system framebuffer is ++ incompatible with simplefb. ++ ++ If unsure, say Y. ++ + config TI_SCI_PROTOCOL + tristate "TI System Control Interface (TISCI) Message Protocol" + depends on TI_MESSAGE_MANAGER +diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile +index 546ac8e7f6d0..946dda07443d 100644 +--- a/drivers/firmware/Makefile ++++ b/drivers/firmware/Makefile +@@ -18,6 +18,8 @@ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o + obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o + obj-$(CONFIG_FW_CFG_SYSFS) += qemu_fw_cfg.o + obj-$(CONFIG_QCOM_SCM) += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o ++obj-$(CONFIG_SYSFB) += sysfb.o ++obj-$(CONFIG_X86_SYSFB) += sysfb_simplefb.o + obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o + obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o + obj-$(CONFIG_TURRIS_MOX_RWTM) += turris-mox-rwtm.o +diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile +index 9b6f5b8e5397..d860f8eb9a81 100644 +--- a/drivers/firmware/efi/Makefile ++++ b/drivers/firmware/efi/Makefile +@@ -37,6 +37,8 @@ obj-$(CONFIG_LOAD_UEFI_KEYS) += mokvar-table.o + fake_map-y += fake_mem.o + fake_map-$(CONFIG_X86) += x86_fake_mem.o + ++obj-$(CONFIG_SYSFB) += sysfb_efi.o ++ + arm-obj-$(CONFIG_EFI) := efi-init.o arm-runtime.o + obj-$(CONFIG_ARM) += $(arm-obj-y) + obj-$(CONFIG_ARM64) += $(arm-obj-y) +diff --git a/arch/x86/kernel/sysfb_efi.c b/drivers/firmware/efi/sysfb_efi.c +similarity index 99% +rename from arch/x86/kernel/sysfb_efi.c +rename to drivers/firmware/efi/sysfb_efi.c +index 8a56a6d80098..9f035b15501c 100644 +--- a/arch/x86/kernel/sysfb_efi.c ++++ b/drivers/firmware/efi/sysfb_efi.c +@@ -21,10 +21,10 @@ + #include + #include + #include ++#include + #include