From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F6DF3054D8; Wed, 28 Jan 2026 15:49:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769615358; cv=none; b=nuxEfiQO+6xgEoPwvNkFx+So90z0vd6Ae8GLtzNr2rYsSefAC8bD4IxfSvaMD3xRrpFHGPWC08HnOy76NhrcyVTClTxbGob9DOoAQJkly3dlwc2u0Z4+WVzxTshocnrsMQuy7SRt30Lr5eWuxHo3Iy/NBP9CmeRQDP0RfUek6+0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769615358; c=relaxed/simple; bh=EICqtRQ6Lv1aSuY7BYuzYlxiNTYNHnSY1oJGHTHxPuc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XA3sdjg/+M6DYE0cmGxfVB61OctUjtYn/kIRb0b/coU49qof5gnXaRwQK8losuFeF0kBlZ2OFp0OOmHxhxzeixL/z5SNhRBQruNn5QHh72svH8hFhGGYiasbc1qBpQrKqYKi02vOTujWzh7AjbeHq3i4/ifQZ0SOvN5RdXyyACs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fItpYE1W; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fItpYE1W" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28A63C116C6; Wed, 28 Jan 2026 15:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1769615358; bh=EICqtRQ6Lv1aSuY7BYuzYlxiNTYNHnSY1oJGHTHxPuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fItpYE1WTFFiJbByDvC0rgbdFzi+9VycCF/fgyUKG8hTpicANPeAoTWxarqPaL+r+ Z9ntnHiJfrXhphR91RQ8OrLYlSU77KeV9j69Wqz7f5B5NCizU5sR2NLpB/g92RBeUS OZ4mq4Pen8kzZK2+6/64dN1XyXnFtkuTPXV29XMA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Fourier , Jakub Kicinski Subject: [PATCH 6.12 123/169] octeontx2: Fix otx2_dma_map_page() error return code Date: Wed, 28 Jan 2026 16:23:26 +0100 Message-ID: <20260128145338.434094679@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260128145334.006287341@linuxfoundation.org> References: <20260128145334.006287341@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Fourier commit d998b0e5afffa90d0f03770bad31083767079858 upstream. 0 is a valid DMA address [1] so using it as the error value can lead to errors. The error value of dma_map_XXX() functions is DMA_MAPPING_ERROR which is ~0. The callers of otx2_dma_map_page() use dma_mapping_error() to test the return value of otx2_dma_map_page(). This means that they would not detect an error in otx2_dma_map_page(). Make otx2_dma_map_page() return the raw value of dma_map_page_attrs(). [1] https://lore.kernel.org/all/f977f68b-cec5-4ab7-b4bd-2cf6aca46267@intel.com Fixes: caa2da34fd25 ("octeontx2-pf: Initialize and config queues") Cc: Signed-off-by: Thomas Fourier Link: https://patch.msgid.link/20260114123107.42387-2-fourier.thomas@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h @@ -894,13 +894,8 @@ static inline dma_addr_t otx2_dma_map_pa size_t offset, size_t size, enum dma_data_direction dir) { - dma_addr_t iova; - - iova = dma_map_page_attrs(pfvf->dev, page, + return dma_map_page_attrs(pfvf->dev, page, offset, size, dir, DMA_ATTR_SKIP_CPU_SYNC); - if (unlikely(dma_mapping_error(pfvf->dev, iova))) - return (dma_addr_t)NULL; - return iova; } static inline void otx2_dma_unmap_page(struct otx2_nic *pfvf,