Commit Graph

9478 Commits

Author SHA1 Message Date
Kairui Song 239b3fea8a configs: set EDD, RAID, CRAMFS as modules
These are required for TS2 dracut boot, it tries to load these modules and
error out if not found.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-25 15:15:58 +08:00
Peng Hao 97152118e4
Merge pull request #304 from ryncsn/tk4/0009-kabi
package: remove TK4 legacy build system
2022-10-19 15:50:56 +08:00
Kairui Song 8cd9618696 package: remove TK4 legacy build system
Now replaced by dist build under dist/, only the config file and kABI
file are kept for a smooth transition.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-18 17:41:39 +08:00
Alex Shi e3f15df5df
Merge pull request #299 from ryncsn/tk4/0009-kabi
[WIP][Draft] Initial Koji/Standard Dist Support
2022-10-18 13:23:20 +08:00
sclaibin 072c3c5802
Merge pull request #303 from Flyriver-wyh/tk4/dev2
config: enable CONFIG_MEMORY_HOTPLUG
2022-10-18 12:56:23 +08:00
Yuehong Wu cfa9498dac config: enable CONFIG_MEMORY_HOTPLUG
Signed-off-by: YueHong Wu <yuehongwu@tencent.com>
2022-10-18 12:25:24 +08:00
Kairui Song b1f00dae47 dist: fix remote name in check-commits
Upstream: no

Fix typo, fix the URL.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-18 11:37:20 +08:00
sclaibin a8c37e7222
Merge pull request #301 from xmmgithub/tk4/0009-kabi
virtio-net: use NETIF_F_GRO_HW instead of NETIF_F_LRO
2022-10-18 10:50:48 +08:00
Jason Wang b50a785eee virtio-net: use NETIF_F_GRO_HW instead of NETIF_F_LRO
[upstream commit dbcf24d153884439dad30484a0e3f02350692e4c]

Commit a02e8964eaf92 ("virtio-net: ethtool configurable LRO")
maps LRO to virtio guest offloading features and allows the
administrator to enable and disable those features via ethtool.

This leads to several issues:

- For a device that doesn't support control guest offloads, the "LRO"
  can't be disabled triggering WARN in dev_disable_lro() when turning
  off LRO or when enabling forwarding bridging etc.

- For a device that supports control guest offloads, the guest
  offloads are disabled in cases of bridging, forwarding etc slowing
  down the traffic.

Fix this by using NETIF_F_GRO_HW instead. Though the spec does not
guarantee packets to be re-segmented as the original ones,
we can add that to the spec, possibly with a flag for devices to
differentiate between GRO and LRO.

Further, we never advertised LRO historically before a02e8964eaf92
("virtio-net: ethtool configurable LRO") and so bridged/forwarded
configs effectively always relied on virtio receive offloads behaving
like GRO - thus even if this breaks any configs it is at least not
a regression.

Fixes: a02e8964eaf92 ("virtio-net: ethtool configurable LRO")
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reported-by: Ivan <ivan@prestigetransportation.com>
Tested-by: Ivan <ivan@prestigetransportation.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Menglong Dong <imagedong@tencent.com>
2022-10-18 10:47:43 +08:00
Peng Hao 290c4e762a
Merge pull request #300 from newcuit/kaicliu-drm-edid
Kaicliu drm edid
2022-10-18 10:38:02 +08:00
liuchun 83267df9d1 dist: tk4: add the function of disabling selinux
When kernel rpm is installed, if selinux in the host is not set,
the function of selinux will be disabled.

Signed-off-by: Chun Liu <kaicliu@tencent.com>
2022-10-17 22:42:16 +08:00
Kairui Song 1014f31426 dist: tk4: make a full copy of arch code in include path
TK4 have this odd behaviour, just try to be compatible.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-17 22:42:16 +08:00
Kairui Song 57d15705a8 dist: tk4: add historical tlinux_cciss_link
Not sure if anyone still using it but try best to be compatible.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-17 22:42:16 +08:00
Kairui Song 5088b6f5b2 dist: tk4: update file list
Update the file list accordingly.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-17 22:42:16 +08:00
Kairui Song 3b51990e67 dist: tk4: MLNX driver TK4 build
Build MLNX for TK4.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-17 22:42:13 +08:00
liuchun e4d4af3ec0 drm/hisilicon: Features to support reading resolutions from EDID
Use drm_get_edid to get the resolution, if that fails, set it to
a fixed resolution. Rewrite the desrtoy callback function to release
resources.

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
2022-10-17 19:09:10 +08:00
liuchun 42055d7dca drm/hisilicon: Support i2c driver algorithms for bit-shift adapters
Adding driver implementation to support i2c driver algorithms for
bit-shift adapters, so hibmc will using the interface provided by
drm to read edid.

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
2022-10-17 19:07:42 +08:00
liuchun 7f5f72bb4b gpu: drm: fix the support of 16bpp,1711BMC
driver inclusion
category: Bugfix
bugzilla: NA
CVE: NA

The resolution of line offset without 128 byte alignment under 16bpp
is adjusted to make it 128 byte aligned, so as to ensure GPU to access
its display memory space normally. At the same time, the initialization
color depth is 32bpp.

Signed-off-by: GongJunjie <gongjunjie2@huawei.com>
Reviewed-by: Xin Yin <yinxin.yinxin@huawei.com>
Reviewed-by: Weiwei Deng <dengweiwei@huawei.com>
Reviewed-by: Liang Liu <liuliang39@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
2022-10-17 19:07:16 +08:00
liuchun e04b0d227e gpu: hibmc: add pll and mode list support
driver inclusion
category: feature
bugzilla: NA
CVE: NA

Added PLL and mode list support corresponding to some resolutions.
The increased resolution is 640x480,1440x900,1600x900, enabling
shadowfb acceleration.

Signed-off-by: GongJunjie <gongjunjie2@huawei.com>
Reviewed-by: Xin Yin <yinxin.yinxin@huawei.com>
Reviewed-by: Mu Zhang <zhangmu1@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
2022-10-17 18:54:11 +08:00
Kairui Song 5936210a87 dist: tk4: fix potential build failure
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-10-17 17:31:28 +08:00
Kairui Song e8ded70203 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-10-17 17:31:28 +08:00
Kairui Song 90a5fc6aae dist: match all possible perf utils
Upstream: no

Be more flexiable about perf binaries.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-17 17:31:28 +08:00
Kairui Song 45344fe85b dist: fix systemd dependency
Upstream: no

It's kernel-core's dependency. And for older RHEL based distro, just
depend on systemd instead.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-17 17:31:28 +08:00
Kairui Song 04aee94875 dist: don't pass BTF perservation param for old find-debuginfo
Upstream: no

Make it compatible with older RHEL based like distro.
2022-10-17 17:31:28 +08:00
Kairui Song ffa39c8cfe dist: relax build time requirements on python-docutils
Upstream: no

Make the dependency more flexible on different distro.
2022-10-17 17:31:28 +08:00
Kairui Song 32b861a967 dist: hook into kernel build system
This is automatically done with:
./dist/scripts/helper/dist-repo-init.sh

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-17 02:25:35 +08:00
Kairui Song 5b560cc3c5 dist: initial dist file commit
Just dump latest dist files from OCKS, 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-10-17 02:25:31 +08:00
Kairui Song b5dbbef1ab configs: enable XZ for initramfs
Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-17 01:30:43 +08:00
Kairui Song 0bab5ad90c 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-10-17 01:30:43 +08:00
Kairui Song 5606f23e80 Makefile: sync the EXTRAVERSION with git tag name
The EXTRAVERSION is out of sync with git taga. Update it so build system
won't get confused.

Signed-off-by: Kairui Song <kasong@tencent.com>
2022-10-17 01:30:43 +08:00
sclaibin fd9b80ef0b
Merge pull request #298 from sclaibin/tk4/0009-kabi-fix-sli
sli: fix the compiling error caused by memory access out of range
2022-10-14 16:58:30 +08:00
Bin Lai 91d5430f42 sli: fix the compiling error caused by memory access out of range
The member of member_offset structure should be char pointer and
not an array, otherwise it could result in
memlat_member_offset[i].member always be true when we iterate the
array. The ARM-GCC can find it and report the error.

Signed-off-by: Bin Lai <robinlai@tencent.com>
Reviewed-by: Munger Jiang <mungerjiang@tencent.com>
2022-10-14 16:20:22 +08:00
sclaibin 93483d12c3
Merge pull request #297 from caellili/tk4/0009-kabi
ACPICA: Utilities: Avoid deleting the same object twice in a row
2022-10-14 13:53:12 +08:00
Rafael J. Wysocki d38dd41f91 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>
Signed-off-by: caelli <caelli@tencent.com>
2022-10-14 12:08:48 +08:00
Peng Hao b37478bbfe
Merge pull request #294 from newcuit/kaicliu-0009-kabi-bpfilter
bpfilter: remove CONFIG_BPFILTER
2022-10-09 19:51:16 +08:00
root e705b13626 bpfilter: remove CONFIG_BPFILTER
Signed-off-by: Liu Chun <kaicliu@tencent.com>
2022-10-09 19:23:47 +08:00
Peng Hao 95e7b03773
Merge pull request #293 from newcuit/kaicliu-0009-kabi-drm-to-m
drm: change drm modules from Y to M.
2022-10-05 17:45:10 +08:00
liuchun 270c04fe25 drm: change drm modules from Y to M.
Signed-off-by: Liu Chun <kaicliu@tencent.com>
2022-10-05 17:39:46 +08:00
sclaibin 13746982ca
Merge pull request #292 from Tencent/tk4/katrinzhou-fixperf
Fix the kernel perf package
2022-09-30 09:26:20 +08:00
Yushan Zhou 6d68e93acd 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:24:51 +08:00
sclaibin a88040aef2
Merge pull request #290 from nick-wang/build-master-0009-kabi
Fix the kernel perf package include files
2022-09-29 09:33:59 +08:00
Haisu Wang 744e0e425c 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:04:09 +08:00
Haisu Wang 7de0e6fd58 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 17:34:25 +08:00
Haisu Wang c5f7b950bd 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 17:34:23 +08:00
Peng Hao f770b1c16a
Merge pull request #288 from xmmgithub/tk4/0009-kabi
Tk4/0009 kabi
2022-09-27 17:11:56 +08:00
Menglong Dong 0779e15fee security: selinux: enable selinux for x86 and arm
Enable selinux by add 'selinux' to CONFIG_LSM for arm64. Meanwhile,
enable CONFIG_SECURITY_SELINUX for x86.

Signed-off-by: Menglong Dong <imagedong@tencent.com>
2022-09-27 10:29:35 +08:00
Thadeu Lima de Souza Cascardo 7b08a28649 can: bcm: delay release of struct bcm_op after synchronize_rcu()
commit d5f9023fa61ee8b94f37a93f08e94b136cf1e463 upstream.

can_rx_register() callbacks may be called concurrently to the call to
can_rx_unregister(). The callbacks and callback data, though, are
protected by RCU and the struct sock reference count.

So the callback data is really attached to the life of sk, meaning
that it should be released on sk_destruct. However, bcm_remove_op()
calls tasklet_kill(), and RCU callbacks may be called under RCU
softirq, so that cannot be used on kernels before the introduction of
HRTIMER_MODE_SOFT.

However, bcm_rx_handler() is called under RCU protection, so after
calling can_rx_unregister(), we may call synchronize_rcu() in order to
wait for any RCU read-side critical sections to finish. That is,
bcm_rx_handler() won't be called anymore for those ops. So, we only
free them, after we do that synchronize_rcu().

Fixes: ffd980f976e7 ("[CAN]: Add broadcast manager (bcm) protocol")
Link: https://lore.kernel.org/r/20210619161813.2098382-1-cascardo@canonical.com
Cc: linux-stable <stable@vger.kernel.org>
Reported-by: syzbot+0f7e7e5e2f4f40fa89c0@syzkaller.appspotmail.com
Reported-by: Norbert Slusarek <nslusarek@gmx.net>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2022-09-27 10:29:35 +08:00
bauerchen 97948cf6d5 arm64/config: open CONFIG_NETFILTER_XT_MATCH_SOCKET / CONFIG_NETFILTER_XT_TARGET_TPROXY
Httpchaos need both CONFIG_NETFILTER_XT_MATCH_SOCKET and
CONFIG_NETFILTER_XT_TARGET_TPROXY, these config were aleady opened in x86, but
not on arm64, so just open it.
2022-09-27 10:29:35 +08:00
sclaibin b605622a85
Merge pull request #287 from sclaibin/tk4/0009-kabi-sched
sched/debug: allow user modify sched_domain flags
2022-09-26 19:22:29 +08:00
Bin Lai b42f03261c sched/debug: allow user modify sched_domain flags
Kernel-5.4 prohibit user to modify the sched_domain flags bit, but
we have to do it to optimize performance in some cases. So we remove
the prohibition of sched_domain flags moditication allow user do the
better tunning.

Signed-off-by: Bin Lai <robinlai@tencent.com>
Reviewed-by: Bauerchen <bauerchen@tencent.com>
2022-09-26 17:11:33 +08:00