From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 2B4F034EEE2 for ; Fri, 21 Nov 2025 18:14:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763748894; cv=none; b=cE/0is5iasxNMlPKBvM2kKdm8mqUGCfqkJjgw2ofnH6rxDKqlOs3fVcf9LD9Jl7ZukzqtAN4Iu6dt6lOdvMAbLFxnbn/8flF9IeGkmbO31UKAclmmf2H+FPju2KzWxQwA7TtM4WlP7bpxbv26QS5KdRTxqhZ+puQSebOpEfHTho= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763748894; c=relaxed/simple; bh=FRJAQ07/YhmKmPddt1eGKBZm0TIjwhbvZt+o9YdlFfs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=P/opPaFuxRUmQgjM7R/7nF/a5R4d3/ByRkPwsBqNpxNybhFu7qtIoDx4hNvg55f2/Z0QIVgqVM85GC9j0NgUeqF0XsgekWuLNWeMr6AAijZhpR/l4RtuUbyJ+UfLR4IxSd41XB4AKqOpgOJ48vqE3Okd8W2K6nGv/OJ/vT87ue0= 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=24UBOMa0; arc=none smtp.client-ip=209.85.210.201 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="24UBOMa0" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-7b80de683efso4193428b3a.3 for ; Fri, 21 Nov 2025 10:14:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763748891; x=1764353691; 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=xfdqeHDgAK15LR78PCURsTehUUcDYBW4cHOHBjLeoD4=; b=24UBOMa0bBuyFHtY6TFyGKhZAGtFQgMoXefBS+//8eWJGqzKuJTUMeJmIM6OzE8rpc cNqDU07oZpuaoMsxUqvGnrpTmFxU+xrBOluJy9CiXSJ7Kpk1xiepxmKGIBHUjAmWA8oO u+2zM8/vCkmkV5hLw91bC4Mc9nCPXfFU9+W04m0QiN9K4w9LbFpv9gDMx3xUkeiVeGxu +y521uNfZL91ZlCf+KH5+1BtTMk8jYTQg6jVpTBHZrHmDF4c9KxaW2RT7t3WwvJIaqk+ a1Gwkdrqv7pO9u1EoP4mtM7cN0ZxMBQPYx1CC0PdyHNvZPrunEnlF0usl/CRiPjojjRp SgEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763748891; x=1764353691; 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=xfdqeHDgAK15LR78PCURsTehUUcDYBW4cHOHBjLeoD4=; b=eAiGgYPICFq3vTK66GH8zrIdLri6dbla/oV8ksaGPr22fHDeillZusb8KOELio2UOC gAl150SCnxpMllaPAOCOMvOT4NkwlY/U4tzMMJk1FWi3Xv/T8ehnnvU8WEfEoKEl3CTR nVpgsgR7L6iuxoXE4ngnBLydscQwXjz4JiZCMsEj4c5QoBivwwHZ1hkPUhzmUW60dp0t EOGdjFWUGDvZHSLifMPKU7JesnvOSkOMiqYx20ERwTXWsqyuwLMjbhmdEAQSnM1mQiBd zkyU3X/j4+qxGL7Vv7lwYmp4VGqI77xnwwmKwMMytApDf5pkRCTixMmQQ732qv8SbdOG QvOQ== X-Forwarded-Encrypted: i=1; AJvYcCVc0dgcc2izkxl1WKxooyFdPxWjWD8tyKzI8yIOq8Fy1BB7+O66DnefR53FmURdrTB0BlXBBktlJSzhib/ajlI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0M83BXpqkAb5zw40Ugbmp8AY+LAPq7hQWBKYabm726uo9SRSB QRr6lKWyCRBRQWzRkBNzMJK0VZa3r4PKhpngHQJkRKtuqr2iUBAgGn4wSuvh/EKkeshNJZapHQ3 X+wKWgNYl/p72PQ== X-Google-Smtp-Source: AGHT+IGMlPlgxfy/223nVhigM59dqes2tTw1R0b59UTm2S2VY02fBmW2NNui1T8Me0tYbY3y4vuH6Qg8MoPS9g== X-Received: from pfbcz11.prod.google.com ([2002:aa7:930b:0:b0:7a2:6b90:c18f]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2d87:b0:7ab:8d8a:1006 with SMTP id d2e1a72fcca58-7c58c2a7372mr3315318b3a.2.1763748891462; Fri, 21 Nov 2025 10:14:51 -0800 (PST) Date: Fri, 21 Nov 2025 18:14:19 +0000 In-Reply-To: <20251121181429.1421717-1-dmatlack@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251121181429.1421717-1-dmatlack@google.com> X-Mailer: git-send-email 2.52.0.rc2.455.g230fcf2819-goog Message-ID: <20251121181429.1421717-9-dmatlack@google.com> Subject: [PATCH v3 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-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 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/testing/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; 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; } @@ -91,23 +91,23 @@ static void dsa_check_sw_err(struct vfio_pci_device *device) return; } - 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]); - 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); VFIO_FAIL("Software Error Detected!\n"); } @@ -256,7 +256,7 @@ static int dsa_completion_wait(struct vfio_pci_device *device, if (status == DSA_COMP_SUCCESS) return 0; - printf("Error detected during memcpy operation: 0x%x\n", status); + dev_info(device, "Error detected during memcpy operation: 0x%x\n", status); return -1; } diff --git a/tools/testing/selftests/vfio/lib/drivers/ioat/ioat.c b/tools/testing/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 = 0; break; default: - printf("ioat: Unsupported version: 0x%x\n", version); + dev_info(device, "ioat: Unsupported version: 0x%x\n", version); r = -EINVAL; } return r; @@ -135,13 +135,13 @@ static void ioat_handle_error(struct vfio_pci_device *device) { void *registers = ioat_channel_registers(device); - 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)); ioat_reset(device); } diff --git a/tools/testing/selftests/vfio/lib/include/vfio_util.h b/tools/testing/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) +#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 { }; struct vfio_pci_device { + const char *bdf; int fd; int group_fd; diff --git a/tools/testing/selftests/vfio/lib/vfio_pci_device.c b/tools/testing/selftests/vfio/lib/vfio_pci_device.c index 57bdd22573d4..f3aea724695d 100644 --- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c +++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c @@ -841,6 +841,7 @@ struct vfio_pci_device *vfio_pci_device_init(const char *bdf, struct iommu *iomm device = calloc(1, sizeof(*device)); VFIO_ASSERT_NOT_NULL(device); + device->bdf = bdf; device->iommu = iommu; if (device->iommu->mode->container_path) -- 2.52.0.rc2.455.g230fcf2819-goog