From patchwork Sat Jun 8 21:31:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dautricourt X-Patchwork-Id: 13691120 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 BE54EED9; Sat, 8 Jun 2024 21:32:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717882367; cv=none; b=pRFZE4RgAHVCYF7VthDX1HV+idE5sO/Bh0yFTMwWBOU6GpYp1htfnix+iuqx+wAIOx3oxTzbuTwGIDiCYq80YiVSPYSIYEyIpAE45RZ1NfCNx/1Qi0gF9ccZzmDaLqMjpNKaQ3TnP/C2FmfYI6OCODUo1Kpf4oO4ssDU9WeLOnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717882367; c=relaxed/simple; bh=zVflGiVL0wY9HCA+JTMHCw5+k5mGjuP8/ZU6BhUj2Ds=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=VBwjFvbLE99IWWmgRXjgFsEhiiBF8w4y2mwYVXYqurRkzrLzswJu2fDKxhpftHGHLBQ8BD66RioKEYSTqQASu46jD1nbwLgopvBxAHFnYj//d3myCbUp7VSH3r5pCifvdxQgYEpbWq7Rsa/VugzkrsoiYXqJ5TVR9cyhj3ylj1Y= 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=FG//4t7R; arc=none smtp.client-ip=209.85.221.42 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="FG//4t7R" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-35f1c209893so418272f8f.2; Sat, 08 Jun 2024 14:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717882364; x=1718487164; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zWNPi1kJTrBS+pEUGE0/YU8V0dOXg4gzyeqJvrLnBPk=; b=FG//4t7RUX+dC072mQiXgAq9iNjrupI2p1m5j8AwRzYyyzJrwaQ1RRKeL9W4I8XHHB uEKKFo4yilr7rEfkYKs6mnloyzrIjr9VYWR46HzWib39LnQaA54t0BxJ515eeHf8Pcxl YTEdq4xcd1uiAXusJNjoeqO0/2QPtooUTB2NGLo7Yt0pQR9jR2Briw+5be4Z9XU+fDn9 CsS6lyCJyqlpFhXOyJLiRfEW+sNvWzf7y8I8KKtyAS18YFCddkTTwekjjdTKxeM4apj5 Pl9o1bTkctOPcj7LWm2HEjjiF8wjiu1f7gtvn+mnDePYh/B0H6fWYNV/rGhKSE83ZHi3 nZcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717882364; x=1718487164; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zWNPi1kJTrBS+pEUGE0/YU8V0dOXg4gzyeqJvrLnBPk=; b=Hz9JCsXMP2gZm5uL+PSfcksD6IQPirybiXGRgifd8hQw0WbneDxHvqrdop1Cc5Xowz e+PDlovpEjs4vJTom52tMGo4RZSmhUgC2Hce0CStpUHNu/Vl6QyWI6vXjPrw+/fhHISG pzBFidLnh5pj0hfJvO/OAD/2FnigLI40movgsSuH4SdlpOhlyJJllBM2vIIrRyfDH85I jsMqWNHxX0HJYqNIuZdoWVmIPWRqb8eKRufHDdrmbDvkj3ESOJcaK/15dR0A3B1+OrC4 r3CJskVQi3pD+M8xYZmJLdCu/C3Xv0Upyab+0Zd5FxINWYbR/ihsnMjfNDA9cWhkE9Ki cK1w== X-Forwarded-Encrypted: i=1; AJvYcCW9ZWiCNk4SXPknrWq4yhagOrOeXXRq9gea6tQeZn0Pmy1kXgbTWHkG0gYd6hQUJiaab+tGU8zV++Cdutnkekt0KLbao5BEn2/w X-Gm-Message-State: AOJu0Yyt+WDI2mNh86gT6AKFGXkC2XzVnQoW9K3V2CFEbjFLKK6EXwDW ypy/C1aqcoN4XmKACso3lSganDR+dnHp+zIpqzLpt3OebPVXXfaY X-Google-Smtp-Source: AGHT+IGrvNI123vWJSNjSF27urRRDGCSmw+7i51AIdkARWNrkjb3GUiXJCx8/xx+T6mbeU7KeYm7Bw== X-Received: by 2002:adf:ec4b:0:b0:35f:1aac:156f with SMTP id ffacd0b85a97d-35f1aac193amr1012237f8f.13.1717882363853; Sat, 08 Jun 2024 14:32:43 -0700 (PDT) Received: from localhost.localdomain (oliv-cloud.duckdns.org. [78.196.47.215]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-35f116540d5sm2793247f8f.15.2024.06.08.14.32.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jun 2024 14:32:43 -0700 (PDT) From: Olivier Dautricourt To: Stefan Roese , Vinod Koul Cc: linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Eric Schwarz , Olivier Dautricourt Subject: [PATCH v2 1/3] dmaengine: altera-msgdma: use irq variant of spin_lock/unlock while invoking callbacks Date: Sat, 8 Jun 2024 23:31:46 +0200 Message-ID: <20240608213216.25087-1-olivierdautricourt@gmail.com> X-Mailer: git-send-email 2.45.0 Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 As we first take the lock with spin_lock_irqsave in msgdma_tasklet, Lockdep might complain about this. Inspired by commit 9558cf4ad07e ("dmaengine: zynqmp_dma: fix lockdep warning in tasklet") Signed-off-by: Olivier Dautricourt Tested-by: Olivier Dautricourt Suggested-by: Eric Schwarz --- drivers/dma/altera-msgdma.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/dma/altera-msgdma.c b/drivers/dma/altera-msgdma.c index a8e3615235b8..160a465b06dd 100644 --- a/drivers/dma/altera-msgdma.c +++ b/drivers/dma/altera-msgdma.c @@ -583,6 +583,7 @@ static void msgdma_issue_pending(struct dma_chan *chan) static void msgdma_chan_desc_cleanup(struct msgdma_device *mdev) { struct msgdma_sw_desc *desc, *next; + unsigned long irqflags; list_for_each_entry_safe(desc, next, &mdev->done_list, node) { struct dmaengine_desc_callback cb; @@ -591,9 +592,9 @@ static void msgdma_chan_desc_cleanup(struct msgdma_device *mdev) dmaengine_desc_get_callback(&desc->async_tx, &cb); if (dmaengine_desc_callback_valid(&cb)) { - spin_unlock(&mdev->lock); + spin_unlock_irqrestore(&mdev->lock, irqflags); dmaengine_desc_callback_invoke(&cb, NULL); - spin_lock(&mdev->lock); + spin_lock_irqsave(&mdev->lock, irqflags); } /* Run any dependencies, then free the descriptor */ From patchwork Sat Jun 8 21:31:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dautricourt X-Patchwork-Id: 13691121 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.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 7F3AE1B80F; Sat, 8 Jun 2024 21:32:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717882368; cv=none; b=W3qKbmSViiEgXffLYcw2Bes5fgwoiQ5Jtn3Ej4QRcXfdcUAC40z85qSjIl0OAujBRvqD0g7qfX7cG2lXRpuJ1qA7rdVKfzj5s4+7BEA3f0V0wzzgA9HJbemb6B4gzyYyT8R1biixkt/EQTzFj0LvfLDS4X9m11+xUNyqgT/SM/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717882368; c=relaxed/simple; bh=SjzAcYcWtfxknYFag5U6s/JvNy4G+mVRyzzStXQixrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D1L6yo9RZpeF4tiKX26Vd2s6GLQr+auhmegsz7rLNctoHedOhMpnK+Z/nNqdy9lDJpc46tUUxikvCKodkcBl8c1XgW43+btmiRm6/arTYUv0qQI2CfrxnAD7I2e5YDLpP/CIIf0XjjBpkmjICBe7gEQUMT/OLqbdebkv2YYDVQM= 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=fFDeej58; arc=none smtp.client-ip=209.85.221.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="fFDeej58" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-35ef92111afso2219313f8f.2; Sat, 08 Jun 2024 14:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717882364; x=1718487164; 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=HIfA/ODECV+f+oLK30+MKaz/KyG3cWL0Wm6WLkPADsE=; b=fFDeej58+GDuTcTIsweDBbniRp23BlR+iViNShoBLKexL3XDtYTaPWmqr/xv3mPmka FPjmQJg+thKMAhWGCcof7U/8At5pusNq+oaZuBIXbip+5fSnNotjSkj/MYfzQMEd34lJ qvOSKLel8Vs2+6Yti6CMNgs9Asi8ziOqSVA/+t8+4UOK8jLjMXenziqNviCnkruCKHkm ligmenNGLH2owyhSlBxT9ePEUks9AKtjp2dO5qgK4ThP4oLCGwrph2vkYdavD7iclLDL hC4hoorWZeglOiqDKBEB61cT/0+FKcslVEwUTFYEeQzbFTpmOGH/Fu3JW5mcITLjcSMF GwPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717882364; x=1718487164; 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=HIfA/ODECV+f+oLK30+MKaz/KyG3cWL0Wm6WLkPADsE=; b=p263u7Ni+/WxYJN7elFm79KR9DRR40OGCpe/sPBfk/Fw1QrigwATgfjScJ0JlE/7MU DYtYxPKVZmlkiL+Yw7/2sF7ijrI5alGSZHqH1DTT6O/wTi/eRam4DAFoP33N1G+gWaLs BMy4UzGFFNF5fBO0MWwxTLcWVfnOu04AhMotO7EiOqkhwyCnLB3cCxgqMB0STzOz6y+H 9HDMwlpHzBWYxZTUkoR94k5u9wKp//dNuK0P2rV/JaJJgJao7JA6AJ5oT5LfDsYG5AxD eqrNzb4rceS3O496qyjQzIcy0de/iQ3DMHtLLSRuqSv5tGT5PKuGjw/wKgKqX72qgR0/ OdPA== X-Forwarded-Encrypted: i=1; AJvYcCWI8+M5BMa38Yf2zDY1e2GWAxh+AhnzNWOreyljlFUzAEJNU/dnT2cFNG9mk/PFwiaOZeXG88rNJ2rYfPyWIFTZxNkhEVD0kHOj X-Gm-Message-State: AOJu0YyMeWoJ6+q7Apcn8w1+RMAlgOIRcjAJ+a8Dr12ijf56jAXRSEBO vCTfBP0y6jEo2cHhyVQV/EGHCBRzH8BuP/gAYJJS0ocBiTHAR/K+ X-Google-Smtp-Source: AGHT+IG9LL9kKcLs0kIB6wXpHNriYLuhOvm1Wg5G/KtRnySZCgdKCiu19WqmALtNVrdfLESyjzWqew== X-Received: by 2002:a5d:5608:0:b0:34c:cca6:3d18 with SMTP id ffacd0b85a97d-35efedf981bmr3778836f8f.68.1717882364408; Sat, 08 Jun 2024 14:32:44 -0700 (PDT) Received: from localhost.localdomain (oliv-cloud.duckdns.org. [78.196.47.215]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-35f116540d5sm2793247f8f.15.2024.06.08.14.32.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jun 2024 14:32:44 -0700 (PDT) From: Olivier Dautricourt To: Stefan Roese , Vinod Koul Cc: linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Eric Schwarz , Olivier Dautricourt Subject: [PATCH v2 2/3] dmaengine: altera-msgdma: cleanup after completing all descriptors Date: Sat, 8 Jun 2024 23:31:47 +0200 Message-ID: <20240608213216.25087-2-olivierdautricourt@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240608213216.25087-1-olivierdautricourt@gmail.com> References: <20240608213216.25087-1-olivierdautricourt@gmail.com> Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 msgdma_chan_desc_cleanup iterates the done list for each completed descriptor while we need to do it once after all descriptors are completed. This fixes a Sparse warning because we first take the lock in msgdma_tasklet. - Move locking to msgdma_chan_desc_cleanup. - Move call to msgdma_chan_desc_cleanup outside of the critical section of msgdma_tasklet. Inspired by: commit 16ed0ef3e931 ("dmaengine: zynqmp_dma: cleanup after completing all descriptors") Signed-off-by: Olivier Dautricourt Tested-by: Olivier Dautricourt Suggested-by: Eric Schwarz --- drivers/dma/altera-msgdma.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/dma/altera-msgdma.c b/drivers/dma/altera-msgdma.c index 160a465b06dd..f32453c97dac 100644 --- a/drivers/dma/altera-msgdma.c +++ b/drivers/dma/altera-msgdma.c @@ -585,6 +585,8 @@ static void msgdma_chan_desc_cleanup(struct msgdma_device *mdev) struct msgdma_sw_desc *desc, *next; unsigned long irqflags; + spin_lock_irqsave(&mdev->lock, irqflags); + list_for_each_entry_safe(desc, next, &mdev->done_list, node) { struct dmaengine_desc_callback cb; @@ -600,6 +602,8 @@ static void msgdma_chan_desc_cleanup(struct msgdma_device *mdev) /* Run any dependencies, then free the descriptor */ msgdma_free_descriptor(mdev, desc); } + + spin_unlock_irqrestore(&mdev->lock, irqflags); } /** @@ -714,10 +718,11 @@ static void msgdma_tasklet(struct tasklet_struct *t) } msgdma_complete_descriptor(mdev); - msgdma_chan_desc_cleanup(mdev); } spin_unlock_irqrestore(&mdev->lock, flags); + + msgdma_chan_desc_cleanup(mdev); } /** From patchwork Sat Jun 8 21:31:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dautricourt X-Patchwork-Id: 13691122 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.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 CE8EB1B947; Sat, 8 Jun 2024 21:32:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717882368; cv=none; b=hmxn21tydkRxISqwg+eBRGnqoF7J/n4F3HLzD6ggxbpwG4GDB+AYlm1xl283pBSOppi2YODuVtcTMg9I/UgKshgcyt9d9M/bwOHCo1AKo2Gv660qyMXqcgfXgMRqKutbpo0pJIqtA8cKA28bbv8guAOr9rss4nVZzGUJXQLVvJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717882368; c=relaxed/simple; bh=+Rs8wYwBoiG3K7IcsS1TPmK0AG2mOW1LQ3u5KD71wcA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ulAl5cv1w5gEBITyicpuL1tlcU7KjIzrUwGI35FPeBz6/RNikWDGEtvP0s11NRZa1ZU5gLeWS6pzb3lTAxcsT2fNwcyOFrltmGem4hs74h36ssoqF7HtRFV0kO50xoyjYH26GFLw1i5NKDW7POdNTA/T2bvHK8CvovOe9yii1e8= 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=h2TXtVV6; arc=none smtp.client-ip=209.85.221.44 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="h2TXtVV6" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-35dc1d8867eso2563133f8f.0; Sat, 08 Jun 2024 14:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717882365; x=1718487165; 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=tu++zvi3hy03WnBvFMzNx4Almv3OZW4GRR+MRySyAmA=; b=h2TXtVV6mxPS/scq3Sod+ZfH35T+r1L4hCsj7wgE+3ThiOrNYHr0qtF+93939bO5FF XOPXDJSRQ2QrvAhPrCacPrpbXrVjY+FfxXY1u/R3u2GroRqbjuM8zWtY/k/Ut9zEA8Cm /6v0hNCu2d+3IuS9R7GlDNVxy/erauI6RIGXhoA1Q9g3O+Pdj2v7jkZWGvYzAkgtYXY8 R5gr+dfi28M4gnZ50uDQLT7tZ53aqNnL0kFMLviC3NwPzCp3s722cc6iRQZ1ZPykhloz WfsvZ1UybkGToiIeZRYrj7edN/7WkM0obK83XjP3et35kA+TCDC/i7Xb34DXPuYMMEgp KDRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717882365; x=1718487165; 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=tu++zvi3hy03WnBvFMzNx4Almv3OZW4GRR+MRySyAmA=; b=uMe9B4zerh56RPSyti1XI2uLrbSTGJCRGELtNeCoRQntARu5H7uTNeACVbpin5foYa 5eDP2cDgPo8+x3Gx4cXOIvDGjGfOuSKG2+0UPd9e5lCxH/PKnUQ9GrtGd6td7hZgXG6B L8eikj6TqrLME9Dsa+cI0jiarPKk5/yBCzJS7rxbgGdI75dO2mMx86F2cj8OmYKv+rnY XeODFunybPHtHYU2crJwAqsCQaq+pCO3icUpVUNb50+MmR8vmQJgXRUX2u94kLu2H2Ek wFk7P30YNoAuVKdYEVoNDqyK1ls72frjuJ35Oh4Z0o1LphMbZEXrG7KV0Mx3kRszwnQB wB/A== X-Forwarded-Encrypted: i=1; AJvYcCXYcmTqYm9GjAQ9i0mK0Gtc2C4gcSJ1g5mKqd6a9QwuP+rl6OtsdEV5HeuuH8qleq1ZCGIuSwv/L0zQiCpm2QC8wIE456oQnQQL X-Gm-Message-State: AOJu0Yy5egtFXYVuIVcw/u4QBQXPMirT87fOtOF7mocoYaZhERQSyXRJ 0AHzZU369jx0hpyOETCzeu1i6stpd/HS84qJn65kgcFLhuQOwgYI X-Google-Smtp-Source: AGHT+IHqfdWSpcopHsiLkd0Mmd6Q+telmoC4X1GiQmjw2Z73x32UZNrXesKuSxOK4cMxRs2gtsPAXA== X-Received: by 2002:a5d:42c8:0:b0:35f:1f19:594d with SMTP id ffacd0b85a97d-35f1f1959aamr220070f8f.33.1717882365133; Sat, 08 Jun 2024 14:32:45 -0700 (PDT) Received: from localhost.localdomain (oliv-cloud.duckdns.org. [78.196.47.215]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-35f116540d5sm2793247f8f.15.2024.06.08.14.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jun 2024 14:32:44 -0700 (PDT) From: Olivier Dautricourt To: Stefan Roese , Vinod Koul Cc: linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Eric Schwarz , Olivier Dautricourt Subject: [PATCH v2 3/3] dmaengine: altera-msgdma: properly free descriptor in msgdma_free_descriptor Date: Sat, 8 Jun 2024 23:31:48 +0200 Message-ID: <20240608213216.25087-3-olivierdautricourt@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240608213216.25087-1-olivierdautricourt@gmail.com> References: <20240608213216.25087-1-olivierdautricourt@gmail.com> Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove list_del call in msgdma_chan_desc_cleanup, this should be the role of msgdma_free_descriptor. In consequence replace list_add_tail with list_move_tail in msgdma_free_descriptor. This fixes the path: msgdma_free_chan_resources -> msgdma_free_descriptors -> msgdma_free_desc_list -> msgdma_free_descriptor which does not correctly free the descriptors as first nodes were not removed from the list. Signed-off-by: Olivier Dautricourt Tested-by: Olivier Dautricourt --- drivers/dma/altera-msgdma.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/dma/altera-msgdma.c b/drivers/dma/altera-msgdma.c index f32453c97dac..0968176f323d 100644 --- a/drivers/dma/altera-msgdma.c +++ b/drivers/dma/altera-msgdma.c @@ -233,7 +233,7 @@ static void msgdma_free_descriptor(struct msgdma_device *mdev, struct msgdma_sw_desc *child, *next; mdev->desc_free_cnt++; - list_add_tail(&desc->node, &mdev->free_list); + list_move_tail(&desc->node, &mdev->free_list); list_for_each_entry_safe(child, next, &desc->tx_list, node) { mdev->desc_free_cnt++; list_move_tail(&child->node, &mdev->free_list); @@ -590,8 +590,6 @@ static void msgdma_chan_desc_cleanup(struct msgdma_device *mdev) list_for_each_entry_safe(desc, next, &mdev->done_list, node) { struct dmaengine_desc_callback cb; - list_del(&desc->node); - dmaengine_desc_get_callback(&desc->async_tx, &cb); if (dmaengine_desc_callback_valid(&cb)) { spin_unlock_irqrestore(&mdev->lock, irqflags);