From nobody Sat Dec 3 15:13:51 2022 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 4NPYHN0pJYz4jcqj; Sat, 3 Dec 2022 15:13:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPYHN0Gp3z3mgn; Sat, 3 Dec 2022 15:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670080432; 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=f3ieGzRGDbqScr7JwBtY3whn6QgDvD0AuJbtNelBvGo=; b=ZW+rFZnnsnU44Oau3Jut9zO7c/cwQ9Qzw6AnJFvH0FOOjexPx6WAzTsQaDEtI3a35JXrDF 9dYSzxcmtnCO2hQ5Di0uVrs+lENrnJG1w8BhAj52dIEJhSOM7i0CS9eN7c99q8C3ZjUruR r6oF2lLfaGhjixvxLKLU5fldsu5QV1na8kCL2eYS4MY7MqZVs31Zue54fUXUQKhClj8oXy mp6ZUoaSQVp4dgcrqJ7k+R/XiaJZsDt9bfviXAcVj/QmF3CnlidyGdVq3sy3qOG+uC8eed p0zUzu8MgmHoVnsVY9KillltaHMBMO7tOJs4jMPor6fxeWuVjMVPLHRNubgXZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670080432; 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=f3ieGzRGDbqScr7JwBtY3whn6QgDvD0AuJbtNelBvGo=; b=XowUMB3lIdgtIdnx+8OCH9Bdi9er6wSVjaV+ZE2YpPZVEZhnLV5k9bxsdz8IfJA+sMCY2b lkoQW4c9nIUkufmTw5QZtZE3tJCZfrXscUg9X6ewFE9jh7rhcCDMANMhFfh4nQOvr7SuZq gX9J2gbmqdBbZwe/xBJ6D8UQHj7hx2a2ueyh5r7lp3LiSYqge/CXAUejfKAraC8PGcjaex //sRekhSv+kqVylQEf/hXC8oXtJoEIIoAK3XVpF2/dS5mNmSahgrk98Gr3NNfx8czrFzNI A4YWbMUfdQpoV2ST9HAd/PRwUTloUu9Z1t+KfH6hA9R3A3QoR0b4gMkshdFrpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670080432; a=rsa-sha256; cv=none; b=BbFwtsosIrlkBjJCQcwuyXnAyIXsx4zQnlEbuHZLlTCo1IPlPSbqzteqBkl0Qcc+s5Ffyc 8p/lVqbvbUAXm6TuMP5byDLugME5OKtLNwgtvbI7tdLqMtZzdI1c8ZLwoDz7Aj0zD+TwtY KMxWOFoQvgjidwBW2QyfhdCLKKw8zz3PZnl8ra2Qk6X8EH8Od6YmZj+RNu8hQswBBMYFjC jlvEMfUDnYo0U3KFjaGD3o39vDLoSZMi1bovQlM98lNx+Y7MWuscEjpbQqmSHMIFkrAFKX 7f/5dIKPqw8TDBo6gH3lR2lmVdOi5eI1rp13avKAJ1kF0gg7ZJ5y+uj1Qa91bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NPYHM6P7Tz10Mg; Sat, 3 Dec 2022 15:13:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B3FDpuo036954; Sat, 3 Dec 2022 15:13:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B3FDpSD036953; Sat, 3 Dec 2022 15:13:51 GMT (envelope-from git) Date: Sat, 3 Dec 2022 15:13:51 GMT Message-Id: <202212031513.2B3FDpSD036953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: b81ac5cdc355 - main - bhyve virtio-scsi: Fix residual reporting. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b81ac5cdc355029b4d5723fcdfcbcbedeb94dcd9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b81ac5cdc355029b4d5723fcdfcbcbedeb94dcd9 commit b81ac5cdc355029b4d5723fcdfcbcbedeb94dcd9 Author: Alexander Motin AuthorDate: 2022-12-03 15:08:20 +0000 Commit: Alexander Motin CommitDate: 2022-12-03 15:08:20 +0000 bhyve virtio-scsi: Fix residual reporting. CTL does not really use residual field and it always returned zero. Use ext_data_filled instead. MFC after: 2 weeks --- usr.sbin/bhyve/pci_virtio_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index 7f8d5a8866c9..bad95e4e85b0 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -557,7 +557,7 @@ pci_vtscsi_request_handle(struct pci_vtscsi_queue *q, struct iovec *iov_in, } else { cmd_wr->sense_len = MIN(io->scsiio.sense_len, sc->vss_config.sense_size); - cmd_wr->residual = io->scsiio.residual; + cmd_wr->residual = ext_data_len - io->scsiio.ext_data_filled; cmd_wr->status = io->scsiio.scsi_status; cmd_wr->response = VIRTIO_SCSI_S_OK; memcpy(&cmd_wr->sense, &io->scsiio.sense_data,