From patchwork Thu Oct 24 06:16:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13848350 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFC5B178362 for ; Thu, 24 Oct 2024 06:18:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729750700; cv=none; b=s3Fc+MVupdbdbNNn/HBwxl/yqZZbHs+q0V5EHn0HMVCWMZcWvi1JjFoH/94qT90APppEFGD8NzZd7Csbs9ejJOLMC4npEo4DPMIKQ0hO4cKwGCH5J7EdUoZXAj+KEctUnjulXn3docFt6l16+bQiBwZGmsmg4E26ki0+hkpTgJ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729750700; c=relaxed/simple; bh=7z9sHxgUCVQsKNY4lmElaeG64+AQ4cWLqv6Rm4s1p+A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dq36kAfKQPUPIUpEUkle8NuKVfMHyx9WPydN13CnnQA1KX184vdhiNnLzEcvnitrF972hfqaDrYeZVcWk1EuLZxr/S57Zf80MjQB9KPDFXaXalzZmVG2w2mVZ70pcrLuz3NApg4dQ+ry2/VqtxEPM3ONhiPQZnTneVpD0aPnru0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=caaqhoYP; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="caaqhoYP" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-208cf673b8dso3954175ad.3 for ; Wed, 23 Oct 2024 23:18:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729750698; x=1730355498; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+19Hn+S445I40H+rmXiB2PRnlZs/Gsckku970IfQUmM=; b=caaqhoYP0Wev1FhzaxoPs8PJWPqMZNiOihGHddvy/KeAjreAp+1+K/BryCooDTLmPS jthhkbY3OFQH5w+D1u7bm0aC8Jx301L/oJo1NeNvXQegYXgmYesUFck8KYg1Br0SwCAU BbYfJJmztELdq5QOOmMowo3TDTpPW0yaXGb2s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729750698; x=1730355498; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+19Hn+S445I40H+rmXiB2PRnlZs/Gsckku970IfQUmM=; b=Jn2S/jrLQf7i3UW+Bb6prWcpsztz0305P0avNbSQZ+v0CxjTBRrulcwZ+5BmIPzzrY SNj2/n/9e69RaGDRqO7TJ6JtDnbenDhhYxfNjUN3HLyJF7jvwyjfmpPTucMhwLUYfMHr aMPi18jMXpdIWJFXSN1UjTV1BTBWKMMSY0VxkrFsnpW0YEfvLRzvMQJaqrYIpx9gL7Bg /mazqPi3p/9mv0nsGO2NzHKBAlFPdOmPBWsZrDei0GBn12UPpQe35Pkg6KhqsUXbEq3l TiOlzoCXGr0l0fYoUVsr5/w1aUKiywmH2dJUlVTUyzMTg1BnCTZ4xA+sYdqkNTYkMy4L gOqg== X-Forwarded-Encrypted: i=1; AJvYcCXCHnzFtcgwpeIbgvmyL5qT05xuBtY32KMUmwr7RptDM3FQIgccCmgtjbjtwCFCDW6s4YQfuLr2oEgiwA==@vger.kernel.org X-Gm-Message-State: AOJu0YwgQf/ajhHw5cisOogC38kgIorQWlD7OxkSiL7QPxgiEv0qs4/4 /fd1Csx5OpSboB0kXGmLKUEUTqd+rDV0yOWk8SUwCTrzjMtZzoTd3qzPUUUD6A== X-Google-Smtp-Source: AGHT+IEsNHH0EoO6f5BiY/wXlSMMNw525wj+rM1OLWKEmamuWM7is6+1JYX7vZrU540bLU4VLMEiAg== X-Received: by 2002:a17:902:d50c:b0:20c:f27f:fcc with SMTP id d9443c01a7336-20fb99eb524mr7690235ad.44.1729750698382; Wed, 23 Oct 2024 23:18:18 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:9422:d958:f749:9a30]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20e7f0bd561sm66418885ad.179.2024.10.23.23.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 23:18:18 -0700 (PDT) From: Sergey Senozhatsky To: Stanimir Varbanov , Vikash Garodia Cc: Bryan O'Donoghue , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky , Tomasz Figa Subject: [PATCHv2 1/2] media: venus: fix enc/dec destruction order Date: Thu, 24 Oct 2024 15:16:57 +0900 Message-ID: <20241024061809.400260-2-senozhatsky@chromium.org> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog In-Reply-To: <20241024061809.400260-1-senozhatsky@chromium.org> References: <20241024061809.400260-1-senozhatsky@chromium.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We destroy mutex-es too early as they are still taken in v4l2_fh_exit()->v4l2_event_unsubscribe()->v4l2_ctrl_find(). We should destroy mutex-es right before kfree(). Also do not vdec_ctrl_deinit() before v4l2_fh_exit(). Suggested-by: Tomasz Figa Signed-off-by: Sergey Senozhatsky Reviewed-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/vdec.c | 7 ++++--- drivers/media/platform/qcom/venus/venc.c | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 6252a6b3d4ba..0013c4704f03 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -1752,13 +1752,14 @@ static int vdec_close(struct file *file) cancel_work_sync(&inst->delayed_process_work); v4l2_m2m_ctx_release(inst->m2m_ctx); v4l2_m2m_release(inst->m2m_dev); - vdec_ctrl_deinit(inst); ida_destroy(&inst->dpb_ids); hfi_session_destroy(inst); - mutex_destroy(&inst->lock); - mutex_destroy(&inst->ctx_q_lock); v4l2_fh_del(&inst->fh); v4l2_fh_exit(&inst->fh); + vdec_ctrl_deinit(inst); + + mutex_destroy(&inst->lock); + mutex_destroy(&inst->ctx_q_lock); vdec_pm_put(inst, false); diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 322a7737e2c7..6a26a6592424 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1519,14 +1519,14 @@ static int venc_close(struct file *file) v4l2_m2m_ctx_release(inst->m2m_ctx); v4l2_m2m_release(inst->m2m_dev); - venc_ctrl_deinit(inst); hfi_session_destroy(inst); - mutex_destroy(&inst->lock); - mutex_destroy(&inst->ctx_q_lock); v4l2_fh_del(&inst->fh); v4l2_fh_exit(&inst->fh); + venc_ctrl_deinit(inst); inst->enc_state = VENUS_ENC_STATE_DEINIT; + mutex_destroy(&inst->lock); + mutex_destroy(&inst->ctx_q_lock); venc_pm_put(inst, false); From patchwork Thu Oct 24 06:16:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13848351 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6266189BB9 for ; Thu, 24 Oct 2024 06:18:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729750703; cv=none; b=gx9p1oBIeV93o3v/9OvNni7g7FIAoZaTT4KNPC53kii8TH9/mbv+sWxXz3YvxLk4axn+b8ej1h/40ESS50bSO52GczPY1ivuZxvdCOB9EWdjQxRWNa3u+isSw1sABUrCGa/ZPspRNoC9Z41hl4iaILHBCh29gcnLGQC6xYEoNgM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729750703; c=relaxed/simple; bh=WuW3DSRWAirPU5hoOMSkM7ECIZU6B8b6JvmaEpe9eXM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FXg5+l/QYRXFKNXm9uGCC3H3WsmfLgFF9hkRmTJaeAUdU0or2SHAM2imev2ULKoAQQoQ+rW3z0T96jeQSqq+vmy2vdr5rNorwhpL5Q9LLj4fEndUGWoq5yEUNWQSisMFzcMo+HQYR0NkSqRcSDyUqgF9IEDhG+NJWx6HWnT/Rx8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=F3JvfKWB; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="F3JvfKWB" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20b5affde14so3425755ad.3 for ; Wed, 23 Oct 2024 23:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729750701; x=1730355501; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f0OqRfY2laRwHMvcPD1Pi9U6AIj3M+h1HSZ0JUx96vI=; b=F3JvfKWBfvM1nF5EXBeImSyb7m4kuQa+pu7UNX3NqOTKgVk3UXxy4j1bCPz7nxvqXp cshoOThG8TNEXx3nQC0V+m/5j045UpjCabhavKsOSG2qNt9xPF7vV7QRQvUkG12Jrx9S fWIRMUOd7MGhXtYKMgPE/hHeuqRu8JVcFnzXk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729750701; x=1730355501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f0OqRfY2laRwHMvcPD1Pi9U6AIj3M+h1HSZ0JUx96vI=; b=c6COOuBmx1mqOtr2mqUtm6ACEhx1DSMYUaCAR3AYFwTIyiloDYbIZGXAueeB5zSdnp dDfADOJEL4d8LYwe1dM84ekV7K6hPED9UVn2uQdAnSOP7QD0JlqYMlRQ5/njGLi6odyI q33LJngTKZ6qWK+24A0uEDXK9bAi9FsM+O0jXRMCsegTFSTmOFg9qCq0WlltEew8jaJY lCB4vfVV1qX75g3YpdID3qIXCWiS5w8Y4UzJuqr4ZC4MLI+D0MgWxSua9h+LWI1wqYI9 RkCVyZ5egJ//KSbf0JGyoPOhIu1ZqmbP4NMl49uzM3ICsMHlBnLX7Jyb8TpVHynI5byx VWmQ== X-Forwarded-Encrypted: i=1; AJvYcCUWiT9VdQNX3IEEk8tR3NpSTK6k5aIHTakQAzGwt3Lv8aoAMTAfApcw+3Yc8n0p58ACE8FkzCETLXkyig==@vger.kernel.org X-Gm-Message-State: AOJu0YzH5MDwlyP15XVzohjnNC+x1g24+0RvrDQ9TTZ6Ts2mUsVW5V6s fcs7lNA/VsUpc/AftCiAXvLVOx8S0BDozwdR7xOEQnt9AuXzTErjFYjVoEqv2g== X-Google-Smtp-Source: AGHT+IGyrwOn7tzkbta+g7U9TkeZyz17lEZfo9cb63EG+ys7jvJGIRRiUSGDj69jHCpOWx+csWxVJw== X-Received: by 2002:a17:902:da84:b0:20c:a644:c5bf with SMTP id d9443c01a7336-20fb99d958bmr7388245ad.31.1729750700921; Wed, 23 Oct 2024 23:18:20 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:9422:d958:f749:9a30]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20e7f0bd561sm66418885ad.179.2024.10.23.23.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 23:18:20 -0700 (PDT) From: Sergey Senozhatsky To: Stanimir Varbanov , Vikash Garodia Cc: Bryan O'Donoghue , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv2 2/2] media: venus: sync with threaded IRQ during inst destruction Date: Thu, 24 Oct 2024 15:16:58 +0900 Message-ID: <20241024061809.400260-3-senozhatsky@chromium.org> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog In-Reply-To: <20241024061809.400260-1-senozhatsky@chromium.org> References: <20241024061809.400260-1-senozhatsky@chromium.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When destroying an inst we should make sure that we don't race against threaded IRQ (or pending IRQ), otherwise we can concurrently kfree() inst context and inst itself. BUG: KASAN: slab-use-after-free in vb2_queue_error+0x80/0x90 Call trace: dump_backtrace+0x1c4/0x1f8 show_stack+0x38/0x60 dump_stack_lvl+0x168/0x1f0 print_report+0x170/0x4c8 kasan_report+0x94/0xd0 __asan_report_load2_noabort+0x20/0x30 vb2_queue_error+0x80/0x90 venus_helper_vb2_queue_error+0x54/0x78 venc_event_notify+0xec/0x158 hfi_event_notify+0x878/0xd20 hfi_process_msg_packet+0x27c/0x4e0 venus_isr_thread+0x258/0x6e8 hfi_isr_thread+0x70/0x90 venus_isr_thread+0x34/0x50 irq_thread_fn+0x88/0x130 irq_thread+0x160/0x2c0 kthread+0x294/0x328 ret_from_fork+0x10/0x20 Allocated by task 20291: kasan_set_track+0x4c/0x80 kasan_save_alloc_info+0x28/0x38 __kasan_kmalloc+0x84/0xa0 kmalloc_trace+0x7c/0x98 v4l2_m2m_ctx_init+0x74/0x280 venc_open+0x444/0x6d0 v4l2_open+0x19c/0x2a0 chrdev_open+0x374/0x3f0 do_dentry_open+0x710/0x10a8 vfs_open+0x88/0xa8 path_openat+0x1e6c/0x2700 do_filp_open+0x1a4/0x2e0 do_sys_openat2+0xe8/0x508 do_sys_open+0x15c/0x1a0 __arm64_sys_openat+0xa8/0xc8 invoke_syscall+0xdc/0x270 el0_svc_common+0x1ec/0x250 do_el0_svc+0x54/0x70 el0_svc+0x50/0xe8 el0t_64_sync_handler+0x48/0x120 el0t_64_sync+0x1a8/0x1b0 Re-arragne inst destruction. First remove the inst from the core ->instacnes list, second synchronize IRQ/IRQ-thread to make sure that nothing else would see the inst while we take it down. Signed-off-by: Sergey Senozhatsky Reviewed-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/vdec.c | 12 +++++++++++- drivers/media/platform/qcom/venus/venc.c | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 0013c4704f03..b3192a36f388 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -1750,10 +1750,20 @@ static int vdec_close(struct file *file) vdec_pm_get(inst); cancel_work_sync(&inst->delayed_process_work); + /* + * First, remove the inst from the ->instances list, so that + * to_instance() will return NULL. + */ + hfi_session_destroy(inst); + /* + * Second, make sure we don't have IRQ/IRQ-thread currently running + * or pending execution, which would race with the inst destruction. + */ + synchronize_irq(inst->core->irq); + v4l2_m2m_ctx_release(inst->m2m_ctx); v4l2_m2m_release(inst->m2m_dev); ida_destroy(&inst->dpb_ids); - hfi_session_destroy(inst); v4l2_fh_del(&inst->fh); v4l2_fh_exit(&inst->fh); vdec_ctrl_deinit(inst); diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 6a26a6592424..36981ce448f5 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1517,9 +1517,19 @@ static int venc_close(struct file *file) venc_pm_get(inst); + /* + * First, remove the inst from the ->instances list, so that + * to_instance() will return NULL. + */ + hfi_session_destroy(inst); + /* + * Second, make sure we don't have IRQ/IRQ-thread currently running + * or pending execution, which would race with the inst destruction. + */ + synchronize_irq(inst->core->irq); + v4l2_m2m_ctx_release(inst->m2m_ctx); v4l2_m2m_release(inst->m2m_dev); - hfi_session_destroy(inst); v4l2_fh_del(&inst->fh); v4l2_fh_exit(&inst->fh); venc_ctrl_deinit(inst);