Accommodate Red Hat’s kernel backports on CentOS Stream release 9 #192

amichelotti · 2024-10-31T08:02:32Z

Sorry again for my previous patch. Here a more reasoned patch to solve driver compilation failure on CentOS Stream release 9.

Insomnia1437 · 2024-10-31T09:01:06Z

Using RHEL_RELEASE_CODE seems being a bad idea, because it fails on AlmaLinux 9

/home/acc/workspace/mrfioc2-vmflags/mrmShared/linux/uio_mrf.c: In function ‘mrf_mmap_physical’:
/home/acc/workspace/mrfioc2-vmflags/mrmShared/linux/uio_mrf.c:127:5: error: implicit declaration of function ‘vm_flags_set’ [-Werror=implicit-function-declaration]
  127 |     vm_flags_set(vma, VM_IO | VM_RESERVED);
      |     ^~~~~~~~~~~~
cc1: some warnings being treated as errors

I checked AlmaLinux 9.4 and RockyLinux 9.4, neither of them backports vm_flags_set, but they have these definitions:

#define RHEL_MAJOR 9
#define RHEL_MINOR 4
#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))
#define RHEL_RELEASE_CODE 2308

jerzyjamroz · 2024-10-31T09:38:36Z

@Insomnia1437 , good catch. What does grep "^NAME=" /etc/os-release return on each of your distros?
@amichelotti , what does it return for you?

Insomnia1437 · 2024-10-31T09:42:01Z

# On AlmaLinux
NAME="AlmaLinux"
# On RockyLinux
NAME="Rocky Linux"
# On CentOS Stream 9
NAME="CentOS Stream"

amichelotti · 2024-10-31T11:08:14Z

it returns:
NAME="CentOS Stream"
However it's a big mess with this backports.. RHEL_RELEASE_CODE is something that has some meaning across rhel distros?

here my numbers:

#define LINUX_VERSION_CODE 331264
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))
#define LINUX_VERSION_MAJOR 5
#define LINUX_VERSION_PATCHLEVEL 14
#define LINUX_VERSION_SUBLEVEL 0
#define RHEL_MAJOR 9
#define RHEL_MINOR 6
#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))
#define RHEL_RELEASE_CODE 2310
#define RHEL_RELEASE "522"

jerzyjamroz · 2024-10-31T11:26:16Z

# On AlmaLinux
NAME="AlmaLinux"
# On RockyLinux
NAME="Rocky Linux"
# On CentOS Stream 9
NAME="CentOS Stream"

Could you check also: grep "^ID=" /etc/os-release?

Insomnia1437 · 2024-10-31T11:40:41Z

Rocky

NAME="Rocky Linux"
VERSION="9.4 (Blue Onyx)"
ID="rocky"
ID_LIKE="rhel centos fedora"
VERSION_ID="9.4"
PLATFORM_ID="platform:el9"
PRETTY_NAME="Rocky Linux 9.4 (Blue Onyx)"
ANSI_COLOR="0;32"
LOGO="fedora-logo-icon"
CPE_NAME="cpe:/o:rocky:rocky:9::baseos"
HOME_URL="https://rockylinux.org/"
BUG_REPORT_URL="https://bugs.rockylinux.org/"
SUPPORT_END="2032-05-31"
ROCKY_SUPPORT_PRODUCT="Rocky-Linux-9"
ROCKY_SUPPORT_PRODUCT_VERSION="9.4"
REDHAT_SUPPORT_PRODUCT="Rocky Linux"
REDHAT_SUPPORT_PRODUCT_VERSION="9.4"

Alma

NAME="AlmaLinux"
VERSION="9.4 (Seafoam Ocelot)"
ID="almalinux"
ID_LIKE="rhel centos fedora"
VERSION_ID="9.4"
PLATFORM_ID="platform:el9"
PRETTY_NAME="AlmaLinux 9.4 (Seafoam Ocelot)"
ANSI_COLOR="0;34"
LOGO="fedora-logo-icon"
CPE_NAME="cpe:/o:almalinux:almalinux:9::baseos"
HOME_URL="https://almalinux.org/"
DOCUMENTATION_URL="https://wiki.almalinux.org/"
BUG_REPORT_URL="https://bugs.almalinux.org/"

ALMALINUX_MANTISBT_PROJECT="AlmaLinux-9"
ALMALINUX_MANTISBT_PROJECT_VERSION="9.4"
REDHAT_SUPPORT_PRODUCT="AlmaLinux"
REDHAT_SUPPORT_PRODUCT_VERSION="9.4"
SUPPORT_END=2032-06-01

CentOS Stream 9

NAME="CentOS Stream"
VERSION="9"
ID="centos"
ID_LIKE="rhel fedora"
VERSION_ID="9"
PLATFORM_ID="platform:el9"
PRETTY_NAME="CentOS Stream 9"
ANSI_COLOR="0;31"
LOGO="fedora-logo-icon"
CPE_NAME="cpe:/o:centos:centos:9"
HOME_URL="https://centos.org/"
BUG_REPORT_URL="https://issues.redhat.com/"
REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 9"
REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream"

jerzyjamroz · 2024-10-31T14:33:31Z

@Insomnia1437 , @amichelotti - as I do not have a possibility to test it, could you do that for your Linux distros using the branch below:
https://github.com/jerzyjamroz/mrfioc2/tree/c9

amichelotti · 2024-10-31T17:47:51Z

@jerzyjamroz tried, it worked, thanks! what is USE_VM_FLAGS_WRAPPER?

Insomnia1437 · 2024-11-01T00:44:47Z

@jerzyjamroz it works on AlmaLinux 9.4

jerzyjamroz · 2024-11-01T10:54:14Z

@amichelotti , I added USE_VM_FLAGS_WRAPPER to allow back-ported distributions (at the moment only CentOS stream).

It would be good if community members added their OS-es to: https://github.com/epics-modules/mrfioc2/blob/master/.github/workflows
otherwise, in theory, those are not supported :)

mdavidsaver · 2024-11-04T02:58:13Z

mrmShared/linux/uio_mrf.c

@@ -123,7 +123,7 @@ int mrf_mmap_physical(struct uio_info *info, struct vm_area_struct *vma)
        return -EINVAL;
    }

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) || (defined(RHEL_RELEASE_CODE) && (RHEL_RELEASE_CODE >= 906))


Is 906 meant to be 0x906, or better yet RHEL_RELEASE_VERSION(9,6)?

The situation seems to me confusing enough to merit a comment describing what we think happened.

/* vm_flags_set() function introduced in upstream Linux 6.3. * Backported to RHEL 9.6 ??? */

Has anyone found a reference for how RHEL_RELEASE_VERSION progresses wrt. distribution versions? Or a summary of how it diverges for the various RHEL derivatives?

@mdavidsaver I haven't been using those distros but it looks like Rocky Linux and AlmaLinux don't backport but CentOS Stream does. All those 3 distros use the same macros.
I haven't found an easy solution but universal solution, so I am waiting for eventual proposals.

Is 906 meant to be 0x906, or better yet RHEL_RELEASE_VERSION(9,6)?

To be clear 906 == 0x38a == RHEL_RELEASE_VERSION(3, 138) is not what is intended. This is a bug. The condition needs to be on 0x906 or RHEL_RELEASE_VERSION(9,6).

As far a "universal solution"... I think this would be difficult within the constraints of Make.

Our best case would be if RH and their competitors have a miraculous reconciliation. I wouldn't put money on this possibility. I think this leaves mrfioc2 to either 1) "delegate" handling of this situation to individual sites. Either as a one-line patch, or somehow defining an extra Make variable. (eg. make USR_CPPFLAGS=-DUSE_VM_FLAGS_WRAPPER) Or 2) trying to do test compilations like autoconf or cmake to see if vm_flags_set() exists. Possible with plain Make, but quite tedious.

@mdavidsaver , I started a thread with the Centos Packaging Team discussion.fedoraproject. They wrote some conclusions.

jerzyjamroz · 2024-11-08T14:07:31Z

@amichelotti , I think try to apply the comment of @mdavidsaver related to macros and then I think it can be merged. It means Alma and Rocky will not be supported for a few months (until they apply the Centos Stream patches (as explained by devs), then all compatible from that moment.

amichelotti · 2024-11-09T20:54:52Z

@amichelotti , I think try to apply the comment of @mdavidsaver related to macros and then I think it can be merged. It means Alma and Rocky will not be supported for a few months (until they apply the Centos Stream patches (as explained by devs), then all compatible from that moment.
Ok that's sound good, it seems the only solution applicable other than not using this kind of distro. I'm more and more convinced to go for Ubuntu on our controls. Many thanks you all!

amichelotti · 2024-11-09T20:56:17Z

@jerzyjamroz patch is ok, thanks you all.

jerzyjamroz · 2024-11-11T08:59:02Z

@amichelotti , what I wrote is that this what you are trying to do is ok. Why did you close the PR? Just apply the RHEL_RELEASE_VERSION(9,6) and test the things.

amichelotti · 2024-11-11T10:18:05Z

sorry I understood that at the moment the best thing to do is to apply your c9 patch.Ok so I re-open and just use 9,6. Il giorno lun 11 nov 2024 alle ore 09:59 Jerzy Jamroz < ***@***.***> ha scritto:

…

@amichelotti <https://github.com/amichelotti> , what I wrote is that this what you are trying to do is ok. Why did you close the PR? Just apply the RHEL_RELEASE_VERSION(9,6) and test the things. — Reply to this email directly, view it on GitHub <#192 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAW6KTEDCIR3L2FUYJYK6E32ABWWZAVCNFSM6AAAAABQ5XX7ESVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDINRXGU4DMMJWGI> . You are receiving this because you were mentioned.Message ID: ***@***.***>

-- --------------------------------------------------- Andrea Michelotti http://it.linkedin.com/in/michelotti skype:a.michelotti

jerzyjamroz · 2024-11-11T11:28:29Z

@amichelotti , and adding your CI update once tested is useful as well.

amichelotti added 3 commits October 30, 2024 10:43

include kernels >= 5.1.0 (CentOS Stream release 9)

666b314

accomodate RHEL backport on Centos 9

39628d9

accomodate RHEL 9.6 backport on Centos 9

d5a57fe

amichelotti requested review from mdavidsaver, jerzyjamroz and gabrielfedel as code owners October 31, 2024 08:02

jerzyjamroz assigned Insomnia1437 and jerzyjamroz Oct 31, 2024

jerzyjamroz added the enhancement label Oct 31, 2024

mdavidsaver reviewed Nov 4, 2024

View reviewed changes

Merge branch 'epics-modules:master' into master

28aaf4e

amichelotti force-pushed the master branch from 1229d93 to 7ffb3e1 Compare November 9, 2024 14:18

adding centos stream 9 build pipeline

80855ab

amichelotti force-pushed the master branch from 7ffb3e1 to 80855ab Compare November 9, 2024 15:16

adding centos stream 9 build pipeline

e78a6b3

amichelotti closed this Nov 9, 2024

jerzyjamroz mentioned this pull request Nov 13, 2024

feat: kmod support for Centos Stream 9 #196

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Accommodate Red Hat’s kernel backports on CentOS Stream release 9 #192

Accommodate Red Hat’s kernel backports on CentOS Stream release 9 #192

amichelotti commented Oct 31, 2024

Insomnia1437 commented Oct 31, 2024

jerzyjamroz commented Oct 31, 2024 •

edited

Loading

Insomnia1437 commented Oct 31, 2024

amichelotti commented Oct 31, 2024 •

edited

Loading

jerzyjamroz commented Oct 31, 2024

Insomnia1437 commented Oct 31, 2024

jerzyjamroz commented Oct 31, 2024

amichelotti commented Oct 31, 2024

Insomnia1437 commented Nov 1, 2024

jerzyjamroz commented Nov 1, 2024 •

edited

Loading

mdavidsaver Nov 4, 2024

jerzyjamroz Nov 4, 2024

mdavidsaver Nov 4, 2024

mdavidsaver Nov 4, 2024

jerzyjamroz Nov 5, 2024 •

edited

Loading

jerzyjamroz commented Nov 8, 2024

amichelotti commented Nov 9, 2024

amichelotti commented Nov 9, 2024 •

edited

Loading

jerzyjamroz commented Nov 11, 2024

amichelotti commented Nov 11, 2024 via email

jerzyjamroz commented Nov 11, 2024

Accommodate Red Hat’s kernel backports on CentOS Stream release 9 #192

Accommodate Red Hat’s kernel backports on CentOS Stream release 9 #192

Conversation

amichelotti commented Oct 31, 2024

Insomnia1437 commented Oct 31, 2024

jerzyjamroz commented Oct 31, 2024 • edited Loading

Insomnia1437 commented Oct 31, 2024

amichelotti commented Oct 31, 2024 • edited Loading

jerzyjamroz commented Oct 31, 2024

Insomnia1437 commented Oct 31, 2024

jerzyjamroz commented Oct 31, 2024

amichelotti commented Oct 31, 2024

Insomnia1437 commented Nov 1, 2024

jerzyjamroz commented Nov 1, 2024 • edited Loading

mdavidsaver Nov 4, 2024

Choose a reason for hiding this comment

jerzyjamroz Nov 4, 2024

Choose a reason for hiding this comment

mdavidsaver Nov 4, 2024

Choose a reason for hiding this comment

mdavidsaver Nov 4, 2024

Choose a reason for hiding this comment

jerzyjamroz Nov 5, 2024 • edited Loading

Choose a reason for hiding this comment

jerzyjamroz commented Nov 8, 2024

amichelotti commented Nov 9, 2024

amichelotti commented Nov 9, 2024 • edited Loading

jerzyjamroz commented Nov 11, 2024

amichelotti commented Nov 11, 2024 via email

jerzyjamroz commented Nov 11, 2024

jerzyjamroz commented Oct 31, 2024 •

edited

Loading

amichelotti commented Oct 31, 2024 •

edited

Loading

jerzyjamroz commented Nov 1, 2024 •

edited

Loading

jerzyjamroz Nov 5, 2024 •

edited

Loading

amichelotti commented Nov 9, 2024 •

edited

Loading