opp: remove WARN when no valid OPPs remain
Subsystems (6)
Sasha Levin
maintainerPATCH 1/7 opp: remove WARN when no valid OPPs remain
From: Michał Mirosław <[email protected]>
[ Upstream commit 335ffab3ef864539e814b9a2903b0ae420c1c067 ]
This WARN can be triggered per-core and the stack trace is not useful. Replace it with plain dev_err(). Fix a comment while at it.
--- drivers/base/power/opp/of.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/base/power/opp/of.c +3 -2
@@ -402,8 +402,9 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np) } } -/* There should be one of more OPP defined */ -if (WARN_ON (!count)) { +/* There should be one or more OPPs defined */ +if (!count) { +dev_err (dev,"%s: no supported OPPs" , __func__); ret = -ENOENT ; goto put_opp_table; }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 2/7 virtio: Improve vq->broken access to avoid any compiler optimization
From: Parav Pandit <[email protected]>
[ Upstream commit 60f0779862e4ab943810187752c462e85f5fa371 ]
Currently vq->broken field is read by virtqueue_is_broken() in busy loop in one context by virtnet_send_command().
vq->broken is set to true in other process context by virtio_break_device(). Reader and writer are accessing it without any synchronization. This may lead to a compiler optimization which may result to optimize reading vq->broken only once.
Hence, force reading vq->broken on each invocation of virtqueue_is_broken() and also force writing it so that such update is visible to the readers.
It is a theoretical fix that isn't yet encountered in the field.
--- drivers/virtio/virtio_ring.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/virtio/virtio_ring.c +4 -2
@@ -1198,7 +1198,7 @@ bool virtqueue_is_broken(struct virtqueue *_vq) {struct vring_virtqueue *vq =to_vvq (_vq); -return vq->broken; +return READ_ONCE (vq->broken); }EXPORT_SYMBOL_GPL (virtqueue_is_broken);
@@ -1212,7 +1212,9 @@ void virtio_break_device(struct virtio_device *dev)list_for_each_entry (_vq, &dev->vqs, list) {struct vring_virtqueue *vq =to_vvq (_vq); - vq->broken = true; + +/* Pairs with READ_ONCE() in virtqueue_is_broken(). */ +WRITE_ONCE (vq->broken, true); } }EXPORT_SYMBOL_GPL (virtio_break_device);
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Sasha Levin
maintainerPATCH 3/7 vringh: Use wiov->used to check for read/write desc order
In reply to Sasha LevinFrom: Neeraj Upadhyay <[email protected]>
[ Upstream commit e74cfa91f42c50f7f649b0eca46aa049754ccdbd ]
As __vringh_iov() traverses a descriptor chain, it populates each descriptor entry into either read or write vring iov and increments that iov's ->used member. So, as we iterate over a descriptor chain, at any point, (riov/wriov)->used value gives the number of descriptor enteries available, which are to be read or written by the device. As all read iovs must precede the write iovs, wiov->used should be zero when we are traversing a read descriptor. Current code checks for wiov->i, to figure out whether any previous entry in the current descriptor chain was a write descriptor. However, iov->i is only incremented, when these vring iovs are consumed, at a later point, and remain 0 in __vringh_iov(). So, correct the check for read and write descriptor order, to use wiov->used.
--- drivers/vhost/vringh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vhost/vringh.c +1 -1
@@ -330,7 +330,7 @@ __vringh_iov(struct vringh *vrh, u16 i, iov = wiov; else { iov = riov; -if (unlikely (wiov && wiov->i)) { +if (unlikely (wiov && wiov->used)) {vringh_bad ("Readable desc %p after writable" , &descs[i]); err = -EINVAL ;
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Sasha Levin
maintainerPATCH 4/7 drm: Copy drm_wait_vblank to user before returning
In reply to Sasha LevinFrom: Mark Yacoub <[email protected]>
[ Upstream commit fa0b1ef5f7a694f48e00804a391245f3471aa155 ]
[Why]
Userspace should get back a copy of drm_wait_vblank that's been modified even when drm_wait_vblank_ioctl returns a failure.
Rationale:drm_wait_vblank_ioctl modifies the request and expects the user to read it back. When the type is RELATIVE, it modifies it to ABSOLUTE and updates the sequence to become current_vblank_count + sequence (which was RELATIVE), but now it became ABSOLUTE.
drmWaitVBlank (in libdrm) expects this to be the case as it modifies the request to be Absolute so it expects the sequence to would have been updated.
The change is in compat_drm_wait_vblank, which is called by drm_compat_ioctl. This change of copying the data back regardless of the return number makes it en par with drm_ioctl, which always copies the data before returning.
[How]
Return from the function after everything has been copied to user.
Fixes IGT:kms_flip::modeset-vs-vblank-race-interruptible Tested on ChromeOS Trogdor(msm)
--- drivers/gpu/drm/drm_ioc32.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/drm_ioc32.c +1 -3
@@ -855,8 +855,6 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, req.request.sequence = req32.request.sequence; req.request.signal = req32.request.signal; err =drm_ioctl_kernel (file, drm_wait_vblank_ioctl, &req,DRM_UNLOCKED ); -if (err) -return err; req32.reply.type = req.reply.type; req32.reply.sequence = req.reply.sequence;
@@ -865,7 +863,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,if (copy_to_user (argp, &req32,sizeof (req32)))return -EFAULT ; -return 0 ; +return err; }#if defined(CONFIG_X86 )
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 5/7 drm/nouveau/disp: power down unused DP links during init
In reply to Sasha LevinFrom: Ben Skeggs <[email protected]>
[ Upstream commit 6eaa1f3c59a707332e921e32782ffcad49915c5e ]
When booted with multiple displays attached, the EFI GOP driver on (at least) Ampere, can leave DP links powered up that aren't being used to display anything. This confuses our tracking of SOR routing, with the likely result being a failed modeset and display engine hang.
Fix this by (ab?)using the DisableLT IED script to power-down the link, restoring HW to a state the driver expects.
--- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h | 1 + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c +1 -1
@@ -418,7 +418,7 @@ nvkm_dp_train(struct nvkm_dp *dp, u32 dataKBps)return ret; } -static void +void nvkm_dp_disable (struct nvkm_outp *outp,struct nvkm_ior *ior) {struct nvkm_dp *dp =nvkm_dp (outp);
drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h +1 -0
@@ -32,6 +32,7 @@ struct nvkm_dp {int nvkm_dp_new (struct nvkm_disp *,int index,struct dcb_output *,struct nvkm_outp **); +void nvkm_dp_disable (struct nvkm_outp *,struct nvkm_ior *);/* DPCD Receiver Capabilities */ #define DPCD_RC00_DPCD_REV 0x00000
drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c +9 -0
@@ -22,6 +22,7 @@* Authors: Ben Skeggs */ #include "outp.h" +#include "dp.h" #include "ior.h" #include <subdev/bios.h>
@@ -207,6 +208,14 @@ nvkm_outp_init_route(struct nvkm_outp *outp)if (!ior->arm.head || ior->arm.proto != proto) {OUTP_DBG (outp,"no heads (%x %d %d)" , ior->arm.head, ior->arm.proto, proto); + +/* The EFI GOP driver on Ampere can leave unused DP links routed, +* which we don't expect. The DisableLT IED script *should* get +* us back to where we need to be. +*/ +if (ior->func->route.get && !ior->arm.head && outp->info.type ==DCB_OUTPUT_DP ) +nvkm_dp_disable (outp, ior); +return ; }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 6/7 drm/nouveau: block a bunch of classes from userspace
In reply to Sasha LevinFrom: Ben Skeggs <[email protected]>
[ Upstream commit 148a8653789c01f159764ffcc3f370008966b42f ]
Long ago, there had been plans for making use of a bunch of these APIs from userspace and there's various checks in place to stop misbehaving.
Countless other projects have occurred in the meantime, and the pieces didn't finish falling into place for that to happen.
They will (hopefully) in the not-too-distant future, but it won't look quite as insane. The super checks are causing problems right now, and are going to be removed.
--- drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 3 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 + drivers/gpu/drm/nouveau/nouveau_usif.c | 57 ++++++++++++++----- .../gpu/drm/nouveau/nvkm/engine/device/user.c | 2 +- 4 files changed, 48 insertions(+), 15 deletions(-)
drivers/gpu/drm/nouveau/include/nvif/cl0080.h +2 -1
@@ -4,7 +4,8 @@struct nv_device_v0 {__u8 version; -__u8 pad01[7 ]; +__u8 priv; +__u8 pad02[6 ];__u64 device;/* device identifier, ~0 for client default */ };
drivers/gpu/drm/nouveau/nouveau_drm.c +1 -0
@@ -151,6 +151,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname, ret =nvif_device_init (&cli->base.object,0 ,NV_DEVICE , &(struct nv_device_v0 ) { .device = ~0 , + .priv = true, },sizeof (struct nv_device_v0 ), &cli->device);if (ret) {
drivers/gpu/drm/nouveau/nouveau_usif.c +44 -13
97 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/engine/device/user.c +1 -1
@@ -347,7 +347,7 @@ nvkm_udevice_new(const struct nvkm_oclass *oclass, void *data, u32 size,return ret;/* give priviledged clients register access */ -if (client->super) +if (args->v0.priv) func = &nvkm_udevice_super;else func = &nvkm_udevice;
Signature · 1 line
2.30.2
Re: [PATCH AUTOSEL 4.14 6/7] drm/nouveau: block a bunch of classes from userspace
This isn't at all intended to be a fix to be backported, so I don't think this should be included. I don't know about 5/7, but I'll let Benjamin comment on that one
Quoted 181 lines · Sasha Levin
From: Ben Skeggs <[email protected]>
[ Upstream commit
148a8653789c01f159764ffcc3f370008966b42f]Long ago, there had been plans for making use of a bunch of these APIs from userspace and there's various checks in place to stop misbehaving.
Countless other projects have occurred in the meantime, and the pieces didn't finish falling into place for that to happen.
They will (hopefully) in the not-too-distant future, but it won't look quite as insane. The super checks are causing problems right now, and are going to be removed.
Signed-off-by Ben Skeggs <[email protected]>Reviewed-by Lyude Paul <[email protected]>Signed-off-by Sasha Levin <[email protected]>---
drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 3 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 + drivers/gpu/drm/nouveau/nouveau_usif.c | 57 ++++++++++++++-----.../gpu/drm/nouveau/nvkm/engine/device/user.c| 2 +-4 files changed, 48 insertions(+), 15 deletions(-)drivers/gpu/drm/nouveau/include/nvif/cl0080.h +0
-0@@ -4,7 +4,8 @@
structnv_device_v0{
__u8 version;
- __u8 pad01[7];
+ __u8 priv;
+ __u8 pad02[6];
__u64 device; /* device identifier, ~0 for client default */ };drivers/gpu/drm/nouveau/nouveau_drm.c +1
-0@@ -151,6 +151,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname, ret = nvif_device_init(&cli->base.object, 0, NV_DEVICE, &(struct nv_device_v0) { .device = ~0, + .priv = true, }, sizeof(struct nv_device_v0), &cli->device);if (ret) {
drivers/gpu/drm/nouveau/nouveau_usif.c +0
-0@@ -32,6 +32,9 @@ #include <nvif/event.h> #include <nvif/ioctl.h>drivers/gpu/drm/nouveau/nouveau_usif.c +3
-0+#include <nvif/class.h> +#include <nvif/cl0080.h> +struct
usif_notify_p{
structdrm_pending_eventbase;
struct {drivers/gpu/drm/nouveau/nouveau_usif.c +0
-0@@ -261,7 +264,7 @@ usif_object_dtor(struct usif_object *object) }
static int
-usif_object_new(structdrm_file*f, void *data, u32 size, void *argv, u32 argc)
+usif_object_new(structdrm_file*f, void *data, u32 size, void *argv, u32 argc, boolparent_abi16)
{
structnouveau_cli*cli =nouveau_cli(f);
structnvif_client*client =&cli->base;drivers/gpu/drm/nouveau/nouveau_usif.c +0
-0@@ -271,23 +274,48 @@ usif_object_new(struct drm_file *f, void *data, u32 size, void *argv, u32 argc) struct usif_object *object; int ret = -ENOSYS;
+ if ((ret =nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) + return ret;drivers/gpu/drm/nouveau/nouveau_usif.c +12
-0+ + switch (args->v0.oclass) { + case NV_DMA_FROM_MEMORY: + case NV_DMA_TO_MEMORY: + case NV_DMA_IN_MEMORY: + return -EINVAL; + case NV_DEVICE: { + union { + struct nv_device_v0 v0; + } *args = data; + + if ((ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0,false)))
+ return ret;drivers/gpu/drm/nouveau/nouveau_usif.c +10
-0+ + args->v0.priv = false; + break; + } + default: + if (!parent_abi16) + return -EINVAL; + break; + } +if (!(object =
kmalloc(sizeof(*object), GFP_KERNEL))) return-ENOMEM;
list_add(&object->head,&cli->objects);
- if (!(ret =nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) { - object->route =args->v0.route;
- object->token =args->v0.token;
- args->v0.route =NVDRM_OBJECT_USIF;
- args->v0.token = (unsigned long)(void *)object; - ret =nvif_client_ioctl(client, argv, argc);
- args->v0.token =object->token;
- args->v0.route =object->route;
+ object->route =args->v0.route;
+ object->token =args->v0.token;
+ args->v0.route =NVDRM_OBJECT_USIF;
+ args->v0.token = (unsigned long)(void *)object;
+ ret =nvif_client_ioctl(client, argv, argc);
+ if (ret) {
+ usif_object_dtor(object);
+ return ret;
}
- if (ret)
- usif_object_dtor(object);
- return ret;
+ args->v0.token =object->token;
+ args->v0.route =object->route;
+ return 0;
}
intdrivers/gpu/drm/nouveau/nouveau_usif.c +1
-0@@ -301,6 +329,7 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 argc) struct nvif_ioctl_v0 v0; } *argv = data; struct usif_object *object; + bool abi16 = false; u8 owner; int ret;drivers/gpu/drm/nouveau/nouveau_usif.c +2
-0@@ -331,11 +360,13 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 argc) mutex_unlock(&cli->mutex); goto done; } + + abi16 = true; }
switch (argv->v0.type) {
caseNVIF_IOCTL_V0_NEW:
- ret =usif_object_new(filp, data, size, argv, argc); + ret =usif_object_new(filp, data, size, argv, argc, abi16); break;
caseNVIF_IOCTL_V0_NTFY_NEW:
ret =usif_notify_new(filp, data, size, argv, argc);drivers/gpu/drm/nouveau/nvkm/engine/device/user.c +0
-0@@ -347,7 +347,7 @@ nvkm_udevice_new(const struct nvkm_oclass *oclass, void *data, u32 size, return ret;
/* give priviledged clients register access */ - if (client->super)
+ if (args->v0.priv)
func =&nvkm_udevice_super; else
func =&nvkm_udevice;
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.14 6/7] drm/nouveau: block a bunch of classes from userspace
Quoted 3 lines · Lyude Paul
This isn't at all intended to be a fix to be backported, so I don't think this should be included. I don't know about 5/7, but I'll let Benjamin comment on that one
I'll drop it, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 7/7 net/rds: dma_map_sg is entitled to merge entries
In reply to Sasha LevinFrom: Gerd Rausch <[email protected]>
[ Upstream commit fb4b1373dcab086d0619c29310f0466a0b2ceb8a ]
Function "dma_map_sg" is entitled to merge adjacent entries and return a value smaller than what was passed as "nents".
Subsequently "ib_map_mr_sg" needs to work with this value ("sg_dma_len") rather than the original "nents" parameter ("sg_len").
This old RDS bug was exposed and reliably causes kernel panics (using RDMA operations "rds-stress -D") on x86_64 starting with:
commit c588072bba6b ("iommu/vt-d: Convert intel iommu driver to the iommu ops")
Simply put: Linux 5.11 and later.
--- net/rds/ib_frmr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/rds/ib_frmr.c +2 -2
@@ -112,9 +112,9 @@ static int rds_ib_post_reg_frmr(struct rds_ib_mr *ibmr)cpu_relax (); } - ret =ib_map_mr_sg_zbva (frmr->mr, ibmr->sg, ibmr->sg_len, + ret =ib_map_mr_sg_zbva (frmr->mr, ibmr->sg, ibmr->sg_dma_len, &off,PAGE_SIZE ); -if (unlikely (ret != ibmr->sg_len)) +if (unlikely (ret != ibmr->sg_dma_len))return ret <0 ? ret : -EINVAL ;/* Perform a WR for the fast_reg_mr. Each individual page
Signature · 1 line
2.30.2