From patchwork Tue Jun 2 07:41:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 11583323 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 37E8A60D for ; Tue, 2 Jun 2020 07:43:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 101F42072F for ; Tue, 2 Jun 2020 07:43:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UjHXT5b+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 101F42072F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:54492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jg1Zs-0005Jn-4Q for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Jun 2020 03:43:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jg1ZB-0003lZ-9j for qemu-devel@nongnu.org; Tue, 02 Jun 2020 03:42:33 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:43724) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jg1ZA-0000Ym-LY for qemu-devel@nongnu.org; Tue, 02 Jun 2020 03:42:33 -0400 Received: by mail-wr1-x442.google.com with SMTP id l10so2269927wrr.10 for ; Tue, 02 Jun 2020 00:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bFt0WsKi9YCNdM7hkyu3tuuPZYw4VooHNM+xovmMUSU=; b=UjHXT5b+mAHucrJN+ZcFcwlt4a7/rA+EDtXusPHC+3wo7dFu0POHseQ/H2tSunibjN eg6As0H9nuVDoyV6r2L0lx69QjH/mC87krqnX4yMN2YU/688/F8hVL17UJdH8C8zO5NO DTvZTClUy1Lw+Af0bI++6Zpxelkm8Z+YXQQgAEkWV/Ij7lKU16ls6/Yh10ge+qU9IjhF g5x+3fbZq25ChZNqGN8C1JV456pfzIaDpFaQExtMFASuw7yUCrNJIB2h6d0OA9Nps+VZ 0ma2bmy9F55JEE78QnIQq2thqOGOnlBqUjNUDZJlWZ7/YyuTd12cAbwgWRvbM12P/mx0 /5iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bFt0WsKi9YCNdM7hkyu3tuuPZYw4VooHNM+xovmMUSU=; b=Irjf4pJFYbrDcQKYigU5rHWo9gi3Rlv2Afg2F3pcRE7uIFFIujWN7hxo0+3+ppPKL2 eC1xbsSJfRpucJz21ouSC5x/tRAIV8RoVmt3PdKSq3oiCIuNM4/71rf2BNQzh0SntO41 VmhLphLHBqQ+A4T1IbYTHLwbdGWUun0uaebX7bXkSjX9H6YtIQJNQmSl5hOVHHG3j5GQ c6iCW4NA+Emd4+Qol+6hLmgKWBsPBDzYMIegOK+UUwV6UGCXHpc3N0ppRcO2dTWsArHJ 3TSryPCCe2HzDqg48Nu7kf795kBulAVNfXHrvZG7fGiDgC8bi69WB7be5cgSJzBSvo3S MbrQ== X-Gm-Message-State: AOAM5324mg2R1b6RTRRYrGZbpeb6+yFTTRWxYCcH++X7mBIfklaeM4U3 SPEjz5D+xSEypFzx2K8Pj5OOLz+jZwE= X-Google-Smtp-Source: ABdhPJxicM6rpPP9PklDqcsi02NSQb1Yq9AysFhDVJeVZg4YJVUxyEu056EqBOTCBgwNAIRJ/vZOdw== X-Received: by 2002:adf:f389:: with SMTP id m9mr23676786wro.195.1591083751265; Tue, 02 Jun 2020 00:42:31 -0700 (PDT) Received: from t440p.suse.asia (60-251-47-115.HINET-IP.hinet.net. [60.251.47.115]) by smtp.gmail.com with ESMTPSA id w3sm2294518wmg.44.2020.06.02.00.42.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 00:42:30 -0700 (PDT) From: Lin Ma To: qemu-devel@nongnu.org Subject: [PATCH 1/4] block: Add bdrv_co_get_lba_status Date: Tue, 2 Jun 2020 15:41:58 +0800 Message-Id: <20200602074201.10879-2-lma@suse.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200602074201.10879-1-lma@suse.com> References: <20200602074201.10879-1-lma@suse.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=morecache@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, stefanha@redhat.com, Lin Ma Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The get lba status wrapper based on the bdrv_block_status. The following patches will add GET LBA STATUS 16 support for scsi emulation layer. Signed-off-by: Lin Ma --- block/io.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/block/io.c b/block/io.c index 121ce17a49..dacc3c2471 100644 --- a/block/io.c +++ b/block/io.c @@ -2186,6 +2186,49 @@ int coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *child, int64_t offset, BDRV_REQ_ZERO_WRITE | flags); } +int coroutine_fn +bdrv_co_get_lba_status(BdrvChild *child, int64_t offset, int64_t bytes, + uint32_t *num_blocks, uint32_t *is_deallocated) +{ + BlockDriverState *bs = child->bs; + int ret; + int64_t target_size, count = 0; + bool first = true; + uint8_t wanted_bit1 = 0; + + target_size = bdrv_getlength(bs); + if (target_size < 0) { + return -EIO; + } + + if (offset < 0 || bytes < 0) { + return -EIO; + } + + for ( ; offset <= target_size - bytes; offset += count) { + ret = bdrv_block_status(bs, offset, bytes, &count, NULL, NULL); + if (ret < 0) { + goto out; + } + if (first) { + if (ret & BDRV_BLOCK_ZERO) { + wanted_bit1 = BDRV_BLOCK_ZERO >> 1;; + *is_deallocated = 1; + } else { + wanted_bit1 = 0; + } + first = false; + } + if ((ret & BDRV_BLOCK_ZERO) >> 1 == wanted_bit1) { + (*num_blocks)++; + } else { + break; + } + } +out: + return ret; +} + /* * Flush ALL BDSes regardless of if they are reachable via a BlkBackend or not. */ From patchwork Tue Jun 2 07:41:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 11583329 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36E07138C for ; Tue, 2 Jun 2020 07:44:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E6C7206C3 for ; Tue, 2 Jun 2020 07:44:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HH64tEcT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E6C7206C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jg1b8-0008Lm-AH for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Jun 2020 03:44:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jg1ZG-0003sv-3n for qemu-devel@nongnu.org; Tue, 02 Jun 2020 03:42:38 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:55726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jg1ZF-0000ZB-CE for qemu-devel@nongnu.org; Tue, 02 Jun 2020 03:42:37 -0400 Received: by mail-wm1-x341.google.com with SMTP id c71so1870180wmd.5 for ; Tue, 02 Jun 2020 00:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jhAbJ4GRGhtDDVKIxTwS8TPvMGErkabeXRmJPRzEdzM=; b=HH64tEcTh2bYLaAwptSA5cSoe0GnCZleCtOT+lWyHEDZe+ZE6bwAqxFczuBRNRa62J 4fAkk83vTdEUfHfkSiQkVxzRUhsk3ddXak0mQRNl5QM4u7m08tVJQv4v/wOc+ybMhEUo 0s/ge9ChCFGiNogcpyW7cuQHgLLvPdLYO7uAPsaXWDpITr1yoDizOsxB3W3NUaPE22PM q0J9R+ElNGW5pNu5u8Yamk4UhNBtQzqeHWjLpobIj//N4+8H63fTotFQ5wSkfz3Kknx5 NZmESQSfYp9X2hnB16LJglKpPCqWNJWt9Vj8peYjX+UcQUXHp1dy+77kmEZdPWvYc7vD e9rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jhAbJ4GRGhtDDVKIxTwS8TPvMGErkabeXRmJPRzEdzM=; b=WPnqr95D96awvb8Ap4XXs/Gq/g8v9tozzOIRPvN4kN7+6J+pVTm4XKoZdHUSYp8oIK fyipJBGAUOBrl2Pa6oU/kaPOd0E21M63saluG3z1QXGpfm2HZnb1zASt4j4ZkwQrKyH5 U1cQrUPyqj7zCFsZwuWhevka90r8Tb2ejjd7aGehV+Pvon5I0ZKGZW09EXW/6QzWlCyy Z4xOVUHY6jwBzCgCzimnYCQMj5/b9fAU1bl6PEKfnMGK9UVdWVLLCJCNxv3yUaRrmb6g Vd22DukKxKHTevstZs4i61ShS9e8P9r+uQ0ry5GI/6i7+hmW/0wG554V4rrnGBGoU6N9 c0oA== X-Gm-Message-State: AOAM533uPUtfGuD+SXB6wb+gPcYUQL6KGKddLhJcWVZFjkGZ+30B2Mqv z69z4WOpg4hzAyU+PvJWLvaMNaUo3UM= X-Google-Smtp-Source: ABdhPJyFD57ySBj1mj6h6wHYgqD+b1Ksjg2wi6MMtqvOj/WUHNl+4VOZ801yFkyo4cp30jRG/Wo9MA== X-Received: by 2002:a1c:3c89:: with SMTP id j131mr2820557wma.59.1591083754653; Tue, 02 Jun 2020 00:42:34 -0700 (PDT) Received: from t440p.suse.asia (60-251-47-115.HINET-IP.hinet.net. [60.251.47.115]) by smtp.gmail.com with ESMTPSA id w3sm2294518wmg.44.2020.06.02.00.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 00:42:34 -0700 (PDT) From: Lin Ma To: qemu-devel@nongnu.org Subject: [PATCH 2/4] block: Add GET LBA STATUS support Date: Tue, 2 Jun 2020 15:41:59 +0800 Message-Id: <20200602074201.10879-3-lma@suse.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200602074201.10879-1-lma@suse.com> References: <20200602074201.10879-1-lma@suse.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=morecache@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, stefanha@redhat.com, Lin Ma Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Lin Ma --- block/block-backend.c | 38 ++++++++++++++++++++++++++++++++++ include/sysemu/block-backend.h | 2 ++ 2 files changed, 40 insertions(+) diff --git a/block/block-backend.c b/block/block-backend.c index 6936b25c83..feb1f38b98 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1650,6 +1650,44 @@ int blk_pdiscard(BlockBackend *blk, int64_t offset, int bytes) return blk_prw(blk, offset, NULL, bytes, blk_pdiscard_entry, 0); } +static int coroutine_fn +blk_do_get_lba_status(BlockBackend *blk, int64_t offset, int bytes, + uint32_t *num_blocks, uint32_t *is_deallocated) +{ + int ret; + + blk_wait_while_drained(blk); + + ret = blk_check_byte_request(blk, offset, bytes); + if (ret < 0) { + return ret; + } + + return bdrv_co_get_lba_status(blk->root, offset, bytes, num_blocks, + is_deallocated); +} + +static void blk_aio_get_lba_status_entry(void *opaque) +{ + BlkAioEmAIOCB *acb = opaque; + BlkRwCo *rwco = &acb->rwco; + + void *data = acb->common.opaque; + uint32_t *num_blocks = &data[0]; + uint32_t *is_deallocated = &data[sizeof(uint32_t)]; + + rwco->ret = blk_do_get_lba_status(rwco->blk, rwco->offset, acb->bytes, + num_blocks, is_deallocated); + blk_aio_complete(acb); +} + +BlockAIOCB *blk_aio_get_lba_status(BlockBackend *blk, int64_t offset, int bytes, + BlockCompletionFunc *cb, void *opaque) +{ + return blk_aio_prwv(blk, offset, bytes, NULL, blk_aio_get_lba_status_entry, + 0, cb, opaque); +} + /* To be called between exactly one pair of blk_inc/dec_in_flight() */ static int coroutine_fn blk_do_flush(BlockBackend *blk) { diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 8203d7f6f9..cd527ec0c9 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -171,6 +171,8 @@ BlockAIOCB *blk_aio_flush(BlockBackend *blk, BlockCompletionFunc *cb, void *opaque); BlockAIOCB *blk_aio_pdiscard(BlockBackend *blk, int64_t offset, int bytes, BlockCompletionFunc *cb, void *opaque); +BlockAIOCB *blk_aio_get_lba_status(BlockBackend *blk, int64_t offset, int bytes, + BlockCompletionFunc *cb, void *opaque); void blk_aio_cancel(BlockAIOCB *acb); void blk_aio_cancel_async(BlockAIOCB *acb); int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf); From patchwork Tue Jun 2 07:42:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 11583325 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D714A138C for ; Tue, 2 Jun 2020 07:43:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD782206C3 for ; Tue, 2 Jun 2020 07:43:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bau/dU6N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD782206C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jg1Zy-0005aB-Lr for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Jun 2020 03:43:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jg1ZH-0003wC-SN for qemu-devel@nongnu.org; Tue, 02 Jun 2020 03:42:39 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:55872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jg1ZH-0000Zj-9u for qemu-devel@nongnu.org; Tue, 02 Jun 2020 03:42:39 -0400 Received: by mail-wm1-x32e.google.com with SMTP id c71so1870280wmd.5 for ; Tue, 02 Jun 2020 00:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+1zDIDD5Ac1G0o+sZnIC0Y87pDen00GlH6TX0f0+z20=; b=Bau/dU6Ng5FJRYIR+5Jqsgha7wM9+N+56gTWMOiqwi2oyb9lyH96cFRxdp/Ab7Qxg+ +HTMPWY0/CZvLooYBvIqFqBOkqV8T6u4StBohNPxdMKokn/ZBN8OSeqkm2mnrrvUUQpz Z/P6hgqI/+6fKnJCRtzNuvFRyXmFwG/dVvnn6IVDyQLZkwAu9dsRR5MOFB128Z9UuA1a Bu1SX+exf+ivTkoUQtxwp4wSfp5iJKRrhxTay/+QLBsSh07EqQpQisrx++r+qBT1nfxZ /tqFHu4as6Y4kJe8csHwlmBuucfVidPKkzsw9Cb59fGBeSw94hcrC7pIu9JmhjITxPvk dZDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+1zDIDD5Ac1G0o+sZnIC0Y87pDen00GlH6TX0f0+z20=; b=j3IRk5S3Rsj8uo7UxVc5SlKYEpXB1nfOYRXWy7nIAQ5cG1CPfem0TW7vEkmQnzNyEe tRkS6OPcVPOr7VKxBsUxgD0tKztVB0/vOmfAx9K13ZcDjyc5kQ4tDCViNsF//JkWJBBe CZra+6897BsC6XX1D5ruun9FIhtwRxoXJNE3gpyWE4H+G418EQOe3xFvM8WBpB6znTNS 9jTxnpnATwMmNFeKSrqC4bcgG6au9ipZKkCQaz2Kjw9ntCtLT4wlNlD2zsL0Runwep9R mkUtvOBTM0VDmApFcRHBnM86Z9E1zXABqYpslA6CSsFD479CyWwkdMXgwVT1U2IXTx9F KPxw== X-Gm-Message-State: AOAM532oTAQ3nn/7VR/GuHY7gkWkXP6HK91MtHI/4bbx/fH0IJiZUktA kZ02ox/paWhL4+sSBB5FZ0TIlq1UJfQ= X-Google-Smtp-Source: ABdhPJw5aidY05pDdf151pOu8+9XKa13pjvSkry29NKrLblhWBL9CrPERwxVAo254nj/BiGDLvYCTw== X-Received: by 2002:a1c:62d6:: with SMTP id w205mr2735145wmb.97.1591083757916; Tue, 02 Jun 2020 00:42:37 -0700 (PDT) Received: from t440p.suse.asia (60-251-47-115.HINET-IP.hinet.net. [60.251.47.115]) by smtp.gmail.com with ESMTPSA id w3sm2294518wmg.44.2020.06.02.00.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 00:42:37 -0700 (PDT) From: Lin Ma To: qemu-devel@nongnu.org Subject: [PATCH 3/4] block: Add block accounting code for GET LBA STATUS Date: Tue, 2 Jun 2020 15:42:00 +0800 Message-Id: <20200602074201.10879-4-lma@suse.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200602074201.10879-1-lma@suse.com> References: <20200602074201.10879-1-lma@suse.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=morecache@gmail.com; helo=mail-wm1-x32e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, stefanha@redhat.com, Lin Ma Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Lin Ma --- include/block/accounting.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/block/accounting.h b/include/block/accounting.h index 878b4c3581..645014fb0b 100644 --- a/include/block/accounting.h +++ b/include/block/accounting.h @@ -38,6 +38,7 @@ enum BlockAcctType { BLOCK_ACCT_WRITE, BLOCK_ACCT_FLUSH, BLOCK_ACCT_UNMAP, + BLOCK_ACCT_GET_LBA_STATUS, BLOCK_MAX_IOTYPE, }; From patchwork Tue Jun 2 07:42:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 11583327 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B87B260D for ; Tue, 2 Jun 2020 07:43:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 906D3206C3 for ; Tue, 2 Jun 2020 07:43:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kZTuFCuM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 906D3206C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jg1a4-0005pT-NN for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Jun 2020 03:43:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jg1ZM-00046k-HL for qemu-devel@nongnu.org; Tue, 02 Jun 2020 03:42:44 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:43726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jg1ZL-0000a3-QE for qemu-devel@nongnu.org; Tue, 02 Jun 2020 03:42:44 -0400 Received: by mail-wr1-x442.google.com with SMTP id l10so2270514wrr.10 for ; Tue, 02 Jun 2020 00:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lSNxJ+he1VqHG88avCPlJcq6eRPaf7eHxjBV+zd6EhI=; b=kZTuFCuMjB3ghBIgMQ0K9uRPLmJWGOcOVynrHoAsZqekzg/xKbK9woa7hBqkXtDmJv Nenln085oeOakQLqltvMCp/FEdcoF6FSZraZNdWi0Ev5vgY3r83h0Yx6c3AVm/LlFkiC PuUxtPkjAV8OKXzpdnklCc2389JpCA2jYO78tc49XWHiyMyqeLN6rSnql0PlduiFKkIh 8vSs5s4JPyBA3VAWc6kArp426KNNBlc6ecfk4bqe6gSN5cy6OZolxz+VxD4KFv7fTZOA BwPRZN2mnMCO9Tsyba3Mn/dvlEJmXKMNI/bpCsPUUOPL1FAsDZHq2yj+FQUJprRqp9U/ Ruqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lSNxJ+he1VqHG88avCPlJcq6eRPaf7eHxjBV+zd6EhI=; b=Oen859da21EblgiYqXIybhwRY4eTXTTROBULNTJdR4nKG6UM9YcgNg5KGi5/FNec1R cTeOgzwTYV0DpDY4JOZzLFEz6KHrbmg7IHNFj7l87DUIUf8xIFGNnlRFIYmtUzOTVWd4 Bj/Uf4Pt2JUz1L48Bi6aklvPJBMtfKpuMqNkpZxVHNCs+8b2pJv8gIP5f00Mic3HPTF9 yuZPEeOEnZQSmk35OgdSNx+pctF3KWb0D6ZeAaVFJAa/m0xtTo1tXtbb1C2xqJBYX0u5 I39j7Tu9IvLJhaFnw6zSTHQKSXNzgMlN8+TQvufQ8sUoJGZr5njBKCSs28EhHsLXqI9e bB9Q== X-Gm-Message-State: AOAM5302A6k4y4OqI30SlV3aPrECB7qoYSxSJPb30g478PohyPZZRX/G S+doFAzLhBnwFJMBpC6whcYNhXSOOiI= X-Google-Smtp-Source: ABdhPJx37iEAkXIMtWiY0UI6lVC5EbjpCaKyW+Z5CJuc7DiZR3OYR5+09G5Q1OcpEB+B/L4Il0+Agw== X-Received: by 2002:adf:f186:: with SMTP id h6mr23913799wro.22.1591083762300; Tue, 02 Jun 2020 00:42:42 -0700 (PDT) Received: from t440p.suse.asia (60-251-47-115.HINET-IP.hinet.net. [60.251.47.115]) by smtp.gmail.com with ESMTPSA id w3sm2294518wmg.44.2020.06.02.00.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 00:42:41 -0700 (PDT) From: Lin Ma To: qemu-devel@nongnu.org Subject: [PATCH 4/4] scsi-disk: Add support for the GET LBA STATUS 16 command Date: Tue, 2 Jun 2020 15:42:01 +0800 Message-Id: <20200602074201.10879-5-lma@suse.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200602074201.10879-1-lma@suse.com> References: <20200602074201.10879-1-lma@suse.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=morecache@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, stefanha@redhat.com, Lin Ma Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Lin Ma --- hw/scsi/scsi-disk.c | 92 ++++++++++++++++++++++++++++++++++++++++ include/scsi/constants.h | 1 + 2 files changed, 93 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 387503e11b..2d2c6b4b82 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1866,6 +1866,91 @@ static void scsi_disk_emulate_write_data(SCSIRequest *req) } } +typedef struct GetLbaStatusCBData { + uint32_t num_blocks; + uint32_t is_deallocated; + SCSIDiskReq *r; +} GetLbaStatusCBData; + +static void scsi_get_lba_status_complete(void *opaque, int ret); + +static void scsi_get_lba_status_complete_noio(GetLbaStatusCBData *data, int ret) +{ + SCSIDiskReq *r = data->r; + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + + assert(r->req.aiocb == NULL); + + block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, + s->qdev.blocksize, BLOCK_ACCT_GET_LBA_STATUS); + + r->req.aiocb = blk_aio_get_lba_status(s->qdev.conf.blk, + r->req.cmd.lba * s->qdev.blocksize, + s->qdev.blocksize, + scsi_get_lba_status_complete, data); + return; +} + +static void scsi_get_lba_status_complete(void *opaque, int ret) +{ + GetLbaStatusCBData *data = opaque; + SCSIDiskReq *r = data->r; + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + + assert(r->req.aiocb != NULL); + r->req.aiocb = NULL; + + aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk)); + if (scsi_disk_req_check_error(r, ret, true)) { + g_free(data); + goto done; + } + + block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct); + scsi_req_unref(&r->req); + g_free(data); + +done: + aio_context_release(blk_get_aio_context(s->qdev.conf.blk)); +} + +static void scsi_disk_emulate_get_lba_status(SCSIRequest *req, uint8_t *outbuf) +{ + SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); + GetLbaStatusCBData *data; + uint32_t *num_blocks; + uint32_t *is_deallocated; + + data = g_new0(GetLbaStatusCBData, 1); + data->r = r; + num_blocks = &(data->num_blocks); + is_deallocated = &(data->is_deallocated); + + scsi_req_ref(&r->req); + scsi_get_lba_status_complete_noio(data, 0); + + /* 8 + 16 is the length in bytes of response header and + * one LBA status descriptor + */ + memset(outbuf, 0, 8 + 16); + outbuf[3] = 20; + outbuf[8] = (req->cmd.lba >> 56) & 0xff; + outbuf[9] = (req->cmd.lba >> 48) & 0xff; + outbuf[10] = (req->cmd.lba >> 40) & 0xff; + outbuf[11] = (req->cmd.lba >> 32) & 0xff; + outbuf[12] = (req->cmd.lba >> 24) & 0xff; + outbuf[13] = (req->cmd.lba >> 16) & 0xff; + outbuf[14] = (req->cmd.lba >> 8) & 0xff; + outbuf[15] = req->cmd.lba & 0xff; + outbuf[16] = (*num_blocks >> 24) & 0xff; + outbuf[17] = (*num_blocks >> 16) & 0xff; + outbuf[18] = (*num_blocks >> 8) & 0xff; + outbuf[19] = *num_blocks & 0xff; + outbuf[20] = *is_deallocated ? 1 : 0; + + return; +} + static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf) { SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); @@ -2076,6 +2161,13 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf) /* Protection, exponent and lowest lba field left blank. */ break; + } else if ((req->cmd.buf[1] & 31) == SAI_GET_LBA_STATUS) { + if (req->cmd.lba > s->qdev.max_lba) { + goto illegal_lba; + } + scsi_disk_emulate_get_lba_status(req, outbuf); + r->iov.iov_len = req->cmd.xfer; + return r->iov.iov_len; } trace_scsi_disk_emulate_command_SAI_unsupported(); goto illegal_request; diff --git a/include/scsi/constants.h b/include/scsi/constants.h index 874176019e..1b6417898a 100644 --- a/include/scsi/constants.h +++ b/include/scsi/constants.h @@ -154,6 +154,7 @@ * SERVICE ACTION IN subcodes */ #define SAI_READ_CAPACITY_16 0x10 +#define SAI_GET_LBA_STATUS 0x12 /* * READ POSITION service action codes