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

(RHEL-55708) rhel 9 fix 55708 #99

Merged
merged 2 commits into from
Nov 27, 2024

Conversation

pvalena
Copy link
Contributor

@pvalena pvalena commented Nov 27, 2024

  • fix(kernel-modules): use modalias info in get_dev_module()
  • fix(dracut-functions.sh): convert mmcblk to the real kernel module name

athierry1 and others added 2 commits November 27, 2024 21:13
When calling dracut with '--hostonly-mode=strict', get_dev_module() gets
called on the system's block devices to find the required drivers. The
driver name is retrieved using udevadm. However, the driver name
returned by udevadm is not necessarily the same as the module name.
This is the case for the Qualcomm UFS driver: udevadm returns
'ufshcd-qcom' while the module name is 'ufs-qcom', so dracut-install is
not able to find the module afterwards.

To solve this, make get_dev_module() also return the module alias info
from the modalias files contained in the sysfs directories parsed by
udevadm.

Signed-off-by: Adrien Thierry <athierry@redhat.com>

(cherry picked from commit 87a76db)

Resolves: RHEL-55708
In some x86_64 platforms such as Intel Elkhartlake, an issue of missing
necessary modules due to udevadm drivers field unmatch the real kernel module
name is found:

  $ udevadm info -a /dev/block/179:1

  looking at parent device '/devices/pci0000:00/0000:00:1a.0/mmc_host/mmc0/mmc0:0001':
    KERNELS=="mmc0:0001"
    SUBSYSTEMS=="mmc"
    DRIVERS=="mmcblk"
    ....

The DRIVERS field, aka mmcblk will be given to instmods to install the
corresponding mmc_block.ko kernel module. However mmc_block.ko cannot be
selected by string mmcblk, as a result, mmc_block.ko cannot be installed
in hostonly-mode strict, which will fail to bootup the machine such as in
kdump cases:

  $ /usr/lib/dracut/dracut-install -D /var/tmp --kerneldir /lib/modules/$(uname -r)/ -m mmcblk
  dracut-install: Failed to find module 'mmcblk'

In this patch, we will convert the string mmcblk to mmc_block, so the
kernel module can be successfully loaded.

Signed-off-by: Tao Liu <ltao@redhat.com>

(cherry picked from commit a62e895)

Resolves: RHEL-55708
@pvalena pvalena self-assigned this Nov 27, 2024
@github-actions github-actions bot changed the title rhel 9 fix 55708 (RHEL-55708) rhel 9 fix 55708 Nov 27, 2024
Copy link

Commit validation

Tracker - RHEL-55708

The following commits meet all requirements

commit upstream
6522b84 - fix(kernel-modules): use modalias info in get_dev_module() dracutdevs/dracut@87a76db
d784d26 - fix(dracut-functions.sh): convert mmcblk to the real kernel module nam… dracutdevs/dracut@a62e895

Tracker validation

Failed

🔴 Tracker RHEL-55708 is missing severity

Success

🟢 Tracker RHEL-55708 has set desired product: rhel-9.4
🟢 Tracker RHEL-55708 has set desired component: dracut
🟢 Tracker RHEL-55708 has been approved


Pull Request validation

Failed

🔴 Failed or pending checks - test (centos:stream9, 36)[failure],test (centos:stream9, 35)[failure],test (centos:stream9, 31)[failure],test (centos:stream9, 30)[failure],test (centos:stream9, 15)[failure],test (centos:stream9, 14)[failure],test (centos:stream9, 03)[failure],centos-9-stream (centos:stream9, 98)[cancelled],centos-9-stream (centos:stream9, 41)[cancelled],centos-9-stream (centos:stream9, 40)[cancelled],centos-9-stream (centos:stream9, 21)[cancelled],centos-9-stream (centos:stream9, 17)[cancelled],centos-9-stream (centos:stream9, 20)[cancelled],centos-9-stream (centos:stream9, 16)[cancelled],centos-9-stream (centos:stream9, 13)[cancelled],centos-9-stream (centos:stream9, 12)[cancelled],centos-9-stream (centos:stream9, 10)[cancelled],centos-9-stream (centos:stream9, 11)[cancelled],centos-9-stream (centos:stream9, 02)[cancelled],basic (centos:stream9, 04)[failure],centos-9-stream (centos:stream9, 01)[cancelled],testing-farm:centos-stream-9-x86_64[in_progress],rpm-build:centos-stream-9-aarch64[in_progress],rpm-build:centos-stream-9-x86_64[in_progress],test (centos:stream9, 21)[in_progress],test (centos:stream9, 20)[in_progress],test (centos:stream9, 16)[in_progress],test (centos:stream9, 13)[in_progress],test (centos:stream9, 12)[in_progress],test (centos:stream9, 10)[in_progress],test (centos:stream9, 01)[in_progress],lint-shell[in_progress]
🔴 Review - Missing review from a member (1 required)

Copy link
Contributor Author

@pvalena pvalena left a comment

Choose a reason for hiding this comment

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

LGTM.

@pvalena pvalena merged commit f194bd6 into redhat-plumbers:main Nov 27, 2024
22 of 44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants