2016-11-18 14:12:04

by Bjorn Helgaas

[permalink] [raw]
Subject: [PATCH] vgaarb: Downgrade userspace-triggerable messages to debug

To avoid userspace-triggerable dmesg spam, downgrade messages in the sysfs
write parsing code to debug level.

Signed-off-by: Bjorn Helgaas <[email protected]>
---
drivers/gpu/vga/vgaarb.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index 3a8e9c6..f1312a9 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -1196,9 +1196,9 @@ static ssize_t vga_arb_write(struct file *file, const char __user *buf,
}
pdev = pci_get_domain_bus_and_slot(domain, bus, devfn);
if (!pdev) {
- pr_err("invalid PCI address %04x:%02x:%02x.%x\n",
- domain, bus, PCI_SLOT(devfn),
- PCI_FUNC(devfn));
+ pr_debug("invalid PCI address %04x:%02x:%02x.%x\n",
+ domain, bus, PCI_SLOT(devfn),
+ PCI_FUNC(devfn));
ret_val = -ENODEV;
goto done;
}
@@ -1212,7 +1212,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user *buf,
pr_debug("vgadev %p\n", vgadev);
if (vgadev == NULL) {
if (pdev) {
- vgaarb_err(&pdev->dev, "not a VGA device\n");
+ vgaarb_dbg(&pdev->dev, "not a VGA device\n");
pci_dev_put(pdev);
}

@@ -1232,7 +1232,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user *buf,
}
}
if (i == MAX_USER_CARDS) {
- vgaarb_err(&pdev->dev, "maximum user cards (%d) number reached, ignoring this one!\n",
+ vgaarb_dbg(&pdev->dev, "maximum user cards (%d) number reached, ignoring this one!\n",
MAX_USER_CARDS);
pci_dev_put(pdev);
/* XXX: which value to return? */


2016-11-18 15:30:12

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PATCH] vgaarb: Downgrade userspace-triggerable messages to debug

On Fri, Nov 18, 2016 at 08:11:58AM -0600, Bjorn Helgaas wrote:
> To avoid userspace-triggerable dmesg spam, downgrade messages in the sysfs
> write parsing code to debug level.
>
> Signed-off-by: Bjorn Helgaas <[email protected]>

Applied to drm-misc, thanks.
-Daniel

> ---
> drivers/gpu/vga/vgaarb.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
> index 3a8e9c6..f1312a9 100644
> --- a/drivers/gpu/vga/vgaarb.c
> +++ b/drivers/gpu/vga/vgaarb.c
> @@ -1196,9 +1196,9 @@ static ssize_t vga_arb_write(struct file *file, const char __user *buf,
> }
> pdev = pci_get_domain_bus_and_slot(domain, bus, devfn);
> if (!pdev) {
> - pr_err("invalid PCI address %04x:%02x:%02x.%x\n",
> - domain, bus, PCI_SLOT(devfn),
> - PCI_FUNC(devfn));
> + pr_debug("invalid PCI address %04x:%02x:%02x.%x\n",
> + domain, bus, PCI_SLOT(devfn),
> + PCI_FUNC(devfn));
> ret_val = -ENODEV;
> goto done;
> }
> @@ -1212,7 +1212,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user *buf,
> pr_debug("vgadev %p\n", vgadev);
> if (vgadev == NULL) {
> if (pdev) {
> - vgaarb_err(&pdev->dev, "not a VGA device\n");
> + vgaarb_dbg(&pdev->dev, "not a VGA device\n");
> pci_dev_put(pdev);
> }
>
> @@ -1232,7 +1232,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user *buf,
> }
> }
> if (i == MAX_USER_CARDS) {
> - vgaarb_err(&pdev->dev, "maximum user cards (%d) number reached, ignoring this one!\n",
> + vgaarb_dbg(&pdev->dev, "maximum user cards (%d) number reached, ignoring this one!\n",
> MAX_USER_CARDS);
> pci_dev_put(pdev);
> /* XXX: which value to return? */
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch