From nobody Sat Apr 11 12:31:24 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 AB115C25B0C for ; Thu, 11 Aug 2022 08:36:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234537AbiHKIgr (ORCPT ); Thu, 11 Aug 2022 04:36:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234150AbiHKIgp (ORCPT ); Thu, 11 Aug 2022 04:36:45 -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 1CEAE792D6 for ; Thu, 11 Aug 2022 01:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660207002; 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=Jsx9V5UMKKzJIemgFfVG6rej/ShWav0ed0J+I53fv9XkshPwnPlFY66C/H1Uvu3gG3PDmy YbBvQn3srcibT8B4Tv33OPe+s3YUIkU9oShfX3DkrWPsQh7OYKKmViuZiTtgvGNDBJB+fs gpTCGHJktgpi9depi9tPWuKX+ePQFYQ= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-221-Lmnc7MFUNYq45huEabfSGA-1; Thu, 11 Aug 2022 04:36:41 -0400 X-MC-Unique: Lmnc7MFUNYq45huEabfSGA-1 Received: by mail-qv1-f70.google.com with SMTP id e12-20020ad4442c000000b004796bf5f82cso8166365qvt.20 for ; Thu, 11 Aug 2022 01:36:40 -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=zLr8aJRtVUwvwtUI3NuvIzEnRs9buxw61zUYGtpJVFOk2rJFm7kh8aokTcgZYF5nCH PvBMyyxQrocNmbNvYLdx9mQJsVjkyGpSdIG7Ts/nDOAt5r3NmTXVlA9OX3IVrqhIX+EG b6VmUOfGOUdUsDZDXTJk6QPRtyMiPZRxw8sAJwdyLTXXcoW3JNIsQ7ftOEQI5G3MaOV7 tGlL3KZFo2zkInsttC/wfUW0MZ2mDc5di/bY7ZvBcS5kyqvOq9z10qBAgHjsDxnPwguO MRuNlMDz5WBimX6HZTktgZl5OoRzNasWpAcuL4kbE65fEttzH7SDMTgOdE2sHkVbrpr0 l98w== X-Gm-Message-State: ACgBeo18sa5fYto1WEGjaWFqAF7CNNgsrgfZFm+rqjuBbkeXdW95inTQ 6Cbbxi/Dvoh3l9DCXejymq0pDDrxMF9+ps91c6X2ANqKl9kFih4doZSfit3o95F4ATSAgyeAlOS EkU/Q/I7CVz8u5OBQJFhLeoL+ X-Received: by 2002:a05:620a:2615:b0:6b9:29a9:b734 with SMTP id z21-20020a05620a261500b006b929a9b734mr17656848qko.273.1660207000598; Thu, 11 Aug 2022 01:36:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR57hP3DZIXEgM1Y5p0tV6h36y995LYZumXLSlAhdlc1snP7yqGxy4qnrXwGh6eXY8qYNOBP7A== X-Received: by 2002:a05:620a:2615:b0:6b9:29a9:b734 with SMTP id z21-20020a05620a261500b006b929a9b734mr17656841qko.273.1660207000404; Thu, 11 Aug 2022 01:36:40 -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 ga25-20020a05622a591900b0034361fb2f75sm1343083qtb.22.2022.08.11.01.36.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 01:36:39 -0700 (PDT) From: Stefano Garzarella To: virtualization@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Stefano Garzarella Subject: [PATCH v3 1/4] vdpa_sim_blk: check if sector is 0 for commands other than read or write Date: Thu, 11 Aug 2022 10:36:29 +0200 Message-Id: <20220811083632.77525-2-sgarzare@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220811083632.77525-1-sgarzare@redhat.com> References: <20220811083632.77525-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 12:31:24 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 1C163C19F2D for ; Thu, 11 Aug 2022 08:36:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234559AbiHKIgz (ORCPT ); Thu, 11 Aug 2022 04:36:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234498AbiHKIgq (ORCPT ); Thu, 11 Aug 2022 04:36:46 -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 8CCA5792E5 for ; Thu, 11 Aug 2022 01:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660207004; 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=GzkudejRbUEeg6ND5zXUodkrADc64N0Jzq8siGi0sTo+Ge3cqngHwWYeKQY1YhPzzu4lgq xrRv6e8ufOv2048K5gFbc8c/xG9SUuPk8rvL2PgVA8u40ASnEH2EleCTGzgkHwcoXyOKhy EpmeeNGgUlM+OtgGvadiG3DzfEKNdSk= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-557-J7lNJf-4Os-eYwBY6qYdJA-1; Thu, 11 Aug 2022 04:36:43 -0400 X-MC-Unique: J7lNJf-4Os-eYwBY6qYdJA-1 Received: by mail-qk1-f200.google.com with SMTP id y17-20020a05620a25d100b006b66293d75aso14369764qko.17 for ; Thu, 11 Aug 2022 01:36:43 -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=LdzdqQxVmYvmiZBdZrBbdOiEZtaJJHVFtlKF6N3DaumfNo7kKu1Ous83yyU2iIQrd0 DkckoSsypksJmlCX9xHPiiFCNVxGj2eBWH5FRduiBS1HgW4vrYO1sleoO7HqpX/RAku8 m4VLHoixZ0+PPehpguA5tUdYBDHVTuURvJiALLsXZiJZY1LzpCu7Fo2h/aNpgh1cZWlL P2pTTntR/iirvGK1Iiis4zYv7N+a/14Qt2Kkuq8cp7pyc0xUesTqpMVItJKCWBN0Wn+E 2nT+uc0w5AzjkiYZ9SmpxZ7uryTKW0u0dRZ/rKCwc/vWDvt592xAFKHMzfXAX4qaan5q Rgiw== X-Gm-Message-State: ACgBeo2BWRQVToUP9QbZArQxsumQjabi73slRERtSrtK9DHXTCjfPAlV cODhO6agWI1gaAZo/h8hsEOkLf84r2rXUusXDXHXvsiCXBNvUKCgncP0HzoxknbI23fH67fgGnX +QYY8aMjFksoKUYfn0CKycf0A X-Received: by 2002:a05:620a:288c:b0:6b3:9d1:dbf1 with SMTP id j12-20020a05620a288c00b006b309d1dbf1mr23327371qkp.593.1660207003236; Thu, 11 Aug 2022 01:36:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR710n4edD3BI5O94vesCWGnN3jpA1lgY7qh5Pnj63dORRorlN4QFNOHDWfrAS62HS8gTf/NcA== X-Received: by 2002:a05:620a:288c:b0:6b3:9d1:dbf1 with SMTP id j12-20020a05620a288c00b006b309d1dbf1mr23327364qkp.593.1660207002990; Thu, 11 Aug 2022 01:36:42 -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 ga25-20020a05622a591900b0034361fb2f75sm1343083qtb.22.2022.08.11.01.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 01:36:42 -0700 (PDT) From: Stefano Garzarella To: virtualization@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Stefano Garzarella Subject: [PATCH v3 2/4] vdpa_sim_blk: make vdpasim_blk_check_range usable by other requests Date: Thu, 11 Aug 2022 10:36:30 +0200 Message-Id: <20220811083632.77525-3-sgarzare@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220811083632.77525-1-sgarzare@redhat.com> References: <20220811083632.77525-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 12:31:24 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 C480EC19F2D for ; Thu, 11 Aug 2022 08:36:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234568AbiHKIg6 (ORCPT ); Thu, 11 Aug 2022 04:36:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234541AbiHKIgv (ORCPT ); Thu, 11 Aug 2022 04:36:51 -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 3DEB2792D8 for ; Thu, 11 Aug 2022 01:36:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660207009; 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=ATwJz23I2FA5hnU3jt1WEVZYvoYe+YZ1baPsl1yy1zrHrOoKbS04V01MVsCqGvj2qY6jJT VEY/rkxD4ZDaDKBJ+qGdATCL3HQvlKmH13n/2fb8sW5AtbctvHCXkLMFWt0tphyYvjp4Bu ukS4oClV+6rb+qyM0Z4Tc/C7lLoO/Oo= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-351-mXuKJcVIP4aKkQyPFnJk3g-1; Thu, 11 Aug 2022 04:36:46 -0400 X-MC-Unique: mXuKJcVIP4aKkQyPFnJk3g-1 Received: by mail-qt1-f199.google.com with SMTP id fy18-20020a05622a5a1200b0033e5b56f031so12753289qtb.15 for ; Thu, 11 Aug 2022 01:36:46 -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=Lx4A6ZdHwsD9rYzfV6BKQr6ayB6+sWTY6BGg8SwhU+gxab2iFo8JqAyAZL76UTZ6kw FPZliSh3ngcfOAar717e9tW43+Zsg+u3J5igz1khUZNlj9QiJBcQ49s0BLaAsNR5peKz HGuxjmvH8R/HBl/TOM00jaH6SnepicDBhlZz9SkllXRd5nkwRLNRfrbRV4wodQ/h2Xq/ lBBAFTgT6ZgofBmAvDeLGy7uWbg8ADTLOTs5XX32dEPQ5KpyRg/+Vz1+QZJtn14Ii5zW VylX/FsufGV5EOYLRWWrjp8KyKDRNmFsbSdgDR6OtrOjAT5Z5DhSYas8fnc72JIVGxUt r10Q== X-Gm-Message-State: ACgBeo0zGOAaZmSwl5G2fMOj6kBX9fxarfIeWespqwrTPE8gvbe+v34h RpQ28+IyZ/oAt1Pte8yFVWl9Sof+2U3yyThgrUpokCpdpd8gnu1VrjqjDsc5C7LsliK4SWwpu+k wg8u4s5JQv/pSyWgcRQwIWwEi X-Received: by 2002:a05:622a:54a:b0:343:5a1a:9acd with SMTP id m10-20020a05622a054a00b003435a1a9acdmr5424737qtx.194.1660207006117; Thu, 11 Aug 2022 01:36:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR4RFzgc5ALPcjlt3FX7MEe3xJX2GOatlwsfQrEhnbVqaD+RWcWMD5dC4uSCC4mr/t0kzhgpuw== X-Received: by 2002:a05:622a:54a:b0:343:5a1a:9acd with SMTP id m10-20020a05622a054a00b003435a1a9acdmr5424728qtx.194.1660207005928; Thu, 11 Aug 2022 01:36:45 -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 ga25-20020a05622a591900b0034361fb2f75sm1343083qtb.22.2022.08.11.01.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 01:36:45 -0700 (PDT) From: Stefano Garzarella To: virtualization@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Stefano Garzarella Subject: [PATCH v3 3/4] vdpa_sim_blk: add support for VIRTIO_BLK_T_FLUSH Date: Thu, 11 Aug 2022 10:36:31 +0200 Message-Id: <20220811083632.77525-4-sgarzare@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220811083632.77525-1-sgarzare@redhat.com> References: <20220811083632.77525-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 12:31:24 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 9D4FDC3F6B0 for ; Thu, 11 Aug 2022 08:37:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234565AbiHKIhm (ORCPT ); Thu, 11 Aug 2022 04:37:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234625AbiHKIhU (ORCPT ); Thu, 11 Aug 2022 04:37:20 -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 6B85A792F0 for ; Thu, 11 Aug 2022 01:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660207033; 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=wxI8STE90R3MtFxd5bcngd81yGb5pFXt8S9v1lVULlg=; b=F4HuLqH2KMPn7CO5SYl9WtSKg7hXp7GhvmA8Anj0cTHAADjwRr7499YdkkMb0y0OakMCx6 8l+vDY/hPdMLtdzr4JfktxMaU0KXhD2kMKNpioxg8vvwKkbpcOLBky0PEdz0mPaUcG1OCB rcOOzyvYPX7HlL43ytoKGtd9gre9kq4= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-492-EhlN-XpXNO-QPZEIjir-rA-1; Thu, 11 Aug 2022 04:37:11 -0400 X-MC-Unique: EhlN-XpXNO-QPZEIjir-rA-1 Received: by mail-qv1-f72.google.com with SMTP id ea7-20020ad458a7000000b00476b8d9bfdcso9037419qvb.18 for ; Thu, 11 Aug 2022 01:37:11 -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=wxI8STE90R3MtFxd5bcngd81yGb5pFXt8S9v1lVULlg=; b=XITzQsDmTOrxUtyFW4arM/Jq//0hTUZfPBSBekwfZQPn8bxmNiDhgZ4fBYIpscmjwi eK9mHXmKOL/G7XATgrcYm+V9jRD9ctoQ+ocHXQDm1FmJJihDSVMASnl9VXTeSi3+jVmL dNpdwaYFFBurTsb4Ouz8Pyv1GDJLpCt9Lm+resupF7smTQsYYG7yYHZGTxA1Y9MgSgoa rWypnqRZxNTlcjVMZgeBzita3uSrrCANFsj6/ZiWxvG7qpZ/mL7Ws/e2q32z2DyA3Rsu PLnsO5V9Ld4DItNvnvSYKoqkITgt0rDDxDmFYQ8KczdoauipFdtftFrHCr9lZrqH68rO sQ9g== X-Gm-Message-State: ACgBeo0W+/A6k8WrwUftuj0cH4+vpDUWrTuq8Ig0DszpI88sxWRZd6ld 45Mzdjqkplyd+jiJbqC0d467j2pQI8FdtNbaqdtHRDfRmqOBYwz1fDi26/STSxnR9klD396bJqf I3GDNhnb9IomicSOvgcf4YvLt X-Received: by 2002:a05:622a:1a01:b0:343:310d:fedf with SMTP id f1-20020a05622a1a0100b00343310dfedfmr9614049qtb.622.1660207031464; Thu, 11 Aug 2022 01:37:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR7iG5hpVQZhHnEux2Ys32Xpb0iTat8U/eI0t5jz6ZCTF9Xjo89LNFBwu9MSbN4hXHLgOHdEhQ== X-Received: by 2002:a05:622a:1a01:b0:343:310d:fedf with SMTP id f1-20020a05622a1a0100b00343310dfedfmr9614035qtb.622.1660207031241; Thu, 11 Aug 2022 01:37:11 -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 i14-20020a05620a248e00b006b57b63a8ddsm1485774qkn.122.2022.08.11.01.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 01:37:10 -0700 (PDT) From: Stefano Garzarella To: virtualization@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Stefano Garzarella Subject: [PATCH v3 4/4] vdpa_sim_blk: add support for discard and write-zeroes Date: Thu, 11 Aug 2022 10:36:32 +0200 Message-Id: <20220811083632.77525-5-sgarzare@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220811083632.77525-1-sgarzare@redhat.com> References: <20220811083632.77525-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..c8bfea3b7db2 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 le64_to_cpu(range.sector); + offset =3D sector << SECTOR_SHIFT; + num_sectors =3D le32_to_cpu(range.num_sectors); + flags =3D le32_to_cpu(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