Bug 2053991

Summary: kernel build fails if CONFIG_RHEL_DIFFERENCES is "not set"
Product: Red Hat Enterprise Linux 9 Reporter: Akemi Yagi <toracat>
Component: kernelAssignee: Joel Savitz <jsavitz>
kernel sub component: Kernel-Core QA Contact: Linqing Lu <lilu>
Status: CLOSED ERRATA Docs Contact:
Severity: low    
Priority: unspecified CC: ajb, bstinson, jsavitz, jwboyer, kernel-qe, lilu, phil
Version: CentOS StreamKeywords: Triaged
Target Milestone: rc   
Target Release: ---   
Hardware: Unspecified   
OS: Linux   
Whiteboard:
Fixed In Version: kernel-5.14.0-82.el9 Doc Type: If docs needed, set a value
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: 2022-11-15 10:55:35 UTC Type: Bug
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Embargoed:

Description Akemi Yagi 2022-02-13 19:56:31 UTC
Description of problem:
Kernel build fails if CONFIG_RHEL_DIFFERENCES is disabled.

Version-Release number of selected component (if applicable):
kernel-5.14.0-42.el9

How reproducible:
Always

Steps to Reproduce:
1. Change the CONFIG_RHEL_DIFFERENCES option from =y to 'not set'
2. Build the kernel
3.

Actual results:
Fails with errors

ld: arch/x86/xen/pci-swiotlb-xen.o: in function `pci_hw_disabled':
/home/yagi2/rpmbuild/kernel/55/BUILD/kernel-5.14.0-55.el9/linux-5.14.0-55.noRD.el9.x86_64/./include/linux/pci.h:1468: multiple definition of `pci_hw_disabled'; arch/x86/events/amd/ibs.o:/home/yagi2/rpmbuild/kernel/55/BUILD/kernel-5.14.0-55.el9/linux-5.14.0-55.noRD.el9.x86_64/./include/linux/pci.h:1468: first defined here
  (and many more lines)

Expected results:
Build succeeds.

Additional info:

pci_hw_disabled is defined twice, one in include/linux/pci.h and another in drivers/pci/pci-driver.c.

(1) include/linux/pci.h has this:

#ifdef CONFIG_RHEL_DIFFERENCES
const struct pci_device_id *pci_hw_deprecated(const struct pci_device_id *ids,
                                              struct pci_dev *dev);
const struct pci_device_id *pci_hw_unmaintained(const struct pci_device_id *ids,
                                                struct pci_dev *dev);
const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids,
                                            struct pci_dev *dev);
#else
static inline const struct pci_device_id *pci_hw_deprecated(const struct pci_device_id *ids,
                                                            struct pci_dev *dev) { return NULL; }
static inline const struct pci_device_id *pci_hw_unmaintained(const struct pci_device_id *ids,
                                                              struct pci_dev *dev) { return NULL; }
const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids,
                                            struct pci_dev *dev) {return NULL; }
#endif

(2) drivers/pci/pci-driver.c has:

const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids,
                                            struct pci_dev *dev)
{
        const struct pci_device_id *ret = pci_match_id(ids, dev);

        if (!ret)
                return NULL;

        mark_hardware_disabled(dev_driver_string(&dev->dev), "%04X:%04X @ %s",
                                   dev->device, dev->vendor, pci_name(dev));
        return ret;
}
EXPORT_SYMBOL(pci_hw_disabled);

Comment 1 Akemi Yagi 2022-02-13 20:04:44 UTC
Addition of "static inline" to the appropriate place in include/linux/pci.h fixes the issue.

Comment 3 Joel Savitz 2022-04-21 19:48:52 UTC
Friendly ping to QE.

Comment 9 Phil Perry 2022-04-29 09:45:51 UTC
Thank you for fixing this.

Will this fix (in kernel-5.14.0-82.el9) make it into the RHEL9.0 release or will we need to wait until RHEL9.1?

Comment 10 Linqing Lu 2022-04-29 15:54:04 UTC
(In reply to Phil Perry from comment #9)
> Thank you for fixing this.
> 
> Will this fix (in kernel-5.14.0-82.el9) make it into the RHEL9.0 release or
> will we need to wait until RHEL9.1?

RHEL9.0 has been stabilized and finalized for GA (early May) at this point.
So this will be available in CentOS Stream and RHEL 9.1 (unless requested & approved for 9.0.z if critical).

Comment 14 errata-xmlrpc 2022-11-15 10:55:35 UTC
Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory (Moderate: kernel security, bug fix, and enhancement update), and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

https://access.redhat.com/errata/RHSA-2022:8267