From nobody Sat Apr 11 13:57:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EBADC25B0D for ; Wed, 10 Aug 2022 09:44:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232249AbiHJJoD (ORCPT ); Wed, 10 Aug 2022 05:44:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231686AbiHJJn5 (ORCPT ); Wed, 10 Aug 2022 05:43:57 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2FC145070F for ; Wed, 10 Aug 2022 02:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660124634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bxa8o9Tbfqnk5UAsXfKTjPHNDbYRHlKkIXBkapUnTe8=; b=OtdfsynKlDxAJByDl+XOHewhNzDjs41yv+uC67M3otEINfR7aTXbDYQrx/LzrtmAc30Fm6 5ueBIgCYo7dzUKI+1EnRf1hUWhzSX8QZNNRXIwgGnKji4VBStLqtB3M12kyPbZxEKqt6Wj Ui+O7w2kZvz2hOgKLkIrxljnXJx6/cc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-SVq3H4QXNb-QrcTMdb6RIw-1; Wed, 10 Aug 2022 05:43:53 -0400 X-MC-Unique: SVq3H4QXNb-QrcTMdb6RIw-1 Received: by mail-wm1-f72.google.com with SMTP id n1-20020a7bcbc1000000b003a4e8c818f5so391052wmi.6 for ; Wed, 10 Aug 2022 02:43:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=bxa8o9Tbfqnk5UAsXfKTjPHNDbYRHlKkIXBkapUnTe8=; b=h1fDVo6i3xsT6Ci10Y09cWa5dPIIJxXYRSficE/hrqi+sbzw8KYCv/5u4/Ol7Jq97V KBKBkuzQhODlPiAusZg4nXZTKZ0SN2rU14A+lrpKlY7r/jh2IFoG6OliMtFzAweFHfYA veuI5bzlbSNCcdrDhaWA3TN+0hXbT7/eZA6W+kPfMTUgG/I5m9LO6EN32exzbO6SfO1n P2jyS+bGQ3ZvNNQjOXFC24g4L8d0Uxhvfq5U/GpZ56huNSxCw1UoAcNWQK8cUKTvuOmG WYUigwwTZOX80KcBLW4jzwqgmlNAVc5gjr8MV3BaG3zmONJzEaqakN6bXeWgUH1DHbsS GWPQ== X-Gm-Message-State: ACgBeo3Do6v+kjGxEwD3MoLH7L4gOxp1dCv91FPQjorxNtnJywW+NCr/ pflwXNda7NS8IBQVYwbLjQJWfL45ozKbuwNYYUzrdAyU68cbBsZ/SjBTFiK/QLr2MVy4OtKbbcC jZx1O8O1M5/U2ii9wZk8fBrgI X-Received: by 2002:a05:600c:1c19:b0:3a5:a3c7:3800 with SMTP id j25-20020a05600c1c1900b003a5a3c73800mr1842909wms.69.1660124631891; Wed, 10 Aug 2022 02:43:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR6Jxsv0aCcVhfY1+aZAP46TL6gSQU1Nu4jG9pvamIlkWl0TlioV7Jo9df4vCccE3CDr541Q2g== X-Received: by 2002:a05:600c:1c19:b0:3a5:a3c7:3800 with SMTP id j25-20020a05600c1c1900b003a5a3c73800mr1842898wms.69.1660124631718; Wed, 10 Aug 2022 02:43:51 -0700 (PDT) Received: from step1.redhat.com (host-79-46-200-178.retail.telecomitalia.it. [79.46.200.178]) by smtp.gmail.com with ESMTPSA id q11-20020a5d658b000000b0021e4bc9edbfsm12921743wru.112.2022.08.10.02.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 02:43:50 -0700 (PDT) From: Stefano Garzarella To: virtualization@lists.linux-foundation.org Cc: Jason Wang , "Michael S. Tsirkin" , linux-kernel@vger.kernel.org, Stefano Garzarella Subject: [PATCH v2 1/4] vdpa_sim_blk: check if sector is 0 for commands other than read or write Date: Wed, 10 Aug 2022 11:43:44 +0200 Message-Id: <20220810094347.20449-2-sgarzare@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220810094347.20449-1-sgarzare@redhat.com> References: <20220810094347.20449-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" VIRTIO spec states: "The sector number indicates the offset (multiplied by 512) where the read or write is to occur. This field is unused and set to 0 for commands other than read or write." Signed-off-by: Stefano Garzarella --- drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c b/drivers/vdpa/vdpa_sim/v= dpa_sim_blk.c index ba253f8bce32..69c9f4f36f9a 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c @@ -112,6 +112,15 @@ static bool vdpasim_blk_handle_req(struct vdpasim *vdp= asim, offset =3D sector << SECTOR_SHIFT; status =3D VIRTIO_BLK_S_OK; =20 + if (type !=3D VIRTIO_BLK_T_IN && type !=3D VIRTIO_BLK_T_OUT && + sector !=3D 0) { + dev_dbg(&vdpasim->vdpa.dev, + "sector must be 0 for %u request - sector: 0x%llx\n", + type, sector); + status =3D VIRTIO_BLK_S_IOERR; + goto err_status; + } + switch (type) { case VIRTIO_BLK_T_IN: if (!vdpasim_blk_check_range(sector, to_push)) { @@ -178,6 +187,7 @@ static bool vdpasim_blk_handle_req(struct vdpasim *vdpa= sim, break; } =20 +err_status: /* If some operations fail, we need to skip the remaining bytes * to put the status in the last byte */ --=20 2.37.1 From nobody Sat Apr 11 13:57:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDDCEC25B08 for ; Wed, 10 Aug 2022 09:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232248AbiHJJo3 (ORCPT ); Wed, 10 Aug 2022 05:44:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232100AbiHJJn6 (ORCPT ); Wed, 10 Aug 2022 05:43:58 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 36E9451435 for ; Wed, 10 Aug 2022 02:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660124636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=38oYZZo5oxfiL5gDqzJLWx2Nj0BFm9A6p9CXqcxwNdc=; b=ScIQAoz8opntk0i4mjwVMYcnXSeZ/JokK2r9/iIy5r29AlmHRvRvFaFMvUtFHM9+7XsuYl UYA6EJMlz/f4Yi6DyW0rXxzwdO7kZot/j0W+sUqYN64DMVlt1/xIp3CYNEIldLXYK+BClW J4iLVCUvFKefnLsxMkUCpVhOE0WkDG8= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-NMfBaNX2PTKsIF1bHwHAMg-1; Wed, 10 Aug 2022 05:43:55 -0400 X-MC-Unique: NMfBaNX2PTKsIF1bHwHAMg-1 Received: by mail-wm1-f71.google.com with SMTP id j36-20020a05600c1c2400b003a540d88677so3619734wms.1 for ; Wed, 10 Aug 2022 02:43:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=38oYZZo5oxfiL5gDqzJLWx2Nj0BFm9A6p9CXqcxwNdc=; b=SM2w7xJ5/kk/3aaSn+bJi4E84cNlQtbR8jwb6h1VcklN/B2boYI2/CXo6NKqTGH94Y K0NmDqLMRDvcn2DYYW6h0BLBtp9/q1sLPbsLhv1MSA4ihWrRvw7cnjsdrnDyCb7I4Ty/ lV3xJyZam59GasZUQTXYQjQJREqaLKsCbKs6V5fBTGCOVDOvf1V0Q6ZxxjucMzO60ERr 6xCBZ/aud3ftgxYaMgUkjCNxsVSSaMAgfOkYi+WcYNqodjuynDFcxEteszneHMZJAhgC moRVNfu75vkZkPkxBmtq79AMO2eFEE9tBBE/KH+ROhShiNgqOSviSgWCf9m/4rjMRVi9 6d+w== X-Gm-Message-State: ACgBeo0+HgVBOC9mrfp2WEzz5Zyo23VXlrBwAUQTJhJrkMtZlPp602X0 Kxvj/94Cw9tOD2TOz+z/O5CCEbV7QTSOn4YBt0FKCnMmc8oAkCk4K8IcYKr1zR6IIdAuLZfQcqU b0WkHLQejemBDWGanO5/pOcu+ X-Received: by 2002:a05:600c:4fc9:b0:3a3:3537:1726 with SMTP id o9-20020a05600c4fc900b003a335371726mr1807910wmq.26.1660124633942; Wed, 10 Aug 2022 02:43:53 -0700 (PDT) X-Google-Smtp-Source: AA6agR6+x6w6khhisrJ7VVikYRvP5aWnDOo2jZbJ9hkj27Qmee0ul8zS76kXeQOyfuD1Ht+pNk6ezA== X-Received: by 2002:a05:600c:4fc9:b0:3a3:3537:1726 with SMTP id o9-20020a05600c4fc900b003a335371726mr1807903wmq.26.1660124633749; Wed, 10 Aug 2022 02:43:53 -0700 (PDT) Received: from step1.redhat.com (host-79-46-200-178.retail.telecomitalia.it. [79.46.200.178]) by smtp.gmail.com with ESMTPSA id q11-20020a5d658b000000b0021e4bc9edbfsm12921743wru.112.2022.08.10.02.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 02:43:52 -0700 (PDT) From: Stefano Garzarella To: virtualization@lists.linux-foundation.org Cc: Jason Wang , "Michael S. Tsirkin" , linux-kernel@vger.kernel.org, Stefano Garzarella Subject: [PATCH v2 2/4] vdpa_sim_blk: make vdpasim_blk_check_range usable by other requests Date: Wed, 10 Aug 2022 11:43:45 +0200 Message-Id: <20220810094347.20449-3-sgarzare@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220810094347.20449-1-sgarzare@redhat.com> References: <20220810094347.20449-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Next patches will add handling of other requests, where will be useful to reuse vdpasim_blk_check_range(). So let's make it more generic by adding the `max_sectors` parameter, since different requests allow different numbers of maximum sectors. Let's also print the messages directly in vdpasim_blk_check_range() to avoid duplicate prints. Signed-off-by: Stefano Garzarella --- drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 38 +++++++++++++++++----------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c b/drivers/vdpa/vdpa_sim/v= dpa_sim_blk.c index 69c9f4f36f9a..24dd9cae6450 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c @@ -42,18 +42,28 @@ =20 static char vdpasim_blk_id[VIRTIO_BLK_ID_BYTES] =3D "vdpa_blk_sim"; =20 -static bool vdpasim_blk_check_range(u64 start_sector, size_t range_size) +static bool vdpasim_blk_check_range(struct vdpasim *vdpasim, u64 start_sec= tor, + u64 num_sectors, u64 max_sectors) { - u64 range_sectors =3D range_size >> SECTOR_SHIFT; - - if (range_size > VDPASIM_BLK_SIZE_MAX * VDPASIM_BLK_SEG_MAX) - return false; + if (start_sector > VDPASIM_BLK_CAPACITY) { + dev_dbg(&vdpasim->vdpa.dev, + "starting sector exceeds the capacity - start: 0x%llx capacity: 0x%x\n", + start_sector, VDPASIM_BLK_CAPACITY); + } =20 - if (start_sector > VDPASIM_BLK_CAPACITY) + if (num_sectors > max_sectors) { + dev_dbg(&vdpasim->vdpa.dev, + "number of sectors exceeds the max allowed in a request - num: 0x%llx m= ax: 0x%llx\n", + num_sectors, max_sectors); return false; + } =20 - if (range_sectors > VDPASIM_BLK_CAPACITY - start_sector) + if (num_sectors > VDPASIM_BLK_CAPACITY - start_sector) { + dev_dbg(&vdpasim->vdpa.dev, + "request exceeds the capacity - start: 0x%llx num: 0x%llx capacity: 0x%= x\n", + start_sector, num_sectors, VDPASIM_BLK_CAPACITY); return false; + } =20 return true; } @@ -123,10 +133,9 @@ static bool vdpasim_blk_handle_req(struct vdpasim *vdp= asim, =20 switch (type) { case VIRTIO_BLK_T_IN: - if (!vdpasim_blk_check_range(sector, to_push)) { - dev_dbg(&vdpasim->vdpa.dev, - "reading over the capacity - offset: 0x%llx len: 0x%zx\n", - offset, to_push); + if (!vdpasim_blk_check_range(vdpasim, sector, + to_push >> SECTOR_SHIFT, + VDPASIM_BLK_SIZE_MAX * VDPASIM_BLK_SEG_MAX)) { status =3D VIRTIO_BLK_S_IOERR; break; } @@ -146,10 +155,9 @@ static bool vdpasim_blk_handle_req(struct vdpasim *vdp= asim, break; =20 case VIRTIO_BLK_T_OUT: - if (!vdpasim_blk_check_range(sector, to_pull)) { - dev_dbg(&vdpasim->vdpa.dev, - "writing over the capacity - offset: 0x%llx len: 0x%zx\n", - offset, to_pull); + if (!vdpasim_blk_check_range(vdpasim, sector, + to_pull >> SECTOR_SHIFT, + VDPASIM_BLK_SIZE_MAX * VDPASIM_BLK_SEG_MAX)) { status =3D VIRTIO_BLK_S_IOERR; break; } --=20 2.37.1 From nobody Sat Apr 11 13:57:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FE6AC00140 for ; Wed, 10 Aug 2022 09:44:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232300AbiHJJod (ORCPT ); Wed, 10 Aug 2022 05:44:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232238AbiHJJoA (ORCPT ); Wed, 10 Aug 2022 05:44:00 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 088A052DF0 for ; Wed, 10 Aug 2022 02:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660124639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b2PRyz9SGjKoLZlYF6JLzg9mzaDVsgEeEMI7cjuKE+0=; b=asBq+1TfVFvM1bedBUJfiDA2dtD1mmWxAq5heZ8d78g+Stu3RhbQfob3TdOgNYlIimfHBn DGRafijuSuGGUK4CZA4sjoiNuJhxkFw76aPcttiZhSocJPOyeZUidjsQTCsTng3DHXHVAn THKha1oNqdBukMoEnlGs5KBvHcMU9VY= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-635-cyhY5qzjMEyQ1fRC7ssZ4w-1; Wed, 10 Aug 2022 05:43:58 -0400 X-MC-Unique: cyhY5qzjMEyQ1fRC7ssZ4w-1 Received: by mail-wr1-f70.google.com with SMTP id w20-20020adf8bd4000000b002237e71d4e4so152446wra.21 for ; Wed, 10 Aug 2022 02:43:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=b2PRyz9SGjKoLZlYF6JLzg9mzaDVsgEeEMI7cjuKE+0=; b=qbK0cEEFBvReEQkZQIs/zEDwhbhd1BGao7Rd4m8fm9HNyZImdL2euE/PAldRpGcaxt Hf274t6n6Sb4wjqn5tjhYBGgsF6mjDTbbmOPZhfUcCDItj/we7XluNLnUUxehwXQ1z5F bsIur9hMhJmoSplHT5l/skZy+DvQzcLhAzpP21SAMvgRAFj290H/6p8Ulu9+o0wBzNUG GlQHqPAyXQVOaUltjnJziOb7X0fUegrY67BXt6y4yl/o/Oq2U6i/yRt1WD2QV3UmnyFM KZtQF+GXFJdC4eE5dmGCdeRee2RS9Q/Iz7EkDe5jRAu1lE46h1n+2xVas/SyDFUFvNs2 yTFQ== X-Gm-Message-State: ACgBeo1YeQGxd6MAqt5Ss+Fvdj3YzcJ3+052TDWzq18IXVCCXJ8/qUcG 81gl4rXILor/bygDdTtUlL6R8Qx7haKMdS2upB/CC5jXgfS6gABZ79TOkD/mKP3vMpPtDqcZVPW 8fmX/8TMo8a/hk5KkgGexZ3E6 X-Received: by 2002:adf:d1c9:0:b0:20f:c3dc:e980 with SMTP id b9-20020adfd1c9000000b0020fc3dce980mr16506750wrd.552.1660124635489; Wed, 10 Aug 2022 02:43:55 -0700 (PDT) X-Google-Smtp-Source: AA6agR5G624psAQ0CDHz/tX9HGp8fAwlc2Q6jgDrVstRV8Ex4w7YsTXeGAp2caKRmTJ7VelfCf8tkg== X-Received: by 2002:adf:d1c9:0:b0:20f:c3dc:e980 with SMTP id b9-20020adfd1c9000000b0020fc3dce980mr16506738wrd.552.1660124635306; Wed, 10 Aug 2022 02:43:55 -0700 (PDT) Received: from step1.redhat.com (host-79-46-200-178.retail.telecomitalia.it. [79.46.200.178]) by smtp.gmail.com with ESMTPSA id q11-20020a5d658b000000b0021e4bc9edbfsm12921743wru.112.2022.08.10.02.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 02:43:54 -0700 (PDT) From: Stefano Garzarella To: virtualization@lists.linux-foundation.org Cc: Jason Wang , "Michael S. Tsirkin" , linux-kernel@vger.kernel.org, Stefano Garzarella Subject: [PATCH v2 3/4] vdpa_sim_blk: add support for VIRTIO_BLK_T_FLUSH Date: Wed, 10 Aug 2022 11:43:46 +0200 Message-Id: <20220810094347.20449-4-sgarzare@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220810094347.20449-1-sgarzare@redhat.com> References: <20220810094347.20449-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The simulator behaves like a ramdisk, so we don't have to do anything when a VIRTIO_BLK_T_FLUSH request is received, but it could be useful to test driver behavior. Let's expose the VIRTIO_BLK_F_FLUSH feature to inform the driver that we support the flush command. Signed-off-by: Stefano Garzarella --- drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c b/drivers/vdpa/vdpa_sim/v= dpa_sim_blk.c index 24dd9cae6450..1f18f336cf0c 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c @@ -25,6 +25,7 @@ #define DRV_LICENSE "GPL v2" =20 #define VDPASIM_BLK_FEATURES (VDPASIM_FEATURES | \ + (1ULL << VIRTIO_BLK_F_FLUSH) | \ (1ULL << VIRTIO_BLK_F_SIZE_MAX) | \ (1ULL << VIRTIO_BLK_F_SEG_MAX) | \ (1ULL << VIRTIO_BLK_F_BLK_SIZE) | \ @@ -188,6 +189,10 @@ static bool vdpasim_blk_handle_req(struct vdpasim *vdp= asim, pushed +=3D bytes; break; =20 + case VIRTIO_BLK_T_FLUSH: + /* nothing to do */ + break; + default: dev_dbg(&vdpasim->vdpa.dev, "Unsupported request type %d\n", type); --=20 2.37.1 From nobody Sat Apr 11 13:57:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F7B3C00140 for ; Wed, 10 Aug 2022 09:45:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231241AbiHJJp2 (ORCPT ); Wed, 10 Aug 2022 05:45:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232281AbiHJJoa (ORCPT ); Wed, 10 Aug 2022 05:44:30 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 23BF06CF5F for ; Wed, 10 Aug 2022 02:44:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660124661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k7/Qe+5eTUGxbNC+s2zlukeDJxV02+FkntfjhZmwiRA=; b=IHtYczn8yF9U6uDJYMiX7nKeO1jJX62iWHj65B06HVCPbLourgjfliH1b1zn07bCJA0Mw5 ++jEtNG1iAbnLlb9uWSEV9nia2gfNXKh1Guip0MjSSExuufgn82glpT1yeKLUwwEJLDyYo vAlblbXmyFZtnYPfJ2d/mhrFZbILrk8= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-510-Pw5ok0ipPw-NxEPFp_QvpQ-1; Wed, 10 Aug 2022 05:44:18 -0400 X-MC-Unique: Pw5ok0ipPw-NxEPFp_QvpQ-1 Received: by mail-wm1-f70.google.com with SMTP id f21-20020a1cc915000000b003a3551598a1so395762wmb.0 for ; Wed, 10 Aug 2022 02:44:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=k7/Qe+5eTUGxbNC+s2zlukeDJxV02+FkntfjhZmwiRA=; b=hDYai9toXeJOyIpPcgE1gZd2NqVDHuvFyX04yOQHv0OyHXEgxtrv135s3OSQ1ReWTv v9paLxqh/89Q8Q1JM3mWiEv6ZdKvlUv3Y8SvLhP0wYVbTrYVBeQ1TCvmBTQq46Jfx26u Cqbx6BCxnq4PTQw7GRhvawee+l+CsUHa5YSEj6WwzMTfxRmunh/Rlhtyc9p0U/nLLkDd XsvL6HEqZAxkLUnG0rc62qYzWnmxxd+rYoN4o04CLFxrMF1tM/B2+xCD03mgE+vkbzw4 r3Z5udN53BcbwYnQaks3BWrdD0rEDJDUcko+W1BBlB3danu0t6Qj6fBVXMpL/xNoPIVe DPTg== X-Gm-Message-State: ACgBeo2zGR3WDvqsIXS0gp+rfX1+QNLvrKwVbw2F6PbE3R/5GKuRmDyr 0wU+y4avxywK8onP2PP281iYXb/61z5JfHfAliBNYbwhmjIM/cYB+CPGuhXtEwadU9AxJXwh+Vk 44NXKhsBhPKmCf5o2nrO9lEv+ X-Received: by 2002:a05:6000:1542:b0:220:603d:ec93 with SMTP id 2-20020a056000154200b00220603dec93mr17536686wry.73.1660124657612; Wed, 10 Aug 2022 02:44:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR6iclGAZJP+HWE3V0NXvbb7Pj7rFr6PGzc2/8kqTzVx9Xl8yB8UdjXdKIphvt2YtlzIaVYsVg== X-Received: by 2002:a05:6000:1542:b0:220:603d:ec93 with SMTP id 2-20020a056000154200b00220603dec93mr17536672wry.73.1660124657375; Wed, 10 Aug 2022 02:44:17 -0700 (PDT) Received: from step1.redhat.com (host-79-46-200-178.retail.telecomitalia.it. [79.46.200.178]) by smtp.gmail.com with ESMTPSA id t188-20020a1c46c5000000b003a327f19bf9sm1729195wma.14.2022.08.10.02.44.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 02:44:16 -0700 (PDT) From: Stefano Garzarella To: virtualization@lists.linux-foundation.org Cc: Jason Wang , "Michael S. Tsirkin" , linux-kernel@vger.kernel.org, Stefano Garzarella Subject: [PATCH v2 4/4] vdpa_sim_blk: add support for discard and write-zeroes Date: Wed, 10 Aug 2022 11:43:47 +0200 Message-Id: <20220810094347.20449-5-sgarzare@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220810094347.20449-1-sgarzare@redhat.com> References: <20220810094347.20449-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Expose VIRTIO_BLK_F_DISCARD and VIRTIO_BLK_F_WRITE_ZEROES features to the drivers and handle VIRTIO_BLK_T_DISCARD and VIRTIO_BLK_T_WRITE_ZEROES requests checking ranges and flags. The simulator behaves like a ramdisk, so for VIRTIO_BLK_F_DISCARD does nothing, while for VIRTIO_BLK_T_WRITE_ZEROES sets to 0 the specified region. Signed-off-by: Stefano Garzarella --- drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 74 +++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c b/drivers/vdpa/vdpa_sim/v= dpa_sim_blk.c index 1f18f336cf0c..db85df1d5073 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c @@ -30,11 +30,14 @@ (1ULL << VIRTIO_BLK_F_SEG_MAX) | \ (1ULL << VIRTIO_BLK_F_BLK_SIZE) | \ (1ULL << VIRTIO_BLK_F_TOPOLOGY) | \ - (1ULL << VIRTIO_BLK_F_MQ)) + (1ULL << VIRTIO_BLK_F_MQ) | \ + (1ULL << VIRTIO_BLK_F_DISCARD) | \ + (1ULL << VIRTIO_BLK_F_WRITE_ZEROES)) =20 #define VDPASIM_BLK_CAPACITY 0x40000 #define VDPASIM_BLK_SIZE_MAX 0x1000 #define VDPASIM_BLK_SEG_MAX 32 +#define VDPASIM_BLK_DWZ_MAX_SECTORS UINT_MAX =20 /* 1 virtqueue, 1 address space, 1 virtqueue group */ #define VDPASIM_BLK_VQ_NUM 1 @@ -193,6 +196,64 @@ static bool vdpasim_blk_handle_req(struct vdpasim *vdp= asim, /* nothing to do */ break; =20 + case VIRTIO_BLK_T_DISCARD: + case VIRTIO_BLK_T_WRITE_ZEROES: + struct virtio_blk_discard_write_zeroes range; + u32 num_sectors, flags; + + if (to_pull !=3D sizeof(range)) { + dev_dbg(&vdpasim->vdpa.dev, + "discard/write_zeroes header len: 0x%zx [expected: 0x%zx]\n", + to_pull, sizeof(range)); + status =3D VIRTIO_BLK_S_IOERR; + break; + } + + bytes =3D vringh_iov_pull_iotlb(&vq->vring, &vq->out_iov, &range, + to_pull); + if (bytes < 0) { + dev_dbg(&vdpasim->vdpa.dev, + "vringh_iov_pull_iotlb() error: %zd offset: 0x%llx len: 0x%zx\n", + bytes, offset, to_pull); + status =3D VIRTIO_BLK_S_IOERR; + break; + } + + sector =3D vdpasim64_to_cpu(vdpasim, range.sector); + offset =3D sector << SECTOR_SHIFT; + num_sectors =3D vdpasim32_to_cpu(vdpasim, range.num_sectors); + flags =3D vdpasim32_to_cpu(vdpasim, range.flags); + + if (type =3D=3D VIRTIO_BLK_T_DISCARD && flags !=3D 0) { + dev_dbg(&vdpasim->vdpa.dev, + "discard unexpected flags set - flags: 0x%x\n", + flags); + status =3D VIRTIO_BLK_S_UNSUPP; + break; + } + + if (type =3D=3D VIRTIO_BLK_T_WRITE_ZEROES && + flags & ~VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP) { + dev_dbg(&vdpasim->vdpa.dev, + "write_zeroes unexpected flags set - flags: 0x%x\n", + flags); + status =3D VIRTIO_BLK_S_UNSUPP; + break; + } + + if (!vdpasim_blk_check_range(vdpasim, sector, num_sectors, + VDPASIM_BLK_DWZ_MAX_SECTORS)) { + status =3D VIRTIO_BLK_S_IOERR; + break; + } + + if (type =3D=3D VIRTIO_BLK_T_WRITE_ZEROES) { + memset(vdpasim->buffer + offset, 0, + num_sectors << SECTOR_SHIFT); + } + + break; + default: dev_dbg(&vdpasim->vdpa.dev, "Unsupported request type %d\n", type); @@ -281,6 +342,17 @@ static void vdpasim_blk_get_config(struct vdpasim *vdp= asim, void *config) blk_config->min_io_size =3D cpu_to_vdpasim16(vdpasim, 1); blk_config->opt_io_size =3D cpu_to_vdpasim32(vdpasim, 1); blk_config->blk_size =3D cpu_to_vdpasim32(vdpasim, SECTOR_SIZE); + /* VIRTIO_BLK_F_DISCARD */ + blk_config->discard_sector_alignment =3D + cpu_to_vdpasim32(vdpasim, SECTOR_SIZE); + blk_config->max_discard_sectors =3D + cpu_to_vdpasim32(vdpasim, VDPASIM_BLK_DWZ_MAX_SECTORS); + blk_config->max_discard_seg =3D cpu_to_vdpasim32(vdpasim, 1); + /* VIRTIO_BLK_F_WRITE_ZEROES */ + blk_config->max_write_zeroes_sectors =3D + cpu_to_vdpasim32(vdpasim, VDPASIM_BLK_DWZ_MAX_SECTORS); + blk_config->max_write_zeroes_seg =3D cpu_to_vdpasim32(vdpasim, 1); + } =20 static void vdpasim_blk_mgmtdev_release(struct device *dev) --=20 2.37.1