From patchwork Sat Aug 20 12:56:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 12949686 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 EDE46C32792 for ; Sat, 20 Aug 2022 13:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TbXa+/m21ZudZEbupYKUMYADW8MKIpdOAfYhQTkIfQI=; b=2DsaGCT7TUO8pd 73Mb4q60RF/ySYCbujZdOFMYODtceqF0SeWgWB0nRhIYDcFHQxYQm+hRE29V4w0xZaRFH3rtQwcEB PTudHqIzUHC2QdqMt7yJ+rCLK0eT9HVnhyPOoYzoZtkZOtf3a6Bx3AgHpVuPv1UAqm81NtL+m9C6I bNiNA0WP6dutW0B0ZCYN34jR+x6VhpAN7U/j6j1YcJJ1Bn+HvpAVUCcc3AlHk411V2z79qmbB81s6 ZcxYPbojvtSg+vNO3bkUcpS++1jZG5eauuqoxgy5NuU/VsKWRcskfUwfaxJO2WICUE6Gx6HDeK4Nj xKRdI+UbqCtBHhiOCqTg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oPO8K-00AFSU-Ho; Sat, 20 Aug 2022 13:03:25 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oPO3M-00ACeD-V9 for linux-arm-kernel@lists.infradead.org; Sat, 20 Aug 2022 12:58:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1661000296; x=1692536296; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6HA2CCHwjDVztWeS6Zb5kvInSxy1acVkNO5tTXYxiBE=; b=Ra2TqiZDNCUtZ7EyVlaWeNDqaFCciCNwEfjbBuW4duVbPdI2yV0cvXqE n3K0Iava9SFu+fRdt77Wc3SZ3US5Pa5QZ9KoMM9GMwBk6hehzKg7w6ol6 /9gZEF4n/XDdQU1qY5fYsm8/V/gLtEFC0JHdfvzodz1ZImkF2rLXw0Ah9 aCSMnV3LeoSlqbKYEbroPXGFIrCpeeu7Ims9oiRF5JuCXkYxeSCBDkFq7 ANUn9TvrljhAFYaxv8dZDFh4zYTHjXIPClISnLlEQiUmkYk4VxNiKAfAv 0pdmwlGeZyaBydsX9ke/vn5Vsc3v2vq6PGS8kQpwi7LsA4D+PiYb8o+RN A==; X-IronPort-AV: E=Sophos;i="5.93,251,1654585200"; d="scan'208";a="173329194" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 20 Aug 2022 05:58:15 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Sat, 20 Aug 2022 05:58:14 -0700 Received: from ROB-ULT-M18064N.mchp-main.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Sat, 20 Aug 2022 05:58:11 -0700 From: Tudor Ambarus To: , , , Subject: [PATCH 15/33] dmaengine: at_hdmac: Free the memset buf without holding the chan lock Date: Sat, 20 Aug 2022 15:56:59 +0300 Message-ID: <20220820125717.588722-16-tudor.ambarus@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220820125717.588722-1-tudor.ambarus@microchip.com> References: <20220820125717.588722-1-tudor.ambarus@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220820_055817_094624_F24BC66B X-CRM114-Status: UNSURE ( 9.43 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tudor.ambarus@microchip.com, linux-kernel@vger.kernel.org, maciej.sosnowski@intel.com, mripard@kernel.org, torfl6749@gmail.com, ludovic.desroches@microchip.com, stable@vger.kernel.org, dmaengine@vger.kernel.org, dan.j.williams@intel.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There's no need to hold the channel lock when freeing the memset buf, as the operation has already completed. Free the memset buf without holding the channel lock. Fixes: 4d112426c344 ("dmaengine: hdmac: Add memset capabilities") Reported-by: Peter Rosin Signed-off-by: Tudor Ambarus Cc: stable@vger.kernel.org Link: https://lore.kernel.org/lkml/13c6c9a2-6db5-c3bf-349b-4c127ad3496a@axentia.se/ --- drivers/dma/at_hdmac.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index b3184da7ced4..c2b3d7b63920 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c @@ -897,13 +897,6 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc) if (!atc_chan_is_cyclic(atchan)) dma_cookie_complete(txd); - /* If the transfer was a memset, free our temporary buffer */ - if (desc->memset_buffer) { - dma_pool_free(atdma->memset_pool, desc->memset_vaddr, - desc->memset_paddr); - desc->memset_buffer = false; - } - /* Remove transfer node from the active list. */ list_del_init(&desc->desc_node); spin_unlock_irqrestore(&atchan->lock, flags); @@ -922,6 +915,13 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc) /* add myself to free_list */ list_add(&desc->desc_node, &atchan->free_list); spin_unlock_irqrestore(&atchan->lock, flags); + + /* If the transfer was a memset, free our temporary buffer */ + if (desc->memset_buffer) { + dma_pool_free(atdma->memset_pool, desc->memset_vaddr, + desc->memset_paddr); + desc->memset_buffer = false; + } } /**