From patchwork Mon May 24 16:41:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12276673 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2319C04FF3 for ; Mon, 24 May 2021 17:12:33 +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 9724D613EC for ; Mon, 24 May 2021 17:12:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9724D613EC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llE80-00060F-IW for qemu-devel@archiver.kernel.org; Mon, 24 May 2021 13:12:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDeW-000571-JW for qemu-devel@nongnu.org; Mon, 24 May 2021 12:42:11 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:43912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDeK-0004Q8-Ga for qemu-devel@nongnu.org; Mon, 24 May 2021 12:42:03 -0400 Received: by mail-ej1-x629.google.com with SMTP id f18so12625143ejq.10 for ; Mon, 24 May 2021 09:41:52 -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=zDuY3FOPTKsIVSVkuFvz8ny58BlbRg0sWUb7PMImOzk=; b=Z2OreiscSluR+xn/NPAsxr1bmgKboU5qicwZToOSGL01nXblzUBrHVLyoGUCjyxQ0M JJSE8ySq63NK8AZqHDqszqI5CT/va4PfVbiBogRsuuoilxdQ3asmbXS0X6EjyEWcDuna +jaHhzgCSxQys+Nn4NqMz7mJ+m5sSCVdoB63F5HD7GMmjSZgmizTbzdLdWvRxUr5sJV7 jnLu6gXSuwFXVhIiqioS3fkEPM0KE3FugYFxPm4VPT2kjWwTY361CWyvpfHqIH0Ev+DB aLf6M8n9n5x2o3TpvGqkHyz7SnS6Bv/zwQ20/GYGBgTBUysPW7zUd+s+eO1itJeV7lcl T0MQ== 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=zDuY3FOPTKsIVSVkuFvz8ny58BlbRg0sWUb7PMImOzk=; b=Fk6IBwGlV36tTq762dSEaz1cA7rRMQ4GXiA8zeGwG+58P2UDjXVql6FUnar1ve8Gxe jY0KjHdDuxxafIxBViBd7V1wUq8zSmX+gcXtpexXAjDig1u07UsBp9sIvtgbqabO2/v5 OhANczULbddhDE8z7ms+o2J4jkLf7k/IZN2+VnUuCpsYjxbBG7o99E0Y+jCjW7kPjPJN y3s/EuS1N5e1rI4R8iS2PV6yvmhaqdHAoiKGCS7WLuI+tSUnaVqe4YybBRmPgoVNKKcV 9PKf1MHuZs7CgztUumCg47JE865z9rMx+0WIFlkJd/G1KoM5craHE02aC42AYVbFpQMY Ag1g== X-Gm-Message-State: AOAM530rXbAZH5ABR5fBiROosaFoWrU3Jfav9AJjvDlqi1xguzQqj8oD DJwiw7lwRInWWTjEDTAO1qs2O/D/Pp5Jcg== X-Google-Smtp-Source: ABdhPJySBfbbuM7/tWQEP1Er52iCRde4r1n3pHRqvJ73VecQscymRIyEpqfHMs3HOxfIT4G91lXsaw== X-Received: by 2002:a17:906:11cc:: with SMTP id o12mr23785885eja.547.1621874511189; Mon, 24 May 2021 09:41:51 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id g4sm9581922edm.83.2021.05.24.09.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:41:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 27/28] hw/scsi: Fix sector translation bug in scsi_unmap_complete_noio Date: Mon, 24 May 2021 18:41:30 +0200 Message-Id: <20210524164131.383778-28-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524164131.383778-1-pbonzini@redhat.com> References: <20210524164131.383778-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: Kit Westneat Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Kit Westneat check_lba_range expects sectors to be expressed in original qdev blocksize, but scsi_unmap_complete_noio was translating them to 512 block sizes, which was causing sense errors in the larger LBAs in devices using a 4k block size. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/345 Signed-off-by: Kit Westneat Message-Id: <20210521142829.326217-1-kit.westneat@gmail.com> Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 3580e7ee61..e8a547dbb7 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1582,6 +1582,7 @@ invalid_field: scsi_check_condition(r, SENSE_CODE(INVALID_FIELD)); } +/* sector_num and nb_sectors expected to be in qdev blocksize */ static inline bool check_lba_range(SCSIDiskState *s, uint64_t sector_num, uint32_t nb_sectors) { @@ -1614,11 +1615,12 @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret) assert(r->req.aiocb == NULL); if (data->count > 0) { - r->sector = ldq_be_p(&data->inbuf[0]) - * (s->qdev.blocksize / BDRV_SECTOR_SIZE); - r->sector_count = (ldl_be_p(&data->inbuf[8]) & 0xffffffffULL) - * (s->qdev.blocksize / BDRV_SECTOR_SIZE); - if (!check_lba_range(s, r->sector, r->sector_count)) { + uint64_t sector_num = ldq_be_p(&data->inbuf[0]); + uint32_t nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL; + r->sector = sector_num * (s->qdev.blocksize / BDRV_SECTOR_SIZE); + r->sector_count = nb_sectors * (s->qdev.blocksize / BDRV_SECTOR_SIZE); + + if (!check_lba_range(s, sector_num, nb_sectors)) { block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP); scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));