From nobody Thu Jun 11 13:07:05 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gbjbY609Sz6hS20 for ; Thu, 11 Jun 2026 13:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gbjbY5HjSz3Ssq for ; Thu, 11 Jun 2026 13:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781183225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XdJfyLzhIZ+tqOPTuQ46P8bG/xT7CkxYRhHbXs25VD0=; b=SJ2jllb2RVf83zC5D8L8Habenyrh8CsvqKMIutDEkG/g+Y/gHOd7woQ3GoEODUxYak0S3E CKOS13WP9sT12RzBy9esmc0CkLYG7ZydpK1bNJF9/VfzJOcpIRPRBUnPYZYDJ/K0KKskk3 KbE/Pzh3yFczh3rKa8bOyvnjCSY977C+lfsKXI0cASKZ1nqJS24jyrN0gPWfEJlqcBy7+p D0BWFU8ggX7nbnbPEs20hQj8xh3qjlbKHW7lOOYHv4mh/EotJ42wlfOY4IoZEk6H+dWYvo 0ToFdYjrO29f7GtYugvtQDSjQ7T2sB6FJawBf+zE6u3mcWqytOeFVV0w3+MPfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781183225; a=rsa-sha256; cv=none; b=Utu5kKfheW85O0agkeCA8jhpMztfuuJjqS8cvFElT3bMbO2bjTKOL0SIpQEJC1affN1fwe TZ4lIQ9kEa+RSuiRlrIAZr/Cd8vQtYvwFNToQnQa0rI8OZBDCdOSXRcJo/SpKbXmnNZDtW hkaMBvTJK0YyZbaPVsoIJTHzjx572C4JzOn4w4HLEJykG/9t+sFDwdYzJrqQmbk7YXMNzH uvWJPYdYjFPT0FHO98WycaxuxUPiaV+wFJMwkCoQq40hgBiMuAWtf33IQPTbIVN+G0mghC Z20mYHkuxMEJymAAQQKwZ+jhjAXWHZXlH3+XeTqvKowzpuZiP6BLdzGcmkrM6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781183225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XdJfyLzhIZ+tqOPTuQ46P8bG/xT7CkxYRhHbXs25VD0=; b=FxUiH0b6R1VYSJ/+Ga6XiJX6pHdh3leSB7YS1A7jowZ4/yxSK4MlfjsNcj7K17qQuPjkKL wDkr1pzqD0qrJbfkXfA4Wz1gaKdiZnmcGNZGZ6PulhRQF7Voafn/CGbTX4P1cBrt6chRB+ +eWjqlBi/CS9K634G2W/7AT8RTnu9kdfMw3YDkzOrk6XZ7NGTFzr1Vnk8AQdGF8KJC9Obh g6UJWXsLKPcHitrOL+as0H48p/5twl+RRyqRZ5zRyd0kqpeCQ2GcUrOZPUMgiZZDZAUmZ4 HoaMHIQ2mOVEC1kWjnCTrrFt8xP1UuqyygYmRyXzaru3rO6ob8zioeTgKr7Tkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gbjbY4Zljzs3F for ; Thu, 11 Jun 2026 13:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 188d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Jun 2026 13:07:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aleksandr Rybalko Subject: git: f056e84e5b46 - main - virtio-scsi: handle device capacity change event List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ray X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f056e84e5b46acd33c5e872f384683718313bad8 Auto-Submitted: auto-generated Date: Thu, 11 Jun 2026 13:07:05 +0000 Message-Id: <6a2ab2f9.188d4.24107e7a@gitrepo.freebsd.org> The branch main has been updated by ray: URL: https://cgit.FreeBSD.org/src/commit/?id=f056e84e5b46acd33c5e872f384683718313bad8 commit f056e84e5b46acd33c5e872f384683718313bad8 Author: Aleksandr Rybalko AuthorDate: 2026-05-26 14:49:21 +0000 Commit: Aleksandr Rybalko CommitDate: 2026-06-11 12:30:04 +0000 virtio-scsi: handle device capacity change event This feature is utilized when updating storage capacity in capable hypervisors such as QEMU. Reviewed by: imp Approved by: imp(mentor) Obtained from: Fudo Security MFC after: 2 weeks Sponsored by: Fudo Security Differential Revision: https://reviews.freebsd.org/D57247 --- sys/dev/virtio/scsi/virtio_scsi.c | 24 ++++++++++++++++++++++++ sys/dev/virtio/scsi/virtio_scsi.h | 9 +++++++++ sys/dev/virtio/scsi/virtio_scsivar.h | 1 + 3 files changed, 34 insertions(+) diff --git a/sys/dev/virtio/scsi/virtio_scsi.c b/sys/dev/virtio/scsi/virtio_scsi.c index 857da56ba426..a61c92485ccc 100644 --- a/sys/dev/virtio/scsi/virtio_scsi.c +++ b/sys/dev/virtio/scsi/virtio_scsi.c @@ -1786,6 +1786,27 @@ vtscsi_transport_reset_event(struct vtscsi_softc *sc, } } +static void +vtscsi_param_change_event(struct vtscsi_softc *sc, + struct virtio_scsi_event *event) +{ + target_id_t target_id; + lun_id_t lun_id; + + vtscsi_get_request_lun(event->lun, &target_id, &lun_id); + + if (VIRTIO_SCSI_ASC(event->reason) == VIRTIO_SCSI_CAPACITY_CHNG_ASC && + VIRTIO_SCSI_ASCQ(event->reason) == VIRTIO_SCSI_CAPACITY_CHNG_ASCQ) { + /* Disk capacity has changed. */ + vtscsi_announce(sc, AC_INQ_CHANGED, target_id, lun_id); + } else { + device_printf(sc->vtscsi_dev, + "unhandled PARAM_CHANGE event. ASC: %02x, ASCQ: %02x\n", + VIRTIO_SCSI_ASC(event->reason), + VIRTIO_SCSI_ASCQ(event->reason)); + } +} + static void vtscsi_handle_event(struct vtscsi_softc *sc, struct virtio_scsi_event *event) { @@ -1796,6 +1817,9 @@ vtscsi_handle_event(struct vtscsi_softc *sc, struct virtio_scsi_event *event) case VIRTIO_SCSI_T_TRANSPORT_RESET: vtscsi_transport_reset_event(sc, event); break; + case VIRTIO_SCSI_T_PARAM_CHANGE: + vtscsi_param_change_event(sc, event); + break; default: device_printf(sc->vtscsi_dev, "unhandled event: %d\n", event->event); diff --git a/sys/dev/virtio/scsi/virtio_scsi.h b/sys/dev/virtio/scsi/virtio_scsi.h index 02e13c6f81b7..66c72304f3f1 100644 --- a/sys/dev/virtio/scsi/virtio_scsi.h +++ b/sys/dev/virtio/scsi/virtio_scsi.h @@ -162,6 +162,15 @@ struct virtio_scsi_config { #define VIRTIO_SCSI_T_ASYNC_NOTIFY 2 #define VIRTIO_SCSI_T_PARAM_CHANGE 3 +/* + * SCSI ASC/ASCQ Sense Codes + * https://www.t10.org/lists/asc-num.txt + */ +#define VIRTIO_SCSI_ASC(x) ((x) & 0xff) +#define VIRTIO_SCSI_ASCQ(x) (((x) >> 8) & 0xff) +#define VIRTIO_SCSI_CAPACITY_CHNG_ASC 0x2a +#define VIRTIO_SCSI_CAPACITY_CHNG_ASCQ 0x09 + /* Reasons of transport reset event */ #define VIRTIO_SCSI_EVT_RESET_HARD 0 #define VIRTIO_SCSI_EVT_RESET_RESCAN 1 diff --git a/sys/dev/virtio/scsi/virtio_scsivar.h b/sys/dev/virtio/scsi/virtio_scsivar.h index 85d2990d8bf4..b5f3c59727cc 100644 --- a/sys/dev/virtio/scsi/virtio_scsivar.h +++ b/sys/dev/virtio/scsi/virtio_scsivar.h @@ -139,6 +139,7 @@ struct vtscsi_request { /* Features desired/implemented by this driver. */ #define VTSCSI_FEATURES \ (VIRTIO_SCSI_F_HOTPLUG | \ + VIRTIO_SCSI_F_CHANGE | \ VIRTIO_RING_F_INDIRECT_DESC) #define VTSCSI_MTX(_sc) &(_sc)->vtscsi_mtx