[PATCH] vhost: fix offset while mmaping log base address

[PATCH] vhost: fix offset while mmaping log base address

[Tomasz Kulasek]

QEMU always set offset to 0 but for sanity we should take the offset
into account.

Fixes: 54f9e32305d4 ("vhost: handle dirty pages logging request")
Cc: yuanhan.liu@linux.intel.com
Cc: stable@dpdk.org

Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
---
 lib/librte_vhost/vhost_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 65ee33919..674f2ffe8 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -991,7 +991,7 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg)
 	 * mmap from 0 to workaround a hugepage mmap bug: mmap will
 	 * fail when offset is not page size aligned.
 	 */
-	addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+	addr = mmap(0, size + off, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
 	close(fd);
 	if (addr == MAP_FAILED) {
 		RTE_LOG(ERR, VHOST_CONFIG, "mmap log base failed!\n");
-- 
2.14.1

Re: [PATCH] vhost: fix offset while mmaping log base address

[Tan, Jianfeng]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Kulasek
> Sent: Friday, February 9, 2018 1:00 AM
> To: yliu@fridaylinux.org
> Cc: dev@dpdk.org; yuanhan.liu@linux.intel.com; stable@dpdk.org;
> Wodkowski, PawelX
> Subject: [dpdk-dev] [PATCH] vhost: fix offset while mmaping log base
> address
> 
> QEMU always set offset to 0 but for sanity we should take the offset
> into account.
> 
> Fixes: 54f9e32305d4 ("vhost: handle dirty pages logging request")
> Cc: yuanhan.liu@linux.intel.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
> Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>

Reviewed-by: Jianfeng Tan <jianfeng.tan@intel.com>

Thanks!

> ---
>  lib/librte_vhost/vhost_user.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 65ee33919..674f2ffe8 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -991,7 +991,7 @@ vhost_user_set_log_base(struct virtio_net *dev,
> struct VhostUserMsg *msg)
>  	 * mmap from 0 to workaround a hugepage mmap bug: mmap will
>  	 * fail when offset is not page size aligned.
>  	 */
> -	addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
> 0);
> +	addr = mmap(0, size + off, PROT_READ | PROT_WRITE,
> MAP_SHARED, fd, 0);
>  	close(fd);
>  	if (addr == MAP_FAILED) {
>  		RTE_LOG(ERR, VHOST_CONFIG, "mmap log base failed!\n");
> --
> 2.14.1

Re: [PATCH] vhost: fix offset while mmaping log base address

[Maxime Coquelin]

On 02/08/2018 05:59 PM, Tomasz Kulasek wrote:
> QEMU always set offset to 0 but for sanity we should take the offset
> into account.
> 
> Fixes: 54f9e32305d4 ("vhost: handle dirty pages logging request")
> Cc: yuanhan.liu@linux.intel.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
> Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
> ---
>   lib/librte_vhost/vhost_user.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

and applied to dpdk-next-virtio/master.

Thanks,
Maxime

[PATCH] vhost: fix offset while mmaping log base address

[BillXiang]

From: BillXiang <xiangwencheng@dayudpu.com>

For sanity the offset should be the last parameter of mmap.

Fixes: fbc4d24 ("vhost: fix offset while mmaping log base address")
Signed-off-by: BillXiang <xiangwencheng@dayudpu.com>
---
 lib/vhost/vhost_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 5f470da38a..0893ae80bb 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -2399,7 +2399,7 @@ vhost_user_set_log_base(struct virtio_net **pdev,
 	 * mmap from 0 to workaround a hugepage mmap bug: mmap will
 	 * fail when offset is not page size aligned.
 	 */
-	addr = mmap(0, size + off, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+	addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, off);
 	alignment = get_blk_size(fd);
 	close(fd);
 	if (addr == MAP_FAILED) {
-- 
2.30.0

Re: [PATCH] vhost: fix offset while mmaping log base address

[Chenbo Xia]

> On Jul 8, 2024, at 14:57, BillXiang <xiangwencheng@dayudpu.com> wrote:
> 
> External email: Use caution opening links or attachments
> 
> 
> From: BillXiang <xiangwencheng@dayudpu.com>
> 
> For sanity the offset should be the last parameter of mmap.
> 
> Fixes: fbc4d24 ("vhost: fix offset while mmaping log base address")

The commit id length should be 12.

Since QEMU always send offset 0, I think it’s no need to backport the
patch, so no cc-stable is fine.

With above fixed:

Reviewed-by: Chenbo Xia <chenbox@nvidia.com>

> Signed-off-by: BillXiang <xiangwencheng@dayudpu.com>
> ---
> lib/vhost/vhost_user.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> index 5f470da38a..0893ae80bb 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -2399,7 +2399,7 @@ vhost_user_set_log_base(struct virtio_net **pdev,
>         * mmap from 0 to workaround a hugepage mmap bug: mmap will
>         * fail when offset is not page size aligned.
>         */
> -       addr = mmap(0, size + off, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
> +       addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, off);
>        alignment = get_blk_size(fd);
>        close(fd);
>        if (addr == MAP_FAILED) {
> --
> 2.30.0

Re: [PATCH] vhost: fix offset while mmaping log base address

[BillXiang]

From: BillXiang <xiangwencheng@dayudpu.com>

> From: "Chenbo Xia"<chenbox@nvidia.com>
> Date: Tue, Jul 9, 2024, 20:42
> Subject: Re: [PATCH] vhost: fix offset while mmaping log base address
> To: "BillXiang"<xiangwencheng@dayudpu.com>
> Cc: "Maxime Coquelin"<maxime.coquelin@redhat.com>, "Jianfeng Tan"<jianfeng.tan@intel.com>, "Tomasz Kulasek"<tomaszx.kulasek@intel.com>, "Pawel Wodkowski"<pawelx.wodkowski@intel.com>, "dev@dpdk.org"<dev@dpdk.org>
> > On Jul 8, 2024, at 14:57, BillXiang <xiangwencheng@dayudpu.com> wrote:
> >
> > External email: Use caution opening links or attachments
> >
> >
> > From: BillXiang <xiangwencheng@dayudpu.com>
> >
> > For sanity the offset should be the last parameter of mmap.
> >
> > Fixes: fbc4d24 ("vhost: fix offset while mmaping log base address")
>
> The commit id length should be 12.
>

Thanks, I will mind it.

> Since QEMU always send offset 0, I think it's no need to backport the
> patch, so no cc-stable is fine.
>

I just think the code is confusing and I'm wondering whether the offset 
sent by QEMU or maybe other VM can be non-zero.

If it's a mistake just fix it.

> With above fixed:
>
> Reviewed-by: Chenbo Xia <chenbox@nvidia.com>
>
> > Signed-off-by: BillXiang <xiangwencheng@dayudpu.com>
> > ---
> > lib/vhost/vhost_user.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> > index 5f470da38a..0893ae80bb 100644
> > --- a/lib/vhost/vhost_user.c
> > +++ b/lib/vhost/vhost_user.c
> > @@ -2399,7 +2399,7 @@ vhost_user_set_log_base(struct virtio_net **pdev,
> >     * mmap from 0 to workaround a hugepage mmap bug: mmap will
> >     * fail when offset is not page size aligned.
> >     */
> > -    addr = mmap(0, size + off, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
> > +    addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, off);
> >    alignment = get_blk_size(fd);
> >    close(fd);
> >    if (addr == MAP_FAILED) {
> > --
> > 2.30.0

Re: [PATCH] vhost: fix offset while mmaping log base address

[Maxime Coquelin]

On 7/8/24 08:57, BillXiang wrote:
> From: BillXiang <xiangwencheng@dayudpu.com>
> 
> For sanity the offset should be the last parameter of mmap.
> 
> Fixes: fbc4d24 ("vhost: fix offset while mmaping log base address")
> Signed-off-by: BillXiang <xiangwencheng@dayudpu.com>
> ---
>   lib/vhost/vhost_user.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> index 5f470da38a..0893ae80bb 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -2399,7 +2399,7 @@ vhost_user_set_log_base(struct virtio_net **pdev,
>   	 * mmap from 0 to workaround a hugepage mmap bug: mmap will
>   	 * fail when offset is not page size aligned.
>   	 */
> -	addr = mmap(0, size + off, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
> +	addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, off);
>   	alignment = get_blk_size(fd);
>   	close(fd);
>   	if (addr == MAP_FAILED) {

Fixed the fixes tag and Cc'ed stable.

Applied to next-virtio/for-next-net.

Thanks,
Maxime

Re: [PATCH] vhost: fix offset while mmaping log base address

[Maxime Coquelin]

On 7/8/24 08:57, BillXiang wrote:
> From: BillXiang <xiangwencheng@dayudpu.com>
> 
> For sanity the offset should be the last parameter of mmap.
> 
> Fixes: fbc4d24 ("vhost: fix offset while mmaping log base address")
> Signed-off-by: BillXiang <xiangwencheng@dayudpu.com>
> ---
>   lib/vhost/vhost_user.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Applied to next-virtio/for-next-net.

Thanks,
Maxime