From nobody Fri Apr 3 04:44:49 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 A72A6199920 for ; Wed, 18 Feb 2026 04:18:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771388281; cv=none; b=EYqWMxAk6sLICjOQ0Y9XsJCEC0Xvn5+2qmo9Pwu2ShhaTGyvZ1hQVmPW0KlqvR6iRBpxc7Q06pDwMs6qXeUqylR8tzJLk3wS8mIC96MCcYTqCJoEoxU7NqsQ3PdFWBjqXz63X5Lj2IdhvEGISS0sACcIFG9B0oqUXXb8kOwyNdw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771388281; c=relaxed/simple; bh=buDniwPppzJrGVOjBeL8+qFvwMiSlPJFeI/3U5o+Z8E=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=ak+CdGB58rSypS4l3fidSM+6bPzsMApdA1IuoBcjumI4d3u5wrsIV/0QrnvpowAzzVv1RBgbeOq3ORuUx2O+ONshWhB3V8lS7ORFXtdZ4l/AoC3nBNnjIh4TDPwYt0jTQuD6kQYrVDKFP+xdf6VJQcY8f4U3MtUBZ2MmJlWaTzI= 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=NPMQKf4B; arc=none smtp.client-ip=209.85.214.176 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="NPMQKf4B" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2a79998d35aso32086375ad.0 for ; Tue, 17 Feb 2026 20:18:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771388280; x=1771993080; 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=NQRKTlFA2C03Hko9lNIUE0/dQo3+GelVNiCBLYxEf+8=; b=NPMQKf4BLYjCXaIGFDWTRSGZDZj1uZs6ijhZudFZX9Eudxrk/F0STK7Af04+8iM5CA /VedWRo3PjvRuhmdpNE3PvVTkLbqhKb/E2hg4vEtoS5he0dqy54qs45RXKKCcoTWTpwH B9uOPerRi/CvNuRiB1fKxtPYaRosCQGb7MntkWlm67Pu8BTin+DIYE0UEwWB40DzokK7 6oq6JRr4pC7NcwkgOYzhcDzWLYu0P1yZbmQOi9GBP9nDGvdQzjU2ERAXx4ZtFrkJkXVN S7KOjRuzOPw8gKVPMdUhKWz0ki+yC4EYR+8Tp92PfzSYPIPE29Z8fMsfbmGLesBgO77N vUGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771388280; x=1771993080; 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=NQRKTlFA2C03Hko9lNIUE0/dQo3+GelVNiCBLYxEf+8=; b=vCXX8+aB9LSGKLGFwrd6z6eaHNL8ega5DRr9Ce06axDQrs9exeRui+Tj4b8yG05M05 Y2OC+emv6+mMnU647+ilb/3xh8Jjty8qPoA3LHBUU/Vd8ANYJAsQdk1a1Tq++TI9eZwC 7Oa2aTeZBSlpbyHjNL7Mcyz9gZHbHioZBvtEmlTkqmBCrVS5BlodFkEDQHyOUkrPB+PU H/WSae0w1la9OmRJ9ja7U/J9+CHCJdtjEebGGcOfP6Z9vaYKxv+IkAU/uNbeiovf5VZJ C+lFHAEGg48BBCOzDEKLeCr2yq9WK+0u75/92VWPbbpJNQLOsxyYs/o/N9rj1pFWkj5C k2BA== X-Forwarded-Encrypted: i=1; AJvYcCVhhQbuPRLSnlkLrYMXIsZxe7Ve+Do0ff0pXVg2PNkCvLkhgv8mVcPuEYWewCP2j2SJDfv8E5NNEPDkm3A=@vger.kernel.org X-Gm-Message-State: AOJu0YxK3NHYgH7jJhlc/GSvuLFP0V2eRcNjZfjtdx1QZDZLJc+BiDf+ o9DtkQvfHuqSHSA7Im9p28A9RZIvwslikMTw+YNuHaXILBvwdrpUwWgq X-Gm-Gg: AZuq6aL+smVCIZLMgROOp8nfB8iTbQubum9/qfUi+3dSTTacSDOIuHG/3nI9hVJB4r7 vPwF5FO+IxFkWe0eJeswPe/BC4QcTFVsObr627p6mYeQckhT5/3AiwAe9vP229YE6MD09QEs+8o t9avGidQoJbRFegXHUVPWx8GlwEx9hsRhj6daPQ8vHXgb+OLsLQ8AMywUXFUG8jjiwOodod5v/q Kl5rKjku9t9iMK51hlMTLawKbZhq6W3YDuIzTNPjH5BNOmNc9WBUj24V2sHBF2oyzlG4RpFOuZX EvGXjmDcSQhNeV+UggCEf7yjipRVZdQ+W2IcpgDYG700cYlxVZDy+SFgzBF77mrcayoave5Pf+I fKC7+MuMLbGKI97UlqQYimWi1GZ6tF25hWwH64lNIYFl4DUMkrukUtz7m4aQZHmnYKcpMR6EOfO 2ROYpN7Z64De1Spy78LaZtBPJH2L+dfih2yIlE6GXVxj2a8O+0fgb2eopucKFSINR7Q7FsAYYvb 0yoJjLhXOdr7eVzuhfPtl0t14gnpyEJSxjxt6s8 X-Received: by 2002:a17:903:b0b:b0:29e:9c82:a918 with SMTP id d9443c01a7336-2ad50ecd9bemr7677975ad.22.1771388275238; Tue, 17 Feb 2026 20:17:55 -0800 (PST) Received: from localhost.localdomain ([2401:4900:c906:adbd:f506:1dbc:e3f3:e38e]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1aaddc46sm118618985ad.73.2026.02.17.20.17.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Feb 2026 20:17:54 -0800 (PST) From: Anand Kumar Shaw To: bpf@vger.kernel.org, netdev@vger.kernel.org Cc: kuba@kernel.org, ast@kernel.org, hawk@kernel.org, john.fastabend@gmail.com, davem@davemloft.net, sdf@fomichev.me, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, linux-kernel@vger.kernel.org, Anand Kumar Shaw Subject: [PATCH v2] bpf: cpumap: add missing XDP_ABORTED handling in xdp prog runner Date: Wed, 18 Feb 2026 09:47:45 +0530 Message-Id: <20260218041745.36791-1-anandkrshawheritage@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" cpu_map_bpf_prog_run_xdp() handles XDP_PASS, XDP_REDIRECT, and XDP_DROP but is missing an XDP_ABORTED case. Without it, XDP_ABORTED falls into the default case which logs a misleading "invalid XDP action" warning instead of tracing the abort via trace_xdp_exception(). Add the missing XDP_ABORTED case with trace_xdp_exception(), matching the handling already present in the skb path (cpu_map_bpf_prog_run_skb), devmap (dev_map_bpf_prog_run), and the generic XDP path (do_xdp_generic). Also pass xdpf->dev_rx instead of NULL to bpf_warn_invalid_xdp_action() in the default case, so the warning includes the actual device name. This aligns with the generic XDP path in net/core/dev.c which already passes the real device. Signed-off-by: Anand Kumar Shaw --- Changes in v2: - Pass xdpf->dev_rx to bpf_warn_invalid_xdp_action() instead of NULL (Jakub Kicinski) --- kernel/bpf/cpumap.c | 7 +++++-- kernel/bpf/devmap.c | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c index 04171fbc39cb..15c377fe4b0d 100644 --- a/kernel/bpf/cpumap.c +++ b/kernel/bpf/cpumap.c @@ -195,7 +195,7 @@ static int cpu_map_bpf_prog_run_xdp(struct bpf_cpu_map_= entry *rcpu, =20 rxq.dev =3D xdpf->dev_rx; rxq.mem.type =3D xdpf->mem_type; - /* TODO: report queue_index to xdp_rxq_info */ + rxq.queue_index =3D xdpf->queue_index; =20 xdp_convert_frame_to_buff(xdpf, &xdp); =20 @@ -221,7 +221,10 @@ static int cpu_map_bpf_prog_run_xdp(struct bpf_cpu_map= _entry *rcpu, } break; default: - bpf_warn_invalid_xdp_action(NULL, rcpu->prog, act); + bpf_warn_invalid_xdp_action(xdpf->dev_rx, rcpu->prog, act); + fallthrough; + case XDP_ABORTED: + trace_xdp_exception(xdpf->dev_rx, rcpu->prog, act); fallthrough; case XDP_DROP: xdp_return_frame(xdpf); diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index 2625601de76e..aa2e929792c8 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c @@ -346,6 +346,7 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_pr= og, u32 act; int err; =20 + rxq.queue_index =3D xdpf->queue_index; xdp_convert_frame_to_buff(xdpf, &xdp); xdp.txq =3D &txq; xdp.rxq =3D &rxq; --=20 2.39.5 (Apple Git-154)