From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.167.200 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795046521; b=Zp2r1YUU7fslXRxWyNV3bTwd+REtV6A3ZN/8aBMK6SJgPTvwE0Cs/+xV9dgDXvhMVz1h S0Od8MvGTjv/E+CellVX1wR68oWR9pYElc4oWqepBDETe+7Jhgaeqqi9ZsYcK2VhNJxZG xssoJly0jLm/+kx9PoZIGGAbXCvM5GCKADzLLOlQMOUPMcFIdTCBzVRGsmIE/NrkDqmyq ecjBWFeOH6epDyaD59g5uN0iceUlwYSz5ZUboW5TZZ7DFj0lSSXnSkmwbkkcizM4N98zr ZlInG21I3iApB4FtLLMmXtVlIuRfU1dSn0ZhCKTv7o2IVAumV2BYWm09YdZIK6a2D2A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795046521; 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=EaUSE7jvtdzLMdDkeb9svQ5+R7D1nly9NFuvzqZAt94=; b=iN+kEMPohbe5KcfDC1HS0Dwn4Db2SoiA0lCdHbrZebXs7ts+8ANBcct8yfJlFL+Uj1r1 UYGn/75u5biJl6jX1jBJL8cN12C/YRuIIWhW35GJ29iMNdBPiDOmKoqWejuaY3TT+MDlA nMT9ayJI4cde5ZQw+vrGtx34icl6hTYdyyIJdqAbRF7kN1BpFDIWIRv3ie5qeUr7tz21q BsdohSp08W3ByyBP54Y5K4uGPEuj+VCdathgwJg5sp58uR9I5SH2noxO3K/R1xeEShoeE O6swVX+v0SjVQCC4u8wzOlF9FGaj1FQQfRJfkVKQDGl8yot7xTgt3iNXu3oc2GUdz2Q== 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=iWDSr3r3; arc=none smtp.remote-ip=209.85.167.200 Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) (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 B426760A2630 for ; Thu, 19 Nov 2026 00:02:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org B426760A2630 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=iWDSr3r3 Received: by mail-oi1-f200.google.com with SMTP id 5614622812f47-4eb0b989f0eso533745b6e.0 for ; Wed, 18 Nov 2026 16:02:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795046520; x=1795651320; 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=EaUSE7jvtdzLMdDkeb9svQ5+R7D1nly9NFuvzqZAt94=; b=iWDSr3r3l8iiwx3aQDbddIuzkifAiT8/3KYkPrxFNoIE8SejRtC1nqQmRojagrY+16 jKsn3RRgZJn1zn8OVpvoLI8NzTOUE/oiDBX9Kcu7i6fOtY6JhjqsoCO+OFqFvg3OZ9kz z5SNSHIfcpOnwHy5U2HVMeHwM6fRlqFIpJz9LQo78LlP8fSBKHany1pJwd733jm1kVO9 0v0sJtOsjVPuOK44LMyPy9nfHHV7rtv8jfBqfb/CQYfYhobSp6S64EuKLyWlBu+Nsari itubvXc5Cw/jf697xN5jLJpqg4m+s7SQuEWjAhBIhGxMvbLWN5Uvaxl/1iaZtI5SgeWE FERQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795046520; x=1795651320; 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=EaUSE7jvtdzLMdDkeb9svQ5+R7D1nly9NFuvzqZAt94=; b=cjnjX2EiHnr175kFbcS5YCSTin4oSOVBPPVEhVn6Hf3Fe2BgodV/PBwQN2JbP0daiY Czmg22ohXDSeeIIh/JMe+UqYsmf56Un6gfSOpvR2OOTvaFB9CZV3ZqR3LQYbs6u8qSju A1WGOxv0WOQRcth9QF8rwkdKH0nxc5kvzAdZPxUt5xPDCvKi6mGNiB50W6gt/UJUhaJJ 57Waq/+GQ4Z76UfaWcOvtjBcJOO6V/vrbqbeAgBbvG1AzzizOs70uGg054XQyFKWjenI wPgVs1vwNlWJUs5UukA9kvRiNNf/qRklqPSFJNm2Uz34oqGQKXEKj6G5lBEErX9LM22b 90Gg== X-Forwarded-Encrypted: i=1; AL+hErFalR9RTkdcA4k3AWOlcxsjT9xMsq89dMdBFdY/Ry6AvjzWsFiuZnI29F5NpiRivNEZI61tjX04xA9k098=@vger.kernel.org X-Gm-Message-State: APuU4Z+xt0n4AEvnyofzjlvi49v2LdOAhCwnO6tSdYla4OENTgtEp19O 0ao6YjyhNf7jiIXlgZqQ/0saRRU8Q1IBiX4IYASBz+pcCeZjRhQs0+ZDh+XU1EVGCADODWSoTve NxJiIhX2eOvbsiQ== X-Received: from oibmo11-n1.prod.google.com ([2002:a05:6809:70b:10b0:4bf:8346:d667]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:2f08:b0:55b:f88d:6e8e with SMTP id 5614622812f47-5790436e90amr291024b6e.11.1795046519323; Wed, 18 Nov 2026 16:01:59 -0800 (PST) Date: Thu, 19 Nov 2026 00:01:45 +0000 In-Reply-To: <20261119000151.442543-1-dmatlack@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261119000151.442543-1-dmatlack@google.com> X-Mailer: git-send-email 2.56.1.708.g77570a6a1d-goog Message-ID: <20261119000151.442543-4-dmatlack@google.com> Subject: [PATCH v2 3/8] vfio: selftests: Add __sysfs_sriov_numvfs_set() From: David Matlack To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, stable@vger.kernel.org Cc: Abhishek Sahu , Alex Williamson , David Matlack , Raghavendra Rao Ananta , Shuah Khan , Vipin Sharma Content-Type: text/plain; charset="UTF-8" Add __sysfs_sriov_numvfs_set(), which returns the error from writing to a PF's sriov_numvfs file instead of asserting that the write succeeds, and implement sysfs_sriov_numvfs_set() on top of it. This will be used in subsequent commits to skip SR-IOV tests when the kernel returns -ENOENT, which means SR-IOV cannot be configured on the PF, e.g. because vfio-pci's enable_sriov module parameter is not set. Signed-off-by: David Matlack --- .../vfio/lib/include/libvfio/sysfs.h | 1 + tools/testing/selftests/vfio/lib/sysfs.c | 38 +++++++++++++++---- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/vfio/lib/include/libvfio/sysfs.h b/tools/testing/selftests/vfio/lib/include/libvfio/sysfs.h index c9ab1ea8f5a9..ede114181cf8 100644 --- a/tools/testing/selftests/vfio/lib/include/libvfio/sysfs.h +++ b/tools/testing/selftests/vfio/lib/include/libvfio/sysfs.h @@ -4,6 +4,7 @@ int sysfs_sriov_totalvfs_get(const char *bdf); int sysfs_sriov_numvfs_get(const char *bdf); +int __sysfs_sriov_numvfs_set(const char *bdf, int numvfs); void sysfs_sriov_numvfs_set(const char *bdf, int numvfs); char *sysfs_sriov_vf_bdf_get(const char *pf_bdf, int i); int sysfs_iommu_group_get(const char *bdf); diff --git a/tools/testing/selftests/vfio/lib/sysfs.c b/tools/testing/selftests/vfio/lib/sysfs.c index d88e348a1e0d..308da0526543 100644 --- a/tools/testing/selftests/vfio/lib/sysfs.c +++ b/tools/testing/selftests/vfio/lib/sysfs.c @@ -56,17 +56,24 @@ static int sysfs_val_get_int(const char *component, const char *name, return ret; } -static void sysfs_val_set(const char *component, const char *name, - const char *file, const char *val) +static int sysfs_val_set(const char *component, const char *name, + const char *file, const char *val) { char path[PATH_MAX]; + ssize_t ret; int fd; snprintf_assert(path, PATH_MAX, "/sys/bus/pci/%s/%s/%s", component, name, file); VFIO_ASSERT_GT(fd = open(path, O_WRONLY), 0); - VFIO_ASSERT_EQ(write(fd, val, strlen(val)), strlen(val)); + ret = write(fd, val, strlen(val)); + if (ret < 0) + ret = -errno; + else + VFIO_ASSERT_EQ(ret, strlen(val)); + VFIO_ASSERT_EQ(close(fd), 0); + return ret < 0 ? ret : 0; } static int sysfs_device_val_get(const char *bdf, const char *file) @@ -74,17 +81,17 @@ static int sysfs_device_val_get(const char *bdf, const char *file) return sysfs_val_get_int("devices", bdf, file); } -static void sysfs_device_val_set(const char *bdf, const char *file, const char *val) +static int sysfs_device_val_set(const char *bdf, const char *file, const char *val) { - sysfs_val_set("devices", bdf, file, val); + return sysfs_val_set("devices", bdf, file, val); } -static void sysfs_device_val_set_int(const char *bdf, const char *file, int val) +static int sysfs_device_val_set_int(const char *bdf, const char *file, int val) { char val_str[32]; snprintf_assert(val_str, sizeof(val_str), "%d", val); - sysfs_device_val_set(bdf, file, val_str); + return sysfs_device_val_set(bdf, file, val_str); } int sysfs_sriov_totalvfs_get(const char *bdf) @@ -97,9 +104,24 @@ int sysfs_sriov_numvfs_get(const char *bdf) return sysfs_device_val_get(bdf, "sriov_numvfs"); } +/** + * __sysfs_sriov_numvfs_set() - Set the number of VFs enabled on a PF + * @bdf: BDF of the PF. + * @numvfs: Number of VFs to enable, or 0 to disable SR-IOV. + * + * Return: 0 on success, or a negative errno on failure. The kernel returns + * -ENOENT if SR-IOV cannot be configured on the PF, e.g. because its driver + * does not support configuring SR-IOV or has it disabled (vfio-pci unless its + * enable_sriov module parameter is set). + */ +int __sysfs_sriov_numvfs_set(const char *bdf, int numvfs) +{ + return sysfs_device_val_set_int(bdf, "sriov_numvfs", numvfs); +} + void sysfs_sriov_numvfs_set(const char *bdf, int numvfs) { - sysfs_device_val_set_int(bdf, "sriov_numvfs", numvfs); + VFIO_ASSERT_EQ(__sysfs_sriov_numvfs_set(bdf, numvfs), 0); } char *sysfs_sriov_vf_bdf_get(const char *pf_bdf, int i) -- 2.56.1.708.g77570a6a1d-goog