kernel February 2024

kernel@lists.fedoraproject.org

4 participants
69 discussions

[OS-BUILD PATCH] gitlab-ci: support CI for zfcpdump kernel on ELN
by Michael Hofmann (via Email Bridge) 13 Feb '24

13 Feb '24

From: Michael Hofmann <mhofmann(a)redhat.com> gitlab-ci: support CI for zfcpdump kernel on ELN Part of https://gitlab.com/cki-project/kernel-ark/-/issues/145 Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -213,7 +213,7 @@ workflow: compiler: clang .eln_up: variables: - rpmbuild_with: up base + rpmbuild_with: up zfcpdump base package_name: kernel architectures: x86_64 aarch64 s390x ppc64le run_redhat_self_test: 'true' -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2932

2 3

[OS-BUILD PATCHv4 0/2] redhat/kernel.spec: add uki_addons to create UKI kernel cmdline addons
by Emanuele Giuseppe Esposito (via Email Bridge) 13 Feb '24

13 Feb '24

From: Emanuele Giuseppe Esposito on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2917 We want to enable kernel.spec to optionally ship UKI addons defined in a common config file in redhat folder. If that file is populated, and the kernel-uki-virt is built, kernel-uki-virt rpm will also contain a folder called addons that will contain the uki addons. As an example of this feature, add the fips addon to optionally enable fips (https://issues.redhat.com/browse/RHEL-23049) --- redhat/addons/sbat/.gitkeep | 0 redhat/addons/fips.addon | 2 + redhat/scripts/uki_addons.py | 124 +++++++++++++++++++++++++++++++++++++++++++ redhat/Makefile | 3 + redhat/kernel.spec.template | 18 ++++++ 5 files changed, 147 insertions(+), 0 deletions(-)

1 4

[OS-BUILD PATCHv3 0/2] redhat/kernel.spec: add uki_addons to create UKI kernel cmdline addons
by Emanuele Giuseppe Esposito (via Email Bridge) 13 Feb '24

13 Feb '24

1 2

[OS-BUILD PATCH] redhat/configs: rhel wireless requests
by José Ignacio Tornos Martínez (via Email Bridge) 12 Feb '24

12 Feb '24

From: Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com> redhat/configs: rhel wireless requests MT7925 Mediatek WiFi7 device (CONFIG_MT7925E) and RTL8852CE Realtek WiFi6E device (CONFIG_RTW89_8852CE) have beed requested to be enabled for rhel. Unify configuration with fedora (they were previously enabled). Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com> diff --git a/redhat/configs/fedora/generic/CONFIG_MT7925E b/redhat/configs/common/generic/CONFIG_MT7925E rename from redhat/configs/fedora/generic/CONFIG_MT7925E rename to redhat/configs/common/generic/CONFIG_MT7925E index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_MT7925E +++ b/redhat/configs/common/generic/CONFIG_MT7925E diff --git a/redhat/configs/fedora/generic/CONFIG_RTW89_8852CE b/redhat/configs/common/generic/CONFIG_RTW89_8852CE rename from redhat/configs/fedora/generic/CONFIG_RTW89_8852CE rename to redhat/configs/common/generic/CONFIG_RTW89_8852CE index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_RTW89_8852CE +++ b/redhat/configs/common/generic/CONFIG_RTW89_8852CE diff --git a/redhat/configs/rhel/generic/CONFIG_MT7925E b/redhat/configs/rhel/generic/CONFIG_MT7925E deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_MT7925E +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MT7925E is not set diff --git a/redhat/configs/rhel/generic/CONFIG_RTW89_8852CE b/redhat/configs/rhel/generic/CONFIG_RTW89_8852CE deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_RTW89_8852CE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_RTW89_8852CE is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2935

1 0

[OS-BUILD PATCH] redhat: add nvidia oot signing key
by David Airlie (via Email Bridge) 12 Feb '24

12 Feb '24

From: Dave Airlie <airlied(a)redhat.com> redhat: add nvidia oot signing key This adds the nvidia out-of-tree signing key to the RHEL kernels, this key will be used to sign nvidia out-of-tree drivers for RHEL. Signed-off-by: Dave Airlie <airlied(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -681,6 +681,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check scripts/gating/rpminspect.yaml > $(SOURCES)/rpminspect.yaml @cp scripts/kernel-tools/kvm_stat.logrotate \ keys/rhel*.x509 \ + keys/nvidia*.x509 \ kabi/check-kabi \ configs/$(SPECPACKAGE_NAME)-*.config \ configs/partial*.config \ diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -935,6 +935,7 @@ Source87: flavors Source100: rheldup3.x509 Source101: rhelkpatch1.x509 +Source102: nvidiagpuoot001.x509 Source200: check-kabi @@ -1879,7 +1880,8 @@ done %if %{signkernel}%{signmodules} openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem -cat rheldup3.pem rhelkpatch1.pem > ../certs/rhel.pem +openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem +cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem > ../certs/rhel.pem %ifarch s390x ppc64le openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem cat secureboot.pem >> ../certs/rhel.pem diff --git a/redhat/keys/nvidiagpuoot001.x509 b/redhat/keys/nvidiagpuoot001.x509 new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/keys/nvidiagpuoot001.x509 Binary files /dev/null and b/redhat/keys/nvidiagpuoot001.x509 differ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2936

1 0

[OS-BUILD PATCHv3 0/0] fedora: cleanups and new enablement
by pbrobinson (via Email Bridge) 11 Feb '24

11 Feb '24

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2926 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Updates for the 6.8 cycle as well as further aarch64 platform enablement. Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- redhat/configs/rhel/generic/CONFIG_ARM64_ERRATUM_3117295 => redhat/configs/common/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_3117295 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_R9A08G045 | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_R9A09G011 | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_S32 | 1 + redhat/configs/fedora/generic/CONFIG_ARM64_ERRATUM_858921 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_858921 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_CAN_RCAR_CANFD | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_NITROX_CNN55XX | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_I2C_RIIC | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_INTERCONNECT_QCOM_X1E80100 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_RENESAS | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_S32G2 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_X1E80100 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_RAVB | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_RENESAS_ETHER_SWITCH | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_RENESAS_GEN4_PTP | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_RENESAS_OSTM | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_RENESAS_RZG2LWDT | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_RZG2L_ADC | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_RZG2L_THERMAL | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_RZ_DMAC | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_8250_EM | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_SH_ETH | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RZ | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_SPI_RSPI | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_USB_RZV2M_USB3DRD | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_USB_XHCI_RCAR=m | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_USB_XHCI_RZV2M | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_RENESAS_FCP | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_RENESAS_FDP1 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_RENESAS_VSP1 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_RZG2L_CRU | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_RZG2L_CSI2 | 2 +- redhat/configs/fedora/generic/CONFIG_CRYPTO_DEV_NITROX_CNN55XX | 2 +- redhat/configs/pending-fedora/generic/CONFIG_ARM64_ERRATUM_3117295 | 13 --------- redhat/configs/pending-fedora/generic/CONFIG_INTERCONNECT_QCOM_X1E80100 | 14 ---------- redhat/configs/pending-fedora/generic/CONFIG_PINCTRL_X1E80100 | 14 ---------- 36 files changed, 29 insertions(+), 59 deletions(-)

1 0

[OS-BUILD PATCH] DO NOT MERGE: Revert Fix cursor planes with virtualized drivers series
by Justin M. Forbes (via Email Bridge) 11 Feb '24

11 Feb '24

From: Justin M. Forbes <jforbes(a)fedoraproject.org> DO NOT MERGE: Revert Fix cursor planes with virtualized drivers series This is a temporary revert while things are worked out upstream. This series breaks gnome on virtio-vga, which means it also breaks openqa, and keeps kernel updates gated out of rawhide. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst index blahblah..blahblah 100644 --- a/Documentation/gpu/drm-kms.rst +++ b/Documentation/gpu/drm-kms.rst @@ -581,12 +581,6 @@ Variable Refresh Properties .. kernel-doc:: drivers/gpu/drm/drm_connector.c :doc: Variable refresh properties -Cursor Hotspot Properties ---------------------------- - -.. kernel-doc:: drivers/gpu/drm/drm_plane.c - :doc: hotspot properties - Existing KMS Properties ----------------------- diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -275,20 +275,6 @@ void __drm_atomic_helper_plane_state_reset(struct drm_plane_state *plane_state, plane_state->normalized_zpos = val; } } - - if (plane->hotspot_x_property) { - if (!drm_object_property_get_default_value(&plane->base, - plane->hotspot_x_property, - &val)) - plane_state->hotspot_x = val; - } - - if (plane->hotspot_y_property) { - if (!drm_object_property_get_default_value(&plane->base, - plane->hotspot_y_property, - &val)) - plane_state->hotspot_y = val; - } } EXPORT_SYMBOL(__drm_atomic_helper_plane_state_reset); diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -551,22 +551,6 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, } else if (plane->funcs->atomic_set_property) { return plane->funcs->atomic_set_property(plane, state, property, val); - } else if (property == plane->hotspot_x_property) { - if (plane->type != DRM_PLANE_TYPE_CURSOR) { - drm_dbg_atomic(plane->dev, - "[PLANE:%d:%s] is not a cursor plane: 0x%llx\n", - plane->base.id, plane->name, val); - return -EINVAL; - } - state->hotspot_x = val; - } else if (property == plane->hotspot_y_property) { - if (plane->type != DRM_PLANE_TYPE_CURSOR) { - drm_dbg_atomic(plane->dev, - "[PLANE:%d:%s] is not a cursor plane: 0x%llx\n", - plane->base.id, plane->name, val); - return -EINVAL; - } - state->hotspot_y = val; } else { drm_dbg_atomic(plane->dev, "[PLANE:%d:%s] unknown property [PROP:%d:%s]\n", @@ -627,10 +611,6 @@ drm_atomic_plane_get_property(struct drm_plane *plane, *val = state->scaling_filter; } else if (plane->funcs->atomic_get_property) { return plane->funcs->atomic_get_property(plane, state, property, val); - } else if (property == plane->hotspot_x_property) { - *val = state->hotspot_x; - } else if (property == plane->hotspot_y_property) { - *val = state->hotspot_y; } else { drm_dbg_atomic(dev, "[PLANE:%d:%s] unknown property [PROP:%d:%s]\n", diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -364,15 +364,6 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv) return -EINVAL; file_priv->writeback_connectors = req->value; break; - case DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT: - if (!drm_core_check_feature(dev, DRIVER_CURSOR_HOTSPOT)) - return -EOPNOTSUPP; - if (!file_priv->atomic) - return -EINVAL; - if (req->value > 1) - return -EINVAL; - file_priv->supports_virtualized_cursor_plane = req->value; - break; default: return -EINVAL; } diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -230,103 +230,6 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane return 0; } -/** - * DOC: hotspot properties - * - * HOTSPOT_X: property to set mouse hotspot x offset. - * HOTSPOT_Y: property to set mouse hotspot y offset. - * - * When the plane is being used as a cursor image to display a mouse pointer, - * the "hotspot" is the offset within the cursor image where mouse events - * are expected to go. - * - * Positive values move the hotspot from the top-left corner of the cursor - * plane towards the right and bottom. - * - * Most display drivers do not need this information because the - * hotspot is not actually connected to anything visible on screen. - * However, this is necessary for display drivers like the para-virtualized - * drivers (eg qxl, vbox, virtio, vmwgfx), that are attached to a user console - * with a mouse pointer. Since these consoles are often being remoted over a - * network, they would otherwise have to wait to display the pointer movement to - * the user until a full network round-trip has occurred. New mouse events have - * to be sent from the user's console, over the network to the virtual input - * devices, forwarded to the desktop for processing, and then the cursor plane's - * position can be updated and sent back to the user's console over the network. - * Instead, with the hotspot information, the console can anticipate the new - * location, and draw the mouse cursor there before the confirmation comes in. - * To do that correctly, the user's console must be able predict how the - * desktop will process mouse events, which normally requires the desktop's - * mouse topology information, ie where each CRTC sits in the mouse coordinate - * space. This is typically sent to the para-virtualized drivers using some - * driver-specific method, and the driver then forwards it to the console by - * way of the virtual display device or hypervisor. - * - * The assumption is generally made that there is only one cursor plane being - * used this way at a time, and that the desktop is feeding all mouse devices - * into the same global pointer. Para-virtualized drivers that require this - * should only be exposing a single cursor plane, or find some other way - * to coordinate with a userspace desktop that supports multiple pointers. - * If the hotspot properties are set, the cursor plane is therefore assumed to be - * used only for displaying a mouse cursor image, and the position of the combined - * cursor plane + offset can therefore be used for coordinating with input from a - * mouse device. - * - * The cursor will then be drawn either at the location of the plane in the CRTC - * console, or as a free-floating cursor plane on the user's console - * corresponding to their desktop mouse position. - * - * DRM clients which would like to work correctly on drivers which expose - * hotspot properties should advertise DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT. - * Setting this property on drivers which do not special case - * cursor planes will return EOPNOTSUPP, which can be used by userspace to - * gauge requirements of the hardware/drivers they're running on. Advertising - * DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT implies that the userspace client will be - * correctly setting the hotspot properties. - */ - -/** - * drm_plane_create_hotspot_properties - creates the mouse hotspot - * properties and attaches them to the given cursor plane - * - * @plane: drm cursor plane - * - * This function enables the mouse hotspot property on a given - * cursor plane. Look at the documentation for hotspot properties - * to get a better understanding for what they're used for. - * - * RETURNS: - * Zero for success or -errno - */ -static int drm_plane_create_hotspot_properties(struct drm_plane *plane) -{ - struct drm_property *prop_x; - struct drm_property *prop_y; - - drm_WARN_ON(plane->dev, - !drm_core_check_feature(plane->dev, - DRIVER_CURSOR_HOTSPOT)); - - prop_x = drm_property_create_signed_range(plane->dev, 0, "HOTSPOT_X", - INT_MIN, INT_MAX); - if (IS_ERR(prop_x)) - return PTR_ERR(prop_x); - - prop_y = drm_property_create_signed_range(plane->dev, 0, "HOTSPOT_Y", - INT_MIN, INT_MAX); - if (IS_ERR(prop_y)) { - drm_property_destroy(plane->dev, prop_x); - return PTR_ERR(prop_y); - } - - drm_object_attach_property(&plane->base, prop_x, 0); - drm_object_attach_property(&plane->base, prop_y, 0); - plane->hotspot_x_property = prop_x; - plane->hotspot_y_property = prop_y; - - return 0; -} - __printf(9, 0) static int __drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, @@ -445,10 +348,6 @@ static int __drm_universal_plane_init(struct drm_device *dev, drm_object_attach_property(&plane->base, config->prop_src_w, 0); drm_object_attach_property(&plane->base, config->prop_src_h, 0); } - if (drm_core_check_feature(dev, DRIVER_CURSOR_HOTSPOT) && - type == DRM_PLANE_TYPE_CURSOR) { - drm_plane_create_hotspot_properties(plane); - } if (format_modifier_count) create_in_format_blob(dev, plane); @@ -779,19 +678,6 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, !file_priv->universal_planes) continue; - /* - * If we're running on a virtualized driver then, - * unless userspace advertizes support for the - * virtualized cursor plane, disable cursor planes - * because they'll be broken due to missing cursor - * hotspot info. - */ - if (plane->type == DRM_PLANE_TYPE_CURSOR && - drm_core_check_feature(dev, DRIVER_CURSOR_HOTSPOT) && - file_priv->atomic && - !file_priv->supports_virtualized_cursor_plane) - continue; - if (drm_lease_held(file_priv, plane->base.id)) { if (count < plane_resp->count_planes && put_user(plane->base.id, plane_ptr + count)) @@ -1166,10 +1052,8 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc, return PTR_ERR(fb); } - if (plane->hotspot_x_property && plane->state) - plane->state->hotspot_x = req->hot_x; - if (plane->hotspot_y_property && plane->state) - plane->state->hotspot_y = req->hot_y; + fb->hot_x = req->hot_x; + fb->hot_y = req->hot_y; } else { fb = NULL; } diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -485,6 +485,7 @@ static int qxl_primary_atomic_check(struct drm_plane *plane, static int qxl_primary_apply_cursor(struct qxl_device *qdev, struct drm_plane_state *plane_state) { + struct drm_framebuffer *fb = plane_state->fb; struct qxl_crtc *qcrtc = to_qxl_crtc(plane_state->crtc); struct qxl_cursor_cmd *cmd; struct qxl_release *release; @@ -509,8 +510,8 @@ static int qxl_primary_apply_cursor(struct qxl_device *qdev, cmd = (struct qxl_cursor_cmd *)qxl_release_map(qdev, release); cmd->type = QXL_CURSOR_SET; - cmd->u.set.position.x = plane_state->crtc_x + plane_state->hotspot_x; - cmd->u.set.position.y = plane_state->crtc_y + plane_state->hotspot_y; + cmd->u.set.position.x = plane_state->crtc_x + fb->hot_x; + cmd->u.set.position.y = plane_state->crtc_y + fb->hot_y; cmd->u.set.shape = qxl_bo_physical_address(qdev, qcrtc->cursor_bo, 0); @@ -530,6 +531,7 @@ static int qxl_primary_apply_cursor(struct qxl_device *qdev, static int qxl_primary_move_cursor(struct qxl_device *qdev, struct drm_plane_state *plane_state) { + struct drm_framebuffer *fb = plane_state->fb; struct qxl_crtc *qcrtc = to_qxl_crtc(plane_state->crtc); struct qxl_cursor_cmd *cmd; struct qxl_release *release; @@ -552,8 +554,8 @@ static int qxl_primary_move_cursor(struct qxl_device *qdev, cmd = (struct qxl_cursor_cmd *)qxl_release_map(qdev, release); cmd->type = QXL_CURSOR_MOVE; - cmd->u.position.x = plane_state->crtc_x + plane_state->hotspot_x; - cmd->u.position.y = plane_state->crtc_y + plane_state->hotspot_y; + cmd->u.position.x = plane_state->crtc_x + fb->hot_x; + cmd->u.position.y = plane_state->crtc_y + fb->hot_y; qxl_release_unmap(qdev, release, &cmd->release_info); qxl_release_fence_buffer_objects(release); @@ -849,8 +851,8 @@ static int qxl_plane_prepare_fb(struct drm_plane *plane, struct qxl_bo *old_cursor_bo = qcrtc->cursor_bo; qcrtc->cursor_bo = qxl_create_cursor(qdev, user_bo, - new_state->hotspot_x, - new_state->hotspot_y); + new_state->fb->hot_x, + new_state->fb->hot_y); qxl_free_cursor(old_cursor_bo); } diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -285,7 +285,7 @@ static const struct drm_ioctl_desc qxl_ioctls[] = { }; static struct drm_driver qxl_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_CURSOR_HOTSPOT, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .dumb_create = qxl_mode_dumb_create, .dumb_map_offset = drm_gem_ttm_dumb_map_offset, diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c @@ -182,7 +182,7 @@ DEFINE_DRM_GEM_FOPS(vbox_fops); static const struct drm_driver driver = { .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_CURSOR_HOTSPOT, + DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .fops = &vbox_fops, .name = DRIVER_NAME, diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_mode.c +++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c @@ -429,8 +429,8 @@ static void vbox_cursor_atomic_update(struct drm_plane *plane, flags = VBOX_MOUSE_POINTER_VISIBLE | VBOX_MOUSE_POINTER_SHAPE | VBOX_MOUSE_POINTER_ALPHA; hgsmi_update_pointer_shape(vbox->guest_pool, flags, - min_t(u32, max(new_state->hotspot_x, 0), width), - min_t(u32, max(new_state->hotspot_y, 0), height), + min_t(u32, max(fb->hot_x, 0), width), + min_t(u32, max(fb->hot_y, 0), height), width, height, vbox->cursor_data, data_size); mutex_unlock(&vbox->hw_mutex); diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -178,7 +178,7 @@ static const struct drm_driver driver = { * out via drm_device::driver_features: */ .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_RENDER | DRIVER_ATOMIC | - DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE | DRIVER_CURSOR_HOTSPOT, + DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE, .open = virtio_gpu_driver_open, .postclose = virtio_gpu_driver_postclose, diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/virtio/virtgpu_plane.c +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c @@ -333,16 +333,16 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane, DRM_DEBUG("update, handle %d, pos +%d+%d, hot %d,%d\n", handle, plane->state->crtc_x, plane->state->crtc_y, - plane->state->hotspot_x, - plane->state->hotspot_y); + plane->state->fb ? plane->state->fb->hot_x : 0, + plane->state->fb ? plane->state->fb->hot_y : 0); output->cursor.hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_UPDATE_CURSOR); output->cursor.resource_id = cpu_to_le32(handle); if (plane->state->fb) { output->cursor.hot_x = - cpu_to_le32(plane->state->hotspot_x); + cpu_to_le32(plane->state->fb->hot_x); output->cursor.hot_y = - cpu_to_le32(plane->state->hotspot_y); + cpu_to_le32(plane->state->fb->hot_y); } else { output->cursor.hot_x = cpu_to_le32(0); output->cursor.hot_y = cpu_to_le32(0); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1611,7 +1611,7 @@ static const struct file_operations vmwgfx_driver_fops = { static const struct drm_driver driver = { .driver_features = - DRIVER_MODESET | DRIVER_RENDER | DRIVER_ATOMIC | DRIVER_GEM | DRIVER_CURSOR_HOTSPOT, + DRIVER_MODESET | DRIVER_RENDER | DRIVER_ATOMIC | DRIVER_GEM, .ioctls = vmw_ioctls, .num_ioctls = ARRAY_SIZE(vmw_ioctls), .master_set = vmw_master_set, diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index blahblah..blahblah 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -768,8 +768,13 @@ vmw_du_cursor_plane_atomic_update(struct drm_plane *plane, struct vmw_plane_state *old_vps = vmw_plane_state_to_vps(old_state); s32 hotspot_x, hotspot_y; - hotspot_x = du->hotspot_x + new_state->hotspot_x; - hotspot_y = du->hotspot_y + new_state->hotspot_y; + hotspot_x = du->hotspot_x; + hotspot_y = du->hotspot_y; + + if (new_state->fb) { + hotspot_x += new_state->fb->hot_x; + hotspot_y += new_state->fb->hot_y; + } du->cursor_surface = vps->surf; du->cursor_bo = vps->bo; diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index blahblah..blahblah 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -110,15 +110,6 @@ enum drm_driver_feature { * Driver supports user defined GPU VA bindings for GEM objects. */ DRIVER_GEM_GPUVA = BIT(8), - /** - * @DRIVER_CURSOR_HOTSPOT: - * - * Driver supports and requires cursor hotspot information in the - * cursor plane (e.g. cursor plane has to actually track the mouse - * cursor and the clients are required to set hotspot in order for - * the cursor planes to work correctly). - */ - DRIVER_CURSOR_HOTSPOT = BIT(9), /* IMPORTANT: Below are all the legacy flags, add new ones above. */ diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index blahblah..blahblah 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -226,18 +226,6 @@ struct drm_file { */ bool is_master; - /** - * @supports_virtualized_cursor_plane: - * - * This client is capable of handling the cursor plane with the - * restrictions imposed on it by the virtualized drivers. - * - * This implies that the cursor plane has to behave like a cursor - * i.e. track cursor movement. It also requires setting of the - * hotspot properties by the client on the cursor plane. - */ - bool supports_virtualized_cursor_plane; - /** * @master: * diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h index blahblah..blahblah 100644 --- a/include/drm/drm_framebuffer.h +++ b/include/drm/drm_framebuffer.h @@ -188,6 +188,18 @@ struct drm_framebuffer { * DRM_MODE_FB_MODIFIERS. */ int flags; + /** + * @hot_x: X coordinate of the cursor hotspot. Used by the legacy cursor + * IOCTL when the driver supports cursor through a DRM_PLANE_TYPE_CURSOR + * universal plane. + */ + int hot_x; + /** + * @hot_y: Y coordinate of the cursor hotspot. Used by the legacy cursor + * IOCTL when the driver supports cursor through a DRM_PLANE_TYPE_CURSOR + * universal plane. + */ + int hot_y; /** * @filp_head: Placed on &drm_file.fbs, protected by &drm_file.fbs_lock. */ diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index blahblah..blahblah 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h @@ -116,10 +116,6 @@ struct drm_plane_state { /** @src_h: height of visible portion of plane (in 16.16) */ uint32_t src_h, src_w; - /** @hotspot_x: x offset to mouse cursor hotspot */ - /** @hotspot_y: y offset to mouse cursor hotspot */ - int32_t hotspot_x, hotspot_y; - /** * @alpha: * Opacity of the plane with 0 as completely transparent and 0xffff as @@ -769,16 +765,6 @@ struct drm_plane { * scaling. */ struct drm_property *scaling_filter_property; - - /** - * @hotspot_x_property: property to set mouse hotspot x offset. - */ - struct drm_property *hotspot_x_property; - - /** - * @hotspot_y_property: property to set mouse hotspot y offset. - */ - struct drm_property *hotspot_y_property; }; #define obj_to_plane(x) container_of(x, struct drm_plane, base) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index blahblah..blahblah 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -850,31 +850,6 @@ struct drm_get_cap { */ #define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS 5 -/** - * DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT - * - * Drivers for para-virtualized hardware (e.g. vmwgfx, qxl, virtio and - * virtualbox) have additional restrictions for cursor planes (thus - * making cursor planes on those drivers not truly universal,) e.g. - * they need cursor planes to act like one would expect from a mouse - * cursor and have correctly set hotspot properties. - * If this client cap is not set the DRM core will hide cursor plane on - * those virtualized drivers because not setting it implies that the - * client is not capable of dealing with those extra restictions. - * Clients which do set cursor hotspot and treat the cursor plane - * like a mouse cursor should set this property. - * The client must enable &DRM_CLIENT_CAP_ATOMIC first. - * - * Setting this property on drivers which do not special case - * cursor planes (i.e. non-virtualized drivers) will return - * EOPNOTSUPP, which can be used by userspace to gauge - * requirements of the hardware/drivers they're running on. - * - * This capability is always supported for atomic-capable virtualized - * drivers starting from kernel version 6.6. - */ -#define DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT 6 - /* DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */ struct drm_set_client_cap { __u64 capability; -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2931

1 2

[OS-BUILD PATCHv2 0/0] fedora: cleanups and new enablement
by pbrobinson (via Email Bridge) 10 Feb '24

10 Feb '24

2 1

[OS-BUILD PATCH] Turn on SECURITY_DMESG_RESTRICT
by Justin M. Forbes (via Email Bridge) 09 Feb '24

09 Feb '24

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Turn on SECURITY_DMESG_RESTRICT It was requested by ProdSec that we enable SECURITY_DMESG_RESTRICT as this makes several security bugs more difficult to exploit. It should be noted that this just controls the default setting of kernel.dmesg_restrict sysctl and thus can be always set back to 0 at runtime. Users in the wheel group also have access to journalctl -k or sudo for dmesg access without giving it to every user on the system. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/common/generic/CONFIG_SECURITY_DMESG_RESTRICT b/redhat/configs/common/generic/CONFIG_SECURITY_DMESG_RESTRICT index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_SECURITY_DMESG_RESTRICT +++ b/redhat/configs/common/generic/CONFIG_SECURITY_DMESG_RESTRICT @@ -1 +1 @@ -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y diff --git a/redhat/configs/fedora/generic/CONFIG_SECURITY_DMESG_RESTRICT b/redhat/configs/fedora/generic/CONFIG_SECURITY_DMESG_RESTRICT deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_SECURITY_DMESG_RESTRICT +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SECURITY_DMESG_RESTRICT=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2930

2 1

[OS-BUILD PATCH] redhat/configs: For aarch64/RT, default kstack randomization off
by Jeremy Linton (via Email Bridge) 09 Feb '24

09 Feb '24

From: Jeremy Linton <jlinton(a)redhat.com> redhat/configs: For aarch64/RT, default kstack randomization off Unlike other architectures which use their cycles counters to seed the kstack randomization (which is sketchy) aarch64 uses the kernel random number generator. For a list of reasons starting with the lack of an enabled/fast cycle counter, a ubiquitous high frequency timer, nor machines which have the v8.5 FEAT_RNG. Using the kernel rng is largely an acceptable solution except for RT workloads which can experience quite large latency spikes as a result. So, lets invert the default kstack randomization for RT kernels on aarch64 until FEAT_RNG is common or a better solution is found. Signed-off-by: Jeremy Linton <jlinton(a)redhat.com> diff --git a/redhat/configs/common/rt/generic/arm/aarch64/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT b/redhat/configs/common/rt/generic/arm/aarch64/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/rt/generic/arm/aarch64/CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT @@ -0,0 +1 @@ +# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2933

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel February 2024