Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.112.34 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.112.34; helo=mail.nvidia.com;
Date:   Wed, 21 Apr 2021 10:44:53 +0300
From:   Eli Cohen <elic@nvidia.com>
To:     Jason Wang <jasowang@redhat.com>
CC:     <mst@redhat.com>, <virtualization@lists.linux-foundation.org>,
        <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/7] virtio-pci library: switch to use
 vp_modern_map_vq_notify()
Message-ID: <20210421074453.GC97533@mtl-vdi-166.wap.labs.mlnx>
References: <20210415073147.19331-1-jasowang@redhat.com>
 <20210415073147.19331-3-jasowang@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20210415073147.19331-3-jasowang@redhat.com>
User-Agent: Mutt/1.9.5 (bf161cf53efb) (2018-04-13)
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2021 07:44:58.2666
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: a3fd6003-4535-487f-a6df-08d904995cd8
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.34];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT030.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3095
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Apr 15, 2021 at 03:31:42AM -0400, Jason Wang wrote:
> This patch switch to use vp_modern_map_notify() for virtio-pci
> library.
> 
> Signed-off-by: Jason Wang <jasowang@redhat.com>

Reviewed-by: Eli Cohen <elic@nvidia.com>

> ---
>  drivers/virtio/virtio_pci_modern.c | 27 ++-------------------------
>  1 file changed, 2 insertions(+), 25 deletions(-)
> 
> diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
> index fbd4ebc00eb6..29607d9bd95c 100644
> --- a/drivers/virtio/virtio_pci_modern.c
> +++ b/drivers/virtio/virtio_pci_modern.c
> @@ -192,7 +192,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
>  
>  	struct virtio_pci_modern_device *mdev = &vp_dev->mdev;
>  	struct virtqueue *vq;
> -	u16 num, off;
> +	u16 num;
>  	int err;
>  
>  	if (index >= vp_modern_get_num_queues(mdev))
> @@ -208,9 +208,6 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
>  		return ERR_PTR(-EINVAL);
>  	}
>  
> -	/* get offset of notification word for this vq */
> -	off = vp_modern_get_queue_notify_off(mdev, index);
> -
>  	info->msix_vector = msix_vec;
>  
>  	/* create the vring */
> @@ -227,27 +224,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
>  				virtqueue_get_avail_addr(vq),
>  				virtqueue_get_used_addr(vq));
>  
> -	if (mdev->notify_base) {
> -		/* offset should not wrap */
> -		if ((u64)off * mdev->notify_offset_multiplier + 2
> -		    > mdev->notify_len) {
> -			dev_warn(&mdev->pci_dev->dev,
> -				 "bad notification offset %u (x %u) "
> -				 "for queue %u > %zd",
> -				 off, mdev->notify_offset_multiplier,
> -				 index, mdev->notify_len);
> -			err = -EINVAL;
> -			goto err_map_notify;
> -		}
> -		vq->priv = (void __force *)mdev->notify_base +
> -			off * mdev->notify_offset_multiplier;
> -	} else {
> -		vq->priv = (void __force *)vp_modern_map_capability(mdev,
> -							  mdev->notify_map_cap, 2, 2,
> -							  off * mdev->notify_offset_multiplier, 2,
> -							  NULL);
> -	}
> -
> +	vq->priv = vp_modern_map_vq_notify(mdev, index);
>  	if (!vq->priv) {
>  		err = -ENOMEM;
>  		goto err_map_notify;
> -- 
> 2.18.1
>