From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 857AA396B90 for ; Wed, 14 Jan 2026 12:35:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768394139; cv=none; b=ud4mlMj+oU9c7V8kkdgHce7WhCk4T2km1zGbFiR/Puh99/FsUvxFq/uWDlXpelRGhpRl3DlFMsZc0BHYXbPR6y/OaO3jbif6assmZV8prL8tdswAHg09Re++vAbB1MrahIlakFyCsAdxP5BkBCqSF3etlabGxOmxu17PmV8mGEM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768394139; c=relaxed/simple; bh=KmF+mxZXBd5usLx31jYbFUdpVv319xRsw1z4NwmBaGQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Bs+4LuLXsKOy2bh+rsXeKsgf9UHUrYUD8vluMJ1Ynv98zEgQzJHezyD9P/u2qzz+WliaMVHTJbQ6Mmj/WrUWkZy+6czGymdEKbE/kYko9lKv24LuL/GpFDzsbNN+eSOdDeJmSt6xLvZGc45IM3PkTZnALlfkk+azgQ92mF7KvBc= 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=nBYs7tW/; arc=none smtp.client-ip=209.85.128.46 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="nBYs7tW/" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-47ee3a6314aso764165e9.0 for ; Wed, 14 Jan 2026 04:35:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768394133; x=1768998933; 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=Q5TjDcxLgtKvSQq5PqYHcBcWFoLtkmVts7uy/aHfmR4=; b=nBYs7tW/3x7wwMyV/lFnZERQJItyCnKQ5to8w5AZmiRmO90Kcin8Y0brIt7szpX39I BI60JrLyXSuoVA5KooU9McRuS4qCKGutHAIe4hiccudblpMQFmIJQFDEXGdeqpVuiu9v dsbNbBj9pV6KuO2X2SAy9pzYEups4x+1Zgg6tWsDHN2jLRaj2HcyactOyah/piwFt3ma zi7meHwS0BOSOoxvyobOv7YIxHuk0qpvOT4Sql05l+umlbihuFaUqQ2sa7MimFbVygBo E7uROKwuw1nPWkbUL5+ir/zd3bBFhDXrMKR5dN7OPbAsrgdVsWYQDPoPJNVOKUpVSvmp zT9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768394133; x=1768998933; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Q5TjDcxLgtKvSQq5PqYHcBcWFoLtkmVts7uy/aHfmR4=; b=FHPVCx17E+vnc4SaRzCGYvcKfcpYF+fpM0N2Lw7eXBqv1/yLwZPyiYr3X3cowoq/HW WlmhvouGtNcjdbxEyVGyQ+ZOfWssnjt1V0d2PYVLEvO26l4Gj7heeYToAQMWWO0mdgOe +sqoLxk7ovK0fxW522+5JM1/+JFjNNssvFCORnCCAgQqi+w0vFVcZVFPrUnnsN9AsWys WAKmEU5A+3ZR81HzeAAlIj8b10+BRAcz3chOd5vMJU+tRI52CEjeeDEFjWL+KAFKvSQY 1t9NgldItBTVjvOZ4WW5oIbh8phs02/afQg/YImq1i7vHx1EhK87Eya41KdfmQxI4yrM 1zPg== X-Forwarded-Encrypted: i=1; AJvYcCW8dfzX1NcmIbXFzEsfWD5/XRwy3RZXY8MAYeJz8kWNJAf6TgUQQMcitM7B1HJd+G2lzlK7tG4=@vger.kernel.org X-Gm-Message-State: AOJu0YzbggZNnkQflRz8EIntv4dAL+lBdlV+b6fefo7oQ5YgiQRGH58O rR1/uAp77r8HURG/Oh2PXva9kgbyiI82p5NoIX7CFJ1OGpGRU3nTBuEl X-Gm-Gg: AY/fxX5mFROKpDgohjOc14dI7jcbecSmkF7CXgR4aHwOvty7pKytQ8QpM83MVKmnxfE wzucbHp23HT+E9gcyjHKch4mY7Pomwnbnr2CJmyVR/wZyrDLnRa/twTED1z7HwSmuajlYAKdGLF ONKfffRM2OvHzR0gniEMHKrVBPas9FYezhq/E1rMqoSpHGfFbFeYPkFNgehmxwOCk/64KdopTqy jkVsqc3mJNHXnYbbj2OBAvBSD5NSfqkk/jh6io/fsqDXmcuUdE421laaFyEZPxe74KpC3h75NBO 2uB3CqY7VLeC3i3U7gxE2n6WSDWo8zGQHVPstCEoE45wGOuioZ0SJdYa/kB9EfkChzQ52gOMXGw QWn0ozxDlHdt1mIPDrr24+1CTrfVmYMhJXvRlDfUlytaFRw3DI0LsIpDZar+5ExLrJjO5bh8vni vd5YzIxTOCstPmv2T6nQD0FI5sevYNyL9zm+F0KMuBdHKDSCnRQa7Zb5DIP1Bc7Pw4rfKs91Dhp qJqnckX6ko2 X-Received: by 2002:a05:600c:8816:b0:477:5ca6:4d51 with SMTP id 5b1f17b1804b1-47ee33918a4mr10348685e9.3.1768394132893; Wed, 14 Jan 2026 04:35:32 -0800 (PST) Received: from thomas-precision3591.paris.inria.fr (wifi-eduroam-85-139.paris.inria.fr. [128.93.85.139]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-432bd5ede7esm51037635f8f.32.2026.01.14.04.35.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 04:35:32 -0800 (PST) From: Thomas Fourier To: Cc: Thomas Fourier , stable@vger.kernel.org, Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] octeontx2: Fix otx2_dma_map_page() error return code Date: Wed, 14 Jan 2026 13:31:06 +0100 Message-ID: <20260114123107.42387-2-fourier.thomas@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h index e616a727a3a9..8cdfc36d79d2 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h @@ -940,13 +940,8 @@ static inline dma_addr_t otx2_dma_map_page(struct otx2_nic *pfvf, 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, -- 2.43.0