diff options
| -rw-r--r-- | configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON | 1 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 3 | ||||
| -rw-r--r-- | kernel-i686.config | 3 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 3 | ||||
| -rw-r--r-- | kernel-x86_64.config | 3 | ||||
| -rw-r--r-- | kernel.spec | 33 | ||||
| -rw-r--r-- | sources | 1 | ||||
| -rwxr-xr-x | tests/memory/memfd_create/runtest.sh | 7 | ||||
| -rw-r--r-- | tests/memory/memfd_create/t_get_seals.c | 3 | ||||
| -rw-r--r-- | tests/memory/memfd_create/t_memfd_create.c | 18 |
13 files changed, 51 insertions, 28 deletions
diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO new file mode 100644 index 000000000..788136fc5 --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_AUTO @@ -0,0 +1 @@ +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF new file mode 100644 index 000000000..d22a12f0d --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_OFF @@ -0,0 +1 @@ +CONFIG_X86_INTEL_TSX_MODE_OFF=y diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON new file mode 100644 index 000000000..b6471915c --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_X86_INTEL_TSX_MODE_ON @@ -0,0 +1 @@ +# CONFIG_X86_INTEL_TSX_MODE_ON is not set @@ -1 +1 @@ -847120f859cc45e074204f4cf33c8df069306eb2 +0e3f1ad80fc8cb0c517fd9a9afb22752b741fa76 diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d0c673c71..abbd6606b 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6613,6 +6613,9 @@ CONFIG_X86_INTEL_LPSS=y CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_QUARK is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_LEGACY_VM86 is not set # CONFIG_X86_LONGHAUL is not set CONFIG_X86_LONGRUN=y diff --git a/kernel-i686.config b/kernel-i686.config index 242861c29..74ad25121 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6592,6 +6592,9 @@ CONFIG_X86_INTEL_LPSS=y CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_QUARK is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_LEGACY_VM86 is not set # CONFIG_X86_LONGHAUL is not set CONFIG_X86_LONGRUN=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 78e443a4c..4ff2b06d2 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6666,6 +6666,9 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_INTEL_MID is not set CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_LEGACY_VM86 is not set CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_INJECT=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index b5267ba41..d03767fad 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6645,6 +6645,9 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_INTEL_MID is not set CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_LEGACY_VM86 is not set CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_INJECT=m diff --git a/kernel.spec b/kernel.spec index e5a046e1f..7670c36f2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -108,7 +108,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 7 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -154,7 +154,7 @@ Summary: The Linux kernel # Only build the debug kernel (--with dbgonly): %define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0} # Control whether we perform a compat. check against published ABI. -#%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1} +%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1} # Temporarily disable kabi checks until RC. %define with_kabichk 0 # Control whether we perform a compat. check against DUP ABI. @@ -195,7 +195,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -812,7 +812,6 @@ This package is required by %{name}-debuginfo subpackages. It provides the kernel source files common to all builds. %if %{with_selftests} - %package selftests-internal Summary: Kernel samples and selftests License: GPLv2 @@ -820,14 +819,13 @@ Requires: binutils, bpftool, iproute-tc, nmap-ncat Requires: kernel-modules-internal = %{version}-%{release} %description selftests-internal Kernel sample programs and selftests. - +%{nil} # Note that this pattern only works right to match the .build-id # symlinks because of the trailing nonmatching alternation and # the leading .*, because of find-debuginfo.sh's buggy handling # of matching the pattern against the symlinks file. %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libexecdir}/(ksamples|kselftests)/.*|XXX' -o selftests-debuginfo.list} - -%endif # with_selftests +%endif %if %{with_gcov} %package gcov @@ -1017,7 +1015,7 @@ Cortex-A15 devices with LPAE and HW virtualisation support %description zfcpdump-core The kernel package contains the Linux kernel (vmlinuz) for use by the zfcpdump infrastructure. -%endif # with_zfcpdump +%endif %define variant_summary The Linux kernel compiled with extra debugging enabled %kernel_variant_package debug @@ -1447,9 +1445,7 @@ BuildKernel() { %endif # make sure EXTRAVERSION says what we want it to say - # Trim the release if this is a CI build, since KERNELVERSION is limited to 64 characters - ShortRel=$(perl -e "print \"%{release}\" =~ s/\.pr\.[0-9A-Fa-f]{32}//r") - perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${ShortRel}.%{_target_cpu}${Flav}/" Makefile + perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}${Flav}/" Makefile # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme %if !0%{?rcrev} @@ -1533,8 +1529,8 @@ BuildKernel() { %pesign -s -i $KernelImage -o vmlinuz.signed %else %pesign -s -i $SignImage -o vmlinuz.signed -a %{secureboot_ca} -c %{secureboot_key} -n %{pesign_name} - %endif # fedora - %endif # arches + %endif + %endif %ifarch s390x ppc64le if [ -x /usr/bin/rpm-sign ]; then rpm-sign --key "%{pesign_name}" --lkmsign $SignImage --output vmlinuz.signed @@ -2076,7 +2072,7 @@ docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion} mkdir -p $docdir tar -h -f - --exclude=man --exclude='.*' -c Documentation | tar xf - -C $docdir -%endif # with_doc +%endif # We have to do the headers install before the tools install because the # kernel headers_install will remove any header files in /usr/include that @@ -2118,10 +2114,9 @@ rm -rf $RPM_BUILD_ROOT/usr/tmp-headers # kabi directory INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/ mkdir -p $INSTALL_KABI_PATH - # install kabi releases directories tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH -%endif # with_kernel_abi_whitelists +%endif %if %{with_selftests} pushd samples @@ -2433,6 +2428,12 @@ fi # # %changelog +* Wed Nov 13 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc7.git1.1 +- Linux v5.4-rc7-49-g0e3f1ad80fc8 + +* Wed Nov 13 2019 Jeremy Cline <jcline@redhat.com> +- Reenable debugging options. + * Mon Nov 11 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc7.git0.1 - Linux v5.4-rc7 @@ -1,2 +1,3 @@ SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d SHA512 (patch-5.4-rc7.xz) = 0bd727332fc13d43f48497c7587ede034a1ca7df67bae3f6a7dab6001f0b75c858b15d4fa6c0ca5bf71bd467c330f14a92918e8bbc542c7c40f59d2a8f71eeb1 +SHA512 (patch-5.4-rc7-git1.xz) = e91441caa7f3cf03c4034faf45d9e4cd4dfc568e034409b437bfbcdd611481ac3e7624f86e8ccefbcda022bfc23d3a6c232cd766125abeed1f7aaa779221b60a diff --git a/tests/memory/memfd_create/runtest.sh b/tests/memory/memfd_create/runtest.sh index 24dfeb5b6..880c3096e 100755 --- a/tests/memory/memfd_create/runtest.sh +++ b/tests/memory/memfd_create/runtest.sh @@ -38,11 +38,12 @@ fi function sanity_memfd_create() { - rlRun "./t_memfd_create memf 1024 gswS &" - rlRun "./t_get_seals /proc/$!/fd/3 > seals" + rlRun "coproc ./t_memfd_create memf 1024 gswS" + rlRun "read -u ${COPROC[0]} MEMFD_PATH" + rlRun "./t_get_seals $MEMFD_PATH > ./seals" rlRun "cat ./seals" rlAssertGrep "SEAL GROW WRITE SHRINK" ./seals - rlRun "pkill t_memfd_create" + rlRun "kill $COPROC_PID" } diff --git a/tests/memory/memfd_create/t_get_seals.c b/tests/memory/memfd_create/t_get_seals.c index 8babe34d2..1a2c900e0 100644 --- a/tests/memory/memfd_create/t_get_seals.c +++ b/tests/memory/memfd_create/t_get_seals.c @@ -16,8 +16,9 @@ * */ -#include <linux/fcntl.h> +#define _GNU_SOURCE #include <unistd.h> +#include <fcntl.h> #include <stdlib.h> #include <string.h> #include <stdio.h> diff --git a/tests/memory/memfd_create/t_memfd_create.c b/tests/memory/memfd_create/t_memfd_create.c index 73d641a6e..4250d7174 100644 --- a/tests/memory/memfd_create/t_memfd_create.c +++ b/tests/memory/memfd_create/t_memfd_create.c @@ -16,11 +16,12 @@ * */ -#include <linux/memfd.h> -#include <linux/fcntl.h> +#define _GNU_SOURCE +#include <unistd.h> +#include <fcntl.h> +#include <sys/mman.h> #include <sys/syscall.h> #include <stdlib.h> -#include <unistd.h> #include <string.h> #include <stdio.h> @@ -66,10 +67,6 @@ int main(int argc, char *argv[]) if (write(fd, message, strlen(message)) <= 0) errExit("write"); - //printf("PID: %ld; fd: %d; /proc/%ld/fd/%d\n", - // (long) getpid(), fd, (long) getpid(), fd); - printf("/proc/%ld/fd/%d\n", (long) getpid(), fd); - /* Code to map the file and populate the mapping with data omitted */ @@ -92,6 +89,13 @@ int main(int argc, char *argv[]) errExit("fcntl"); } + /* Output the pathname of (a symbolic link to) the file + created by memfd_create() */ + + printf("/proc/%ld/fd/%d\n", (long) getpid(), fd); + + fflush(stdout); + /* Keep running, so that the file created by memfd_create() continues to exist */ |