From nobody Wed Dec 17 15:36:27 2025 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) (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 1C24815B553 for ; Mon, 6 May 2024 21:10:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029831; cv=none; b=dggaHpAhoGo/gz7o6++R653vQq4JZrUQkW9fGBBvug83DAwvRVcPA17yu0IsErL0FS4+H2t6uwkyGuZDuiC9lACkjNJqDmr1ZEHXtzDGgkasM/5lV/c5wCtqsuKAWDdgMpWZrPYDRaNI+mZ/+OuV7Ew8FVsrXvdFwerC5JdQexA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029831; c=relaxed/simple; bh=onS8B0M5Jv8Adbn3ETYy2u3f71LcIIwxaG7egh3GMOA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f6qc27BL9SQX/w0v+PIAJO2cd8kZ1HKDDXdrt1hKZ6Z2Q0qE2WQwa7yuWB6Ht39CDrK1s4tfo/hi1LMGtAR+jZwUOd8wmi4eVAkdb3BKF4+DN34YWW1Hy0SYt4nynVtxmoMFmPTstx7AhewPimX53D358Yt7WDhmCA5LH/EgDdQ= 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=Pj5biK3H; arc=none smtp.client-ip=209.85.210.44 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="Pj5biK3H" Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-6f065bc237aso651725a34.0 for ; Mon, 06 May 2024 14:10:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1715029829; x=1715634629; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=jtUlP6VM7qrXki+A4GKytcg5ATq7Ztpreg61VfyOW+M=; b=Pj5biK3Hq8ko7p5nG3kzeJ2i7QPZ2N2EZ3zrPitj3cDSf4XcQa2TvVhV99Zii1amFV NWN/7Bljo7C06yUa6J6n3XM2cFk/M6D3bYcHimByMxAnvYA6RVgC3RsnffmGEtwxpasN KLFC2hPVApiza4s0QPJmEs6j9D2ataalmC1LM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715029829; x=1715634629; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jtUlP6VM7qrXki+A4GKytcg5ATq7Ztpreg61VfyOW+M=; b=XNZnNEzUUqk0P0l8zJdG0/ntNLlcAkBhFEeret0zB6JFwBtkznx7PXOFhpPtsPUdht R5DY3c7TqvI/E9eRhJ1cI1KOjay8M6IpTv6PxaNXed+d1wm26A6lOguwkW/UNKlw94aM fjxgHMf9SdGaaJGm3I+g5P6sS682m2Ul7X1xYZMZXV+mAPFQbWDR2w3j2o8MWr4L/ooN 8uu6gYL761gZX6RUETEhXHGq5vIJ/1g2qF7+Vk8iT9pACf5M1VVbux87x6lQ2RZ8/pvD 7y58FkN6uq+AcEV62ps9zI6JFf248gCtX4otw1vxttomZbFy0iRQulbzspHpFJeJaJoK ptOA== X-Forwarded-Encrypted: i=1; AJvYcCUMmdCsId+42ZTOBzByev6c3XCxwDTJ0G1jq6okCBicdeXd9Rk2o5UvObSTN9Eqvjv+vVCZJER2aMYoOxyasCzCad59gLD1Nl9Qm7Ug X-Gm-Message-State: AOJu0YwLEqDeyxwLjbYKvZ/D3jfmQsNz5N6uNvbFF+Y3LNTeD4SaPVmr 49zPsFuV+yzuehtEIyx2UNARON64iKWD5uJEuGVTwF+Kf1WX58jEIo30m0Cwng== X-Google-Smtp-Source: AGHT+IF8Sz8E4E8aQminjkh9wNuTyPXbJEfh1IRvEaK9iGF6PZ9aIZftMbIJIZYtGTFlMIVQc4MDfA== X-Received: by 2002:a9d:6943:0:b0:6f0:30b8:4f06 with SMTP id p3-20020a9d6943000000b006f030b84f06mr5974830oto.2.1715029829149; Mon, 06 May 2024 14:10:29 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id pa20-20020a05620a831400b0078f13e59dc9sm4224921qkn.102.2024.05.06.14.10.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 14:10:28 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 06 May 2024 21:10:26 +0000 Subject: [PATCH 1/5] media: ivtv: Factor out schedule functions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240506-cocci-locks-v1-1-a67952fe5d19@chromium.org> References: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> In-Reply-To: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> To: Andy Walls , Mauro Carvalho Chehab , Sean Young , Jarod Wilson Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.12.4 Cocci is very confused by unlock-lock a mutex in the middle of a function. Factor the schedules out, avoid code duplication and make cocci a bit happier. Fix the following cocci warnings: drivers/media/pci/ivtv/ivtv-fileops.c:223:4-10: preceding lock on line 267 drivers/media/pci/ivtv/ivtv-fileops.c:230:3-9: preceding lock on line 267 drivers/media/pci/ivtv/ivtv-fileops.c:236:4-10: preceding lock on line 267 drivers/media/pci/ivtv/ivtv-fileops.c:245:3-9: preceding lock on line 267 drivers/media/pci/ivtv/ivtv-fileops.c:251:3-9: preceding lock on line 267 drivers/media/pci/ivtv/ivtv-fileops.c:257:3-9: preceding lock on line 267 drivers/media/pci/ivtv/ivtv-fileops.c:272:3-9: preceding lock on line 267 drivers/media/pci/ivtv/ivtv-fileops.c:598:4-10: preceding lock on line 627 drivers/media/pci/ivtv/ivtv-fileops.c:598:4-10: preceding lock on line 689 drivers/media/pci/ivtv/ivtv-fileops.c:606:3-9: preceding lock on line 627 drivers/media/pci/ivtv/ivtv-fileops.c:606:3-9: preceding lock on line 689 drivers/media/pci/ivtv/ivtv-fileops.c:648:3-9: preceding lock on line 627 drivers/media/pci/ivtv/ivtv-fileops.c:648:3-9: preceding lock on line 689 drivers/media/pci/ivtv/ivtv-fileops.c:692:4-10: preceding lock on line 689 Signed-off-by: Ricardo Ribalda --- drivers/media/pci/ivtv/ivtv-fileops.c | 66 +++++++++++++++++++++----------= ---- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/pci/ivtv= /ivtv-fileops.c index 4202c3a47d33..cfa28d035586 100644 --- a/drivers/media/pci/ivtv/ivtv-fileops.c +++ b/drivers/media/pci/ivtv/ivtv-fileops.c @@ -21,6 +21,7 @@ #include "ivtv-ioctl.h" #include "ivtv-cards.h" #include "ivtv-firmware.h" +#include #include #include =20 @@ -190,12 +191,27 @@ static void ivtv_update_pgm_info(struct ivtv *itv) itv->pgm_info_write_idx =3D (itv->pgm_info_write_idx + i) % itv->pgm_info= _num; } =20 +static void ivtv_schedule(struct ivtv_stream *s) +{ + struct ivtv *itv =3D s->itv; + DEFINE_WAIT(wait); + + lockdep_assert_held(&itv->serialize_lock); + + mutex_unlock(&itv->serialize_lock); + prepare_to_wait(&s->waitq, &wait, TASK_INTERRUPTIBLE); + /* New buffers might have become free before we were added to the waitque= ue */ + if (!s->q_free.buffers) + schedule(); + finish_wait(&s->waitq, &wait); + mutex_lock(&itv->serialize_lock); +} + static struct ivtv_buffer *ivtv_get_buffer(struct ivtv_stream *s, int non_= block, int *err) { struct ivtv *itv =3D s->itv; struct ivtv_stream *s_vbi =3D &itv->streams[IVTV_ENC_STREAM_TYPE_VBI]; struct ivtv_buffer *buf; - DEFINE_WAIT(wait); =20 *err =3D 0; while (1) { @@ -258,13 +274,7 @@ static struct ivtv_buffer *ivtv_get_buffer(struct ivtv= _stream *s, int non_block, } =20 /* wait for more data to arrive */ - mutex_unlock(&itv->serialize_lock); - prepare_to_wait(&s->waitq, &wait, TASK_INTERRUPTIBLE); - /* New buffers might have become available before we were added to the w= aitqueue */ - if (!s->q_full.buffers) - schedule(); - finish_wait(&s->waitq, &wait); - mutex_lock(&itv->serialize_lock); + ivtv_schedule(s); if (signal_pending(current)) { /* return if a signal was received */ IVTV_DEBUG_INFO("User stopped %s\n", s->name); @@ -533,6 +543,25 @@ int ivtv_start_decoding(struct ivtv_open_id *id, int s= peed) return 0; } =20 +static int ivtv_schedule_dma(struct ivtv_stream *s) +{ + struct ivtv *itv =3D s->itv; + int got_sig; + DEFINE_WAIT(wait); + + lockdep_assert_held(&itv->serialize_lock); + + mutex_unlock(&itv->serialize_lock); + prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); + while (!(got_sig =3D signal_pending(current)) && + test_bit(IVTV_F_S_DMA_PENDING, &s->s_flags)) + schedule(); + finish_wait(&itv->dma_waitq, &wait); + mutex_lock(&itv->serialize_lock); + + return got_sig; +} + static ssize_t ivtv_write(struct file *filp, const char __user *user_buf, = size_t count, loff_t *pos) { struct ivtv_open_id *id =3D fh2id(filp->private_data); @@ -544,7 +573,6 @@ static ssize_t ivtv_write(struct file *filp, const char= __user *user_buf, size_t int bytes_written =3D 0; int mode; int rc; - DEFINE_WAIT(wait); =20 IVTV_DEBUG_HI_FILE("write %zd bytes to %s\n", count, s->name); =20 @@ -618,13 +646,7 @@ static ssize_t ivtv_write(struct file *filp, const cha= r __user *user_buf, size_t break; if (filp->f_flags & O_NONBLOCK) return -EAGAIN; - mutex_unlock(&itv->serialize_lock); - prepare_to_wait(&s->waitq, &wait, TASK_INTERRUPTIBLE); - /* New buffers might have become free before we were added to the waitqu= eue */ - if (!s->q_free.buffers) - schedule(); - finish_wait(&s->waitq, &wait); - mutex_lock(&itv->serialize_lock); + ivtv_schedule(s); if (signal_pending(current)) { IVTV_DEBUG_INFO("User stopped %s\n", s->name); return -EINTR; @@ -674,20 +696,10 @@ static ssize_t ivtv_write(struct file *filp, const ch= ar __user *user_buf, size_t =20 if (test_bit(IVTV_F_S_NEEDS_DATA, &s->s_flags)) { if (s->q_full.length >=3D itv->dma_data_req_size) { - int got_sig; - if (mode =3D=3D OUT_YUV) ivtv_yuv_setup_stream_frame(itv); =20 - mutex_unlock(&itv->serialize_lock); - prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); - while (!(got_sig =3D signal_pending(current)) && - test_bit(IVTV_F_S_DMA_PENDING, &s->s_flags)) { - schedule(); - } - finish_wait(&itv->dma_waitq, &wait); - mutex_lock(&itv->serialize_lock); - if (got_sig) { + if (ivtv_schedule_dma(s)) { IVTV_DEBUG_INFO("User interrupted %s\n", s->name); return -EINTR; } --=20 2.45.0.rc1.225.g2a3ae87e7f-goog From nobody Wed Dec 17 15:36:27 2025 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (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 4442315B966 for ; Mon, 6 May 2024 21:10:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029834; cv=none; b=WkDEYhLW4jK6vkop6jZGTkzy0SHNpqsYnqDmgGVofu9rsAznKxSU99fze+pgyXpQGqv/CM2QK3OSPkCuAUuPZfTlWlZIko00RGaUyIjZ+r/X9QJ4HdX7JRO7wfFslAn4pR6rKxaTNDhtfwMvLmmgdkFbmcwOiYZK1AQSqD842WU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029834; c=relaxed/simple; bh=rmMHfZ07Kd9lTZW6PwC3rqA96g9FbrjW5lK3extywms=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dJnTnMjCMHHV4tuqxfyl6Hb+KqQLoz8bYeSy8HO2fFOre81bN1z1CinKdNIHSr9kXaWtx3/i7MUslu7Xf5o5XRmB8GETvKAwb9obfoFM9kkqxaoVYXDRy5yeSqaGTl+W4I9rwt9z8a/YwKyng4shTU7A7JKCntfP+ntzCBv8nXw= 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=AD8v238k; arc=none smtp.client-ip=209.85.222.172 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="AD8v238k" Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-792639cf4faso260818785a.1 for ; Mon, 06 May 2024 14:10:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1715029830; x=1715634630; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GChtxSEHiZ0rsnEnXBszudDorgEfMXDvam+C+CQ8ysU=; b=AD8v238kG/nRmGskPklFvxXewBA+3TI+A2uSOWBNUYHNym1YT14DlD/dUc0YpjsH+d ZiyY+x2FX2Zx6tatsr7ebbwclChoXX6QC6WQb0fUSQQzuT9aToTXu4jrT1bPQ2qUnN2n Y6vGYnqE+O706qslQb5NRtbF4W3TtkKtiTsls= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715029830; x=1715634630; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GChtxSEHiZ0rsnEnXBszudDorgEfMXDvam+C+CQ8ysU=; b=rqCAiqjHv5US0Blnj0fdqff2u7hVYXN1yUY3/RnVRU9Bs6SgUwVhN6EsZL89DDb7Ug yPm3FHJrrpGXmkuV7FAnYX+CiDHfw0i8RurmbY7oPw1SUu9sois/o4JhGwvii9bDQyBc sEf70z4ysNQZSoVPSmv2Xu/Oge9r/p/eCSeX9Vi1L5BTf9Y/7vxkCk/yrVMRxvix1IS7 XkMvNYkxXYRPyvu/0tUWtumoagcdaXs5vi1cMYndxJrJK0B/TsAifEuePc8yVUYs7vbu Pmck1KbCQ9WrwL39q/XJnD/03bRrIw4bB56monozX3dycKbBZbES9z/+pvNexhMzTYaK Ih5A== X-Forwarded-Encrypted: i=1; AJvYcCXbDnQTWONNMNhSN9qt25loT/DL98OJ58qH2e31t0WpuQiyRTANAq6+pJvlCOyMLsY2MXUejA22bsh+uUBb95VbVtTz1kA9Nz0Re1KR X-Gm-Message-State: AOJu0Yy4UXizJHMYBHCbmedN+DKnuP3LdEwEt7BQPMNMWuKyp4ivITmQ YDp9IG1Wsz0neD8x/AP2KmmjTaj7HBKfszVX5/1ONqFkjNouHp3TNF0T97zCVA== X-Google-Smtp-Source: AGHT+IHCIfstPtI+qCxYBl/8IeI1JeUuGRWhMdpvvDoh1G+j87TAujBrzH7bpSdDG6tDvHp9Uo2iFg== X-Received: by 2002:a05:620a:89e:b0:792:93ed:2e7c with SMTP id b30-20020a05620a089e00b0079293ed2e7cmr4684450qka.76.1715029830157; Mon, 06 May 2024 14:10:30 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id pa20-20020a05620a831400b0078f13e59dc9sm4224921qkn.102.2024.05.06.14.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 14:10:29 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 06 May 2024 21:10:27 +0000 Subject: [PATCH 2/5] media: imon: Fix race getting ictx->lock Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240506-cocci-locks-v1-2-a67952fe5d19@chromium.org> References: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> In-Reply-To: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> To: Andy Walls , Mauro Carvalho Chehab , Sean Young , Jarod Wilson Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.12.4 Lets fix a race between mutex_is_lock() and mutex_lock(). <-mutex is not locked if (!mutex_is_locked(&ictx->lock)) { unlock =3D true; <- mutex is locked externaly mutex_lock(&ictx->lock); } Let's use mutex_trylock() that does mutex_is_lock() and mutex_lock() atomically. Fix the following cocci warning: drivers/media/rc/imon.c:1167:1-7: preceding lock on line 1153 Fixes: 23ef710e1a6c ("[media] imon: add conditional locking in change_proto= col") Signed-off-by: Ricardo Ribalda --- drivers/media/rc/imon.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index 0b55314a8082..8f1361bcce3a 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c @@ -1148,10 +1148,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc= , u64 *rc_proto) =20 memcpy(ictx->usb_tx_buf, &ir_proto_packet, sizeof(ir_proto_packet)); =20 - if (!mutex_is_locked(&ictx->lock)) { - unlock =3D true; - mutex_lock(&ictx->lock); - } + unlock =3D mutex_trylock(&ictx->lock); =20 retval =3D send_packet(ictx); if (retval) --=20 2.45.0.rc1.225.g2a3ae87e7f-goog From nobody Wed Dec 17 15:36:27 2025 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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 11F1215B988 for ; Mon, 6 May 2024 21:10:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029833; cv=none; b=ZdHl2UfxvPS8lUGQaAhnwbQ3wthteMhyS/Sjnt9GQvQE8Y6njv/90yy9nB1NADQnEqUjM+kZ5832bPEDkVUbb2DBIyKM7tk0iF+pc3VgcBJeiG1gxo/Z6qYaQGjRe/ZZ4KP//M9APtDYPkBZ37MwOa0oz9PtoKf6zLcnr22wto8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029833; c=relaxed/simple; bh=13OxCCXFD0dQ5I30NApvqTwlwhaZmASYM9bf5Kr18JA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Zm7wcSShJYGG7/QfMGDiBlV30vxAiu5FBZwmHU1wdes9H7wsstYVuL37If4jnVohtIyjqZSA1yJXKBnBtHUtGYZH/O6P95tE0leaq3sCf5gMns1ghRVdkKIdz46sYyl/zch7E/fjYjtgTaLooAX9Mvsw83+Sl7lMH/jGlGIdmdg= 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=XwKYLAWH; arc=none smtp.client-ip=209.85.222.178 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="XwKYLAWH" Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-7928c54e945so208432485a.2 for ; Mon, 06 May 2024 14:10:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1715029831; x=1715634631; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=OkJF7t/M3Ojeyh5RuyGpe29BYnbPsSXvxhXAxpUcSgA=; b=XwKYLAWHKeesNbtDBek7g9IS4gFMiv9eI9W2VBr5egHx5PloHV7HSKt4OlzddnYsH+ QBZeHbgd3jXjI7ickZ4evj85OGAlPcfdzHoNL7sBJoAjJ4SBBGUpEK7BMIMjZrP1A7Gd x8GnPM9FZaD0w/uVfEWgbMbcgZvuNDCI25M8M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715029831; x=1715634631; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OkJF7t/M3Ojeyh5RuyGpe29BYnbPsSXvxhXAxpUcSgA=; b=KHzCNV1T4oXmxB7eqshGftd+8MhSa12vF2fU1XsKC/txWYiaQgKh/wocstd8gXFZ+7 hSvVWcQOEzel49gz4ceMxGn/Kvd0W4mqsYPxJmxnc3D+jjoJ9mAEAeRittCmDB/HlSiB J79fWHVAiqaCaFwEZwZ7nJR8PcYIYFo3KWT4NojCM2YcGi1goLxCkjSOia0bxpVWnRkJ gaHmDcw2qO3S7ydZnRCwlTYG4pxcH9VsxBeghOtPMBz+o+ki5GHaoG+Gmr4LxSih3GA/ X2BxgeLgwASvVDo68hEIXpsjYfh+musMlj41eFt8TRrRNsSLY8TnGf/PgIRrhM6FH/76 mm5A== X-Forwarded-Encrypted: i=1; AJvYcCWGEMmitOWeVkO5Smm/huzSKJvxvrrzvf1ze+yrFGrh5ocv6ej0slHgQQ/aw1H0sy77DJmLEn2eKInUZWeEV7RXqkPRKOB1GJ5y3yDo X-Gm-Message-State: AOJu0YwdCHaDpWykeZxH2wYkxZdUx7L2CAfyR1PXcJYEolskgBOXr2eP CsH520O2Fb7HP/S9qnGRenAAbwGwVp6A1MBNthFytoYAmRmUHNlrnY0iDcS32w== X-Google-Smtp-Source: AGHT+IEHqq8p4xvadiUkZkjltTHuOSmpKAULLj6lKhTtpITVnQwDNjpo5F7If+QRhvKAuXMvz0wKiQ== X-Received: by 2002:a05:620a:2481:b0:792:8c4c:375c with SMTP id i1-20020a05620a248100b007928c4c375cmr9980404qkn.11.1715029830998; Mon, 06 May 2024 14:10:30 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id pa20-20020a05620a831400b0078f13e59dc9sm4224921qkn.102.2024.05.06.14.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 14:10:30 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 06 May 2024 21:10:28 +0000 Subject: [PATCH 3/5] media: dvb-frontends/stv090x: Refactor tuner_i2c_lock Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240506-cocci-locks-v1-3-a67952fe5d19@chromium.org> References: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> In-Reply-To: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> To: Andy Walls , Mauro Carvalho Chehab , Sean Young , Jarod Wilson Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.12.4 Move the lock logic to it's own function. There is less code duplication and cocci is much happier. Fix the following cocci warning: drivers/media/dvb-frontends/stv090x.c:799:1-7: preceding lock on line 768 Signed-off-by: Ricardo Ribalda --- drivers/media/dvb-frontends/stv090x.c | 37 ++++++++++++++++++++-----------= ---- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-fron= tends/stv090x.c index cc45139057ba..3b02d504941f 100644 --- a/drivers/media/dvb-frontends/stv090x.c +++ b/drivers/media/dvb-frontends/stv090x.c @@ -748,6 +748,22 @@ static int stv090x_write_reg(struct stv090x_state *sta= te, unsigned int reg, u8 d return stv090x_write_regs(state, reg, &tmp, 1); } =20 +static inline void stv090x_tuner_i2c_lock(struct stv090x_state *state) +{ + if (state->config->tuner_i2c_lock) + state->config->tuner_i2c_lock(&state->frontend, 1); + else + mutex_lock(&state->internal->tuner_lock); +} + +static inline void stv090x_tuner_i2c_unlock(struct stv090x_state *state) +{ + if (state->config->tuner_i2c_lock) + state->config->tuner_i2c_lock(&state->frontend, 0); + else + mutex_unlock(&state->internal->tuner_lock); +} + static int stv090x_i2c_gate_ctrl(struct stv090x_state *state, int enable) { u32 reg; @@ -761,12 +777,8 @@ static int stv090x_i2c_gate_ctrl(struct stv090x_state = *state, int enable) * In case of any error, the lock is unlocked and exit within the * relevant operations themselves. */ - if (enable) { - if (state->config->tuner_i2c_lock) - state->config->tuner_i2c_lock(&state->frontend, 1); - else - mutex_lock(&state->internal->tuner_lock); - } + if (enable) + stv090x_tuner_i2c_lock(state); =20 reg =3D STV090x_READ_DEMOD(state, I2CRPT); if (enable) { @@ -782,20 +794,13 @@ static int stv090x_i2c_gate_ctrl(struct stv090x_state= *state, int enable) goto err; } =20 - if (!enable) { - if (state->config->tuner_i2c_lock) - state->config->tuner_i2c_lock(&state->frontend, 0); - else - mutex_unlock(&state->internal->tuner_lock); - } + if (!enable) + stv090x_tuner_i2c_unlock(state); =20 return 0; err: dprintk(FE_ERROR, 1, "I/O error"); - if (state->config->tuner_i2c_lock) - state->config->tuner_i2c_lock(&state->frontend, 0); - else - mutex_unlock(&state->internal->tuner_lock); + stv090x_tuner_i2c_unlock(state); return -1; } =20 --=20 2.45.0.rc1.225.g2a3ae87e7f-goog From nobody Wed Dec 17 15:36:27 2025 Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) (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 C23EA15CD53 for ; Mon, 6 May 2024 21:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029834; cv=none; b=hVO2eygembsPxzu+IDY5aqD0UegKq1NFKv5StVIfg6twsC7/eFEG0B5Sn9wESg2x47lz7/hnHXqOecPQ43+XSkZf5mUPjpuz5eJhDufifdCjAa4TOyw+SdIXnfaMZFrzE6Msq8n+3UmFyy9WD1mqWN/kod20Rs0TD9Ktj0Av1js= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029834; c=relaxed/simple; bh=7MOAwd4bBULwL5xOTaUt6yrPZS3n8PS3P9PINQKXayg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OkTpoa7WoE+/ambP2jOdx0Z3JfKc0y3i66cqU2t8QH8wyEcX/hK7TSMZzAzmiqhcul/HhaU7IHALRuPZhx8n7lOUcXcsbpXhTgA5MEaMicfgKFBkGTmEfEG2ZBBcN8+80P9uQ6VyAvn8Zosfskx3PFDByZ2w8LAbtkGKzJOFNwk= 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=ACUBShd9; arc=none smtp.client-ip=209.85.160.51 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="ACUBShd9" Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-23eff8c9a1dso1396794fac.0 for ; Mon, 06 May 2024 14:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1715029832; x=1715634632; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Sqvg3kz5s9OxeYpuWk0/MXqOrMxTZPD2syeSEOk+5RQ=; b=ACUBShd9mbIa0Ya5TH/mHs1ksWYaiB+sy6sebrjYnuUTAxOXIP5UU0viwRGzD9rkeB ByMgehQ2J/uHpvrIdr6VaXgOVLli5o+Sd0yVXVdSxLW4Rt60MWemqk10rloGE0BJaT2F 8JPJwXszS85PTNOT5oIQj7C8JSNgwteMjAxzw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715029832; x=1715634632; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sqvg3kz5s9OxeYpuWk0/MXqOrMxTZPD2syeSEOk+5RQ=; b=VWGP1XH/Ow9lPiOZQa1ivENiPLeSBzhrWy/BZGwcTOe1l2rQSVomo+x1UH+9I0LI/x /C158NxWI+y99XSm4z5DCs/O/zSyzSdsy73uC+WWEES7F7a6x54UFEatvXhxvyDfLm9F fJ9wDESlPADBff3j8KKxUsdN/cZD47aFPQtz02amRRE7xqNx4HuvCuloZXEnr+ODjROR eRbCYT2ehXTaIHledaVVHjC3+neuu18iGjeYBI84vUbqwSRu8LcMJoBJvy9sqwP/bCNi KnIsFVSP1UmqBkokSAQ8P/N/JssQSZjwkgQimSKXW4ohjHFR957t8GdT84t3D0DPvOYO k0PA== X-Forwarded-Encrypted: i=1; AJvYcCXRvaVPRRdac7lHz2pwSKq16y3F2ANSzbWy5wmZwc18Z17EBhGEblH3oiquYjmghPxiaoE9s0DBX8KlTq5N6xSx4JmRR1JYvBW6ZeNF X-Gm-Message-State: AOJu0YxP5BoMaoXUWdRttdqw/BbJLx9yLOZsvq7QqB5ZqjI/hgRIfXMO kndNKNcMKTUOpS0pynJJ4Tz2x9mPgQGeLdplsOsFSPRDgiVK3+6ueRlGyJgCxoxd9k2zQEte9bk = X-Google-Smtp-Source: AGHT+IEAFuuBQrD8KQbGry8SYQjhcxEUI+G4myA4NMTrdT2JnKJdlengkUCK51yDD5mFW/bTmbxyNQ== X-Received: by 2002:a05:6871:341b:b0:22e:bcfd:debc with SMTP id nh27-20020a056871341b00b0022ebcfddebcmr16281376oac.13.1715029831841; Mon, 06 May 2024 14:10:31 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id pa20-20020a05620a831400b0078f13e59dc9sm4224921qkn.102.2024.05.06.14.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 14:10:31 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 06 May 2024 21:10:29 +0000 Subject: [PATCH 4/5] media: go7007: Refactor Adlink PCI-MPG24 i2c mutex Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240506-cocci-locks-v1-4-a67952fe5d19@chromium.org> References: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> In-Reply-To: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> To: Andy Walls , Mauro Carvalho Chehab , Sean Young , Jarod Wilson Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.12.4 Move the lock/unlock to its own function. It makes the code cleaner and cocci happier. Fix the following cocci warning: drivers/media/usb/go7007/go7007-i2c.c:125:1-7: preceding lock on line 61 Signed-off-by: Ricardo Ribalda --- drivers/media/usb/go7007/go7007-i2c.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/media/usb/go7007/go7007-i2c.c b/drivers/media/usb/go70= 07/go7007-i2c.c index 2880370e45c8..f6ce28a4a768 100644 --- a/drivers/media/usb/go7007/go7007-i2c.c +++ b/drivers/media/usb/go7007/go7007-i2c.c @@ -33,7 +33,21 @@ =20 /* There is only one I2C port on the TW2804 that feeds all four GO7007 VIPs * on the Adlink PCI-MPG24, so access is shared between all of them. */ -static DEFINE_MUTEX(adlink_mpg24_i2c_lock); +static DEFINE_MUTEX(adlink_mpg24_i2c_mutex); + +static inline void adlink_mpg24_i2c_lock(struct go7007 *go) +{ + /* Bridge the I2C port on this GO7007 to the shared bus */ + mutex_lock(&adlink_mpg24_i2c_mutex); + go7007_write_addr(go, 0x3c82, 0x0020); +} + +static inline void adlink_mpg24_i2c_unlock(struct go7007 *go) +{ + /* Isolate the I2C port on this GO7007 from the shared bus */ + go7007_write_addr(go, 0x3c82, 0x0000); + mutex_unlock(&adlink_mpg24_i2c_mutex); +} =20 static int go7007_i2c_xfer(struct go7007 *go, u16 addr, int read, u16 command, int flags, u8 *data) @@ -56,11 +70,8 @@ static int go7007_i2c_xfer(struct go7007 *go, u16 addr, = int read, =20 mutex_lock(&go->hw_lock); =20 - if (go->board_id =3D=3D GO7007_BOARDID_ADLINK_MPG24) { - /* Bridge the I2C port on this GO7007 to the shared bus */ - mutex_lock(&adlink_mpg24_i2c_lock); - go7007_write_addr(go, 0x3c82, 0x0020); - } + if (go->board_id =3D=3D GO7007_BOARDID_ADLINK_MPG24) + adlink_mpg24_i2c_lock(go); =20 /* Wait for I2C adapter to be ready */ for (i =3D 0; i < 10; ++i) { @@ -116,11 +127,8 @@ static int go7007_i2c_xfer(struct go7007 *go, u16 addr= , int read, ret =3D 0; =20 i2c_done: - if (go->board_id =3D=3D GO7007_BOARDID_ADLINK_MPG24) { - /* Isolate the I2C port on this GO7007 from the shared bus */ - go7007_write_addr(go, 0x3c82, 0x0000); - mutex_unlock(&adlink_mpg24_i2c_lock); - } + if (go->board_id =3D=3D GO7007_BOARDID_ADLINK_MPG24) + adlink_mpg24_i2c_unlock(go); mutex_unlock(&go->hw_lock); return ret; } --=20 2.45.0.rc1.225.g2a3ae87e7f-goog From nobody Wed Dec 17 15:36:27 2025 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (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 3EC2915D5BD for ; Mon, 6 May 2024 21:10:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029835; cv=none; b=FhBaJsXJP6wNTroqQEDRCVDEI7PV2uKakAaeslT/RAPRKT7H9c1qGYLhUMgw+KPdFCXxxi2JLk1ZFkLdOOq1M9boLE2epgu11w9/ZcpsyjxikW4sL2LFAKdt8pmI+q08BDPkb8oKWIjFjBadPO8PssRwhfnP2ev42RoUt+8Ooo8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715029835; c=relaxed/simple; bh=E2Y7TzdEbh5vcibAf3xlTX0c6fqY+SvR327dj3nMUZY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jCBydrJ6pxdxsEdksFDw8x8eKP2JLEAgiLxVrJT07hKBJKNrXiBWBA2a96/x6RsOF69aV7oV7VJqsrkwMJ/0MFNivvWilHH1THCKyNmUd/3zagYGFmTTAmcRhmP1ntJxqIvB63BsiJGDEmtULGLM1bVaFQj0RNOur0be5WQNUH0= 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=crnIXjPE; arc=none smtp.client-ip=209.85.160.49 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="crnIXjPE" Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-23f0d7d2ce6so1356260fac.2 for ; Mon, 06 May 2024 14:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1715029833; x=1715634633; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=B9QNMPvGLAYBnNPSn0ftFG2L7lyXZe/71ldtmrt+Bjs=; b=crnIXjPEFYnavZcwoQrYP+vp+BmvG3hM2cC/Ep6tWEwY9ttDlIpZq5UwExUamvriuS rJIom+3YzKN6oGcak4w/qCWRWVtlTXwl5qUVqmcF1D3IOxb0LkUMATiRd9tTwX6TJXok 9COPGp8OSZh2/FyJr/IYaOmXd4158oNvBn0Z8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715029833; x=1715634633; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B9QNMPvGLAYBnNPSn0ftFG2L7lyXZe/71ldtmrt+Bjs=; b=obfx0KZw40wJOMj0M9uCQiy5cXmtCmCQo1r9nZD2g06V6vFhAI6qXsgtLwOLdLbHjS p3aicXQ8FsLBeJocvHo2BFoxxuRvB6NTvjKgBsYVtYanmTZLgyiBKH1IqeRQ4zkXMO8N ZYmtIJrmddSqlqKorP4XRzalgxaQRsIoUFh/Y9iklR0MXieGJuA4c/sKsxlt8PxnasCC WusvoHKfVtWyZVsdpMpbkBH079c6rjMay7pg0JcuuHyvWgGQEtN1Nxt8w5+nZ6A8H5cJ WTQgr4N/5+XWmf/nAlzuDoeIuilQo17OxKDuaoQnKQ6oyv59YcRkxAS8t6TVrBoUKHWX 2QpA== X-Forwarded-Encrypted: i=1; AJvYcCWuQrV2inDZhvf/wNnPFRDU09tBEPR3Jze6zRqQJeSNshId5WFHayO8hN7mVCDS0XdOuAEDvkRDwpKF2cDQ8sbiJdm9HDaWErThbybk X-Gm-Message-State: AOJu0Yw/xh8HnfNKR88XKiRfF9aKFbgtz95RX3mW6132QlaNLg1YdbUA 6zqFge3yTenj4Am/0H6fG5sqSGyRcoJVGsNmRvLASOXOMUn7uuqub1EZKU32Xw== X-Google-Smtp-Source: AGHT+IFYjs3nRF6SaoGCfVOA1vP4x0YulqSRg/VGAqs+ro65Kw9a73H+Z1IGlXP/lC5je220W3Ok6A== X-Received: by 2002:a05:6870:2007:b0:23d:41b7:6f10 with SMTP id o7-20020a056870200700b0023d41b76f10mr14015836oab.31.1715029833192; Mon, 06 May 2024 14:10:33 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id pa20-20020a05620a831400b0078f13e59dc9sm4224921qkn.102.2024.05.06.14.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 14:10:32 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 06 May 2024 21:10:30 +0000 Subject: [PATCH 5/5] media: drivers/media/dvb-core: Refactor dvb_frontend_open Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240506-cocci-locks-v1-5-a67952fe5d19@chromium.org> References: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> In-Reply-To: <20240506-cocci-locks-v1-0-a67952fe5d19@chromium.org> To: Andy Walls , Mauro Carvalho Chehab , Sean Young , Jarod Wilson Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.12.4 Move the shared frontend logic to its own function. This allows using guard() to handle the mfe_lock mutex, and using lockdep asserts. There is no intended change of behavior in this code. This fixes the following cocci warnings: drivers/media/dvb-core/dvb_frontend.c:2897:1-7: preceding lock on line 2776 drivers/media/dvb-core/dvb_frontend.c:2897:1-7: preceding lock on line 2786 drivers/media/dvb-core/dvb_frontend.c:2897:1-7: preceding lock on line 2809 Signed-off-by: Ricardo Ribalda --- drivers/media/dvb-core/dvb_frontend.c | 116 ++++++++++++++++++++----------= ---- 1 file changed, 69 insertions(+), 47 deletions(-) diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core= /dvb_frontend.c index 4f78f30b3646..d04a6092f1ba 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c @@ -30,6 +30,7 @@ #include #include #include +#include #include =20 #include @@ -2760,66 +2761,70 @@ static __poll_t dvb_frontend_poll(struct file *file= , struct poll_table_struct *w return 0; } =20 -static int dvb_frontend_open(struct inode *inode, struct file *file) +static int dvb_get_shared_frontend(struct dvb_adapter *adapter, + struct dvb_device *dvbdev, + struct file *file) { - struct dvb_device *dvbdev =3D file->private_data; - struct dvb_frontend *fe =3D dvbdev->priv; - struct dvb_frontend_private *fepriv =3D fe->frontend_priv; - struct dvb_adapter *adapter =3D fe->dvb; - int ret; + struct dvb_device *mfedev; + struct dvb_frontend *mfe; + struct dvb_frontend_private *mfepriv; + int mferetry; =20 - dev_dbg(fe->dvb->device, "%s:\n", __func__); - if (fe->exit =3D=3D DVB_FE_DEVICE_REMOVED) - return -ENODEV; + lockdep_assert_held(&adapter->mfe_lock); =20 if (adapter->mfe_shared =3D=3D 2) { - mutex_lock(&adapter->mfe_lock); if ((file->f_flags & O_ACCMODE) !=3D O_RDONLY) { if (adapter->mfe_dvbdev && !adapter->mfe_dvbdev->writers) { - mutex_unlock(&adapter->mfe_lock); return -EBUSY; } adapter->mfe_dvbdev =3D dvbdev; } - } else if (adapter->mfe_shared) { - mutex_lock(&adapter->mfe_lock); + return 0; + } =20 - if (!adapter->mfe_dvbdev) - adapter->mfe_dvbdev =3D dvbdev; + if (!adapter->mfe_dvbdev) { + adapter->mfe_dvbdev =3D dvbdev; + return 0; + } =20 - else if (adapter->mfe_dvbdev !=3D dvbdev) { - struct dvb_device - *mfedev =3D adapter->mfe_dvbdev; - struct dvb_frontend - *mfe =3D mfedev->priv; - struct dvb_frontend_private - *mfepriv =3D mfe->frontend_priv; - int mferetry =3D (dvb_mfe_wait_time << 1); - - mutex_unlock(&adapter->mfe_lock); - while (mferetry-- && (mfedev->users !=3D -1 || - mfepriv->thread)) { - if (msleep_interruptible(500)) { - if (signal_pending(current)) - return -EINTR; - } - } + if (adapter->mfe_dvbdev =3D=3D dvbdev) + return 0; =20 - mutex_lock(&adapter->mfe_lock); - if (adapter->mfe_dvbdev !=3D dvbdev) { - mfedev =3D adapter->mfe_dvbdev; - mfe =3D mfedev->priv; - mfepriv =3D mfe->frontend_priv; - if (mfedev->users !=3D -1 || - mfepriv->thread) { - mutex_unlock(&adapter->mfe_lock); - return -EBUSY; - } - adapter->mfe_dvbdev =3D dvbdev; + mfedev =3D adapter->mfe_dvbdev; + mfe =3D mfedev->priv; + mfepriv =3D mfe->frontend_priv; + mferetry =3D (dvb_mfe_wait_time << 1); + + mutex_unlock(&adapter->mfe_lock); + while (mferetry-- && (mfedev->users !=3D -1 || mfepriv->thread)) { + if (msleep_interruptible(500)) { + if (signal_pending(current)) { + mutex_lock(&adapter->mfe_lock); + return -EINTR; } } } + mutex_lock(&adapter->mfe_lock); + + if (adapter->mfe_dvbdev !=3D dvbdev) { + mfedev =3D adapter->mfe_dvbdev; + mfe =3D mfedev->priv; + mfepriv =3D mfe->frontend_priv; + if (mfedev->users !=3D -1 || mfepriv->thread) + return -EBUSY; + adapter->mfe_dvbdev =3D dvbdev; + } + + return 0; +} + +static int __dvb_frontend_open(struct inode *inode, struct file *file) +{ + struct dvb_device *dvbdev =3D file->private_data; + struct dvb_frontend *fe =3D dvbdev->priv; + struct dvb_frontend_private *fepriv =3D fe->frontend_priv; + int ret; =20 if (dvbdev->users =3D=3D -1 && fe->ops.ts_bus_ctrl) { if ((ret =3D fe->ops.ts_bus_ctrl(fe, 1)) < 0) @@ -2871,8 +2876,6 @@ static int dvb_frontend_open(struct inode *inode, str= uct file *file) =20 dvb_frontend_get(fe); =20 - if (adapter->mfe_shared) - mutex_unlock(&adapter->mfe_lock); return ret; =20 err3: @@ -2892,11 +2895,30 @@ static int dvb_frontend_open(struct inode *inode, s= truct file *file) if (dvbdev->users =3D=3D -1 && fe->ops.ts_bus_ctrl) fe->ops.ts_bus_ctrl(fe, 0); err0: - if (adapter->mfe_shared) - mutex_unlock(&adapter->mfe_lock); return ret; } =20 +static int dvb_frontend_open(struct inode *inode, struct file *file) +{ + struct dvb_device *dvbdev =3D file->private_data; + struct dvb_frontend *fe =3D dvbdev->priv; + struct dvb_adapter *adapter =3D fe->dvb; + int ret; + + dev_dbg(fe->dvb->device, "%s:\n", __func__); + if (fe->exit =3D=3D DVB_FE_DEVICE_REMOVED) + return -ENODEV; + + if (!adapter->mfe_shared) + return __dvb_frontend_open(inode, file); + + guard(mutex)(&adapter->mfe_lock); + ret =3D dvb_get_shared_frontend(adapter, dvbdev, file); + if (ret) + return ret; + return __dvb_frontend_open(inode, file); +} + static int dvb_frontend_release(struct inode *inode, struct file *file) { struct dvb_device *dvbdev =3D file->private_data; --=20 2.45.0.rc1.225.g2a3ae87e7f-goog