From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (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 C8D4B128819 for ; Thu, 24 Apr 2025 00:28:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745454500; cv=none; b=Beu5SxOUAdzu3uA7wAEsC8L8YtO6uWCM5aRfYxC74toilc31VrIG8bdrtKKcV9ZuP9mh6RULmckwHoDz0JQhByvrTA+DKuetICor7THikP56F4jdAj2d0IyDRci6I6yB3vMuA+X5IeMp2Iu+3x18bvhC4XuJJRuKnfzw8OEUGX4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745454500; c=relaxed/simple; bh=CC5P9PlTFOFYmpGkh+AgeMpeAfxK9NmmEpB4vEaUjMk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K8aIvkQfXI5+P9jJCsPyTqjJkr3gKBWW7slY6DHvVmP4nWhjO841WbWAtmy7qgbG1ryMezNtpSF1b1lVom+SgbKndNK02D3C6p7Qut0CcP2iBYlIZs9ZP7/SK3d8PdeqZl9LFSmXsS34D8w4xOzc4hfdweAyMhgyyb8cp4pEZOc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=gi9Jco+a; arc=none smtp.client-ip=209.85.215.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="gi9Jco+a" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-b0b2ce7cc81so359410a12.3 for ; Wed, 23 Apr 2025 17:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1745454497; x=1746059297; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K0pZyEyvgBt8oFD4ZrZQFJhXNyLvOB+O0xQ+Wcll9kk=; b=gi9Jco+aEqNtbuyDmscJmg9o5IK/DK1zy6puezcbPjsbBSPJKI+Meuy8cuotwPLx5Y UIPLcYZuj5PdAU25UiZdjQ1pKX6lzWIHfjAbLI6W8esUbXsxGM6o32Mh1dH9yWRhSZmZ aQZSpBl49lHIJz+HRB3PB3KFttNvWiZCkfEpw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745454497; x=1746059297; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K0pZyEyvgBt8oFD4ZrZQFJhXNyLvOB+O0xQ+Wcll9kk=; b=i+NEO+bUkxiMpg4JC3mOdcSKEajWlA8TJT7qL05hPK+Nvcxf714igN7qZdI392jmzU vHjsoOJ0MlKTIKJv1sRqRLAYgSu2hL3TRTHlwy9OiKkFf6ucGhUIPfxHDHcoR8q6+mCg i52/oTADdCMDwuzYUNp26Wa2KANiMGKCzHxtV43wi3ze8fNgQYqn/3u50hIASc81ZWK6 kuDWwoqZ+G2PbfKafMMsuvLMQwDfLWeWwVW/zSzwJDgdjBCi9HYjUzvQeVoRy8pTV6ds WFxKjhpJyYEGyLYXZlOaO4cnbpZHX9qtIWTogM6ZMp/ivh59G2Ju+FpW99QgI5zYXpmf R8/w== X-Gm-Message-State: AOJu0Yx9NFTXC6G/izAJnGm3yTQbIcOtEYKy4BB3EPjJyJNqXIK0LCme MOOm0bYUXqt4SAbDjl8BEwaOg9Dlc+njk0r1TN/fsUfPtajB8W7u7cEuDIGePrP8jvCC42xPJbf 8tU9O8DcGq1UsQTSccH1gU+DrKek6wiMX3BZQtzcWBYwrIqgRkzvCj7NRwSTPJrHg26qllCx8kV xpvek++2WducpIR+qaOYWRTHSlb0S3s2ow7NY= X-Gm-Gg: ASbGncsSSKTpAP3mb5cT00jVLHDMqyEZlgbNrT1O70DUweeN/SKuZgOrMC2JXMUNkPh ASWLXqDJn8qTNjYTSF7y/lBuk8Ikzu8jci22rde+DDwVHSH7tdvmrZ9yAl4VAeJxiRUKu+QvHV0 AypUfB2y93UV2cFKNz3w6ziRTgtlocs4RlKRPii58aZhpGxeXXQZ7jVep1KqSNe5JCTBp0lzqxt dBv4I8RINicz49wFMzHzV1xD1YsMpXX3jJNd+GUDj15wf7sr9N4rNceMDf+rUlVMXuJaA76KiTT w5a6fxxIL+cUGBDWGq9Fd974w2BTPv9P1HDmWuqGLRhha2HN X-Google-Smtp-Source: AGHT+IEAmg0XR+f+4dbbuaII7I/1Nj1o8g+oD7f7K+/8qFPWxrVWr1FeBq7fThzkgJQPYmfowLY1oQ== X-Received: by 2002:a17:90a:f945:b0:2f6:be57:49d2 with SMTP id 98e67ed59e1d1-309ed29c8d8mr1097904a91.17.1745454497172; Wed, 23 Apr 2025 17:28:17 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-309ee7c4054sm83013a91.23.2025.04.23.17.28.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:28:16 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: kuba@kernel.org, shaw.leon@gmail.com, pabeni@redhat.com, Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , Shuah Khan , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , linux-kernel@vger.kernel.org (open list), linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK), bpf@vger.kernel.org (open list:XDP (eXpress Data Path):Keyword:(?:\b|_)xdp(?:\b|_)) Subject: [PATCH net-next v4 2/3] selftests: drv-net: Factor out ksft C helpers Date: Thu, 24 Apr 2025 00:27:32 +0000 Message-ID: <20250424002746.16891-3-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424002746.16891-1-jdamato@fastly.com> References: <20250424002746.16891-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Factor ksft C helpers to a header so they can be used by other C-based tests. Signed-off-by: Joe Damato --- tools/testing/selftests/drivers/net/ksft.h | 56 +++++++++++++++++++ .../selftests/drivers/net/xdp_helper.c | 49 +--------------- 2 files changed, 58 insertions(+), 47 deletions(-) create mode 100644 tools/testing/selftests/drivers/net/ksft.h diff --git a/tools/testing/selftests/drivers/net/ksft.h b/tools/testing/selftests/drivers/net/ksft.h new file mode 100644 index 000000000000..c30a02da903f --- /dev/null +++ b/tools/testing/selftests/drivers/net/ksft.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#if !defined(__NET_KSFT_H__) +#define __NET_KSFT_H__ + +#include +#include +#include + +static void ksft_ready(void) +{ + const char msg[7] = "ready\n"; + char *env_str; + int fd; + + env_str = getenv("KSFT_READY_FD"); + if (env_str) { + fd = atoi(env_str); + if (!fd) { + fprintf(stderr, "invalid KSFT_READY_FD = '%s'\n", + env_str); + return; + } + } else { + fd = STDOUT_FILENO; + } + + write(fd, msg, sizeof(msg)); + if (fd != STDOUT_FILENO) + close(fd); +} + +static void ksft_wait(void) +{ + char *env_str; + char byte; + int fd; + + env_str = getenv("KSFT_WAIT_FD"); + if (env_str) { + fd = atoi(env_str); + if (!fd) { + fprintf(stderr, "invalid KSFT_WAIT_FD = '%s'\n", + env_str); + return; + } + } else { + /* Not running in KSFT env, wait for input from STDIN instead */ + fd = STDIN_FILENO; + } + + read(fd, &byte, sizeof(byte)); + if (fd != STDIN_FILENO) + close(fd); +} + +#endif diff --git a/tools/testing/selftests/drivers/net/xdp_helper.c b/tools/testing/selftests/drivers/net/xdp_helper.c index aeed25914104..d5bb8ac33efa 100644 --- a/tools/testing/selftests/drivers/net/xdp_helper.c +++ b/tools/testing/selftests/drivers/net/xdp_helper.c @@ -11,56 +11,11 @@ #include #include +#include "ksft.h" + #define UMEM_SZ (1U << 16) #define NUM_DESC (UMEM_SZ / 2048) -/* Move this to a common header when reused! */ -static void ksft_ready(void) -{ - const char msg[7] = "ready\n"; - char *env_str; - int fd; - - env_str = getenv("KSFT_READY_FD"); - if (env_str) { - fd = atoi(env_str); - if (!fd) { - fprintf(stderr, "invalid KSFT_READY_FD = '%s'\n", - env_str); - return; - } - } else { - fd = STDOUT_FILENO; - } - - write(fd, msg, sizeof(msg)); - if (fd != STDOUT_FILENO) - close(fd); -} - -static void ksft_wait(void) -{ - char *env_str; - char byte; - int fd; - - env_str = getenv("KSFT_WAIT_FD"); - if (env_str) { - fd = atoi(env_str); - if (!fd) { - fprintf(stderr, "invalid KSFT_WAIT_FD = '%s'\n", - env_str); - return; - } - } else { - /* Not running in KSFT env, wait for input from STDIN instead */ - fd = STDIN_FILENO; - } - - read(fd, &byte, sizeof(byte)); - if (fd != STDIN_FILENO) - close(fd); -} /* this is a simple helper program that creates an XDP socket and does the * minimum necessary to get bind() to succeed. -- 2.43.0