From mboxrd@z Thu Jan 1 00:00:00 1970 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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 D01E4C433E6 for ; Fri, 5 Feb 2021 08:50:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7411A64F48 for ; Fri, 5 Feb 2021 08:50:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229651AbhBEIu3 (ORCPT ); Fri, 5 Feb 2021 03:50:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32100 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229496AbhBEIuX (ORCPT ); Fri, 5 Feb 2021 03:50:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612514933; 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=qats9+82wU3qAY98Gc8MG/7rmEQkf2rmw/ej3jR/AJc=; b=AnCkgh6rqDEIjY5mOcpI4+PuVer1Z+tuRthcyMdd8HdqafuYGBMLH8YQ8R/ba0B/UP5S6e 7g4ZJW5Fu0aBNMgwIsfPt5tHSuFL/9mKizNZ2CV5fobq5rZQwUCh8L5ebjh8YtvCByeagd l2gvN0i4WoWjWGhmCyTGCqO5Nw9SPUY= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-331-esgYXFiQPFmyQro038mZmQ-1; Fri, 05 Feb 2021 03:48:52 -0500 X-MC-Unique: esgYXFiQPFmyQro038mZmQ-1 Received: by mail-wr1-f69.google.com with SMTP id r5so4910787wrx.18 for ; Fri, 05 Feb 2021 00:48:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=qats9+82wU3qAY98Gc8MG/7rmEQkf2rmw/ej3jR/AJc=; b=EegRrm9Uk0YJhH7IaCzg6hX0NOPbfEpiliUd+LWiAOAWm9fwhib82uIgjmo8yoV/oL sYTnPdm+/zla39GEb3Uz0zMscWHI+PyXVBJMbKE0s1KXne7JIIEaZOd21DYKocule0Ct fVKREVNDxETwlKO7jx9e2v2bO75KO9B3IWIWch8kkleej+ohq1wpxgEtRYqkioAWHIzS dAXVg81lCPWqK9bwAVipvYkI1fi+hqIz7sareKkNIQRjVpnYksVwO7Zq272xIBD/h2Sl sn/7JjQHc9mKUEcCzz0zSYi+Wug0dTmT/pFhaWOH/Ui2pp3gfWInYreBikWFcIevfZI2 KGzg== X-Gm-Message-State: AOAM532KrkNSksG9Pm1G2AyI4NaM4TV81icXMFtiGrdVS1xMx56JkzFW vI0CPdFDZ3coD85G8MDphdKf25QsRD1USa5UNrLNFqN0VSP4NquZSmBuYiayvS624azxTpwGIsd F26+s7UNYEZNwZLAnHgSTKYGt X-Received: by 2002:a5d:6712:: with SMTP id o18mr3603969wru.375.1612514931189; Fri, 05 Feb 2021 00:48:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCQqPTFZtarTI+RyF/EcK9EX3zDigmzlWkyGFPbLEWf1RVHsZ2nDDpeNiO5e/Z/sg+KIrizQ== X-Received: by 2002:a5d:6712:: with SMTP id o18mr3603950wru.375.1612514930954; Fri, 05 Feb 2021 00:48:50 -0800 (PST) Received: from steredhat (host-79-34-249-199.business.telecomitalia.it. [79.34.249.199]) by smtp.gmail.com with ESMTPSA id o9sm11859486wrw.81.2021.02.05.00.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 00:48:50 -0800 (PST) Date: Fri, 5 Feb 2021 09:48:47 +0100 From: Stefano Garzarella To: Jason Wang , Eli Cohen Cc: virtualization@lists.linux-foundation.org, Xie Yongji , kvm@vger.kernel.org, Laurent Vivier , Stefan Hajnoczi , Max Gurtovoy , linux-kernel@vger.kernel.org, "Michael S. Tsirkin" Subject: Re: [PATCH v3 08/13] vdpa: add return value to get_config/set_config callbacks Message-ID: <20210205084847.d4pkqq2sbqs3p53r@steredhat> References: <20210204172230.85853-1-sgarzare@redhat.com> <20210204172230.85853-9-sgarzare@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding Eli in the loop. On Fri, Feb 05, 2021 at 11:20:11AM +0800, Jason Wang wrote: > >On 2021/2/5 上午1:22, Stefano Garzarella wrote: >>All implementations of these callbacks already validate inputs. >> >>Let's return an error from these callbacks, so the caller doesn't >>need to validate the input anymore. >> >>We update all implementations to return -EINVAL in case of invalid >>input. >> >>Signed-off-by: Stefano Garzarella >>--- >> include/linux/vdpa.h | 18 ++++++++++-------- >> drivers/vdpa/ifcvf/ifcvf_main.c | 24 ++++++++++++++++-------- >> drivers/vdpa/mlx5/net/mlx5_vnet.c | 17 +++++++++++------ >> drivers/vdpa/vdpa_sim/vdpa_sim.c | 16 ++++++++++------ >> 4 files changed, 47 insertions(+), 28 deletions(-) >> >>diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h >>index 4ab5494503a8..0e0cbd5fb41b 100644 >>--- a/include/linux/vdpa.h >>+++ b/include/linux/vdpa.h >>@@ -157,6 +157,7 @@ struct vdpa_iova_range { >> * @buf: buffer used to read to >> * @len: the length to read from >> * configuration space >>+ * Returns integer: success (0) or error (< 0) >> * @set_config: Write to device specific configuration space >> * @vdev: vdpa device >> * @offset: offset from the beginning of >>@@ -164,6 +165,7 @@ struct vdpa_iova_range { >> * @buf: buffer used to write from >> * @len: the length to write to >> * configuration space >>+ * Returns integer: success (0) or error (< 0) >> * @get_generation: Get device config generation (optional) >> * @vdev: vdpa device >> * Returns u32: device generation >>@@ -231,10 +233,10 @@ struct vdpa_config_ops { >> u32 (*get_vendor_id)(struct vdpa_device *vdev); >> u8 (*get_status)(struct vdpa_device *vdev); >> void (*set_status)(struct vdpa_device *vdev, u8 status); >>- void (*get_config)(struct vdpa_device *vdev, unsigned int offset, >>- void *buf, unsigned int len); >>- void (*set_config)(struct vdpa_device *vdev, unsigned int offset, >>- const void *buf, unsigned int len); >>+ int (*get_config)(struct vdpa_device *vdev, unsigned int offset, >>+ void *buf, unsigned int len); >>+ int (*set_config)(struct vdpa_device *vdev, unsigned int offset, >>+ const void *buf, unsigned int len); >> u32 (*get_generation)(struct vdpa_device *vdev); >> struct vdpa_iova_range (*get_iova_range)(struct vdpa_device *vdev); >>@@ -329,8 +331,8 @@ static inline int vdpa_set_features(struct vdpa_device *vdev, u64 features) >> } >>-static inline void vdpa_get_config(struct vdpa_device *vdev, unsigned offset, >>- void *buf, unsigned int len) >>+static inline int vdpa_get_config(struct vdpa_device *vdev, unsigned offset, >>+ void *buf, unsigned int len) >> { >> const struct vdpa_config_ops *ops = vdev->config; >>@@ -339,8 +341,8 @@ static inline void vdpa_get_config(struct vdpa_device *vdev, unsigned offset, >> * If it does happen we assume a legacy guest. >> */ >> if (!vdev->features_valid) >>- vdpa_set_features(vdev, 0); >>- ops->get_config(vdev, offset, buf, len); >>+ return vdpa_set_features(vdev, 0); >>+ return ops->get_config(vdev, offset, buf, len); >> } >> /** >>diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c >>index 7c8bbfcf6c3e..f5e6a90d8114 100644 >>--- a/drivers/vdpa/ifcvf/ifcvf_main.c >>+++ b/drivers/vdpa/ifcvf/ifcvf_main.c >>@@ -332,24 +332,32 @@ static u32 ifcvf_vdpa_get_vq_align(struct vdpa_device *vdpa_dev) >> return IFCVF_QUEUE_ALIGNMENT; >> } >>-static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev, >>- unsigned int offset, >>- void *buf, unsigned int len) >>+static int ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev, >>+ unsigned int offset, >>+ void *buf, unsigned int len) >> { >> struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); >>- WARN_ON(offset + len > sizeof(struct virtio_net_config)); >>+ if (offset + len > sizeof(struct virtio_net_config)) >>+ return -EINVAL; >>+ >> ifcvf_read_net_config(vf, offset, buf, len); >>+ >>+ return 0; >> } >>-static void ifcvf_vdpa_set_config(struct vdpa_device *vdpa_dev, >>- unsigned int offset, const void *buf, >>- unsigned int len) >>+static int ifcvf_vdpa_set_config(struct vdpa_device *vdpa_dev, >>+ unsigned int offset, const void *buf, >>+ unsigned int len) >> { >> struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); >>- WARN_ON(offset + len > sizeof(struct virtio_net_config)); >>+ if (offset + len > sizeof(struct virtio_net_config)) >>+ return -EINVAL; >>+ >> ifcvf_write_net_config(vf, offset, buf, len); >>+ >>+ return 0; >> } >> static void ifcvf_vdpa_set_config_cb(struct vdpa_device *vdpa_dev, >>diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c >>index 029822060017..9323b5ff7988 100644 >>--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c >>+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c >>@@ -1796,20 +1796,25 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status) >> ndev->mvdev.status |= VIRTIO_CONFIG_S_FAILED; >> } >>-static void mlx5_vdpa_get_config(struct vdpa_device *vdev, unsigned int offset, void *buf, >>- unsigned int len) >>+static int mlx5_vdpa_get_config(struct vdpa_device *vdev, unsigned int offset, void *buf, >>+ unsigned int len) >> { >> struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev); >> struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev); >>- if (offset + len < sizeof(struct virtio_net_config)) >>- memcpy(buf, (u8 *)&ndev->config + offset, len); >>+ if (offset + len > sizeof(struct virtio_net_config)) >>+ return -EINVAL; > > >It looks to me we should use ">=" here? Ehmm, I think it was wrong before this patch. If 'offset + len' is equal to 'sizeof(struct virtio_net_config)', should be okay to copy, no? I think it's one of the rare cases where the copy and paste went well :-) Should I fix this in a separate patch? Thanks, Stefano