From: pjgeorg on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610
Some details about this series: * Commits 06218335 to e1eb4b24 forward port commits to use new messaging introduced in cf796e6a. * Commits d5867f81 to 3f858e49 add missing #ifdef CONFIG_RHEL_DIFFERENCES guards. * Commit 47f7c2f5 fixes a typo in cf796e6a. * Commits efeb0057 to 0f1c6113 update a few more drivers to use the new messaging introduced in cf796e6a.
Commits 5aec7a92, 02a4b827 and 67f77726 could be further improved. All of these still silently drop PCI IDs with no messaging at all.
Downstream commit [ce5b1ff71108d] is not included as these modules have already been disabled in 48086994.
Downstream MR [489] is also not included as it has not been merged yet.
[ce5b1ff71108d]: https://gitlab.com/redhat/centos-stream/src/kernel/centos- stream-9/-/commit/ce5b1ff71108d [489]: https://gitlab.com/redhat/centos-stream/src/kernel/centos- stream-9/-/merge_requests/489
!1504 contains some changes also included in this MR.
--- arch/x86/kernel/setup.c | 2 -- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 -- drivers/net/team/team.c | 2 -- drivers/net/wireguard/main.c | 1 - drivers/virtio/virtio_mem.c | 13 ------------- fs/ext4/super.c | 5 ----- fs/xfs/xfs_super.c | 5 ----- include/linux/kernel.h | 2 +- mm/cma.c | 10 ---------- 9 files changed, 1 insertions(+), 41 deletions(-)
From: Peter Georg peter.georg@physik.uni-regensburg.de
rh_message: Fix function name
Bugzilla: https://bugzilla.redhat.com/2019377 Upstream Status: RHEL only
Signed-off-by: Peter Georg peter.georg@physik.uni-regensburg.de
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index blahblah..blahblah 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -514,7 +514,7 @@ void mark_driver_deprecated(const char *driver_name); void mark_hardware_disabled(const char *driver_name, char *fmt, ...); void mark_tech_preview(const char *msg, struct module *mod); #else -static inline void mark_hardware_unsupported(const char *driver_name, char *fmt, ...) { } +static inline void mark_hardware_unmaintained(const char *driver_name, char *fmt, ...) { } static inline void mark_driver_unmaintained(const char *driver_name) { } static inline void mark_hardware_deprecated(const char *driver_name, char *fmt, ...) { } static inline void mark_driver_deprecated(const char *driver_name) { }
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610
From: Peter Georg peter.georg@physik.uni-regensburg.de
ARK: Remove code marking devices unmaintained
Upstream Status: RHEL only
Remove code marking devices unmaintained in ARK.
Signed-off-by: Peter Georg peter.georg@physik.uni-regensburg.de
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index blahblah..blahblah 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -750,8 +750,6 @@ static void rh_check_supported(void) pr_crit("Detected processor %s %s\n", boot_cpu_data.x86_vendor_id, boot_cpu_data.x86_model_id); - mark_hardware_unmaintained("x86 processor", "%s %s", boot_cpu_data.x86_vendor_id, - boot_cpu_data.x86_model_id); break; }
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index blahblah..blahblah 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -933,8 +933,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) int bars, need_ioport; bool disable_dev = false;
- pci_hw_unmaintained(e1000_pci_tbl, pdev); - /* do not allocate ioport bars when not needed */ need_ioport = e1000_is_need_ioport(pdev); if (need_ioport) {
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610
From: Peter Georg peter.georg@physik.uni-regensburg.de
ARK: Remove code marking devices deprecated
Upstream Status: RHEL only
Remove code marking devices deprecated in ARK.
Signed-off-by: Peter Georg peter.georg@physik.uni-regensburg.de
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index blahblah..blahblah 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -3045,8 +3045,6 @@ static int __init team_module_init(void) if (err) goto err_nl_init;
- mark_driver_deprecated(DRV_NAME); - return 0;
err_nl_init:
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610
From: Peter Georg peter.georg@physik.uni-regensburg.de
ARK: Remove code marking drivers as tech preview
Upstream Status: RHEL only
Remove code marking drivers as tech preview in ARK.
Signed-off-by: Peter Georg peter.georg@physik.uni-regensburg.de
diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c index blahblah..blahblah 100644 --- a/drivers/net/wireguard/main.c +++ b/drivers/net/wireguard/main.c @@ -54,7 +54,6 @@ static int __init wg_mod_init(void) pr_info("WireGuard " WIREGUARD_VERSION " loaded. See www.wireguard.com for information.\n"); pr_info("Copyright (C) 2015-2019 Jason A. Donenfeld Jason@zx2c4.com. All Rights Reserved.\n");
- mark_tech_preview("WireGuard", THIS_MODULE); return 0;
err_netlink: diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index blahblah..blahblah 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -2792,19 +2792,6 @@ static int virtio_mem_probe(struct virtio_device *vdev)
/* trigger a config update to start processing the requested_size */ if (!vm->in_kdump) { -#ifdef CONFIG_RHEL_DIFFERENCES - static bool printed; - - /* - * virtio-mem, and especially its memory hot(un)plug - * functionality, is tech-preview. - */ - if (!printed) { - printed = true; - mark_tech_preview("virtio_mem", THIS_MODULE); - } -#endif /* CONFIG_RHEL_DIFFERENCES */ - atomic_set(&vm->config_changed, 1); queue_work(system_freezable_wq, &vm->wq); } diff --git a/fs/ext4/super.c b/fs/ext4/super.c index blahblah..blahblah 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4760,7 +4760,6 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) }
if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) { - static bool printed = false; if (ext4_has_feature_inline_data(sb)) { ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem" " that may contain inline data"); @@ -4771,10 +4770,6 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) "DAX unsupported by block device."); goto failed_mount; } - if (!printed) { - mark_tech_preview("ext4 direct access (dax)", NULL); - printed = true; - } }
if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) { diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index blahblah..blahblah 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1602,14 +1602,9 @@ xfs_fs_fill_super( sb->s_flags |= SB_I_VERSION;
if (xfs_has_dax_always(mp)) { - static bool printed = false; error = xfs_setup_dax_always(mp); if (error) goto out_filestream_unmount; - if (!printed) { - mark_tech_preview("xfs direct access (dax)", NULL); - printed = true; - } }
if (xfs_has_discard(mp)) { diff --git a/mm/cma.c b/mm/cma.c index blahblah..blahblah 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -125,12 +125,6 @@ static void __init cma_activate_area(struct cma *cma) spin_lock_init(&cma->mem_head_lock); #endif
-#ifdef CONFIG_RHEL_DIFFERENCES - /* s390x and ppc64 has been using CMA already in RHEL 8 as default. */ - if (!IS_ENABLED(CONFIG_S390) && !IS_ENABLED(CONFIG_PPC64)) - mark_tech_preview("CMA", NULL); -#endif /* CONFIG_RHEL_DIFFERENCES */ - return;
not_in_zone: @@ -443,10 +437,6 @@ struct page *cma_alloc(struct cma *cma, unsigned long count, if (!cma || !cma->count || !cma->bitmap) goto out;
-#ifdef CONFIG_RHEL_DIFFERENCES - pr_info_once("Initial CMA usage detected\n"); -#endif /* CONFIG_RHEL_DIFFERENCES */ - pr_debug("%s(cma %p, count %lu, align %d)\n", __func__, (void *)cma, count, align);
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610
From: pjgeorg on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610#note_8414795...
e582ea6a9572e, 01b34c7056601, 6350098c0964e, e0085856e8223
I have added a new commit removing the code marking drivers as tech preview introduced in these commits.
From: pjgeorg on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610#note_8414995...
@liuhangbin Hi, I updated the MR description. Indeed the MR is now about something different after the discussion with @prarit.
ebtables, arptables, etc. are not marked as deprecated in ARK. Actually these have already been disabled in ARK (48086994). Following your notes in 661584df3cad4 the same should probably be done with the team device.
From: Hangbin Liu on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610#note_8428078...
Thanks for this info, I will update the team CONFIG later.
From: Patrick Talbert on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610#note_8664249...
@pjgeorg The `os-build` branch is rebased whenever there is an official release of the upstream kernel. This is expected to next happen this coming Monday, the 14th. So just be aware if this MR is not ready for merge by then that it will need to be rebased.
kernel@lists.fedoraproject.org
-
Hangbin Liu (via Email Bridge) -
Patrick Talbert (via Email Bridge)
-
pjgeorg (via Email Bridge)