From patchwork Wed Sep 26 16:18:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10616155 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 91BFC913 for ; Wed, 26 Sep 2018 16:20:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 846922B461 for ; Wed, 26 Sep 2018 16:20:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 829602B3DC; Wed, 26 Sep 2018 16:20:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B1B2C2B3DC for ; Wed, 26 Sep 2018 16:20:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 165356E4C0; Wed, 26 Sep 2018 16:19:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::60a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 69E6A6E4B7 for ; Wed, 26 Sep 2018 16:19:23 +0000 (UTC) Received: from localhost.localdomain (155.4.205.56) by DM6PR05MB4588.namprd05.prod.outlook.com (2603:10b6:5:9f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.14; Wed, 26 Sep 2018 16:19:19 +0000 From: Thomas Hellstrom To: dri-devel@lists.freedesktop.org Subject: [PATCH -next 12/18] drm/ttm: Export ttm_bo_reference_unless_doomed() Date: Wed, 26 Sep 2018 18:18:33 +0200 Message-Id: <20180926161839.4549-12-thellstrom@vmware.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180926161839.4549-1-thellstrom@vmware.com> References: <20180926161839.4549-1-thellstrom@vmware.com> MIME-Version: 1.0 X-Originating-IP: [155.4.205.56] X-ClientProxiedBy: VI1PR0601CA0020.eurprd06.prod.outlook.com (2603:10a6:800:1e::30) To DM6PR05MB4588.namprd05.prod.outlook.com (2603:10b6:5:9f::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c7e65b91-adc7-4149-afaf-08d623cbd0d8 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:DM6PR05MB4588; X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4588; 3:CPTLexRQGm62hFsjr/PP/PfWPJg01fa+bzwyquchfVZLpeT+nCttmVZ1b50gbwDHvndLXWrFwzOSSsEQ4z/RF7a6v6hH5k6tzXBoYR+fORm6FTaESymefPOBhckdSoepPc5YYxOdotT/52chh/cUwwb6WYiH3Q6nyFcBB0ePf418H38EU1Yd66GRSBzUBwsDWoCQgRVSuPAgesK3sqzYuLm4IS51rYZv//71H+Yg+APTlgPJfBNMopnXQDS/BY7z; 25:YK+wl32D5fcCY0H2ty+39Id5wY4jqzoRv/vb4KrsBsTKhyp5XxXrsxzeSPBvOO6u7kSZGrQFhewhT+Yplp71+d677Tu/MJex3OH7BmaTZk+l1GmGL0yW0HWGBykhzx8UIc8+rJtB70+CBsmrQkpr9U9EdPwJSTqLAykTq0aISaxPn34t8o+ihq5hKONG2aXoY5pGWCv9bHugfjh8oS5oC3zeM9McJnegV5VlMghWUp7lopm9GEboXSTGpZRrxdutTpoykJbNlGycgrG03b3ccv3JrqGHqZeao9nmZ4fpQE+ZmYMdFvJnLCRNJ6s7bqvYq4n9SrX8sgtp9nV5SBCCFg==; 31:Z74rCs5ZhyD4gFAcYbFRDOlG8bGBwHSUHWPZlkUnCfbyFd7jYCc3MpWutbqk67gN81/Bh0/tLolPnqMrrqtpU2vn+5yTKwJy6rVYbDDjrg0Qu9+V4jPeKjI0CA9Z5vaxo9NBknQPm5/w1JoTKjrhQQbQAkuuP4eh6Rfl0peReexZ5he4vseL1aIOwE2mn30Fy4Yl4aZNK5LSn9MVHLyA9R9j8cV1/gS4mmjdQUPUa28= X-MS-TrafficTypeDiagnostic: DM6PR05MB4588: BCL: 0 X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4588; 20:APrcbn8GYMvcOxyTx/ourqHPkJqwGUkL3M+5jkJSrffcikd6ts0fDXQL12IUgmpYyiCaQRaCXJ1G6xvZVLI1CumG7lMYvrrQUd4J2xFi4gl1Z7SQoZVaxluYGISb4liZlUXs3TIVA87uvqtONSt2mf5WPRJmmzS9REky/9s4WzXjtbRrslsX+wiaOTbAfNr5ZEYAXwkSEoUpmv9PPw04kRLFIR5U3VUUIJSGeKtocxm4odvczvqI3tmZf3vg7zoU7AUUim4effYFE2xqhRpmwI6gJ66V6JpWMM/hQte+JsoRB8hc1ftLtznnSGwGLgXPhM3e746jCRLsC0GCdeMAsVpBOgoUqIKLiaSxpCQcMACS+ivlFT3/HuADiSDQ0ruyABuLv6as9t9zlHpL/s+uiiqOXaxM4L7Z2b0JrC14P3WBcIGUYsW7tFMJ36uTrh27SYueFI3quY9M2T9vZfLQB9Zd5wJbBEAAC5glixevNAchiVSL6dm63fUJ8rmCWY88e3P/agmDNS1hGFiywoYkIIMkEaU3BiBuGd8QZUYb+fwsiSR0NqOpLnI3K+4cd0Kwg0Lcv6PCFiQ/loDuVrFN3oXOUDsTHkUylTt8b6pMXss= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(61668805478150); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231355)(944501410)(52105095)(3002001)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201708071742011)(7699051)(76991041); SRVR:DM6PR05MB4588; BCL:0; PCL:0; RULEID:; SRVR:DM6PR05MB4588; X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4588; 4:amAfMFrINv2KXH9WN4lu6cB834SCvtSH09RGDTftzeYKwGL0GaM2q8WZG6tN+TWvryI98dBQqll9E9jZw9/ZP/A+Re7DrX4l+RlxUwAC5RajYe8A9QCqE9KBYr82cneiAIrtBofC+XOJ+xau01haZmB1bXZw/8OsfZv1hlR8QsoxxhAO5+dRfbZiqKxpKd7Dptppx7pmCroSoYWtDtyEF71BZchJjxNsJiT6M1Jx1lPjlIBXHae1ZIYDSsT0GF04KMg6dyKGI4/Te/WVUZYuzu3rYga6EZLNKnzyitdkX8KnCq3YFCq/nvcQg3c2l1yDyY/6wAYttxF/H1VP2lva1OFpbysQO6WC0nIQWyMRrjE= X-Forefront-PRVS: 08076ABC99 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(346002)(376002)(366004)(396003)(136003)(39860400002)(199004)(189003)(11346002)(186003)(105586002)(36756003)(47776003)(26005)(66066001)(6512007)(2351001)(305945005)(14444005)(446003)(2361001)(486006)(16526019)(106356001)(7736002)(5660300001)(476003)(6666003)(53936002)(86362001)(6486002)(97736004)(478600001)(68736007)(54906003)(50466002)(25786009)(8936002)(316002)(956004)(2616005)(386003)(76176011)(6506007)(3846002)(6916009)(1076002)(4326008)(8676002)(81166006)(50226002)(6116002)(23676004)(2870700001)(2906002)(81156014)(52116002)(34290500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR05MB4588; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BDM6PR05MB4588=3B23=3AtVHtcYf?= =?utf-8?q?CvZHXC05C1RKUDUEN8ExjocB0aEKN2oLhluqbM8dT4HcyCQZ6UWh+VrolWeLifQck?= =?utf-8?q?jTbVeQK0vgf7A4u2wgUBBmfXLC9UHkJQ6KqhX4aDSIFLWXdQ8hy+PcRaT/WNrbkgX?= =?utf-8?q?M2cDGX81VlcyCtR4FcD6fQ9/COmK8SkltO/C3P6iKyNxs9w2dRc24/nCN/0qQIXks?= =?utf-8?q?UDN3eGJ/5wtd5NyD8JPOqXEpKkOMrmuX41BSQGf2aM4D5E6jAHMVvBT7eKCpBwJ8f?= =?utf-8?q?YRSKLoMNRlFyYcT/f4pYagFmbJj25LfOjCy3v1m8yVfIADR9tOMhgyq1wm+6F3eLG?= =?utf-8?q?t8R56lYCwCkrJYTt+YEc+G2uhbTAmGBGRsvij8TPH7FsarzU8BZPZZUWDXCGXaO1m?= =?utf-8?q?vVSAmkLEKMxnYUHSnXeCUEcD2ll7p41rD5Jyvc9T+2xSEBbE+nup/4GasImfy7pin?= =?utf-8?q?qsm42g1zKhT4XgShw4xio02srF7EqBXPlPmWCwuupD8S9J1UFi/aAb+RDPwODn8hx?= =?utf-8?q?C3bu7k0PTHzBQMfzqJjzT7cFYASupiv3K8kBEqDzPnoAYlPSIA6alVl71I5VvludN?= =?utf-8?q?Bybs6PJ3w0sGwJkcJRGeWcmCRbozHCuPtgy9otyNl+fv1uY5l2OY0JFggBYGLkCfm?= =?utf-8?q?QTAWwCVitmLZ2Ji9VFkZpU/5s84n4vkK7qh4brNfXzVoOiXc5AHH977yRJzIM/9vp?= =?utf-8?q?RO5fJhKTpNQbxBgH6b0fYc7h6aQR+cQR1mPYSZ/KN+O6/3wuTkOZNuXC/7vhO6GyQ?= =?utf-8?q?vr2pL1VsGrhbLL8dRxRXrHMeq+96epfQMtetwwF0Lko0CVCk1vSTvGhrSx/Gy61h9?= =?utf-8?q?b2fyPvx2+ZkC99De4yYOxShtfRLG+kDJdyc9twCM2yBvAp1+LDJn/DiKRcfT2/Mwc?= =?utf-8?q?A4ZOQzlzlr9UYxvurVPWU0qUIt2ll60wxDetivjWZ3s2fIyLulof1fOsmLQxJhBmE?= =?utf-8?q?EKRUJ5M+ENzBwrPh5PersHVjOruyO82HjS3H1WD/mwo69zbGlggIlk6yTn1WpeMCz?= =?utf-8?q?hBLSk0BWFTTEBFxPf0ssDUGdb6EJiOWoi7NQx+6RwGU4kPwaYuSfmfcDTNkP9ysp6?= =?utf-8?q?2gXdjBz1qEUJOSX068nbaFE8uZBYxgOD6A0HDBGjXqQB0fyqCivumJn/840SMkNnp?= =?utf-8?q?lLXdCena37UyJ6lsTvLSZzyAZjXmxbihEcO3ZVF9xuGobRbrQ2rCk7NLp9WaeuZmd?= =?utf-8?q?p6SWq1DdgpctkmNCpT7Nboz/aS8v0BhQokM5lMkNVwQQO+M8is3ABPaZTJQg=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: hJJkTA3EHXWQLkvJEY5J5mu3pPY0fJcx90J2LTuywghuLR8yInWRF8wysBQtRkdxrJnvCVJ09Xq3//XvUMScInOTbtfgjWfTHZxw0sS/t9iESapeMe/BmfWIHv2DuofNuxmC7bWir2k0o3LqujQhvuWq9f5lJdeB5NWpruvwBzzDmDqtOmY9unEUUidq6zM+pnuDV2OCOacbpvSg2sRfcLFJT0MRLaH/oW8jq6RyJ0wWe4ib8Tek8VOSBxhXKrAKqqwvHKKhsi/+vYb/1nSqvO1WKCLxgrHeKLWo/ZvpUu9u+KylLm2qEzSVswLZTb60vYaPtfO6e15lFyAz4ChFS/lMCJCUtdpl1GZt8idZcj4= X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4588; 6:FIFPwKpvNl80x8RVwzZnloEzE3+4qaxLcogAGR+mHjsrtQ12JNp2NhgwQ6V/maPjRCK9SKOZ604AtgAxp3FDWy1acAPTZHHpkJ9uHd5pYGjjuhmwZd32PQQBTKwbSS/HyWRPUB9mPcriuFoVEBCXg1GALUL2SPMFlFRW5JPmKFzlrLbaxGFxp7/XPNjMT5FWRmSrjLPy3BTCCUm22C7E0qClYJu6M+39WpJ6WNrv8BrHKH8jMBWLzTb8qBMF/nYyzRk2h4syjLb21TvX0Kv7IyNPFsIAZcs5K8Zuey9k6H1t68+vNHeVljsDRwuCNIMZMAwXj3WWuBW1gaOL8NeJ12X53dQjb3ay9LbxAJlZjErYv8PNH8zhBO6S07co8CYkNi+7i4J9vauwbwnwvMdPMVhT8kqQo+J2zqpSM3yVW/mpJ0iVPugx6MWrmkvngk4/LLhRhJ9jet9nGuCiyqUCCA==; 5:9/djKbf35iYXvtqUp/wVIfvm5jG3T9MwAa1V6Wda8BGTiufDmK74yQW4SD2ugZHewLUPWohzGEfCEhiq7RjpRJBO6taLUAlJpeNraB8fZDyl09ZbgmTvTNRLMJ5ALS4p4dNca4BfM5TzN0zzim9Bka0kDjqLsHTji/WTsmo1V0k=; 7:T2NuKcmnT0hoBUoKoCSq02DEpPd9GvpIAGweH8+4FewP2DXRQoW8tbhvH29kFW+NZ8Ccc5ys62hId+MsRnZ4C9XNud3IYzFr1srkcHJN8/R43C7u1qf7SpF9h/61kO+vnGZZVk1e/UXK6MCJPZ8ijdD4p+qPqAUJW0qT97/iWyjarI+lcG/Mv0wSQCg4hbAG76UhfjJWsywKSWiMdkurthwfB4WO4v7Z60pZWu650eBfoiirTFbEIu8qBrTiz+oj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4588; 20:v1YhNF7kf1vVYaT7UeXqGedbmbf64Kugz4Q2d2gxi0sYgNzGzVcEsE1b0A8s6q4lXqS5YDxHRRbMOmAlfvMgvMP/9zTrtUNjMxQYgZZ1cBMWGtZXg7vRjfb+IpaCc40A47LAugkXeBpxJUYke7bKOjEaHuO470Txz9udE12CRaQ= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2018 16:19:19.8661 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c7e65b91-adc7-4149-afaf-08d623cbd0d8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR05MB4588 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Hellstrom , linux-graphics-maintainer@vmware.com, =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Export ttm_bo_reference_unless_doomed() to be used when looking up buffer objects that are removed from the lookup structure in the destructor. Cc: Christian König Signed-off-by: Thomas Hellstrom Reviewed-by: Sinclair Yeh --- drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 +-- include/drm/ttm/ttm_bo_api.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 6fe91c1b692d..ec4b09366213 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -409,8 +409,7 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev, node = drm_vma_offset_lookup_locked(&bdev->vma_manager, offset, pages); if (likely(node)) { bo = container_of(node, struct ttm_buffer_object, vma_node); - if (!kref_get_unless_zero(&bo->kref)) - bo = NULL; + bo = ttm_bo_reference_unless_doomed(bo); } drm_vma_offset_unlock_lookup(&bdev->vma_manager); diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 8c19470785e2..b6bf6b086576 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -312,6 +312,24 @@ ttm_bo_reference(struct ttm_buffer_object *bo) return bo; } +/** + * ttm_bo_reference_unless_doomed - reference a struct ttm_buffer_object unless + * its refcount has already reached zero. + * @bo: The buffer object. + * + * Used to reference a TTM buffer object in lookups where the object is removed + * from the lookup structure during the destructor and for RCU lookups. + * + * Returns: @bo if the referencing was successful, NULL otherwise. + */ +static inline __must_check struct ttm_buffer_object * +ttm_bo_reference_unless_doomed(struct ttm_buffer_object *bo) +{ + if (!kref_get_unless_zero(&bo->kref)) + return NULL; + return bo; +} + /** * ttm_bo_wait - wait for buffer idle. *