From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) (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 186F2292B44 for ; Fri, 3 Apr 2026 15:37:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775230634; cv=none; b=cpzYOMDidIPUmxre9Wr7OM1NRdVXPSrNFgj6taABxt43LW3TaYqC0WgnRIVgkfHgRvxL0IuVj4MllPmDa+Y8GDdSH39bPmLNflAp58o6M5SFb+1AS4rj/kHZpj/2Ep5E82o5De0PcGg7IO0UBZ18OnJTDBQZWHGhjNc/z3uArzs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775230634; c=relaxed/simple; bh=YZ9x9LlQUdaWzhrdGk3G6BEBa/K0v+Vx0017f8NKskQ=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=IY9qxRNYdpsX1kovQmUuCmhFOG68DK352vQrslAb/YDsiO9FtxR+6xDDlOB8MuMt1f7swlqtf300YyOqTj+f8NYHa9NpB91L8qKfWFFcn8h0xtyLLa37CPLWQwitKEExafI0G0wBH0g0W/mgzvga7UpBfT0981pA2oeEcZYhN6Q= 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=X65IIqZe; arc=none smtp.client-ip=209.85.128.171 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="X65IIqZe" Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-78fc4425b6bso19599237b3.1 for ; Fri, 03 Apr 2026 08:37:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775230631; x=1775835431; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=KpuvJuy/tFtXZE3ikq8tJ0F1YYf2MuYLH559k2dBC5U=; b=X65IIqZeuVffj6BLMsybZKW9d7TTWuCd9/LMImdp7VgmNlg3MlwLn6+In6wGr3V2lK jiFdCpcDAcyFszfFS45ZN5nC1p6kRYNNlo2uTKDV3c4IQIO9Nr31gFDvgAJ1WortHWaG 0Gzo9EqJRijdNOjpmRVpHiQqWQi3trkclj9lvI6eSLf+7AdIGqmifqULjOWAKIf435iI LEQ8Ns/Cp7jDXaMRNtVt6obbsZhX4wU7mp13Vj6fC/fihrv+b/AGYZrwASnaWt/ZHbGd 0wTpb9oeFg5fBZ2ZzD7f/03qyxklPCHg8swgOC+t26uiDUaKTzDsBvRoO0aQ8gdvYqK2 Eo+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775230631; x=1775835431; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KpuvJuy/tFtXZE3ikq8tJ0F1YYf2MuYLH559k2dBC5U=; b=SojlKRx2xTFl4L+LozDg4NGKQQVC+Mdx5KiBcCy/aHQzuSmepHX9auP7mb0G1aAgpV A5Y4aqkbJDcU/mOGNnhEllccfip1bhbIZLQN5//LTZuGMz7JahYVc3zAYmHQ8yYkHrPo xAkhBLP+VO0NS+NJO0459JyQlun5g/OpRQBDAY+lRnyhr7hKnpWrxhi+rsH+oxMhV1CS ArsN9XZ9XfWmTWWUVS/EwM5SCWeCEMVVnCv4extwQjeo5KiMeixEq7+COoxZ5Z+ti64R Tu+Bn2SnyiCp5jUXx2c6C8bfVFPpkMKf6eoOrI+ZVmRLBwAsGQcp5ZzcMAuNL7UHACom Ul9Q== X-Forwarded-Encrypted: i=1; AJvYcCW+sL2nthQtDT0SkGJwEKcvfqHMw4RIzb2cQ8yKrDedfv5ClqseMrudoLbgXoZ0ceFdeaQENT6bZ8hJH10=@vger.kernel.org X-Gm-Message-State: AOJu0YxaYuVQigZbLvuAypH1OSDebK3fYmRpgFsSuJipsfU6RpMAwEJ+ cl+IzpsqM4hOZyPNZT/P6b3tZijo/qB8mEY35el73dbmYnS/BBn+BIw1 X-Gm-Gg: AeBDieuXpH7WnIWWMFqNpt9zsR8NosQk3WJFI0cNvgfwE/wm7r3xnBteiakUSPkllbS NVcndSXhfAVKvEuu732I60TiLuk9l2YfY7ZSQiihR9sjTmMzw97QYc9+1NtypJrthtkaYIpCaic KkPHJtYpWvJMJFrj9PyyX9HrU9YlX+D5tPCaonQnQi2ICbH60//Fzyw/j/8xRoByET20VPmKFa9 5aFXftNtqak0JDwExcKiZ0HgJdHp7jQSvQjkZUCF6u5Gb0ovnhnxMUFvIvTyUtcnGkd3P9gKF+5 GXoMGuV4938NGq2md5gPbcFDK4LOn64KC+g7+E5pnjMigrxi0FR5H0jmCDdQuUQ2H9HAyqgFiBW N0vkkzOBn/FlnQY/RMMDMwjj4x9CSgiHPcXhdZ2RS+pBahLkHgNITbj9XbdK04LLByVy/JOvpAW HbR1+z3WLmGbjOh/komgg0ih+YGcfn+uIM1zl+IZ3fB9f2b1UpCzgtC+NbPLp43o8M/7PbYqxAz mLR X-Received: by 2002:a05:690c:dd4:b0:79a:b75e:1509 with SMTP id 00721157ae682-7a4d6158cbamr36144717b3.43.1775230631157; Fri, 03 Apr 2026 08:37:11 -0700 (PDT) Received: from gmail.com (172.165.85.34.bc.googleusercontent.com. [34.85.165.172]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7a3709075besm22668317b3.25.2026.04.03.08.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2026 08:37:10 -0700 (PDT) Date: Fri, 03 Apr 2026 11:37:10 -0400 From: Willem de Bruijn To: Joe Damato , netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: andrew+netdev@lunn.ch, linux-kernel@vger.kernel.org, willemb@google.com, Joe Damato , linux-kselftest@vger.kernel.org Message-ID: In-Reply-To: <20260402232203.2004496-4-joe@dama.to> References: <20260402232203.2004496-1-joe@dama.to> <20260402232203.2004496-4-joe@dama.to> Subject: Re: [net-next 3/3] selftests/net: Test PACKET_AUXDATA Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Joe Damato wrote: > Extend the packet socket selftest, adding a recvmsg path, to test > PACKET_AUXDATA. Check basic attributes of tpacket_auxdata. > > Signed-off-by: Joe Damato > --- > tools/testing/selftests/net/psock_snd.c | 57 ++++++++++++++++++++++-- > tools/testing/selftests/net/psock_snd.sh | 5 +++ > 2 files changed, 59 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/net/psock_snd.c b/tools/testing/selftests/net/psock_snd.c > index 7bbce274b9f0..682e0afe364d 100644 > --- a/tools/testing/selftests/net/psock_snd.c > +++ b/tools/testing/selftests/net/psock_snd.c > @@ -40,6 +40,7 @@ static bool cfg_use_qdisc_bypass; > static bool cfg_use_vlan; > static bool cfg_use_vnet; > static bool cfg_drop; > +static bool cfg_aux_data; > > static char *cfg_ifname = "lo"; > static int cfg_mtu = 1500; > @@ -281,9 +282,26 @@ static int setup_rx(void) > > static void do_rx(int fd, int expected_len, char *expected) > { > + char cmsg_buf[1024] = {}; > + struct msghdr msg = {}; > + struct iovec iov[1]; > int ret; > > - ret = recv(fd, rbuf, sizeof(rbuf), 0); > + if (cfg_aux_data) { > + iov[0].iov_base = rbuf; > + iov[0].iov_len = sizeof(rbuf); > + > + msg.msg_iov = iov; > + msg.msg_iovlen = 1; > + > + msg.msg_control = cmsg_buf; > + msg.msg_controllen = sizeof(cmsg_buf); > + > + ret = recvmsg(fd, &msg, 0); > + } else { > + ret = recv(fd, rbuf, sizeof(rbuf), 0); > + } > + > if (ret == -1) > error(1, errno, "recv"); > if (ret != expected_len) > @@ -292,6 +310,31 @@ static void do_rx(int fd, int expected_len, char *expected) > if (memcmp(rbuf, expected, ret)) > error(1, 0, "recv: data mismatch"); > > + if (cfg_aux_data) { > + struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg); > + struct tpacket_auxdata *adata; > + > + if (!cmsg) > + error(1, 0, "auxdata null"); > + > + if (cmsg->cmsg_level != SOL_PACKET) > + error(1, 0, "cmsg_level != SOL_PACKET"); > + > + if (cmsg->cmsg_type != PACKET_AUXDATA) > + error(1, 0, "cmsg_type != PACKET_AUXDATA"); > + > + adata = (struct tpacket_auxdata *)CMSG_DATA(cmsg); > + > + if (adata->tp_net != ETH_HLEN) > + error(1, 0, "cmsg tp_net != ETH_HLEN"); > + > + if (adata->tp_len != expected_len) > + error(1, 0, "cmsg tp_len != %u", expected_len); > + > + if (adata->tp_snaplen != expected_len) > + error(1, 0, "cmsg tp_snaplen != %u", expected_len); > + } > + > fprintf(stderr, "rx: %u\n", ret); > } > > @@ -312,6 +355,10 @@ static int setup_sniffer(void) > if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &one, sizeof(one))) > error(1, errno, "setsockopt SO_RCVBUF"); > > + if (cfg_aux_data) > + if (setsockopt(fd, SOL_PACKET, PACKET_AUXDATA, &one, sizeof(one))) > + error(1, errno, "setsockopt PACKET_AUXDATA"); > + > pair_udp_setfilter(fd); > do_bind(fd); > > @@ -322,8 +369,11 @@ static void parse_opts(int argc, char **argv) > { > int c; > > - while ((c = getopt(argc, argv, "bcCdDgl:qt:vV")) != -1) { > + while ((c = getopt(argc, argv, "abcCdDgl:qt:vV")) != -1) { > switch (c) { > + case 'a': > + cfg_aux_data = true; > + break; > case 'b': > cfg_use_bind = true; > break; > @@ -436,7 +486,8 @@ static void run_test(void) > check_packet_stats(fds); > } > > - do_rx(fdr, cfg_payload_len, tbuf + total_len - cfg_payload_len); > + if (!cfg_aux_data) > + do_rx(fdr, cfg_payload_len, tbuf + total_len - cfg_payload_len); Slight preference to instead detect that this is a read not from a packet socket and skip the cmsg processing inside do_rx as a result. A roundabout way would be using getsockname. Simpler may be just to pass a new boolean to do_rx is_psock or os.