Received: by 2002:a25:f815:0:0:0:0:0 with SMTP id u21csp876754ybd; Wed, 26 Jun 2019 07:28:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqx2OXLAXzZO3vGtdnri6vgayaaA6j4kQr8JcvZk2q2fsI9Tz69tI3qnIS3e2JsTrCFuZ+jF X-Received: by 2002:a17:90a:cb87:: with SMTP id a7mr5270297pju.130.1561559295209; Wed, 26 Jun 2019 07:28:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561559295; cv=none; d=google.com; s=arc-20160816; b=DP5OG5qGg9YUCN+012Th//hzvsqPGOYXKQSEVF/WM1UbvbmSaAsRfZ/Axpie+r6wcV BbbQsWA/e4RTjcT062tNOIw5NiIn7b1PmFWElNQZfEBlTxTrMc+X6UxYk9jLW6i1CuRb if/tCZeNIxIkrppiSUhR5gq9zu5ZzbL2tdQo48DK/FXynRHAQ6i+W7utieXJN/OS7S04 h3T/b8b9MoQ6ZtqFAUFN/ISWvC2CW/MbJ4dCA6jTwpq4guM7WfvjGQKpbZB0j+yL2Yvo SB7b24CxgFvfibfHB3+H1YpBWyY5x8+mRKLGcJ/GGvE4kA8+I1k0qNSBfsIUnRowRA0Y /LQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:mail-followup-to:message-id:subject:cc:to:from:date :dkim-signature; bh=+Sws+y+jIZZelBzcnrJJ0ZS8ppZIP3b1lsfL6ibj+Hg=; b=WpOGtL88ipljVgCU9p0rtTxLkWki+YE+lnby8srTbFZiIHa4ie7FGuNgw0cE0yZxFV hhCLSfWIXO10zvd0c0TrQyb3Wf7+kVV5ARvtMXB53gdR3WW0ysVyQRtxneYfq7Gh03zH V7ARiL4vTXdu+5XHJyifjLA5I7L/L8xgo/4pkYM0sXCfoQZKu7ccLwWqnwoj1umht771 usWfoYp6a/tg/xAX/mNUyPscjTtJ6PYaHYKS1M+GE1wljRLVEbSAK5UrlR6zU/NNcXVj W0S2kBKqA/7GSkhiMpBp+M0OVKEeCa9p5mDTnp+dOsfpUTuqlkfP26HjO5PKZw0yNkQZ DS6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@ffwll.ch header.s=google header.b=fuw0xmzW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j190si941882pge.92.2019.06.26.07.27.58; Wed, 26 Jun 2019 07:28:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@ffwll.ch header.s=google header.b=fuw0xmzW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727890AbfFZO07 (ORCPT + 99 others); Wed, 26 Jun 2019 10:26:59 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:35000 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727139AbfFZO06 (ORCPT ); Wed, 26 Jun 2019 10:26:58 -0400 Received: by mail-ed1-f67.google.com with SMTP id w20so3680620edd.2 for ; Wed, 26 Jun 2019 07:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=+Sws+y+jIZZelBzcnrJJ0ZS8ppZIP3b1lsfL6ibj+Hg=; b=fuw0xmzWVsvYQ7NHziWwmctpltE/r/OGyFMtcvpw9sv8qBO+YV33n0Mc7j6fQqiqfB Ja3+Ej4QXaQx/e8rB+5pVFuvF3r+CMYb/7JrhhKN0WLIG5LsbzDOWiR//ynyAmk2sI5H KiJKUjzIa6YTwpMxeeH8JoevX2edcOhSC//Cs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=+Sws+y+jIZZelBzcnrJJ0ZS8ppZIP3b1lsfL6ibj+Hg=; b=MHDh6/gHAxXtjzgAkwNaggxZ6IrRx0o3/duSaXfajMqzTQpeZPBG1VXZT7/rVwJ0JF wVP79qfNGutbT2XTzjAiVUgHMpJiLTzluARfwcuHjDAbXdJpcxtRVKxO3pApWU2KwQ2R 4wem5ATMTLqh1VSJImoFqi9sSwFvKKJ87l/Ol2KqK8o9O5dr3ysClxJEdWnkBGHslhdD zWYgyl8uot6kHZZvmVp6f2bKQ2FdSWUgzJzvoHo9zdhfMRvYjCo2oWflJfFvDEP0IUov 2oS8vG/bQN8jrvOFqQfIqgk/WUgQpWOIXneuc80/naIFzjlrXVBWzMbnl5OBoPFkBBVw AZGA== X-Gm-Message-State: APjAAAW9UfPk5EOCBZd919OwNY30IVK9yAH43+59tQpn9c5QqgVZHLvI nzh1yfR2Y14UIKa7R6xg7WLA3w== X-Received: by 2002:a17:906:15d0:: with SMTP id l16mr4451217ejd.234.1561559215925; Wed, 26 Jun 2019 07:26:55 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id j17sm6164900ede.60.2019.06.26.07.26.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 26 Jun 2019 07:26:55 -0700 (PDT) Date: Wed, 26 Jun 2019 16:26:52 +0200 From: Daniel Vetter To: Rodrigo Siqueira Cc: Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie , dri-devel , Linux Kernel Mailing List , kernel-janitors@vger.kernel.org, intel-gfx Subject: Re: [Intel-gfx] [PATCH V4] drm/drm_vblank: Change EINVAL by the correct errno Message-ID: <20190626142652.GL12905@phenom.ffwll.local> Mail-Followup-To: Rodrigo Siqueira , Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie , dri-devel , Linux Kernel Mailing List , kernel-janitors@vger.kernel.org, intel-gfx References: <20190619020750.swzerehjbvx6sbk2@smtp.gmail.com> <20190619074856.GJ12905@phenom.ffwll.local> <20190619075059.GK12905@phenom.ffwll.local> <20190626020005.vb5gmqcvkyzgcjee@smtp.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Operating-System: Linux phenom 4.19.0-5-amd64 User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 26, 2019 at 10:37:11AM -0300, Rodrigo Siqueira wrote: > On Wed, Jun 26, 2019 at 4:53 AM Daniel Vetter wrote: > > > > On Wed, Jun 26, 2019 at 4:00 AM Rodrigo Siqueira > > wrote: > > > > > > On 06/19, Daniel Vetter wrote: > > > > On Wed, Jun 19, 2019 at 09:48:56AM +0200, Daniel Vetter wrote: > > > > > On Tue, Jun 18, 2019 at 11:07:50PM -0300, Rodrigo Siqueira wrote: > > > > > > For historical reason, the function drm_wait_vblank_ioctl always return > > > > > > -EINVAL if something gets wrong. This scenario limits the flexibility > > > > > > for the userspace make detailed verification of the problem and take > > > > > > some action. In particular, the validation of “if (!dev->irq_enabled)” > > > > > > in the drm_wait_vblank_ioctl is responsible for checking if the driver > > > > > > support vblank or not. If the driver does not support VBlank, the > > > > > > function drm_wait_vblank_ioctl returns EINVAL which does not represent > > > > > > the real issue; this patch changes this behavior by return EOPNOTSUPP. > > > > > > Additionally, some operations are unsupported by this function, and > > > > > > returns EINVAL; this patch also changes the return value to EOPNOTSUPP > > > > > > in this case. Lastly, the function drm_wait_vblank_ioctl is invoked by > > > > > > libdrm, which is used by many compositors; because of this, it is > > > > > > important to check if this change breaks any compositor. In this sense, > > > > > > the following projects were examined: > > > > > > > > > > > > * Drm-hwcomposer > > > > > > * Kwin > > > > > > * Sway > > > > > > * Wlroots > > > > > > * Wayland-core > > > > > > * Weston > > > > > > * Xorg (67 different drivers) > > > > > > > > > > > > For each repository the verification happened in three steps: > > > > > > > > > > > > * Update the main branch > > > > > > * Look for any occurrence "drmWaitVBlank" with the command: > > > > > > git grep -n "drmWaitVBlank" > > > > > > * Look in the git history of the project with the command: > > > > > > git log -SdrmWaitVBlank > > > > > > > > > > > > Finally, none of the above projects validate the use of EINVAL which > > > > > > make safe, at least for these projects, to change the return values. > > > > > > > > > > > > Change since V3: > > > > > > - Return EINVAL for _DRM_VBLANK_SIGNAL (Daniel) > > > > > > > > > > > > Change since V2: > > > > > > Daniel Vetter and Chris Wilson > > > > > > - Replace ENOTTY by EOPNOTSUPP > > > > > > - Return EINVAL if the parameters are wrong > > > > > > > > > > > > > > > > Reviewed-by: Daniel Vetter > > > > > > > > > > Apologies for the confusion on the last time around. btw if someone tells > > > > > you "r-b (or a-b) with these changes", then just apply the r-b/a-b tag > > > > > next time around. Otherwise people will re-review the same thing over and > > > > > over again. > > > > > > > > btw when resending patches it's good practice to add anyone who commented > > > > on it (or who commented on the igt test for the same patch and other way > > > > round) onto the explicit Cc: list of the patch. That way it's easier for > > > > them to follow the patch evolution and do a quick r-b once they're happy. > > > > > > Thanks for these valuable tips. > > > Do you think that is a good idea to resend this patch CC's everybody? Or > > > is it ok if I just apply it? > > > > Hm I thought I answered that on irc ... but just today I realized that > > we missed 2 ioctls. There's also drm_crtc_get_sequence_ioctl and > > drm_crtc_queue_sequence_ioctl which have the same dev->irq_enabled > > check and I think should be treated the same. > > Hi, > > I reexamined all the composers described in the commit message (latest > versions) to check if any project use and validate the return value > from drm_crtc_get_sequence_ioctl and drm_crtc_queue_sequence_ioctl. I > noticed that mesa and xserver use them. FWIU replace EINVAL by > EOPNOTSUPP is harmless for mesa project, however it is not the same > for xserver. > > Take a look at line 189 and 238 of hw/xfree86/drivers/modesetting/vblank.c > > * https://gitlab.freedesktop.org/xorg/xserver/blob/master/hw/xfree86/drivers/modesetting/vblank.c#L238 > * https://gitlab.freedesktop.org/xorg/xserver/blob/master/hw/xfree86/drivers/modesetting/vblank.c#L189 > > A little bit below the above lines, you can see a validation like that: > > if (ret != -1 || (errno != ENOTTY && errno != EINVAL)) > > In other words, if we change the EINVAL by EOPNOTSUPP > drm_crtc_[get|queue]_sequence_ioctl we could break xserver. I noticed > that Keith Packard introduced these ioctls to the kernel and also to > the xserver, I will prepare a new version and CC Keith. Should I do > another thing to notify xserver developers? If you want cc: xorg-devel or so, but I think they all moved to gitlab and the m-l is pretty dead. Cc'ing Keith should be enough. I looked at the code and I think we're fine. Better than fine actually, because if dev->irq_enabled == false then we really shouldn't use vblank ioctl, no matter whether the new or old version. So for drivers without vblank support, all that will happen is that we leave ->has_queue_sequence as false and then fail a bit later on with the legacy ioctl. Should be all harmless. Note that the idea behind filtering out EINVAL is that if you do a QueueSequence on a crtc that's currently off, then it'll fail with EINVAL. But the ioctl still works, hence why we want to accept that. Setting has_queue_sequence = TRUE for the case where there's actually no vblank might trigger a bug somewhere later on. -Daniel > > Thanks > > > Can you pls resend with those addressed too? Then you can also resend > > with the cc's all added. > > -Daniel > > > > > > > > > If you don't do that then much bigger chances your patch gets ignored. > > > > -Daniel > > > > > > > > > > > Signed-off-by: Rodrigo Siqueira > > > > > > --- > > > > > > drivers/gpu/drm/drm_vblank.c | 2 +- > > > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > > > > > diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c > > > > > > index 603ab105125d..bed233361614 100644 > > > > > > --- a/drivers/gpu/drm/drm_vblank.c > > > > > > +++ b/drivers/gpu/drm/drm_vblank.c > > > > > > @@ -1582,7 +1582,7 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data, > > > > > > unsigned int flags, pipe, high_pipe; > > > > > > > > > > > > if (!dev->irq_enabled) > > > > > > - return -EINVAL; > > > > > > + return -EOPNOTSUPP; > > > > > > > > > > > > if (vblwait->request.type & _DRM_VBLANK_SIGNAL) > > > > > > return -EINVAL; > > > > > > -- > > > > > > 2.21.0 > > > > > > > > > > -- > > > > > Daniel Vetter > > > > > Software Engineer, Intel Corporation > > > > > http://blog.ffwll.ch > > > > > > > > -- > > > > Daniel Vetter > > > > Software Engineer, Intel Corporation > > > > http://blog.ffwll.ch > > > > > > -- > > > Rodrigo Siqueira > > > https://siqueira.tech > > > _______________________________________________ > > > Intel-gfx mailing list > > > Intel-gfx@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > +41 (0) 79 365 57 48 - http://blog.ffwll.ch > > > > -- > > Rodrigo Siqueira > https://siqueira.tech -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch