From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.167.198 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794425061; b=G+KnMXC6X4LEVSfguoq+kJoXvKB5uU2qg+OCcGmolmNu3/MchYWyBIY878wnDiYtfhqe oIeI25HKEBweSgPBIlHwtXNRACoYJd3tNxX2rY1mYdy/GQGjL+Zi46PbWt6cqtbXIGTGj jX6qz+BQBQpE/3iO+gyQ3nIy57Di2VjChV+yh4NBeTeZFXKHcIVUmqf02qMUikT49g2PP ng+fII2fPY86+YcLls6Dv4Tz4dFs1270U7NWxprDx7/3c11QyxxNiZJUfpBAns1DFIg07 Ju0+heftfcB4ueFOXbvB9YlkOQymrzicDF5ycOqV2G5cymPjRrUzcctAxwc1uuHjNbQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794425061; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=jeGS53i3H2ZA/AB75TkRMSZsgx42pQ2yxXWF/NRY1NA=; b=TD+xh60OTcV8R8lUHTTDfrQrYg6qkj+Go0FQt6SlQ/VeEj81GiwDJ333hlTKLmitG7Jp KglEez7bf7KO4x0wSJizorfhnRNdLe8mC6Kgr8VBZnJGnYcmEwDEJ3tqPn61JAlEtMMcz Zw9rT5n+WJHONr9tULnJ910lQAJuSheue5BOvVCQxKVjN4gDeWpZ4h87QQo2YCtg49AvI +TM15PYMhLE7OCyJrXvbDC00/kjHTfgniDm4u6Q6LxvFPhn7Hkrq5J304NPgA1wkKqg3Z M+aR6mu83bg/GLSmu2SA/Htq6MSEfB2DAHBKgtvhCJPQ7XjHxAox465DJfgr6kc8QuQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=cQkqVn92; arc=none smtp.remote-ip=209.85.167.198 Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5040060A2602 for ; Wed, 11 Nov 2026 19:24:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 5040060A2602 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=cQkqVn92 Received: by mail-oi1-f198.google.com with SMTP id 5614622812f47-4f2040e10d8so2560721b6e.3 for ; Wed, 11 Nov 2026 11:24:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794425059; x=1795029859; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=jeGS53i3H2ZA/AB75TkRMSZsgx42pQ2yxXWF/NRY1NA=; b=cQkqVn92T4Oui/+VCglZgs8fJXAig6R5l+VclvZ+Jt0ppAVZz4yDq1yK/FyJHtdx+g Y9AiC9GzQYqQro0gB91+f6zfs0CI38Rz0k7LPkpjFOsYWA1zXOu+8tnZI0ih0tUHOjom VABERVCjvucj3eWe0UUcbmbkNqpagIeM/SCJrDtbrSlGJHN/SVcH+SjdOaXs54xDLKp5 dW5KWH23Ywn8CdnSF45Z/tKhvFCVaL2W1JCCVW2w6DdjUey1K/IgHSnBZoUUdTv33CKi h38Ig4xOV5fIjWj+37pSTKurD5RI10wq9TInvnW5n07x3XTcdyNRemmhhvbbzPFv3JFc 9MeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794425059; x=1795029859; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=jeGS53i3H2ZA/AB75TkRMSZsgx42pQ2yxXWF/NRY1NA=; b=K3GSQ8EuCeDikgcfqUPiUGmJj7NTNE8C0Umt5gL9fgyBix8nwYI04mb/Umf5tvO6rn PGcbJB46jUY0hFnpz4gCya3sP1aZOiFJKS6Rj+3m/M/7NqI5sJy7NccBlwu9uohCaz2R nGmHNbNCRLTiGeCuauN61sYZAmlQIACQ8Dhu/uvmBn0gHT48Cw0ooFynGn4QLn/qfOuO uh3imuaV/Ubcg+hAhXQfV1sdJTyXzdz+yjcS7ZsxOjCbeNav2X7YR9JLRwklksaLC6P1 4qmZFP5+Lzu6MOt141uAKrbEi4RAX34UxXHi1dbI6PBlpcz9ci6nqjNzFJ99vC6cuVjE 44Wg== X-Forwarded-Encrypted: i=1; AL+hErFwLtYKPxhFcDJ1lh2Gh4rcB9cgKxG87WGIor/oa1z6NZpwAfoYNCmYpsmDqZ01KMWyC9XOPIfhMRo=@vger.kernel.org X-Gm-Message-State: APuU4Z/Zz71wQLVuRDwrywr+CFOxQy+mKc7cttBZ24nXD/jdlUotNYkL oCA+IrKo8jKcpTrlEE9TD9Tyv9iKnUFJ3VnhWbRoln0xyin9Jl6XAixIWY4NfgvVQ4t+X+HDhGY 9EGZ/HPMBrogEYg== X-Received: from jagm2.prod.google.com ([2002:a05:6638:40c2:b0:620:1989:fc1c]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6809:19:20b0:567:cbf5:bb96 with SMTP id 5614622812f47-56cc533e313mr527002b6e.44.1794425059253; Wed, 11 Nov 2026 11:24:19 -0800 (PST) Date: Wed, 11 Nov 2026 19:24:07 +0000 In-Reply-To: <20261111192411.4133780-1-dmatlack@google.com> X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261111192411.4133780-1-dmatlack@google.com> X-Mailer: git-send-email 2.56.0.567.gdb80ae8cd5-goog Message-ID: <20261111192411.4133780-4-dmatlack@google.com> Subject: [RFC PATCH 3/7] vfio: selftests: Allow multiple BDFs in VFIO_SELFTESTS_BDF From: David Matlack To: dri-devel@lists.freedesktop.org, iommu@lists.linux.dev, kvm@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-media@vger.kernel.org, linux-pci@vger.kernel.org Cc: Alex Mastro , Alex Williamson , Bjorn Helgaas , "=?UTF-8?q?Christian=20K=C3=B6nig?=" , David Matlack , Jason Gunthorpe , Josh Hilke , Kevin Tian , Leon Romanovsky , Logan Gunthorpe , Matt Evans , Matt Evans , Mina Almasry , Samiullah Khawaja , Shuah Khan , Sumit Semwal , Vipin Sharma Content-Type: text/plain; charset="UTF-8" Parse whitespace-separated PCI BDFs from VFIO_SELFTESTS_BDF in vfio_selftests_get_bdfs() instead of requiring a single BDF. Multi-device tests such as P2P DMA tests need two or more devices even when invoked through run_kselftest.sh without command-line arguments. Single-device callers using vfio_selftests_get_bdf() continue to receive the first BDF. Signed-off-by: David Matlack --- tools/testing/selftests/vfio/lib/libvfio.c | 53 ++++++++++++++++------ 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/vfio/lib/libvfio.c b/tools/testing/selftests/vfio/lib/libvfio.c index 3a3d1ed635c1..448d11442b53 100644 --- a/tools/testing/selftests/vfio/lib/libvfio.c +++ b/tools/testing/selftests/vfio/lib/libvfio.c @@ -2,6 +2,7 @@ #include #include +#include #include #include @@ -32,38 +33,62 @@ static char **get_bdfs_cmdline(int *argc, char *argv[], int *nr_bdfs) return *nr_bdfs ? &argv[i] : NULL; } -static char *get_bdf_env(void) +static char **get_bdfs_env(int *nr_bdfs) { - char *bdf; + static char **bdfs; + static int count; + char *env, *tok, *saveptr; + int cap = 0; - bdf = getenv("VFIO_SELFTESTS_BDF"); - if (!bdf) + if (bdfs) { + *nr_bdfs = count; + return bdfs; + } + + env = getenv("VFIO_SELFTESTS_BDF"); + if (!env) return NULL; - VFIO_ASSERT_TRUE(is_bdf(bdf), "Invalid BDF: %s\n", bdf); - return bdf; + env = strdup(env); + VFIO_ASSERT_NOT_NULL(env); + + for (tok = strtok_r(env, " \t\n", &saveptr); tok; + tok = strtok_r(NULL, " \t\n", &saveptr)) { + VFIO_ASSERT_TRUE(is_bdf(tok), "Invalid BDF: %s\n", tok); + if (count == cap) { + cap = cap ? cap * 2 : 4; + bdfs = realloc(bdfs, cap * sizeof(*bdfs)); + VFIO_ASSERT_NOT_NULL(bdfs); + } + bdfs[count++] = tok; + } + + if (!count) { + free(env); + return NULL; + } + + *nr_bdfs = count; + return bdfs; } char **vfio_selftests_get_bdfs(int *argc, char *argv[], int *nr_bdfs) { - static char *env_bdf; char **bdfs; bdfs = get_bdfs_cmdline(argc, argv, nr_bdfs); if (bdfs) return bdfs; - env_bdf = get_bdf_env(); - if (env_bdf) { - *nr_bdfs = 1; - return &env_bdf; - } + bdfs = get_bdfs_env(nr_bdfs); + if (bdfs) + return bdfs; fprintf(stderr, "Unable to determine which device(s) to use, skipping test.\n"); fprintf(stderr, "\n"); - fprintf(stderr, "To pass the device address via environment variable:\n"); + fprintf(stderr, "To pass the device address(es) via environment variable:\n"); fprintf(stderr, "\n"); - fprintf(stderr, " export VFIO_SELFTESTS_BDF=\"segment:bus:device.function\"\n"); + fprintf(stderr, " export VFIO_SELFTESTS_BDF=\"segment:bus:device.function ...\"\n"); fprintf(stderr, " %s [options]\n", argv[0]); fprintf(stderr, "\n"); fprintf(stderr, "To pass the device address(es) via argv:\n"); -- 2.56.0.567.gdb80ae8cd5-goog