From patchwork Tue Jun 7 18:23:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 12872330 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D90BC43334 for ; Tue, 7 Jun 2022 19:59:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357725AbiFGT7L (ORCPT ); Tue, 7 Jun 2022 15:59:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357739AbiFGT5H (ORCPT ); Tue, 7 Jun 2022 15:57:07 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 99706B040A for ; Tue, 7 Jun 2022 11:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654626227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hkQx7yHQRkPbdTnula/SBJrpw+Sj9SwG2uOeS/prAHE=; b=izZTe1Fp4YmJ7E3RaPDO1sf4aWRCK+AvPMYFC8pTWmTTI7jdWtZh/5FzT4mVb+LHbO2RB0 vbbcyT5WQ1NlFizQQeKRPzr8G3Zp0j7wbAkyvIRHwV9aK3khzKzDcko4NjIHdjJNFBmuO9 aN6gabt+Xd7gtGMcSyGAZqCHiWPfihg= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-75-Qdu0LW-8PvO34EagZ6hKfQ-1; Tue, 07 Jun 2022 14:23:46 -0400 X-MC-Unique: Qdu0LW-8PvO34EagZ6hKfQ-1 Received: by mail-wr1-f72.google.com with SMTP id bw25-20020a0560001f9900b002175d64fd29so2304960wrb.9 for ; Tue, 07 Jun 2022 11:23:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hkQx7yHQRkPbdTnula/SBJrpw+Sj9SwG2uOeS/prAHE=; b=idoGvG0XQoe5Xcxh1EMJGc5kdukfNmeN3XC5J+VHs0IOEbacwhXd3OdsMEVl1kLYrq +e+UdkB8M6oAY/hI/r9kSLNTXZK5dNp3DIJKMe4nBqwMp4/cahtZCcOtjaLOpu7PPCpU TSk0x5/rEYwggfmaIjKibW7q+pyU+FRonfG1Ok1UAuxmwvwzCNeihzj+LxGAuSefzWz8 LaHSxhssEza6cjnnc4dHVfB86Q9HrFPPvhLgVWKECm8lPVjzX82FhlXw0oDjRAJSjLGY PzOe4sP/tn6CyI2/iMDzCCWT7cJPltc0ztTQHkwEiVhEI8GL+K4pgg9y82wc/129xWBz 5Yrg== X-Gm-Message-State: AOAM530AO/GT2AzzRHw7Dp0rP6T/cYLsxoFUtiJiwT2USjsF7aZYa0Ip SEBwHZiyAG8cwrCtzKjik5i8ZoQMaRnZ8R7Ca6/Uj9Aep9K1L6vVA8GLVbeeY1U9KjJ7qUIz/by k5LO5xpq682IRFA7oQXodTbw= X-Received: by 2002:a05:6000:18aa:b0:210:eef2:1137 with SMTP id b10-20020a05600018aa00b00210eef21137mr29273093wri.134.1654626224719; Tue, 07 Jun 2022 11:23:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxN4w6wiLjoJYUQMubo1fIcQNXev6xL+517nU/KlMZgD8bGIW170MGyDzMCn47TwhWHZ6WTgQ== X-Received: by 2002:a05:6000:18aa:b0:210:eef2:1137 with SMTP id b10-20020a05600018aa00b00210eef21137mr29273059wri.134.1654626224460; Tue, 07 Jun 2022 11:23:44 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id m8-20020a05600c4f4800b003942a244f51sm28267502wmq.42.2022.06.07.11.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 11:23:44 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Thomas Zimmermann , Laszlo Ersek , Alex Williamson , Gerd Hoffmann , kvm@vger.kernel.org, Greg Kroah-Hartman , Daniel Vetter , Javier Martinez Canillas , Daniel Vetter , Hans de Goede , Helge Deller , Jonathan Corbet , Peter Jones , linux-doc@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: [PATCH v6 0/5] Fix some races between sysfb device registration and drivers probe Date: Tue, 7 Jun 2022 20:23:33 +0200 Message-Id: <20220607182338.344270-1-javierm@redhat.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Hello, The patches in this series contain mostly changes suggested by Daniel Vetter Thomas Zimmermann. They aim to fix existing races between the Generic System Framebuffer (sysfb) infrastructure and the fbdev and DRM device registration. For example, it is currently possible for sysfb to register a platform device after a real DRM driver was registered and requested to remove the conflicting framebuffers. Or is possible for a simple{fb,drm} to match with a device previously registered by sysfb, even after a real driver is present. A symptom of this issue, was worked around with the commit fb561bf9abde ("fbdev: Prevent probing generic drivers if a FB is already registered") but that's really a hack and should be reverted instead. This series attempt to fix it more correctly and revert the mentioned hack. That will also allow to make the num_registered_fb variable not visible to drivers anymore, since that's internal to fbdev core. Pach 1 is just a simple cleanup in preparation for later patches. Patch 2 add a sysfb_disable() helper to allow disabling sysfb and unregister devices registered by sysfb. Patch 3 fixes the race that exists between sysfb devices registration and fbdev framebuffer devices registration, by disabling the sysfb when a DRM or fbdev driver requests to remove conflicting framebuffers. Patch 4 is the revert patch that was posted by Daniel before but dropped from his set and finally patch 5 is the one that makes num_registered_fb private to fbmem.c, to not allow drivers to use it anymore. The patches were tested on a rpi4 with the vc4, simpledrm and simplefb drivers, using different combinations of built-in and as a module. Best regards, Javier Changes in v6: - Drop sysfb_try_unregister() helper since is no longer needed. - Move the sysfb_disable() before the remove conflicting framebuffers loop (Daniel Vetter). - Drop patch "fbdev: Make sysfb to unregister its own registered devices" since was no longer needed. Changes in v5: - Move the sysfb_disable() call at conflicting framebuffers again to avoid the need of a DRIVER_FIRMWARE capability flag. - Add Daniel Vetter's Reviewed-by tag again since reverted to the old patch that he already reviewed in v2. - Drop patches that added a DRM_FIRMWARE capability and use them since the case those prevented could be ignored (Daniel Vetter). Changes in v4: - Make sysfb_disable() to also attempt to unregister a device. - Add patch to make registered_fb[] private. - Add patches that introduce the DRM_FIRMWARE capability and usage. Changes in v3: - Add Thomas Zimmermann's Reviewed-by tag to patch #1. - Call sysfb_disable() when a DRM dev and a fbdev are registered rather than when conflicting framebuffers are removed (Thomas Zimmermann). - Call sysfb_disable() when a fbdev framebuffer is registered rather than when conflicting framebuffers are removed (Thomas Zimmermann). - Drop Daniel Vetter's Reviewed-by tag since patch changed a lot. - Rebase on top of latest drm-misc-next branch. Changes in v2: - Rebase on top of latest drm-misc-next and fix conflicts (Daniel Vetter). - Add kernel-doc comments and include in other_interfaces.rst (Daniel Vetter). - Explain in the commit message that fbmem has to unregister the device as fallback if a driver registered the device itself (Daniel Vetter). - Also explain that fallback in a comment in the code (Daniel Vetter). - Don't encode in fbmem the assumption that sysfb will always register platform devices (Daniel Vetter). - Add a FIXME comment about drivers registering devices (Daniel Vetter). - Drop RFC prefix since patches were already reviewed by Daniel Vetter. - Add Daniel Reviewed-by tags to the patches. Daniel Vetter (2): Revert "fbdev: Prevent probing generic drivers if a FB is already registered" fbdev: Make registered_fb[] private to fbmem.c Javier Martinez Canillas (3): firmware: sysfb: Make sysfb_create_simplefb() return a pdev pointer firmware: sysfb: Add sysfb_disable() helper function fbdev: Disable sysfb device registration when removing conflicting FBs .../driver-api/firmware/other_interfaces.rst | 6 ++ drivers/firmware/sysfb.c | 58 ++++++++++++++++--- drivers/firmware/sysfb_simplefb.c | 16 ++--- drivers/video/fbdev/core/fbmem.c | 20 ++++++- drivers/video/fbdev/efifb.c | 11 ---- drivers/video/fbdev/simplefb.c | 11 ---- include/linux/fb.h | 7 +-- include/linux/sysfb.h | 23 ++++++-- 8 files changed, 103 insertions(+), 49 deletions(-)