From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) (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 65C5A4418CA for ; Mon, 29 Jun 2026 16:03:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782748994; cv=none; b=ULZiP9xZO/F3ET2ULGugfbZm/qeTLpY15n7B2C1Lp75zQhinr8H6DWNghcmHwSgCQvXB9WUyYtLUOWZQLUxM9yboD8tjdJKwmUf1nWK2Vl4fN+X4ro6XvbayzTIxxO1P8ArlcIe8O4cL80ujlD6ObfokWKdb7yf4eyA9QvKLUEI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782748994; c=relaxed/simple; bh=TChvif//UlGX4BiPL0HFon0QXD/z6TGdXUMmTLSiyFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VnT3Lfxj3YKUGInyeWKe/GrU0xuyyOl/WK2rcFSAblzL7bsYP+FnMKhBHRpbwNi+DouConhEc6NKWAOtu1UD9bVIVOxYygULxhVleUDAH2h/ekv7EyToP0Cp1UUSscadiZKNdMJcQozNAcZbROEDsCL4Xt54eEJhr82xQdDkzA8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DetOiwBQ; arc=none smtp.client-ip=209.85.210.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DetOiwBQ" Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-7e9cb0e594bso571123a34.3 for ; Mon, 29 Jun 2026 09:03:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782748991; x=1783353791; 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=G47o06VjlX8VcRcaeK5b+BgTp2kgv5PYRRvWYpQg9dQ=; b=DetOiwBQkFI9LrXAoQNixhPeLsoZRe1cXWZC2jtNrTX/rDYM4CbWF6WkmQ4A8zF3Bc mos13SxHo9xVlkhgfJvKAjAKtgBz90rk/N18iW9WAXb11pGiKMFVHwT8onx33xfNbXS6 dhoOnIqwBl6U7qIhodNzcj3gbJXqP4qb+bCoBRPFroXNuBMoR/jfTqVxZPpU5qJEVlJz yv5ULmHky03iR7eaYG3Q+cQUydX2/GPvNlfGMTuAKRKD6IOvU8aVOxLfms8RRk+OIbtH A+6aKwV0XoMgEHgTJjd7KKGDNXsqPR8VL1JmJzJ6WE1r0mTIMwO6KSph8gNg2EEa0dU1 BIkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782748991; x=1783353791; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=G47o06VjlX8VcRcaeK5b+BgTp2kgv5PYRRvWYpQg9dQ=; b=gWnVinDNwSdLlXUP+g8Euc9+dhbqV0q2vlq53IqoJdA38CKDGLXCud1Y3s5f04660L 3+2fq+Zh2AXuqt7grcfDJ+gOWYd4jxEID0EtX4TMcjURbvcZfSIheEvx1QHKM/alRpzt QIx5SajRGR6BJFGT75c9DND6mWz+iWWBjHhLwRGd2AzqURpZ5u9EBmpaDa/YfwWN+4vR XG6d1K5m3b/6ZA4fHCSdUG/UIN/PCZQN48PO6/x9KxsqclRP0CFG2Vu9QU8xY46hVjrZ jiSAeR5KMDqm27WtsjGwapA8mMh5Lp37IEqQ1JSBfJUgB+PbKiXqfBYmxwOtw60GpYGE gfvw== X-Gm-Message-State: AOJu0Yw2JyCa6I3ZV1qLIdizH/W3zp9LG3jFaAXdWfseZ4RxJvtg1ITo pNkF4EjbKIhN8qAqWX1tl3TssKPUe0jGv5lqHJuOUkZ7dF5x6NQumHOvkSvuSg== X-Gm-Gg: AfdE7cn2PAAX7/gEhFUdXIcHiJj5dATwUaUZmjlRzLRUD3inz9Vckp45IXOkotIukVx qsYWCAIAEDoOKLhqJs45SC9e35yyr/gGYfqpQ3V6FMHO24TGJJ/c6uiYcifJJTTTaY7ZfMQz+AX QS5RbiSc+QsejM2bWObSfC0NCtMg5rNeD2UozOZ67fxo5NoQZSGUi2kNMHXEwahuqlOVvKYIR6U iZNHyiTr4WH7QtIHvAYBSbCcQxGRZvwANvN92P7GbsfrZxlNbxDHu/mPTrboRaRdOvkYFiiCnL/ 9yKgoA0oSKGqdNBljDKfIrkLkjLnbW89JIKvZd6h/PXwGc4JD8+E9ISx0YWv5ra0LCh79oFpc+h 5aV9/ox+WLRMIoXpfWzx3eeKIVwZzIZ548l0urGwBp9uyyOR0qU4RFSbnudHMNoc0za7lgfp4jj Wdd+7Xtdgt80xsfrEf5SRbsdfTLCLFWysrR6zeP/VvkSFW2wEXvBXtFYHfGCDnTQ== X-Received: by 2002:a05:6870:21e4:b0:43a:677d:241d with SMTP id 586e51a60fabf-448dc9be034mr97127fac.31.1782748991161; Mon, 29 Jun 2026 09:03:11 -0700 (PDT) Received: from father (76-224-4-192.lightspeed.clmboh.sbcglobal.net. [76.224.4.192]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-448db9370c9sm145868fac.1.2026.06.29.09.03.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 09:03:10 -0700 (PDT) From: hoff.benjamin.k@gmail.com To: mchehab@kernel.org, hverkuil+cisco@kernel.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 4/5] media: hws: harden video DMA queue ownership Date: Mon, 29 Jun 2026 12:03:03 -0400 Message-ID: <20260629160304.154046-5-hoff.benjamin.k@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260629160304.154046-1-hoff.benjamin.k@gmail.com> References: <20260629160304.154046-1-hoff.benjamin.k@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ben Hoff --- drivers/media/pci/hws/hws_video.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/media/pci/hws/hws_video.c b/drivers/media/pci/hws/hws_video.c index 3a7b2abda502..58bcc2e7030d 100644 --- a/drivers/media/pci/hws/hws_video.c +++ b/drivers/media/pci/hws/hws_video.c @@ -330,8 +330,8 @@ static bool hws_force_no_signal_frame(struct hws_video *v, const char *tag) struct hws_pcie_dev *hws; unsigned long flags; struct hwsvideo_buffer *buf = NULL, *next = NULL; - bool have_next = false; bool programmed = false; + int ret = 0; if (!v) return false; @@ -354,22 +354,31 @@ static bool hws_force_no_signal_frame(struct hws_video *v, const char *tag) if (v->next_prepared) { next = v->next_prepared; v->next_prepared = NULL; - next->slot = HWS_VIDEO_DIRECT_SLOT; v->active = next; - have_next = true; + programmed = true; } else if (!list_empty(&v->capture_queue)) { next = list_first_entry(&v->capture_queue, struct hwsvideo_buffer, list); list_del_init(&next->list); if (v->queued_count) v->queued_count--; - next->slot = HWS_VIDEO_DIRECT_SLOT; - v->active = next; - have_next = true; + ret = hws_program_dma_for_buffer(hws, v->channel_index, next); + if (ret) { + list_add(&next->list, &v->capture_queue); + v->queued_count++; + next = NULL; + } else { + v->active = next; + programmed = true; + } } else { v->active = NULL; } spin_unlock_irqrestore(&v->irq_lock, flags); + if (ret) + dev_warn_ratelimited(&hws->pdev->dev, + "%s: failed to arm no-signal buffer ch=%u ret=%d\n", + tag, v->channel_index, ret); if (!buf) return false; /* Complete buffer with a neutral frame so dequeuers keep running. */ @@ -385,10 +394,6 @@ static bool hws_force_no_signal_frame(struct hws_video *v, const char *tag) vb2v->vb2_buf.timestamp = ktime_get_ns(); vb2_buffer_done(&vb2v->vb2_buf, VB2_BUF_STATE_DONE); } - if (have_next && next) { - if (!hws_program_dma_for_buffer(hws, v->channel_index, next)) - programmed = true; - } if (programmed) { wmb(); /* ensure descriptors visible before enabling capture */ hws_enable_video_capture(hws, v->channel_index, true); -- 2.54.0