From nobody Mon Dec 1 22:34:45 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 23086345CCC for ; Wed, 26 Nov 2025 23:17:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764199076; cv=none; b=c5irwtsohXcL7yCK9Iw7X8hiHLbpMJPIRwtauZ+VLd/AoA9fakD8eiMRKeeQF7AebGir79GBZQO0vRUi46mghmIeYaNgorWuJY+fLlyf2+raxmJny8qurOo0am0DoW3isgSDOsA1FFZYkOBjw9GGI3RuEY3ISB3+rV+ePwf52qo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764199076; c=relaxed/simple; bh=KxTfth2LiC+qzfu6/CGY4Lzqbc98GbylpFUphDP8NeU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RssinZcKAo2hzzfGjLVHz7WGogBhDL1kmjubFThpy/DcGLx+klYhz0EAe9zxiVtFV8JHW9mr18vYpYk8jWJHyXNE9Z1BgE6pDZ4BxcqiCdwrEW8Y2O6iBNCxIS5+Z4quQoghauaQeODX7uUvUo8blIgQ/GcCIGx7YWu8Ormrzxc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=A2wpbWwn; arc=none smtp.client-ip=209.85.210.202 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.b="A2wpbWwn" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7b952a966d7so364372b3a.3 for ; Wed, 26 Nov 2025 15:17:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764199074; x=1764803874; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=fbnANw2nV+Hjijn1Te7nfl7yW9KM2Nn8PxD/zuD33I8=; b=A2wpbWwnsnw2jbLcML0gzGOdlh4oNW+yb7mkgyqS8eFHk2Zq+rmoDDeFfhpNrSlMXa 7BI44XVC+eSbhuQkORlYvnz7MBBJ8FyGltN99DoruVQ/mh+nHgBQWQ0oIyxISr4qj2+2 yDaZ4UuBhAeJLdGvECmhc4KTfV7b9wd7AQZY+A5lU7BeGtHXPcsn3HjS/FLiq7OrvgsY ONHar6DkOJLQSdaZ2Ok7RZLS6hkbuEzidH1bSjMK0YsJpCmMwApTTOuRJtM2YdgIKQkk i44XlFuvg283k0V0N3mBHyG09fXffArUMT76BxmYSql7ErP6YceNGpTGrx8cHL2LlnM1 1pTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764199074; x=1764803874; h=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; bh=fbnANw2nV+Hjijn1Te7nfl7yW9KM2Nn8PxD/zuD33I8=; b=bSAkjQ56Xcr0w+yZgIfdjX2x+z8M60sODLFZhkez/phcva07dAdNpJnXMnMHHOj83P cJjAThvyZ0OSXCCu5rvctJwqL1YrnZw+wtjp8UhNgBMXbgN70XblGUJRU40yW1/SgIuD RU0EvILcNqaSyFh/YrhedCsJVatlc+6YpWg7VTJzYiINRa6G/w1x0PZKxxuvoSoPWlg/ D/DnD6rzSAHLfgu/99BiLmXpRHlwqS+hHV/wvJ13+4CSiYa4q6JTOTUU5YvOPqIyVQAr 5361jq1pJkRNZ5j+eHuVO9QJiS9SjW+Wa2Mj7yKbuGKWsJTFvi9b9e3nHF/aibQkHwwD lSTQ== X-Forwarded-Encrypted: i=1; AJvYcCXngUEz64XzxfAJ+WvgEIbqCm/P9pRmdkR/HGkGCA2Qd07F7q7IopnmucU9j2dvil5uchrYDltQnScz9Ck=@vger.kernel.org X-Gm-Message-State: AOJu0Yy31pPIqaZmC0mcD7UtpHxNerXNWFSE090W1tZd55YdvubgmCuc Ga2x1C75yHLhSmZzEVaXAop+KqqVLQmwE7F6xLeZadolge0p3l+NNwBoznQU8FgvrtGpsDZhPrO XFHTbmrI2ddCE3A== X-Google-Smtp-Source: AGHT+IERDDysJurYwyfN72ycgKf3NTfFwzB800hcP5sf7Hnd0l0m0SZU3Ypa0vhU8ZHeNgQfG+QvJrHe83HMMA== X-Received: from pfhz4.prod.google.com ([2002:a05:6a00:2404:b0:7ad:9a99:34d]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:6a27:b0:350:d523:808d with SMTP id adf61e73a8af0-36150e6b162mr24955523637.15.1764199074425; Wed, 26 Nov 2025 15:17:54 -0800 (PST) Date: Wed, 26 Nov 2025 23:17:23 +0000 In-Reply-To: <20251126231733.3302983-1-dmatlack@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251126231733.3302983-1-dmatlack@google.com> X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog Message-ID: <20251126231733.3302983-9-dmatlack@google.com> Subject: [PATCH v4 08/18] vfio: selftests: Prefix logs with device BDF where relevant From: David Matlack To: Alex Williamson Cc: Alex Mastro , David Matlack , Jason Gunthorpe , Josh Hilke , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Raghavendra Rao Ananta , Vipin Sharma Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Prefix log messages with the device's BDF where relevant. This will help understanding VFIO selftests logs when tests are run with multiple devices. Reviewed-by: Alex Mastro Tested-by: Alex Mastro Reviewed-by: Raghavendra Rao Ananta Signed-off-by: David Matlack --- .../selftests/vfio/lib/drivers/dsa/dsa.c | 34 +++++++++---------- .../selftests/vfio/lib/drivers/ioat/ioat.c | 16 ++++----- .../selftests/vfio/lib/include/vfio_util.h | 4 +++ .../selftests/vfio/lib/vfio_pci_device.c | 1 + 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/tools/testing/selftests/vfio/lib/drivers/dsa/dsa.c b/tools/tes= ting/selftests/vfio/lib/drivers/dsa/dsa.c index 0ca2cbc2a316..8d667be80229 100644 --- a/tools/testing/selftests/vfio/lib/drivers/dsa/dsa.c +++ b/tools/testing/selftests/vfio/lib/drivers/dsa/dsa.c @@ -70,7 +70,7 @@ static int dsa_probe(struct vfio_pci_device *device) return -EINVAL; =20 if (dsa_int_handle_request_required(device)) { - printf("Device requires requesting interrupt handles\n"); + dev_info(device, "Device requires requesting interrupt handles\n"); return -EINVAL; } =20 @@ -91,23 +91,23 @@ static void dsa_check_sw_err(struct vfio_pci_device *de= vice) return; } =20 - fprintf(stderr, "SWERR: 0x%016lx 0x%016lx 0x%016lx 0x%016lx\n", + dev_err(device, "SWERR: 0x%016lx 0x%016lx 0x%016lx 0x%016lx\n", err.bits[0], err.bits[1], err.bits[2], err.bits[3]); =20 - fprintf(stderr, " valid: 0x%x\n", err.valid); - fprintf(stderr, " overflow: 0x%x\n", err.overflow); - fprintf(stderr, " desc_valid: 0x%x\n", err.desc_valid); - fprintf(stderr, " wq_idx_valid: 0x%x\n", err.wq_idx_valid); - fprintf(stderr, " batch: 0x%x\n", err.batch); - fprintf(stderr, " fault_rw: 0x%x\n", err.fault_rw); - fprintf(stderr, " priv: 0x%x\n", err.priv); - fprintf(stderr, " error: 0x%x\n", err.error); - fprintf(stderr, " wq_idx: 0x%x\n", err.wq_idx); - fprintf(stderr, " operation: 0x%x\n", err.operation); - fprintf(stderr, " pasid: 0x%x\n", err.pasid); - fprintf(stderr, " batch_idx: 0x%x\n", err.batch_idx); - fprintf(stderr, " invalid_flags: 0x%x\n", err.invalid_flags); - fprintf(stderr, " fault_addr: 0x%lx\n", err.fault_addr); + dev_err(device, " valid: 0x%x\n", err.valid); + dev_err(device, " overflow: 0x%x\n", err.overflow); + dev_err(device, " desc_valid: 0x%x\n", err.desc_valid); + dev_err(device, " wq_idx_valid: 0x%x\n", err.wq_idx_valid); + dev_err(device, " batch: 0x%x\n", err.batch); + dev_err(device, " fault_rw: 0x%x\n", err.fault_rw); + dev_err(device, " priv: 0x%x\n", err.priv); + dev_err(device, " error: 0x%x\n", err.error); + dev_err(device, " wq_idx: 0x%x\n", err.wq_idx); + dev_err(device, " operation: 0x%x\n", err.operation); + dev_err(device, " pasid: 0x%x\n", err.pasid); + dev_err(device, " batch_idx: 0x%x\n", err.batch_idx); + dev_err(device, " invalid_flags: 0x%x\n", err.invalid_flags); + dev_err(device, " fault_addr: 0x%lx\n", err.fault_addr); =20 VFIO_FAIL("Software Error Detected!\n"); } @@ -256,7 +256,7 @@ static int dsa_completion_wait(struct vfio_pci_device *= device, if (status =3D=3D DSA_COMP_SUCCESS) return 0; =20 - printf("Error detected during memcpy operation: 0x%x\n", status); + dev_info(device, "Error detected during memcpy operation: 0x%x\n", status= ); return -1; } =20 diff --git a/tools/testing/selftests/vfio/lib/drivers/ioat/ioat.c b/tools/t= esting/selftests/vfio/lib/drivers/ioat/ioat.c index c3b91d9b1f59..e04dce1d544c 100644 --- a/tools/testing/selftests/vfio/lib/drivers/ioat/ioat.c +++ b/tools/testing/selftests/vfio/lib/drivers/ioat/ioat.c @@ -51,7 +51,7 @@ static int ioat_probe(struct vfio_pci_device *device) r =3D 0; break; default: - printf("ioat: Unsupported version: 0x%x\n", version); + dev_info(device, "ioat: Unsupported version: 0x%x\n", version); r =3D -EINVAL; } return r; @@ -135,13 +135,13 @@ static void ioat_handle_error(struct vfio_pci_device = *device) { void *registers =3D ioat_channel_registers(device); =20 - printf("Error detected during memcpy operation!\n" - " CHANERR: 0x%x\n" - " CHANERR_INT: 0x%x\n" - " DMAUNCERRSTS: 0x%x\n", - readl(registers + IOAT_CHANERR_OFFSET), - vfio_pci_config_readl(device, IOAT_PCI_CHANERR_INT_OFFSET), - vfio_pci_config_readl(device, IOAT_PCI_DMAUNCERRSTS_OFFSET)); + dev_info(device, "Error detected during memcpy operation!\n" + " CHANERR: 0x%x\n" + " CHANERR_INT: 0x%x\n" + " DMAUNCERRSTS: 0x%x\n", + readl(registers + IOAT_CHANERR_OFFSET), + vfio_pci_config_readl(device, IOAT_PCI_CHANERR_INT_OFFSET), + vfio_pci_config_readl(device, IOAT_PCI_DMAUNCERRSTS_OFFSET)); =20 ioat_reset(device); } diff --git a/tools/testing/selftests/vfio/lib/include/vfio_util.h b/tools/t= esting/selftests/vfio/lib/include/vfio_util.h index 379942dc5357..babbf90688e8 100644 --- a/tools/testing/selftests/vfio/lib/include/vfio_util.h +++ b/tools/testing/selftests/vfio/lib/include/vfio_util.h @@ -50,6 +50,9 @@ VFIO_LOG_AND_EXIT(_fmt, ##__VA_ARGS__); \ } while (0) =20 +#define dev_info(_dev, _fmt, ...) printf("%s: " _fmt, (_dev)->bdf, ##__VA_= ARGS__) +#define dev_err(_dev, _fmt, ...) fprintf(stderr, "%s: " _fmt, (_dev)->bdf,= ##__VA_ARGS__) + struct iommu_mode { const char *name; const char *container_path; @@ -172,6 +175,7 @@ struct iommu { }; =20 struct vfio_pci_device { + const char *bdf; int fd; int group_fd; =20 diff --git a/tools/testing/selftests/vfio/lib/vfio_pci_device.c b/tools/tes= ting/selftests/vfio/lib/vfio_pci_device.c index 8f8fed4f384d..f0cf18d3de55 100644 --- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c +++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c @@ -843,6 +843,7 @@ struct vfio_pci_device *vfio_pci_device_init(const char= *bdf, struct iommu *iomm =20 VFIO_ASSERT_NOT_NULL(iommu); device->iommu =3D iommu; + device->bdf =3D bdf; =20 if (iommu->mode->container_path) vfio_pci_container_setup(device, bdf); --=20 2.52.0.487.g5c8c507ade-goog