From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 495FDC43457 for ; Mon, 12 Oct 2020 02:08:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EE9820782 for ; Mon, 12 Oct 2020 02:08:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="l4SG2ZYT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726863AbgJLCIo (ORCPT ); Sun, 11 Oct 2020 22:08:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbgJLCIo (ORCPT ); Sun, 11 Oct 2020 22:08:44 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1F63C0613CE; Sun, 11 Oct 2020 19:08:42 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id o3so2813421pgr.11; Sun, 11 Oct 2020 19:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dmwggOCqdZ43g+jJ6N3bGQO88ZFGrgGWMzcJMG6MFZc=; b=l4SG2ZYTxZKCmiVskGZCGOvLHGQhqQ81uSH7q3UFNYNrqFYs2Ua/E3wsNbMri8B1R7 Zl8BTMpx6Zsu+Pn1TESqkoH/Vazk9PT+hclBaUQRoqcRltpEFS/siq4l0EhFk3EaN1Ln 24FcJOuZMBJQyKo1Lu5cGft+ZIjYBa0qaIilIPzY+YKQ0pEGuSW4smOnmTG2pbpC+8JE bN2BnQ7dYFcwAOhUhPcFBJgsr5td4mxzFZcbUO/Tku+3NjsJTTJ7/5/DJOVxyJkq5bLW G9+so+U1+1/lJ8ZWgXft+NcKCjm8dGmgeo+tKleZ5jxmlXe2a0pVVdKRmtE5NlGPWyW+ usxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dmwggOCqdZ43g+jJ6N3bGQO88ZFGrgGWMzcJMG6MFZc=; b=K5UcTRrTnZMQhaEocANscD9SKuDo5c1FFjGdlpBtNXprjT6/YjEDwUGN3CWQalFotF cuOUblHiABgldYP6ZbJa/JeKuV6tVHzjZtBnK6gTPZGehjkjTHYk8DCE7AtHrDtK74tV 0i+vsxDXPwM3ASN96fnaYixHBEZ0rWVPlhOQd3RvAAvNXjhEcn36Ex6KVjwTndWf6RDA GGGsRhyFQO/JFB9/jmDLGGoseES7vKl9zLYp1qgTtCIxOKK359hOdFGUBM8m3dUVO1by yKuxLDewu732dnhKjtPwwgAI1Cm6ZHubMli5cAsHWsMihTXZ5o8qYkvfOSJO+FPIkNL3 NHGA== X-Gm-Message-State: AOAM533jbmqyWClGhZKsErpPVpVWty/jPcpHBYZQJKIO/8qm8VwZjVdp 9Oo1nixhPNdpMxjC0mDQGJo= X-Google-Smtp-Source: ABdhPJzc6Fu9J+JxBCHpefhcMz1MLh+TQl5nN/I2XuTSAE9C39n+EnAcOs0namKHz9x7wpMt1N6nmw== X-Received: by 2002:a17:90b:1111:: with SMTP id gi17mr17663259pjb.109.1602468522254; Sun, 11 Oct 2020 19:08:42 -0700 (PDT) Received: from localhost (c-73-25-156-94.hsd1.or.comcast.net. [73.25.156.94]) by smtp.gmail.com with ESMTPSA id p16sm19702873pfq.63.2020.10.11.19.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 19:08:40 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , Rob Clark , AngeloGioacchino Del Regno , Brian Masney , Christophe JAILLET , Daniel Vetter , Emil Velikov , Eric Anholt , freedreno@lists.freedesktop.org (open list:DRM DRIVER FOR MSM ADRENO GPU), Harigovindan P , Jonathan Marek , Jordan Crouse , linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK), linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM ADRENO GPU), linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK), Liviu Dudau , Matthias Kaehlcke , Rajendra Nayak , Sam Ravnborg , Sharat Masetty , Thomas Zimmermann Subject: [PATCH 00/14] drm/msm: de-struct_mutex-ification Date: Sun, 11 Oct 2020 19:09:27 -0700 Message-Id: <20201012020958.229288-1-robdclark@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Rob Clark This doesn't remove *all* the struct_mutex, but it covers the worst of it, ie. shrinker/madvise/free/retire. The submit path still uses struct_mutex, but it still needs *something* serialize a portion of the submit path, and lock_stat mostly just shows the lock contention there being with other submits. And there are a few other bits of struct_mutex usage in less critical paths (debugfs, etc). But this seems like a reasonable step in the right direction. v2: teach lockdep about shrinker locking patters (danvet) and convert to obj->resv locking (danvet) Rob Clark (22): drm/msm/gem: Add obj->lock wrappers drm/msm/gem: Rename internal get_iova_locked helper drm/msm/gem: Move prototypes to msm_gem.h drm/msm/gem: Add some _locked() helpers drm/msm/gem: Move locking in shrinker path drm/msm/submit: Move copy_from_user ahead of locking bos drm/msm: Do rpm get sooner in the submit path drm/msm/gem: Switch over to obj->resv for locking drm/msm: Use correct drm_gem_object_put() in fail case drm/msm: Drop chatty trace drm/msm: Move update_fences() drm/msm: Add priv->mm_lock to protect active/inactive lists drm/msm: Document and rename preempt_lock drm/msm: Protect ring->submits with it's own lock drm/msm: Refcount submits drm/msm: Remove obj->gpu drm/msm: Drop struct_mutex from the retire path drm/msm: Drop struct_mutex in free_object() path drm/msm: remove msm_gem_free_work drm/msm: drop struct_mutex in madvise path drm/msm: Drop struct_mutex in shrinker path drm/msm: Don't implicit-sync if only a single ring drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 +- drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 12 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 1 + drivers/gpu/drm/msm/msm_debugfs.c | 7 + drivers/gpu/drm/msm/msm_drv.c | 21 +- drivers/gpu/drm/msm/msm_drv.h | 73 ++----- drivers/gpu/drm/msm/msm_fbdev.c | 1 + drivers/gpu/drm/msm/msm_gem.c | 245 ++++++++++------------ drivers/gpu/drm/msm/msm_gem.h | 131 ++++++++++-- drivers/gpu/drm/msm/msm_gem_shrinker.c | 81 +++---- drivers/gpu/drm/msm/msm_gem_submit.c | 154 +++++++++----- drivers/gpu/drm/msm/msm_gpu.c | 98 +++++---- drivers/gpu/drm/msm/msm_gpu.h | 5 +- drivers/gpu/drm/msm/msm_ringbuffer.c | 3 +- drivers/gpu/drm/msm/msm_ringbuffer.h | 13 +- 18 files changed, 459 insertions(+), 396 deletions(-) -- 2.26.2