From patchwork Mon Oct 14 14:22:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Coster X-Patchwork-Id: 13835118 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 37D83D16275 for ; Mon, 14 Oct 2024 14:22:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A420F10E464; Mon, 14 Oct 2024 14:22:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=imgtec.com header.i=@imgtec.com header.b="M9I48B2w"; dkim=pass (1024-bit key; unprotected) header.d=IMGTecCRM.onmicrosoft.com header.i=@IMGTecCRM.onmicrosoft.com header.b="Y7qjiG6W"; dkim-atps=neutral Received: from mx07-00376f01.pphosted.com (mx07-00376f01.pphosted.com [185.132.180.163]) by gabe.freedesktop.org (Postfix) with ESMTPS id 47D2D10E360 for ; Mon, 14 Oct 2024 14:22:52 +0000 (UTC) Received: from pps.filterd (m0168889.ppops.net [127.0.0.1]) by mx07-00376f01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49E689cD003071; Mon, 14 Oct 2024 15:22:42 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=imgtec.com; h=cc :content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to; s=dk201812; bh=Y1W73LQbn0Pua5uG7QH4AADD2 X8OHkLtOO++ToKXmvo=; b=M9I48B2wqWSkQXyYp4Gw7T83NsuhFw6uKOh4MOehL QM1btgNeRxlEquPnfj9kPwwRDGL6p80g1ga0Wblr8OFbH+/HAHaBM5H3/xpyxQWb 67WDDiVRIRAq70Us4KbsyB64+2r4DGUgClI6Q0LPRDvmFZT+WGsgwpqIOuKSn9RS uviAye95+LWM+RzoIpaZf/HdXYeurdD489RktrT4WuToEYsndO3EBw/63EXrAxcq N+g24kq+yNckxDrIp0fbHJiZnwlHca6w05qzG9WU3ohxAkSPuG0KMBADYmYjHagS pxIEc49fDIY04NeZo+AJVxgvT05tjKuTt2jehNvituwpg== Received: from cwxp265cu009.outbound.protection.outlook.com (mail-ukwestazlp17011027.outbound.protection.outlook.com [40.93.68.27]) by mx07-00376f01.pphosted.com (PPS) with ESMTPS id 427h6w29dp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Oct 2024 15:22:41 +0100 (BST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SauoFDARB9R8AjAUbkIa6PJYGujdU9K3nU1dJFmDCEXQpHRZhz69cf1xoXPU5DNmEh/qX5RocdlYplrUw9YPwoH1M0xm6vyuzJRSW3Vler4vNaNPE1tbDDm0ySE3kjhtTceyqh1StPAcT4gploKOeOytFfMnEvFirwz4Yr4+gyT8KE/nKQ0euTnvEIJDlC9g2b2n0bASBSU+db7bEkMzF2t4GBfpr5X8aAG53Ldjxj+FYqDz97VGZVzlKQnE9mdvRvY9iBe/16QwoKwlAo3PB4Zk81ZVkgo77OtlzXnroX2nx6d2490EM4ZoDj+Nj41SvuWJylKEhUT6iTpfKgFeAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Y1W73LQbn0Pua5uG7QH4AADD2X8OHkLtOO++ToKXmvo=; b=xTt2jC4D+Gde2UfbdEyXvYtdUvzrH70O8eZciRnjJ+LZ49/ZOBMy98/gAJZIhXzyPJz3ef79C0K8+u/X0Tuankjt96c9saeGRuEFb+nAC5CzDeRjQqtJ3xpUq+WPWKqJc2B4rdWsa95ypE/x3Lo3fUiwEi2pQ6bAy/NE4xnSEQLkeSCESbVGStuCfijWaANDJ7BsDbObkonfnyLkuQeE546KYLk0GKTry+vKwBZgRSzPIIygK9YeSZipQGaD26YRgQadc55jrdK6dS7rX5Phi062tpf7/fwIuf/VcQmrl0wIjpwlrn2D4ifSHZC4n2pU7VzuhXAfM9aKdmYoMIBAqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=imgtec.com; dmarc=pass action=none header.from=imgtec.com; dkim=pass header.d=imgtec.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=IMGTecCRM.onmicrosoft.com; s=selector2-IMGTecCRM-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y1W73LQbn0Pua5uG7QH4AADD2X8OHkLtOO++ToKXmvo=; b=Y7qjiG6Wgj6LVxro2gUV8xKYTJgYaGU9aM6MWR9aAwQbdVTotvV2TlanH+Ov6bLmfHRNi+4BxSjLEeQrONMv5x84Ffzy9CDaXbrDtxUQTCTyJBlRhRp5lwfzyN5b4yEzW66JCMQ654hbWMn+BGR/lRcWM0FChlWbXwmvaOYHAjE= Received: from CWXP265MB3397.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:e7::8) by LO0P265MB5894.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:289::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.27; Mon, 14 Oct 2024 14:22:38 +0000 Received: from CWXP265MB3397.GBRP265.PROD.OUTLOOK.COM ([fe80::8e9d:6b2f:9881:1e15]) by CWXP265MB3397.GBRP265.PROD.OUTLOOK.COM ([fe80::8e9d:6b2f:9881:1e15%3]) with mapi id 15.20.8048.020; Mon, 14 Oct 2024 14:22:38 +0000 From: Matt Coster To: "dri-devel@lists.freedesktop.org" CC: Brendan King , Frank Binns , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 1/2] drm/imagination: Add a per-file PVR context list Thread-Topic: [PATCH v2 1/2] drm/imagination: Add a per-file PVR context list Thread-Index: AQHbHkSFDE160/GjWkq3Mfb72eyJpg== Date: Mon, 14 Oct 2024 14:22:38 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CWXP265MB3397:EE_|LO0P265MB5894:EE_ x-ms-office365-filtering-correlation-id: 5ba05169-b26b-4c42-f80d-08dcec5ba80b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|376014|1800799024|38070700018; x-microsoft-antispam-message-info: =?utf-8?q?9Sk9LuUKsuIajQ4+z2evNSKKfY8+84B?= =?utf-8?q?/VOO0C5lIqjXjsaveKjAbcnn8VPLCNGkfzBQJbq7+xCGh9JtKkYdJ54UkebszHFs4?= =?utf-8?q?yAv2QW8eElciiH8cLLk4wBlSw5I2EG9piSJv5onuLdMeLALVmx6Pr+xPLfF/qmEYw?= =?utf-8?q?fWzd/hU5I3gjAUBsQHRe45Jc4qPca4+Xh2tOLqf/jW6seLHUqwInBAAXCkEmTQ+MN?= =?utf-8?q?8Rg0qtx61SAMnktFzPn35wYHouWHZ3MKvdNKEa06FZaaNS2On8sK5BBf3rFOJoCba?= =?utf-8?q?WK83OUUdEgzweVIG38QB3JgTPgOSkD+fJzi1t3NrFT3wVHi52f1e6lk9v9DabZllz?= =?utf-8?q?FBc0wm98M+Nrd9/RuOKDCiUlwpV0Q67rG6/Go7ojake4deDI7Tuad1AqUJOLRMCQi?= =?utf-8?q?wIZO9NZfpH0xcrNp7LD/3REAfZzkN3TBmftagvQbrhoETHMOJZpn3KWV7/f7lW/1V?= =?utf-8?q?05+TbZzlPFCIquA6K1BvVE6Pf0bmod5QTRMu7bB7btfccPRJmOiBCV0QQel0Uui5p?= =?utf-8?q?TZN475Np9wJUceOrErEBTe6YQVrKAVX5eGjeL6EdAcliE+mfrd2tAOYmDED88vX+B?= =?utf-8?q?eA4DRKfqoQvwHQCiAp8uxoijALMr/r2rihBWmsO19efHOv22+liSZUSTJ1XslDh8+?= =?utf-8?q?UbuzcfwqGA2+XZciwmgYbSnCd3w+imqu/rbYMXHGUM9ZrnmlpTaDUSlkPg14S/6zV?= =?utf-8?q?/rY+HXfeTJf3N1gPo/TsJ19rNRi/f0uEHCgSe16U4OTzi9nH5UbXxZM3aknZ252Ki?= =?utf-8?q?WTTr/erGcuuDZQoxzVJ4ICeEBVUsqM1X2eMFYRXtn6DTOOnAFESnHh+Cplu2Z/M8B?= =?utf-8?q?bRXvNKiMFbrDNarnAyO2S7uZOTu9wa4D1qfwAaRDwN8xuNFJpsK2MUgFrS/p6tFrx?= =?utf-8?q?4cwgGbiRTfpujvhC6Wuq2Rwn2T7HrIJ6v22Jp9ZRBpkZzR3gThmId75QOxf5NPiey?= =?utf-8?q?8jmSAEBo9YT4xfRIZjL/Po1+GvvTFJB3hVSXBn6sghtDSwF45DCbAboe4PhuXzXQ/?= =?utf-8?q?fxzlPuthFIkHD2fhlvY06w/3byCTrvLLF2jPmaKvAUqjUImvFQAjMySKSgyHCDN1i?= =?utf-8?q?nh19tDv2Ix4Jugw5DK67cSHhawnpt1R3Pf4pvw1Z+GMkRnP+A35kV2VBZ0fsByMMu?= =?utf-8?q?KVYKc0twPUNryR4xD8IsSix87n/Ao2+4XjiLMl3hOlQYSJAvN8+rE4eX+6yEcET8A?= =?utf-8?q?Jhyktp/6bcL2ykcSRbHs5MxPENRRN+isExh0c9tsotil1BVjVqFGD+sPKgoE9JWn8?= =?utf-8?q?f4sNV6myf9B8AjW+xArf4QmacWMaG30s53w=3D=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CWXP265MB3397.GBRP265.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024)(38070700018); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?qzr+hU+YVPwYVPC3lkr+CIyesrhZ?= =?utf-8?q?2/N79qy7bibAdeTPSc/hJqUjT/blHMeZkZQfVhpkpKlXhZoE4n5p4AZdn7BWakOMO?= =?utf-8?q?ypPha7V9GIED3butaHq9VNLJcawUwznG42lL/l5WX3CDJ/ExPj+rckPKBikFgrPCc?= =?utf-8?q?VJC+dS6tggSzEwScknQMryU9nRAWTSEf3zy6gggvrfQKuDAd37cPb7p99HHeKP7Li?= =?utf-8?q?RW3zgu1TywZjYZHKRX2vOrUWuHKJe96LB53W2mILFvo5Tpgs3lh7yTxWkcyCUpYuD?= =?utf-8?q?efrlUuNTriXF0xRFIS+1Qi5nLK4s5Vkw/To0rbck80UoUGmiN6EdE5/v/u/qNarI4?= =?utf-8?q?2lOPn9pdEIAXMY67v5YcH61Jz5xPbisiKsfsGY/ajzVkdgL0/km4nwRwFZSJddiZu?= =?utf-8?q?271rr7BW8CmHGdBGqTMbFA0t/zce8NEQ8Fn/mRhlG3Cx7k0BWHmxseymaFcTuLYa9?= =?utf-8?q?hjsTHzZLu3/RSkbcKxUMSRwOJy0CjFYrlsf6n2Z8ocqktClbQDOQvtGMiwHc93tRp?= =?utf-8?q?yeVb/WdpkTUvRZoHVJHaD7yq5m+s+BsuUjB/poL/AVVygUxiKHMJKlGQ+Kzr4gO10?= =?utf-8?q?VrP21EyHl48BGww9++g1G+OHqGElFsolKl8gg1mCdhok/tf/v87pPiWAdIEF1of45?= =?utf-8?q?0Zuok4D6HBvwVPTHK7Xf3nO0cskYkmaQvs9Kot8KM1ReiaWMOPlJoiTPjXwGSlEFi?= =?utf-8?q?69QYlQTfcmcsGZYtol2NvPtOYfoLhWJad3DZMlhyNmwpW3H+EkkhmInTXfxTguJ0w?= =?utf-8?q?u+nXN53zUa/ZkWNEPi4Ppj+LN+atA/ob95ZQK8hdrJ9kf3ntSotKVeVGs1uj0Pe1x?= =?utf-8?q?pJT/fqOYwQGhGgN4uGwFmxUTWuVanqJ7yhbDMwv6CXfJ3zjYJ6vcvVGOFNgIgUflI?= =?utf-8?q?TxsKR8V84JKONSRcVxbDLhscEHcgpdxb+LOf4e7AGsknTfUcgmaBOVjodEcjP8uvP?= =?utf-8?q?A3eLu+PkJI1XxXcHu8A4YD79tULIClGeMn6rFO9pJL7YwxHOupxaMIWXtZCXheRiR?= =?utf-8?q?eQUIZEwKwYsv3oKKfZOCbVS3tH6FxGZ7nEXRfWG/lsfV//VXSiz6KcALiDzv7IeHb?= =?utf-8?q?COUWnm8nbT1f5vUdjLz2Lw5sOh6QxPZk5s4070rCprI9DZF8RlunlZthBUb0DaQjH?= =?utf-8?q?WP7IhxeEE5kBJTCBn1KwJL29NIwr+N05UQCul36fW3zZY/LGch+5Y/GQ3oJ2+fNLL?= =?utf-8?q?qyf7vgW8f4M7JEjqPXUkLiKUc2BjvdHcfHBRCUfcrfoEbh+XVvic6yrgOG9ZHOV0Y?= =?utf-8?q?2iR3dPSCg+odU6XNXJv+Czio9qQXNZrJcJY+/J3F1upzMgn2Rs9pKCHocd+aafvCi?= =?utf-8?q?MXXUkFIYGhoeNH64Hw7laZL1txu9/sqehpJWWy1DvnmjQB9nBy23ZzCCi+Vknr2bU?= =?utf-8?q?zS74kdspaife1aHtkascRE0XVuHgyGEeLLJqUai+FxCjSvg0x+bowyX/FH70/ImkK?= =?utf-8?q?h8fIKMoN6F8xXhLeR+kXCzjhNvp8TtwprDzTSjgMLvd8S/4ayOLsHA0hB9DvSKua1?= =?utf-8?q?Y3kzrTD09leOu2XJbyA4+h60fXPFV08RQw=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: imgtec.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CWXP265MB3397.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 5ba05169-b26b-4c42-f80d-08dcec5ba80b X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Oct 2024 14:22:38.4687 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0d5fd8bb-e8c2-4e0a-8dd5-2c264f7140fe X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: P0uSY9D1bynJ1Y3MF1JhMj+Q+CjNdQXTmrasMZC+0kect1Tckc/IluKUDEZOcWv5DkqRvADEEfy35aF6ebuj+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO0P265MB5894 X-Authority-Analysis: v=2.4 cv=LbZu6Sfi c=1 sm=1 tr=0 ts=670d2932 cx=c_pps a=OsxvgCVCPgftFDG+4S7SsQ==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=DAUX931o1VcA:10 a=WnR_qW7rlZcA:10 a=NgoYpvdbvlAA:10 a=r_1tXGB3AAAA:8 a=2zjTdtMHGxF8P-iNuwwA:9 a=QEXdDO2ut3YA:10 a=lyOg1_WVnN3a3aLNPZIA:9 a=FfaGCDsud1wA:10 a=t8nPyN_e6usw4ciXM-Pk:22 X-Proofpoint-ORIG-GUID: 6BKH6nL-rZfBRCRV4uujK9O7Ump1k5dJ X-Proofpoint-GUID: 6BKH6nL-rZfBRCRV4uujK9O7Ump1k5dJ X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Brendan King This adds a linked list of VM contexts which is needed for the next patch to be able to correctly track VM contexts for destruction on file close. It is only safe for VM contexts to be removed from the list and destroyed when not in interrupt context. Signed-off-by: Brendan King Signed-off-by: Matt Coster Reviewed-by: Frank Binns --- Changes in v1 -> v2: - Add justification to the commit message so it stands on its own (e.g. during bisect) --- drivers/gpu/drm/imagination/pvr_context.c | 14 ++++++++++++++ drivers/gpu/drm/imagination/pvr_context.h | 3 +++ drivers/gpu/drm/imagination/pvr_device.h | 10 ++++++++++ drivers/gpu/drm/imagination/pvr_drv.c | 3 +++ 4 files changed, 30 insertions(+) diff --git a/drivers/gpu/drm/imagination/pvr_context.c b/drivers/gpu/drm/imagination/pvr_context.c index eded5e955cc0..255c93582734 100644 --- a/drivers/gpu/drm/imagination/pvr_context.c +++ b/drivers/gpu/drm/imagination/pvr_context.c @@ -17,10 +17,14 @@ #include #include + +#include #include #include +#include #include #include +#include #include #include #include @@ -354,6 +358,10 @@ int pvr_context_create(struct pvr_file *pvr_file, struct drm_pvr_ioctl_create_co return err; } + spin_lock(&pvr_dev->ctx_list_lock); + list_add_tail(&ctx->file_link, &pvr_file->contexts); + spin_unlock(&pvr_dev->ctx_list_lock); + return 0; err_destroy_fw_obj: @@ -380,6 +388,11 @@ pvr_context_release(struct kref *ref_count) container_of(ref_count, struct pvr_context, ref_count); struct pvr_device *pvr_dev = ctx->pvr_dev; + WARN_ON(in_interrupt()); + spin_lock(&pvr_dev->ctx_list_lock); + list_del(&ctx->file_link); + spin_unlock(&pvr_dev->ctx_list_lock); + xa_erase(&pvr_dev->ctx_ids, ctx->ctx_id); pvr_context_destroy_queues(ctx); pvr_fw_object_destroy(ctx->fw_obj); @@ -451,6 +464,7 @@ void pvr_destroy_contexts_for_file(struct pvr_file *pvr_file) void pvr_context_device_init(struct pvr_device *pvr_dev) { xa_init_flags(&pvr_dev->ctx_ids, XA_FLAGS_ALLOC1); + spin_lock_init(&pvr_dev->ctx_list_lock); } /** diff --git a/drivers/gpu/drm/imagination/pvr_context.h b/drivers/gpu/drm/imagination/pvr_context.h index 0c7b97dfa6ba..a5b0a82a54a1 100644 --- a/drivers/gpu/drm/imagination/pvr_context.h +++ b/drivers/gpu/drm/imagination/pvr_context.h @@ -85,6 +85,9 @@ struct pvr_context { /** @compute: Transfer queue. */ struct pvr_queue *transfer; } queues; + + /** @file_link: pvr_file PVR context list link. */ + struct list_head file_link; }; static __always_inline struct pvr_queue * diff --git a/drivers/gpu/drm/imagination/pvr_device.h b/drivers/gpu/drm/imagination/pvr_device.h index b574e23d484b..6d0dfacb677b 100644 --- a/drivers/gpu/drm/imagination/pvr_device.h +++ b/drivers/gpu/drm/imagination/pvr_device.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -293,6 +294,12 @@ struct pvr_device { /** @sched_wq: Workqueue for schedulers. */ struct workqueue_struct *sched_wq; + + /** + * @ctx_list_lock: Lock to be held when accessing the context list in + * struct pvr_file. + */ + spinlock_t ctx_list_lock; }; /** @@ -344,6 +351,9 @@ struct pvr_file { * This array is used to allocate handles returned to userspace. */ struct xarray vm_ctx_handles; + + /** @contexts: PVR context list. */ + struct list_head contexts; }; /** diff --git a/drivers/gpu/drm/imagination/pvr_drv.c b/drivers/gpu/drm/imagination/pvr_drv.c index 1a0cb7aa9cea..fb17196e05f4 100644 --- a/drivers/gpu/drm/imagination/pvr_drv.c +++ b/drivers/gpu/drm/imagination/pvr_drv.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -1326,6 +1327,8 @@ pvr_drm_driver_open(struct drm_device *drm_dev, struct drm_file *file) */ pvr_file->pvr_dev = pvr_dev; + INIT_LIST_HEAD(&pvr_file->contexts); + xa_init_flags(&pvr_file->ctx_handles, XA_FLAGS_ALLOC1); xa_init_flags(&pvr_file->free_list_handles, XA_FLAGS_ALLOC1); xa_init_flags(&pvr_file->hwrt_handles, XA_FLAGS_ALLOC1);