Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package google-guest-configs for openSUSE:Factory checked in at 2025-05-14 17:01:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-guest-configs (Old) and /work/SRC/openSUSE:Factory/.google-guest-configs.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-guest-configs" Wed May 14 17:01:58 2025 rev:29 rq:1277403 version:20250501.00 Changes: -------- --- /work/SRC/openSUSE:Factory/google-guest-configs/google-guest-configs.changes 2025-01-07 20:52:48.899412710 +0100 +++ /work/SRC/openSUSE:Factory/.google-guest-configs.new.30101/google-guest-configs.changes 2025-05-14 17:02:33.278623463 +0200 @@ -1,0 +2,60 @@ +Wed May 14 06:58:28 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaub...@suse.com> + +- Update to version 20250501.00 + * Configure local domain as route only domain to support cloud dns local + domain but avoid adding it to the search path. +- from version 20250409.00 + * Change RDMA test condition to ensure renaming race conditions can be + detected. If such a case is detected the script will err and exit rather + than returning a name. Udev accepts this and continues as though the rule + was not triggered in such a case. +- from version 20250328.00 + * Merge pull request #105 from dorileo:revert-ubuntu-hostname-hooks + * Revert "Include systemd-networkd hook in Ubuntu packaging (#77)" +- from version 20250326.00 + * Merge pull request #104 from xiliuxyz:master + * Merge pull request #1 from xiliuxyz/xiliuxyz-patch-1 + * Update google_set_multiqueue to check pnic_ids +- from version 20250221.00 + * Merge pull request #103 from a-r-n:master + * Make google_set_multiqueue aware A4X is multinic_accelerator_platform +- from version 20250207.00 + * Merge pull request #102 from xiliuxyz:master + * Update google_set_multiqueue to adapt A4 platform + * Merge branch 'GoogleCloudPlatform:master' into master + * Fix IS_A3_PLATFORM syntax + * Fix IS_A3_PLATFORM syntax + * Correct IS_A3_PLATFORM to save is_a3_platform results + * Remove excess empty line. + * Store is_a3_platform results into a global variable to avoid redundant curl calls + * Skip tx affinity binding on non-gvnic interfaces only on A3 platforms. + * Skip tx affinity binding on non-gvnic interfaces + * Update comments for get_vcpu_ranges_on_accelerator_platform + to reflect the expected vcpu ranges + * rename get_vcpu_ranges to get_vcpu_ranges_on_accelerator_platform + * Avoid IRQ binding on vCPU 0 + * Fix returned value for get_vcpu_ranges + * Update get_vcpu_ranges to read from sys file instead of hardcoded value + * Update google_set_multiqueue + * Update google_set_multiqueue to set vCPU ranges based on platform + * Merge branch 'GoogleCloudPlatform:master' into master + * Add comment for handling IRQ binding on non-gvnic devices + * Remove excess empty line. + * Update is_gvnic to include gvnic driver checks + * Merge branch 'master' into master + * revert removed echo lines + * Update google_set_multiqueue to skip set_irq if nic is not a gvnic device. + * Update google_set_multiqueue to enable on A3Ultra family +- from version 20250124.00 + * Merge pull request #88 from zmarano:nvme + * Fix missing files. This is a no-op. + * No public description + * Also force virtio_scsi. +- from version 20250116.00 + * Add GPL-2 to licensing information (#98) +- from version 20250107.00 + * Restore IDPF devices for renaming rules (#95) +- from version 20241213.00 + * Remove Pat from owners file. (#97) + +------------------------------------------------------------------- Old: ---- google-guest-configs-20241205.00.tar.gz New: ---- google-guest-configs-20250501.00.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-guest-configs.spec ++++++ --- /var/tmp/diff_new_pack.6576bh/_old 2025-05-14 17:02:33.714641773 +0200 +++ /var/tmp/diff_new_pack.6576bh/_new 2025-05-14 17:02:33.718641941 +0200 @@ -1,7 +1,7 @@ # # spec file for package google-guest-configs # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ %define _udevdir %(pkg-config --variable udev_dir udev) %endif Name: google-guest-configs -Version: 20241205.00 +Version: 20250501.00 Release: 0 Summary: Google Cloud Guest Configs License: Apache-2.0 ++++++ google-guest-configs-20241205.00.tar.gz -> google-guest-configs-20250501.00.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-configs-20241205.00/LICENSE new/guest-configs-20250501.00/LICENSE --- old/guest-configs-20241205.00/LICENSE 2024-12-05 00:55:00.000000000 +0100 +++ new/guest-configs-20250501.00/LICENSE 2025-04-09 19:00:41.000000000 +0200 @@ -199,3 +199,274 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + 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. + + 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. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-configs-20241205.00/OWNERS new/guest-configs-20250501.00/OWNERS --- old/guest-configs-20241205.00/OWNERS 2024-12-05 00:55:00.000000000 +0100 +++ new/guest-configs-20250501.00/OWNERS 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -# This file enables automatic assignment of PR reviewers. -# See the OWNERS docs at https://go.k8s.io/owners - -approvers: - - a-crate - - ajorg - - bkatyl - - chaitanyakulkarni28 - - dorileo - - drewhli - - elicriffield - - gaughen - - jjerger - - karnvadaliya - - koln67 - - lpleahy - - zmarano diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-configs-20241205.00/packaging/debian/copyright new/guest-configs-20250501.00/packaging/debian/copyright --- old/guest-configs-20241205.00/packaging/debian/copyright 2024-12-05 00:55:00.000000000 +0100 +++ new/guest-configs-20250501.00/packaging/debian/copyright 2025-04-09 19:00:41.000000000 +0200 @@ -10,6 +10,10 @@ Copyright: Copyright 202020 Google Inc. License: Apache-2.0 +Files: src/sbin/google-dhclient-script +Copyright: 2008-2014 Red Hat, Inc. +License: GPL-2+ + License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,3 +29,20 @@ . On Debian systems, the complete text of the Apache version 2.0 license can be found in "/usr/share/common-licenses/Apache-2.0". + +License: GPL-2+ + 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, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General + Public License can be found in "/usr/share/common-licenses/GPL". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-configs-20241205.00/packaging/ubuntu/install new/guest-configs-20250501.00/packaging/ubuntu/install --- old/guest-configs-20241205.00/packaging/ubuntu/install 2024-12-05 00:55:00.000000000 +0100 +++ new/guest-configs-20250501.00/packaging/ubuntu/install 2025-04-09 19:00:41.000000000 +0200 @@ -5,7 +5,6 @@ src/etc/sysctl.d/* etc/sysctl.d src/lib/udev/* lib/udev src/usr/bin/* usr/bin -src/usr/lib/networkd-dispatcher/* usr/lib/networkd-dispatcher src/etc/systemd/resolved.conf.d/* etc/systemd/resolved.conf.d # Ubuntu-specific configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-configs-20241205.00/src/etc/dracut.conf.d/gce.conf new/guest-configs-20250501.00/src/etc/dracut.conf.d/gce.conf --- old/guest-configs-20241205.00/src/etc/dracut.conf.d/gce.conf 2024-12-05 00:55:00.000000000 +0100 +++ new/guest-configs-20250501.00/src/etc/dracut.conf.d/gce.conf 2025-04-09 19:00:41.000000000 +0200 @@ -1,2 +1,2 @@ # Include NVMe driver in initrd to boot on NVMe devices. -force_drivers+=" nvme " +force_drivers+=" nvme virtio_scsi " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-configs-20241205.00/src/etc/systemd/resolved.conf.d/gce-resolved.conf new/guest-configs-20250501.00/src/etc/systemd/resolved.conf.d/gce-resolved.conf --- old/guest-configs-20241205.00/src/etc/systemd/resolved.conf.d/gce-resolved.conf 2024-12-05 00:55:00.000000000 +0100 +++ new/guest-configs-20250501.00/src/etc/systemd/resolved.conf.d/gce-resolved.conf 2025-04-09 19:00:41.000000000 +0200 @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License [Resolve] -# Add .local as a search domain to send mDNS to cloud DNS -Domains=local +# Add .local as a search domain to local cloud DNS domain. Configure it as a +# route only domain to avoid adding local to search path. +Domains=~local # Disable mDNS MulticastDNS=false # Send DNS requests to MDS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-configs-20241205.00/src/lib/udev/rules.d/75-gce-network.rules new/guest-configs-20250501.00/src/lib/udev/rules.d/75-gce-network.rules --- old/guest-configs-20241205.00/src/lib/udev/rules.d/75-gce-network.rules 2024-12-05 00:55:00.000000000 +0100 +++ new/guest-configs-20250501.00/src/lib/udev/rules.d/75-gce-network.rules 2025-04-09 19:00:41.000000000 +0200 @@ -16,3 +16,7 @@ # Rule to rename Mellanox devices SUBSYSTEM=="net", ACTION=="add", DRIVERS=="mlx5_core", PROGRAM="/usr/bin/gce-nic-naming", NAME="%c" + +# Rule to rename RDMA devices +SUBSYSTEM=="net", ACTION=="add", DRIVERS=="idpf", PROGRAM="/usr/bin/gce-nic-naming %E{ID_NET_DRIVER}", NAME="%c" +SUBSYSTEM=="auxiliary", ACTION=="add", DRIVERS=="*irdma*", PROGRAM="/usr/bin/gce-nic-naming" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-configs-20241205.00/src/usr/bin/gce-nic-naming new/guest-configs-20250501.00/src/usr/bin/gce-nic-naming --- old/guest-configs-20241205.00/src/usr/bin/gce-nic-naming 2024-12-05 00:55:00.000000000 +0100 +++ new/guest-configs-20250501.00/src/usr/bin/gce-nic-naming 2025-04-09 19:00:41.000000000 +0200 @@ -14,6 +14,10 @@ # # This script is used to generate the network device name for a given device. + +# Input to test if a directory in the PCI tree exists under the device +declare DEVICE_DRIVER="$1" + # Generate a instance specific tag for logging to journal readonly LOG_TAG=${LOG_TAG:-"gce-nic-naming_$$"} @@ -21,8 +25,8 @@ declare PCI_BUS_PATH='/sys/bus/pci/devices' declare SYS_PREPEND_PATH='/sys' # 0x15b3:0x101e is the vendor and device ID for Mellanox CX7 - -readonly ETHERNET_DEVICES_VENDORS=('15b3:101e') +# 0x8086:0x145c is the vendor and device ID for Intel IDPF VF +readonly ETHERNET_DEVICES_VENDORS=('15b3:101e' '8086:145c') # 0x10de is the vendor ID for Nvidia readonly GPU_DEVICES_VENDORS=('10de' '10de') # PCI BUS ID path is in the format of 0000:00:04.0 @@ -457,7 +461,20 @@ if [[ ${accelerator_devices[*]} == "" ]] ; then if [[ " ${ETHERNET_DEVICES_VENDORS[*]} " =~ \ [[:space:]]${eth_device_vendor}[[:space:]] ]]; then - name_builder="rdma${eth_index}" + if [[ "${SUBSYSTEM}" == "net" ]] && [[ -d "${SYS_PREPEND_PATH}${DEVPATH}/device/${RDMA_TEST_FOLDER}" ]]; then + + name_builder="rdma${eth_index}" + elif [[ "${SUBSYSTEM}" == "net" ]] && [[ -d "${SYS_PREPEND_PATH}${DEVPATH}/device" ]]; then + # If this is a VF device and not an RDMA we do not want this device + # to claim the eth0 name so give it a PCI path based name instead. + # + notice "Non RDMA VF NIC. Setting name to path name" + name_builder=$ID_NET_NAME_PATH + else + # If device path is empty it indicates other changes happening so this script will skip + error_and_exit "DEVPATH provided is empty, skipping naming. Path:${SYS_PREPEND_PATH}${DEVPATH}" + + fi else error_and_exit "Device is not for intent based name: "\ "Device vendors: eth:${eth_device_vendor}" @@ -478,8 +495,18 @@ echo ${name_builder} } +# Intel VF driver and needs special handling to determine if name should be +# RDMA related +if [[ "${DEVICE_DRIVER}" == "idpf" ]]; then + RDMA_TEST_FOLDER="infiniband" +fi + # Give the ability to test the script without running the main logic -if [[ ! $TEST == 'test' ]]; then +if [[ ! $TEST == 'test' ]] && [[ ! "${GCE_NIC_NAMING}" == "disable" ]]; then + + if [[ "$SUBSYSTEM" != "net" ]]; then + notice "Triggered for non Net Device" + fi # Note can not use "" around ls path here or it errors out list_devices ethernet_devices accelerator_devices "$(ls -d "${PCI_BUS_PATH}"/*)" @@ -492,5 +519,20 @@ determine_index_ratios fi - generate_name "${DEVPATH}" -fi + generated_name=$(generate_name "${DEVPATH}") + + if [[ "$SUBSYSTEM" == "net" ]]; then + echo ${generated_name} + else + # Handle load order where netdev plug happens prior to RDMA plug events + dev_path="${SYS_PREPEND_PATH}${DEVPATH}/.." + # Check that device has loaded as a net dev before applying the name. + if [[ -d "$dev_path/net/" ]]; then + current_net_iface="$(ls $dev_path/net/)" + notice "Renaming iface ${current_net_iface} to ${generated_name}" + /usr/sbin/ip link set dev ${current_net_iface} down + /usr/sbin/ip link set dev ${current_net_iface} name ${generated_name} + /usr/sbin/ip link set dev ${generated_name} up + fi + fi +fi \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-configs-20241205.00/src/usr/bin/google_set_multiqueue new/guest-configs-20250501.00/src/usr/bin/google_set_multiqueue --- old/guest-configs-20241205.00/src/usr/bin/google_set_multiqueue 2024-12-05 00:55:00.000000000 +0100 +++ new/guest-configs-20250501.00/src/usr/bin/google_set_multiqueue 2025-04-09 19:00:41.000000000 +0200 @@ -99,16 +99,39 @@ done } -# returns 0 (success) if it's running on a3 or a3plus platform. -function is_a3_platform() { +# returns 0 (success) if the all the interfaces contains pnic_id on the Metadats server. +function contains_pnic_ids() { + while IFS= read -r interface; do + echo "Interface: $interface" + + network_interfaces_mds_attributes=$(curl -m 1 -H "Metadata-Flavor: Google" \ + "http://169.254.169.254/computeMetadata/v1/instance/network-interfaces/$interface/") + + if ! echo "$network_interfaces_mds_attributes" | grep -q "physical-nic-id"; then + echo "physical-nic-id NOT found in interface $interface" + return 1 + fi + done < <(curl -m 1 -H "Metadata-Flavor: Google" http://169.254.169.254/computeMetadata/v1/instance/network-interfaces/) + + return 0 +} + +# returns 0 (success) if the platform is a multinic accelerator platform. +function is_multinic_accelerator_platform() { + contains_pnic_ids + CONTAINS_PNIC_IDS=$? + machine_type=$(curl -m 1 -H "Metadata-Flavor: Google" \ http://169.254.169.254/computeMetadata/v1/instance/machine-type) - [[ "$machine_type" == *"a3-highgpu-8g"* \ + [[ $CONTAINS_PNIC_IDS -eq 0 \ + || "$machine_type" == *"a3-highgpu-8g"* \ || "$machine_type" == *"a3-ultragpu-8g"* \ || "$machine_type" == *"a3-megagpu-8g"* \ || "$machine_type" == *"a3-edgegpu-8g"* \ - || "$machine_type" == *"a3-ultragpu-"* ]] || return 1 + || "$machine_type" == *"a3-ultragpu-"* \ + || "$machine_type" == *"a4-highgpu-"* \ + || "$machine_type" == *"a4x-highgpu-"* ]] || return 1 return 0 } @@ -177,8 +200,8 @@ echo "Running $(basename $0)." VIRTIO_NET_DEVS=/sys/bus/virtio/drivers/virtio_net/virtio* -is_a3_platform -IS_A3_PLATFORM=$? +is_multinic_accelerator_platform +IS_MULTINIC_ACCELERATOR_PLATFORM=$? # Loop through all the virtionet devices and enable multi-queue if [ -x "$(command -v ethtool)" ]; then @@ -267,7 +290,7 @@ num_queues=0 for q in $XPS; do interface=$(echo "$q" | grep -oP 'net/\K[^/]+') - if [[ $IS_A3_PLATFORM == 0 ]] && ! $(is_gvnic "$interface"); then + if [[ $IS_MULTINIC_ACCELERATOR_PLATFORM == 0 ]] && ! $(is_gvnic "$interface"); then continue fi num_queues=$((num_queues + 1)) @@ -277,7 +300,7 @@ # as CPUNumber % queue_count. for q in $XPS; do interface=$(echo "$q" | grep -oP 'net/\K[^/]+') - if [[ $IS_A3_PLATFORM == 0 ]] && ! $(is_gvnic "$interface"); then + if [[ $IS_MULTINIC_ACCELERATOR_PLATFORM == 0 ]] && ! $(is_gvnic "$interface"); then continue fi @@ -307,7 +330,7 @@ printf "Queue %d XPS=%s for %s\n" $queue_num `cat $q` $q done | sort -n -k2 -if [[ ! $IS_A3_PLATFORM == 0 ]]; then +if [[ ! $IS_MULTINIC_ACCELERATOR_PLATFORM == 0 ]]; then exit fi