Commit Graph

9660 Commits

Author SHA1 Message Date
Alex Shi 2a676c5375
Merge pull request #322 from ryncsn/tk4/master-pub
Dist build system for TK4 public
2022-12-01 17:43:22 +08:00
Kairui Song 8caa829490 dist: tk4: fix debugedit compact issue
Upstream: no

Fixes: "canonicalization unexpectedly shrank by one character" error on
older RHEL based distro. debugedit util doesn't recognize double '//' in
kernel tracepoints.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-12-01 16:06:42 +08:00
liuchun 9386990068 dist: tk4: add the function of disabling selinux
Upstream: no

When kernel rpm is installed, if selinux in the host is not set,
the function of selinux will be disabled.

This is an issue reported from CSIG, so keep it.

Signed-off-by: Chun Liu <kaicliu@tencent.com>
2022-12-01 16:06:42 +08:00
Kairui Song 0bd807ff31 dist: tk4: make a full copy of arch code in include path
Upstream: no

TK4 have this odd behaviour, just try to be compatible.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-12-01 16:06:42 +08:00
Kairui Song ac2b844f13 dist: tk4: add historical tlinux_cciss_link
Upstream: no

Not sure if anyone still using it but try best to be compatible.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-12-01 16:06:41 +08:00
Kairui Song 6d04ab057e dist: tk4: MLNX driver TK4 build
Upstream: no

Build MLNX for TK4.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-12-01 16:06:41 +08:00
Kairui Song eae97f0513 dist: tk4: fix potential build failure
Upstream: no

For some reason, TK4 Makefile fails for userspace tools when there are
too many workers. Just limit it to one, user space tools are fast to
compile anyway.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-12-01 16:06:41 +08:00
Kairui Song b6042649e4 dist: tk4: adapt the file list
Upstream: no

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-12-01 16:06:41 +08:00
Kairui Song a120b6adb2 dist: initial dist Hook
Upstream: no

This commit is automatically done with:
./dist/scripts/helper/dist-repo-init.sh

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-12-01 16:06:41 +08:00
Kairui Song b8b0fe13e9 dist: initial dist file commit
Upstream: no

Just dump latest dist files from TKS, with following change:

- Use symlinks for the config file and kabi files under dist/configs
and dist/kabi, point to the ones under package/, keep compatibility.
- Update VENDOR_CAPITALIZED, VENDOR, URL, and KDIST in dist/Makefile
- Clean up changelog.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-12-01 16:06:38 +08:00
sclaibin 874a9c7c7d
Merge pull request #317 from caellili/tk4/master
Tk4/master
2022-11-15 11:31:43 +08:00
caelli 4e8cbad728 enable CONFIG_DRM_CIRRUS_QEMU
Enable cirrus vga driver to support qemu cirrus better.

Signed-off-by: caelli <caelli@tencent.com>
2022-11-08 20:37:19 +08:00
Kairui Song b805977331 configs: enabled several DRM/FB drivers for VMs
Enable commonly used DRM/FB drivers for VMs. We may need to enable more
DRM drivers later but for now, just enabled these VM drivers.

Also update changelog. Latest OC public iso is already using OC 5.4
kernel as default kernel.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-11-08 20:37:06 +08:00
sclaibin e714535377
Merge pull request #302 from Flyriver-wyh/tk4/dev1
config: enable CONFIG_MEMORY_HOTPLUG in aarch64
2022-10-18 11:51:11 +08:00
Yuehong Wu e045502bce config: enable CONFIG_MEMORY_HOTPLUG in aarch64
Signed-off-by: YueHong Wu <yuehongwu@tencent.com>
2022-10-18 11:35:45 +08:00
sclaibin acf709419b
Merge pull request #295 from caellili/tk4/fix-acpi
ACPICA: Utilities: Avoid deleting the same object twice in a row
2022-10-14 11:50:48 +08:00
Rafael J. Wysocki 61d4ce9119 ACPICA: Utilities: Avoid deleting the same object twice in a row
ACPICA commit c11af67d8f7e3d381068ce7771322f2b5324d687

If original_count is 0 in acpi_ut_update_ref_count (),
acpi_ut_delete_internal_obj () is invoked for the target object, which is
incorrect, because that object has been deleted once already and the
memory allocated to store it may have been reclaimed and allocated
for a different purpose by the host OS.  Moreover, a confusing debug
message following the "Reference Count is already zero, cannot
decrement" warning is printed in that case.

To fix this issue, make acpi_ut_update_ref_count () return after finding
that original_count is 0 and printing the above warning.

Link: https://github.com/acpica/acpica/commit/c11af67d
Link: https://github.com/acpica/acpica/pull/652
Reported-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2022-10-14 11:45:39 +08:00
sclaibin 88c471dff8
Merge pull request #291 from Tencent/tk4/katrinzhou-fixmaster
Fix the kernel perf package
2022-09-30 09:26:32 +08:00
Yushan Zhou f27728205d Fix the kernel perf package
Signed-off-by: Haisu Wang <haisuwang@tencent.com>
Signed-off-by: Yushan Zhou <katrinzhou@tencent.com>
2022-09-29 19:25:52 +08:00
sclaibin bf59664b81
Merge pull request #289 from nick-wang/build-master
Fix the kernel perf package include files
2022-09-29 09:34:16 +08:00
Haisu Wang c04cc75c65 package: compat perf build on tmanager
libperf-jvmti.so doesn't build in tmanager.
Add a dummy libperf-jvmti.so in perf to compat two system.

Signed-off-by: Haisu Wang <haisuwang@tencent.com>
2022-09-28 16:14:02 +08:00
Haisu Wang 854a58783a package: include cpupower file to kernel-tools
After fixed the wide cast of perf package.
Move the cpupower files to kernel-tools.

Signed-off-by: Haisu Wang <haisuwang@tencent.com>
2022-09-27 16:54:03 +08:00
Haisu Wang 3f527002c7 package: remove the duplicate file included by perf
Remove the duplicate files from kernel-tools/bpftools but
included by perf.

Keep the python2, python-perf name and libraries location
for backward compatibility.

Signed-off-by: Haisu Wang <haisuwang@tencent.com>
2022-09-27 16:34:21 +08:00
sclaibin 5344c4018c
Merge pull request #283 from Tencent/tk4/honglin_bpftools
package/arm: enable build bpftool with kernel for arm
2022-09-24 18:58:07 +08:00
Honglin Li ba0ddf48bc package: fix a warning/error in spec for x86/arm
Add %{_mandir}/man7/bpf-helpers.7.gz to solve
the bug with kernel.

Signed-off-by: Honglin Li <honglinli@tencent.com>
Reviewed-by: Haisu Wang <haisuwang@tencent.com>
2022-09-23 17:40:56 +08:00
Honglin Li 73238e1f39 package/arm: enable build bpftool with kernel for arm
Build and deliver kernel builtin bpftool

Signed-off-by: Honglin Li <honglinli@tencent.com>
Reviewed-by: Haisu Wang <haisuwang@tencent.com>
2022-09-23 17:34:49 +08:00
sclaibin e88965af0f
Merge pull request #280 from Tencent/tk4/katrinzhou-fixpack
package: support tag startswith x86
2022-09-23 16:06:09 +08:00
Yushan Zhou 27a914a699 package: support tag startswith x86
Tmanager generates tag to build kernel when branch specified.
The tag starts with x86, which leads to the build process failing
to parse the tag.
Modify the generate-rpms.sh to support building with "x86-*" tags.

Signed-off-by: Yushan Zhou <katrinzhou@tencent.com>
2022-09-23 15:31:01 +08:00
sclaibin 297ab14805
Merge pull request #279 from sclaibin/tk4/master-hyperv
config: enable hyperv configurations for x86 platform
2022-09-23 15:18:02 +08:00
Bin Lai d60e770a8d config: enable hyperv configurations for x86 platform
Hyperv is a native hypervisor that can create virtual machine on x86-64
platform. Enable all hyperv configurations for linux, then it can run
on windows hyperv.

Signed-off-by: Bin Lai <robinlai@tencent.com>
2022-09-23 15:16:12 +08:00
sclaibin 870bd25076
Merge pull request #273 from Tencent/tk4/katrinzhou-fixpack
generate-rpm.sh: unify package script
2022-09-22 16:28:45 +08:00
Yushan Zhou 32b6274570 generate-rpm.sh: unify package script
Modify generate-rpm.sh so that x86/arm can use the same tag.

Signed-off-by: Yushan Zhou <katrinzhou@tencent.com>
2022-09-22 16:16:11 +08:00
sclaibin 2005afdc6c
Merge pull request #270 from nick-wang/tk4-master
package: support repackage bpftool for tl2
2022-09-21 11:03:34 +08:00
sclaibin b1816b40f3
Merge pull request #268 from Tencent/tk4/katrinzhou-fixmaster
perf spec: remove perf obj default
2022-09-21 10:58:59 +08:00
Haisu Wang 6a9ae87797 package: support repackage bpftool for tl2
tl2 release system using repackage trick instead of full tl2
env to build kernel and other packages from scratch.

Update the perf tools spec to support build bpftool with
perf and kernel tools.

Signed-off-by: Haisu Wang <haisuwang@tencent.com>
2022-09-19 14:16:50 +08:00
Yushan Zhou c65aab2a4a perf spec: remove perf obj default
The bash script mkmakefile generates Makefile which includes itself.
It leads to dead cycle when build rpm packages.

Signed-off-by: Yushan Zhou <katrinzhou@tencent.com>
2022-09-19 10:13:51 +08:00
sclaibin 96aa2400b1
Merge pull request #265 from Tencent/haisu/tk4-public-bpftool
package: enable build bpftool with kernel
2022-09-16 15:01:20 +08:00
Haisu Wang 0a38cbfb23 package: support bpftool in tlinux2
In tlinux2, use python2-docutils instead of python3-docutils.

Signed-off-by: Haisu Wang <haisuwang@tencent.com>
2022-09-06 16:25:43 +08:00
Haisu Wang b68ab35a8d package: enable build bpftool with kernel
Build and deliver kernel builtin bpftool

Signed-off-by: Haisu Wang <haisuwang@tencent.com>
2022-09-06 09:48:49 +08:00
sclaibin 4863d4d5d6
Merge pull request #264 from sclaibin/tk4/master_revert_lru_lock
Tk4/master revert lru lock
2022-09-05 22:17:26 +08:00
Bin Lai bdd489e543 Revert "mm/lru: introduce TestClearPageLRU"
This reverts commit 4702fd8039.
2022-09-05 21:29:22 +08:00
Bin Lai d74caa7a54 Revert "mm/compaction: do page isolation first in compaction"
This reverts commit f784a238c7.
2022-09-05 21:29:13 +08:00
Bin Lai 065f204ff9 Revert "mm/swap.c: serialize memcg changes in pagevec_lru_move_fn"
This reverts commit 4e9dc3310b.
2022-09-05 21:29:03 +08:00
Bin Lai c40431dbf8 Revert "mm: memcontrol: charge swapin pages on instantiation"
This reverts commit 821adde85c.
2022-09-05 21:28:53 +08:00
Bin Lai 0562b6d94c Revert " mm/lru: replace pgdat lru_lock with lruvec lock"
This reverts commit 1b7478d8d0.
2022-09-05 21:28:42 +08:00
Bin Lai 5a23b77415 Revert " mm/lru: revise the comments of lru_lock"
This reverts commit 3df720cae4.
2022-09-05 21:28:30 +08:00
Bin Lai 04ec1c8db5 Revert " mm/vmscan: fix shmctl SHM_UNLOCK triggering an warning"
This reverts commit ae0126c5aa.
2022-09-05 21:28:11 +08:00
sclaibin c5b4c812ef
Merge pull request #260 from sclaibin/tk4/master_fix_cve
net_sched: cls_route: remove from list when handle is 0
2022-08-31 16:13:30 +08:00
sclaibin 88ab825dc1
Merge pull request #261 from Tencent/tk4/tallwu
Tk4/tallwu
2022-08-31 16:13:15 +08:00
Wu Tao 9fa464c041 netfilter: nf_tables: do not allow RULE_ID to refer to another chain
[ Upstream commit 36d5b2913219ac853908b0f1c664345e04313856 ]

When doing lookups for rules on the same batch by using its ID, a rule from
a different chain can be used. If a rule is added to a chain but tries to
be positioned next to a rule from a different chain, it will be linked to
chain2, but the use counter on chain1 would be the one to be incremented.

When looking for rules by ID, use the chain that was used for the lookup by
name. The chain used in the context copied to the transaction needs to
match that same chain. That way, struct nft_rule does not need to get
enlarged with another member.

Fixes: 1a94e38d254b ("netfilter: nf_tables: add NFTA_RULE_ID attribute")
Fixes: 75dd48e2e420 ("netfilter: nf_tables: Support RULE_ID reference in new rule")
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tao Wu <tallwu@tencent.com>
2022-08-31 15:24:37 +08:00