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

packaging/kernel: Add CONFIG_PCI_MMCONFIG to x86 guest kernel configuration #2311

Merged
merged 1 commit into from Oct 10, 2021

Conversation

dgibson
Copy link
Contributor

@dgibson dgibson commented Jul 26, 2021

The guest kernel configuration suggested for Kata, and which is used by the
CI didn't include CONFIG_PCI_MMCONFIG. That's kind of weird, MMCONFIG is
the modern normal way of handling configuration cycles.

In addition, due to a complex set of interactions through the ACPI code,
disabling MMCONFIG means that SHPC hotplug doesn't work: the driver is
included in the guest kernel, but will fail to probe on PCI to PCI bridges,
meaning it won't actually be activated.

Enable MMCONFIG so that we suggest and testa more typical guest kernel
configuration.

fixes #2288

Signed-off-by: David Gibson david@gibson.dropbear.id.au

@dgibson dgibson added wip Work in Progress (PR incomplete - needs more work or rework) no-backport-needed labels Jul 26, 2021
@dgibson dgibson self-assigned this Jul 26, 2021
@cmaf
Copy link
Contributor

cmaf commented Jul 26, 2021

/test

@dgibson
Copy link
Contributor Author

dgibson commented Jul 27, 2021

/test
/test-vfio

@dgibson
Copy link
Contributor Author

dgibson commented Jul 27, 2021

/test-vfio

@dgibson
Copy link
Contributor Author

dgibson commented Jul 27, 2021

/retest-vfio

@dgibson dgibson removed the wip Work in Progress (PR incomplete - needs more work or rework) label Sep 28, 2021
@dgibson
Copy link
Contributor Author

dgibson commented Sep 28, 2021

Rebased now that we're using ACPI hotplug, which should address the problems it had.

@dgibson
Copy link
Contributor Author

dgibson commented Sep 28, 2021

/test
/test-vfio

@dgibson
Copy link
Contributor Author

dgibson commented Sep 28, 2021

Wait, I jumped the gun a little. This won't be ok until #1682 is actually merged.

@dgibson dgibson added the wip Work in Progress (PR incomplete - needs more work or rework) label Sep 28, 2021
@dgibson
Copy link
Contributor Author

dgibson commented Sep 28, 2021

/retest

@dgibson dgibson force-pushed the mmconfig branch 2 times, most recently from 4d80396 to 5acc24a Compare September 29, 2021 03:07
@dgibson
Copy link
Contributor Author

dgibson commented Sep 29, 2021

/test
/test-vfio

@dgibson
Copy link
Contributor Author

dgibson commented Sep 29, 2021

/retest-ubuntu-metrics

@dgibson
Copy link
Contributor Author

dgibson commented Sep 29, 2021

/retest-fedora

@dgibson
Copy link
Contributor Author

dgibson commented Sep 29, 2021

/retest-arm

@dgibson
Copy link
Contributor Author

dgibson commented Sep 29, 2021

/retest-firecracker

@dgibson
Copy link
Contributor Author

dgibson commented Sep 29, 2021

/retest-fc

@dgibson
Copy link
Contributor Author

dgibson commented Sep 30, 2021

@amshinde @wainersm I don't think the failures on the ARM and s390 tests are due to this change. Any ideas what's causing those?

@fidencio
Copy link
Member

/cc @Jakob-Naucke (for s390x) and @jongwu (for ARM)

@Jakob-Naucke
Copy link
Member

They shall be fixed by #2736

@Jakob-Naucke
Copy link
Member

/retest-arm /retest-s390x

@Jakob-Naucke
Copy link
Member

kata-containers/tests#4044 for tracking

@dgibson
Copy link
Contributor Author

dgibson commented Oct 1, 2021

/test
/test-vfio

@dgibson
Copy link
Contributor Author

dgibson commented Oct 4, 2021

/retest-arm
/retest-s390x

@dgibson
Copy link
Contributor Author

dgibson commented Oct 5, 2021

/test
/test-vfio

@dgibson
Copy link
Contributor Author

dgibson commented Oct 5, 2021

/retest-metrics

@dgibson
Copy link
Contributor Author

dgibson commented Oct 5, 2021

/retest-ubuntu-metrics

@dgibson
Copy link
Contributor Author

dgibson commented Oct 5, 2021

@marcel-apf now that you're back, could you have a look at this one. Now that the rescan removal is merged, this is no longer blocked.

@dgibson
Copy link
Contributor Author

dgibson commented Oct 6, 2021

@Jakob-Naucke IIUC you were saying earlier that the ARM & s390x CI failures should be fixed by kata-containers/tests#4044. That's now closed, but the failures remain. Any ideas?

@dgibson
Copy link
Contributor Author

dgibson commented Oct 6, 2021

/test
/test-vfio

@dgibson
Copy link
Contributor Author

dgibson commented Oct 6, 2021

/retest-centos

@dgibson
Copy link
Contributor Author

dgibson commented Oct 6, 2021

/retest-ubuntu-metrics

@dgibson
Copy link
Contributor Author

dgibson commented Oct 6, 2021

/retest-centos
/retest-ubuntu-metrics

@Jakob-Naucke
Copy link
Member

@Jakob-Naucke IIUC you were saying earlier that the ARM & s390x CI failures should be fixed by kata-containers/tests#4044. That's now closed, but the failures remain. Any ideas?

@dgibson #2774 is ready for review :)

@dgibson
Copy link
Contributor Author

dgibson commented Oct 7, 2021

/retest-arm
/retest-s390x

@dgibson
Copy link
Contributor Author

dgibson commented Oct 7, 2021

/retest-arm

…ration

The guest kernel configuration suggested for Kata, and which is used by the
CI didn't include CONFIG_PCI_MMCONFIG.  That's kind of weird, MMCONFIG is
the modern normal way of handling configuration cycles.

In addition, due to a complex set of interactions through the ACPI code,
disabling MMCONFIG means that SHPC hotplug doesn't work: the driver is
included in the guest kernel, but will fail to probe on PCI to PCI bridges,
meaning it won't actually be activated.

Enable MMCONFIG so that we suggest and testa more typical guest kernel
configuration.

fixes kata-containers#2288

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
@dgibson
Copy link
Contributor Author

dgibson commented Oct 7, 2021

/test
/test-vfio

@dgibson
Copy link
Contributor Author

dgibson commented Oct 7, 2021

/retest-ubuntu-metrics

@marcel-apf marcel-apf merged commit 9796bab into kata-containers:main Oct 10, 2021
@marcel-apf
Copy link
Contributor

Thanks @dgibson !

@dgibson dgibson deleted the mmconfig branch October 11, 2021 02:16
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.

Kernel built by tools/packaging has !CONFIG_PCI_MMCONFIG on x86
6 participants