From mboxrd@z Thu Jan 1 00:00:00 1970 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 5703B34F497 for ; Sat, 20 Jun 2026 21:38:03 +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=1781991484; cv=none; b=t1J3/omLzFV7Dh8lURc3co5pMRjLqVpa93NLp8Z6TJGcZBSCQGe/CsOyOB7Oqcj5JU8ExxReLyGa1bM8JcWAlNDlnZgKfixIexLNWiVVH/Ghx1feiA3IAnjAK8KbolZzCXiwU4xLHABVzD0AvELZYEIn2m/lVbMsgwtwcdgOvtc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781991484; c=relaxed/simple; bh=ZEJ92BXzs7uxFvZ8o+bk+yvRtMFQ80qmq1Smsi3caog=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=nOOIZRiUGrlUDmE0g5JWlGMA8SQY/t7yB+19jiGy6DG1ZbdErUkC2eHaTZbQFkAslJmhU9WOlIswLs7zhbUm/SeUam7IC2kmslPmewgfiXKb8kttVpFIG0hWByuN4Ygmn4P0SYOgBqL09/DwwAXi60JmN1UA1fzhJzbw18tdX1A= 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=oGTB73hC; 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="oGTB73hC" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-46255b269c2so2368171f8f.3 for ; Sat, 20 Jun 2026 14:38:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781991482; x=1782596282; 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=kyy19G3UAGpqNpZJRFtz4WPWcaaqaP4tOOJJnrBVNEo=; b=oGTB73hCBI+aKbmNhcNbDN1rb//FBS5ylOmcoCekAH4r7Y7tCe1MDtDGwCSkOviot2 ZGPB7KVzU3avkexN+WsVTNAxrle9TSRc+jeBraiSgJcw5ViwObsxrgGyQpWEm9sYTEiI rOhdnKTwV4GJWFR3ToAUpg+vwg40SNDF26cE7/oXlQreosRMeWiubQ1qSP3SDMvg2kFJ UP7piEUg7cPmhEG8ZFLD/oI91soqxjwRXRBcHC9or4dDTUYHoW50+m2Ue7vEDR1K1jjx +dcM0PwSh7P9/kjQFCc1y8bRFXlrGL19Q2G6biHG8c8caKtiY14UhUhpDQqNsbMkBPLn k+fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781991482; x=1782596282; 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=kyy19G3UAGpqNpZJRFtz4WPWcaaqaP4tOOJJnrBVNEo=; b=dN5r9llbbPhgnCW9jyb+Nnur4ASliPWDkil3Y4zq4U0/orB4tIU13ABMl2KBL7r/Ut ce0O77YluaJuMdYiPsMGgkUwKvHZHQ39felqMKtU0usvmTCB7yEgowth2B+SzkNFK4VB 62DYya1IaWrIO03c6kx2/vZxT58yrEucTyvcI+S50nAXb9BUVdOEql/CxtNMLxKBSIVr /flwg00S1KkqicdU6tb7cKpt/ynJciQhBOg3tUxt3x90/ru4oXfk9qlz+k1+t0K5EVvu +ib8Lv9b977XKyNoLWQwAZTwUDRWbtTE/O1kOIwCDoqKGftT+y+Zn6t0ZInKRTmR2pzG 9lLw== X-Forwarded-Encrypted: i=1; AHgh+RoA7J8BL/Gw62TZ0C1QfSJvaDFzj0XoN5duPnoVhTUD457IFVoYxK/nuPPu2/YT7JY8i0f2gvLccjYFQ1s=@vger.kernel.org X-Gm-Message-State: AOJu0YzBcfmEh2FKUtVQP8NFSM8dtOqJ1tr8sSvQ2kgTfrR3IM2B3Omb oSTryuluFlz9YIbWgqmgIBIvozaK/rx4bVinyS+WNgrLoUUXUTZP+fUD X-Gm-Gg: AfdE7ckImWRc3chm0qoTDf5tcqsKxZWHQlb9yme6PMIhqb8wCi3EPoMvxlVCWJaLo2B ZVdUxxW0OKxKxxyctMdvWdM2XONdmsAqwfcsifBH4o2+7Ps88KBpm0hNVcGhd0nGjgmuSjjrGHr RfVhcZasyv4dDSThgQJ+YfZmM7RJMOPF3cP4XtvbSRkrxxPxcnlVbQ9BxEaxza1hO+nkDZ/UjGw sFUHNXimDVLm6X05IEwsrTgtgZR22oJHnsuBdIuMA/zFknWYLpAuBorhp9vg0PpcwVzzOLjdcOj zMMox6RIKAfGQxMtmVtIv3KnWSI9NaqKItOzdwDedSb/ZCM0IalUb7h8JSUUEcW1Ml1J9ttLlQ5 58nhLlgoafiWWVMXzMk9EBbVavr0uqoaptL0JJwP91qV+hlHqJLx4hnLML2oHGwfSkjbmgrtCHn pndUBX3qf3rCRz4ekxVX+FWI1V57lrvLA1BBuNRQ06J9cEpmeo9KNSQ1mAz5ZdMplY67opF/gc X-Received: by 2002:a05:6000:2b01:b0:45e:e1a4:c4c3 with SMTP id ffacd0b85a97d-4650043b85amr9392338f8f.15.1781991481496; Sat, 20 Jun 2026 14:38:01 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-466648c698dsm12128189f8f.16.2026.06.20.14.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jun 2026 14:38:01 -0700 (PDT) From: David Carlier To: danishanwar@ti.com, rogerq@kernel.org, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, m-malladi@ti.com, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, ast@kernel.org, daniel@iogearbox.net, bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, David Carlier Subject: [PATCH net] net: ti: icssg-prueth: fix XDP_TX from the AF_XDP zero-copy RX path Date: Sat, 20 Jun 2026 22:37:56 +0100 Message-ID: <20260620213756.87499-1-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On XDP_TX from the zero-copy RX path, emac_run_xdp() converts the xsk buffer via xdp_convert_zc_to_xdp_frame(), which clones the data into a fresh MEM_TYPE_PAGE_ORDER0 page that is not DMA mapped. Transmitting it as PRUETH_TX_BUFF_TYPE_XDP_TX derives the DMA address with page_pool_get_dma_addr(), reading an uninitialized page->dma_addr, so the device DMAs from a bogus address (corrupt TX, or an IOMMU fault). Pick the TX buffer type from the frame's memory type: keep PRUETH_TX_BUFF_TYPE_XDP_TX for page_pool frames and use PRUETH_TX_BUFF_TYPE_XDP_NDO for the cloned zero-copy frame. The completion path already unmaps PRUETH_SWDATA_XDPF buffers. Fixes: 7a64bb388df3 ("net: ti: icssg-prueth: Add AF_XDP zero copy for RX") Cc: stable@vger.kernel.org Signed-off-by: David Carlier --- drivers/net/ethernet/ti/icssg/icssg_common.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/icssg/icssg_common.c b/drivers/net/ethernet/ti/icssg/icssg_common.c index 82ddef9c17d5..302e700ea17d 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_common.c +++ b/drivers/net/ethernet/ti/icssg/icssg_common.c @@ -804,6 +804,7 @@ EXPORT_SYMBOL_GPL(emac_xmit_xdp_frame); */ static u32 emac_run_xdp(struct prueth_emac *emac, struct xdp_buff *xdp, u32 *len) { + enum prueth_tx_buff_type tx_buff_type; struct net_device *ndev = emac->ndev; struct netdev_queue *netif_txq; int cpu = smp_processor_id(); @@ -826,11 +827,21 @@ static u32 emac_run_xdp(struct prueth_emac *emac, struct xdp_buff *xdp, u32 *len goto drop; } + /* In AF_XDP zero-copy mode xdp_convert_buff_to_frame() + * clones the xsk buffer into a fresh MEM_TYPE_PAGE_ORDER0 + * page that is not DMA mapped. Such a frame must be mapped + * via the NDO path; only a page pool-backed frame already + * carries a usable page_pool DMA address. + */ + tx_buff_type = xdpf->mem_type == MEM_TYPE_PAGE_POOL ? + PRUETH_TX_BUFF_TYPE_XDP_TX : + PRUETH_TX_BUFF_TYPE_XDP_NDO; + q_idx = cpu % emac->tx_ch_num; netif_txq = netdev_get_tx_queue(ndev, q_idx); __netif_tx_lock(netif_txq, cpu); result = emac_xmit_xdp_frame(emac, xdpf, q_idx, - PRUETH_TX_BUFF_TYPE_XDP_TX); + tx_buff_type); __netif_tx_unlock(netif_txq); if (result == ICSSG_XDP_CONSUMED) { ndev->stats.tx_dropped++; -- 2.53.0