| Message ID | 20221220140205.795115-1-lulu@redhat.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2984001wrn;
Tue, 20 Dec 2022 06:08:45 -0800 (PST)
X-Google-Smtp-Source:
AA0mqf5IZKaR0r3gYAGsmyEgae+YgBLTeWRrvYdR3dfmpv5C2guxmwXtgojVVmQV6nVqN4tEvWPz
X-Received: by 2002:a05:6a00:88c:b0:56b:f51d:820a with SMTP id
q12-20020a056a00088c00b0056bf51d820amr58561165pfj.7.1671545325071;
Tue, 20 Dec 2022 06:08:45 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1671545325; cv=none;
d=google.com; s=arc-20160816;
b=Asiydq1fHxRIW1yp92jHxJ2DyZtm9p6w6ZtdvEcPUNHwRs74UJRK34V6yXOdw/ba5m
IxFWxznEjZQBCdeCkZB6vwVTe6hmFlZvEjaQOt54AnJuMhKbYQjDs9TwperIKve69In3
TxFyBNfKmMJkyAmB4zQox6RlAG5ucyY+msbHu4r2qF1H/PbCrd0yP7lnP/p72IoDQrNM
Wrv7xpuuNeDm6xClfhLHSSA3pwP5esmohOvs7PQs/9nTMN2eGEnpKaRXHcIr7as6Xrw8
0rTl+eootBZ0eusE/W/8CdxuBmZzu3fcZ1P/+2J5Hc2QBa1al0ZUO5ZZi8oqqFduAUDM
HOBQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from:dkim-signature;
bh=LiH/7F4Cx8tMkgKW5fUS61LWWStD6+IDSYW+AV8YpQI=;
b=EtSOZcjZ3ShgFnTAxATLvp4SKabHkmJ+XVsCRgQCvNMhExsciVmtVmsNac4zfaoO3O
CtmaXZMap3cVSsiTozf2i9MoAtl0PqVT2GrlMVsMEMdl6Wm4gxI1OWDomxaELbBtBf63
ftMzG7WpKz6GiK4zKuW3Qkr6IX2J0Q1lkp9YBZ4jgfsbMxeWNjHFtAx+KcwVPqCPL7xj
Ch4Gd0QxHUPTXglkK/7Jdoz90s4Qn7MvhRoKCDPJk7LVTWT1M+KYKU/NPrIbwAgVvyk0
41ZzZs7WwbKyMwkxZK4MxVsupbo/G2FB677gbeKL8hyfN5cokGVAPuedOXNNJocVkIsy
VDMw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@redhat.com header.s=mimecast20190719
header.b="B6IH/QNw";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
x24-20020a62fb18000000b00574eb89dfccsi12735300pfm.251.2022.12.20.06.08.29;
Tue, 20 Dec 2022 06:08:45 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@redhat.com header.s=mimecast20190719
header.b="B6IH/QNw";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230506AbiLTODM (ORCPT <rfc822;abdi.embedded@gmail.com>
+ 99 others); Tue, 20 Dec 2022 09:03:12 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35844 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S233652AbiLTODJ (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 20 Dec 2022 09:03:09 -0500
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [170.10.133.124])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEC251B1CA
for <linux-kernel@vger.kernel.org>;
Tue, 20 Dec 2022 06:02:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1671544940;
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;
bh=LiH/7F4Cx8tMkgKW5fUS61LWWStD6+IDSYW+AV8YpQI=;
b=B6IH/QNwKfytB9fePirbAuOpcwhnp4Mcb8WiAqgwGFcWwdH/J8ACqEHRy9Zjx3dcP7W6ow
YArDkjqaQge0oMZJUQQ+IzxBXraohv84wkEHKCjOHROzJOD/k8vG9+VeUrutcyf4wBTrK4
HkkfgbCLsDfZ6BLpuM5I4xwYWu4YIxk=
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
us-mta-134-3yrGsoUTPCyBUoQoZTSE_A-1; Tue, 20 Dec 2022 09:02:16 -0500
X-MC-Unique: 3yrGsoUTPCyBUoQoZTSE_A-1
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
[10.11.54.5])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6DDB485C06A;
Tue, 20 Dec 2022 14:02:16 +0000 (UTC)
Received: from server.redhat.com (ovpn-12-67.pek2.redhat.com [10.72.12.67])
by smtp.corp.redhat.com (Postfix) with ESMTP id 1FC5C175AD;
Tue, 20 Dec 2022 14:02:12 +0000 (UTC)
From: Cindy Lu <lulu@redhat.com>
To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org, netdev@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: [PATCH] vhost_vdpa: fix the compile issue in commit 881ac7d2314f
Date: Tue, 20 Dec 2022 22:02:05 +0800
Message-Id: <20221220140205.795115-1-lulu@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1752742310421496268?=
X-GMAIL-MSGID: =?utf-8?q?1752742310421496268?=
|
| Series |
vhost_vdpa: fix the compile issue in commit 881ac7d2314f
|
|
Commit Message
Cindy Lu
Dec. 20, 2022, 2:02 p.m. UTC
The input of vhost_vdpa_iotlb_unmap() was changed in 881ac7d2314f,
But some function was not changed while calling this function.
Add this change
Cc: stable@vger.kernel.org
Fixes: 881ac7d2314f ("vhost_vdpa: fix the crash in unmap a large memory")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
drivers/vhost/vdpa.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Comments
On Tue, Dec 20, 2022 at 10:02 PM Cindy Lu <lulu@redhat.com> wrote: > > The input of vhost_vdpa_iotlb_unmap() was changed in 881ac7d2314f, > But some function was not changed while calling this function. > Add this change > > Cc: stable@vger.kernel.org > Fixes: 881ac7d2314f ("vhost_vdpa: fix the crash in unmap a large memory") Is this commit merged into Linus tree? Btw, Michael, I'd expect there's a respin of the patch so maybe Cindy can squash the fix into the new version? Thanks > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Cindy Lu <lulu@redhat.com> > --- > drivers/vhost/vdpa.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > index 46ce35bea705..ec32f785dfde 100644 > --- a/drivers/vhost/vdpa.c > +++ b/drivers/vhost/vdpa.c > @@ -66,8 +66,8 @@ static DEFINE_IDA(vhost_vdpa_ida); > static dev_t vhost_vdpa_major; > > static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v, > - struct vhost_iotlb *iotlb, > - u64 start, u64 last); > + struct vhost_iotlb *iotlb, u64 start, > + u64 last, u32 asid); > > static inline u32 iotlb_to_asid(struct vhost_iotlb *iotlb) > { > @@ -139,7 +139,7 @@ static int vhost_vdpa_remove_as(struct vhost_vdpa *v, u32 asid) > return -EINVAL; > > hlist_del(&as->hash_link); > - vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1); > + vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1, asid); > kfree(as); > > return 0; > -- > 2.34.3 >
On Wed, 21 Dec 2022 at 11:23, Jason Wang <jasowang@redhat.com> wrote: > > On Tue, Dec 20, 2022 at 10:02 PM Cindy Lu <lulu@redhat.com> wrote: > > > > The input of vhost_vdpa_iotlb_unmap() was changed in 881ac7d2314f, > > But some function was not changed while calling this function. > > Add this change > > > > Cc: stable@vger.kernel.org > > Fixes: 881ac7d2314f ("vhost_vdpa: fix the crash in unmap a large memory") > > Is this commit merged into Linus tree? > > Btw, Michael, I'd expect there's a respin of the patch so maybe Cindy > can squash the fix into the new version? > > Thanks > This is not merged in linus tree, and this compile issue was hit in mst's tree should I send a new version squash the patch and the fix? Thanks Cindy > > Reported-by: kernel test robot <lkp@intel.com> > > Signed-off-by: Cindy Lu <lulu@redhat.com> > > --- > > drivers/vhost/vdpa.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > > index 46ce35bea705..ec32f785dfde 100644 > > --- a/drivers/vhost/vdpa.c > > +++ b/drivers/vhost/vdpa.c > > @@ -66,8 +66,8 @@ static DEFINE_IDA(vhost_vdpa_ida); > > static dev_t vhost_vdpa_major; > > > > static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v, > > - struct vhost_iotlb *iotlb, > > - u64 start, u64 last); > > + struct vhost_iotlb *iotlb, u64 start, > > + u64 last, u32 asid); > > > > static inline u32 iotlb_to_asid(struct vhost_iotlb *iotlb) > > { > > @@ -139,7 +139,7 @@ static int vhost_vdpa_remove_as(struct vhost_vdpa *v, u32 asid) > > return -EINVAL; > > > > hlist_del(&as->hash_link); > > - vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1); > > + vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1, asid); > > kfree(as); > > > > return 0; > > -- > > 2.34.3 > > >
On Wed, Dec 21, 2022 at 11:23:09AM +0800, Jason Wang wrote: > On Tue, Dec 20, 2022 at 10:02 PM Cindy Lu <lulu@redhat.com> wrote: > > > > The input of vhost_vdpa_iotlb_unmap() was changed in 881ac7d2314f, > > But some function was not changed while calling this function. > > Add this change > > > > Cc: stable@vger.kernel.org > > Fixes: 881ac7d2314f ("vhost_vdpa: fix the crash in unmap a large memory") > > Is this commit merged into Linus tree? > > Btw, Michael, I'd expect there's a respin of the patch so maybe Cindy > can squash the fix into the new version? > > Thanks Thanks, I fixed it myself already. Why do you want a respin? That will mean trouble as the fixed patch is now being tested. > > Reported-by: kernel test robot <lkp@intel.com> > > Signed-off-by: Cindy Lu <lulu@redhat.com> > > --- > > drivers/vhost/vdpa.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > > index 46ce35bea705..ec32f785dfde 100644 > > --- a/drivers/vhost/vdpa.c > > +++ b/drivers/vhost/vdpa.c > > @@ -66,8 +66,8 @@ static DEFINE_IDA(vhost_vdpa_ida); > > static dev_t vhost_vdpa_major; > > > > static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v, > > - struct vhost_iotlb *iotlb, > > - u64 start, u64 last); > > + struct vhost_iotlb *iotlb, u64 start, > > + u64 last, u32 asid); > > > > static inline u32 iotlb_to_asid(struct vhost_iotlb *iotlb) > > { > > @@ -139,7 +139,7 @@ static int vhost_vdpa_remove_as(struct vhost_vdpa *v, u32 asid) > > return -EINVAL; > > > > hlist_del(&as->hash_link); > > - vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1); > > + vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1, asid); > > kfree(as); > > > > return 0; > > -- > > 2.34.3 > >
On Wed, Dec 21, 2022 at 01:58:11PM +0800, Cindy Lu wrote: > On Wed, 21 Dec 2022 at 11:23, Jason Wang <jasowang@redhat.com> wrote: > > > > On Tue, Dec 20, 2022 at 10:02 PM Cindy Lu <lulu@redhat.com> wrote: > > > > > > The input of vhost_vdpa_iotlb_unmap() was changed in 881ac7d2314f, > > > But some function was not changed while calling this function. > > > Add this change > > > > > > Cc: stable@vger.kernel.org > > > Fixes: 881ac7d2314f ("vhost_vdpa: fix the crash in unmap a large memory") > > > > Is this commit merged into Linus tree? > > > > Btw, Michael, I'd expect there's a respin of the patch so maybe Cindy > > can squash the fix into the new version? > > > > Thanks > > > This is not merged in linus tree, and this compile issue was hit in mst's tree > should I send a new version squash the patch and the fix? > > Thanks > Cindy No I fixed it myself. Pls check my tree now if it's not ok let me know. Thanks! > > > Reported-by: kernel test robot <lkp@intel.com> > > > Signed-off-by: Cindy Lu <lulu@redhat.com> > > > --- > > > drivers/vhost/vdpa.c | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > > > index 46ce35bea705..ec32f785dfde 100644 > > > --- a/drivers/vhost/vdpa.c > > > +++ b/drivers/vhost/vdpa.c > > > @@ -66,8 +66,8 @@ static DEFINE_IDA(vhost_vdpa_ida); > > > static dev_t vhost_vdpa_major; > > > > > > static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v, > > > - struct vhost_iotlb *iotlb, > > > - u64 start, u64 last); > > > + struct vhost_iotlb *iotlb, u64 start, > > > + u64 last, u32 asid); > > > > > > static inline u32 iotlb_to_asid(struct vhost_iotlb *iotlb) > > > { > > > @@ -139,7 +139,7 @@ static int vhost_vdpa_remove_as(struct vhost_vdpa *v, u32 asid) > > > return -EINVAL; > > > > > > hlist_del(&as->hash_link); > > > - vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1); > > > + vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1, asid); > > > kfree(as); > > > > > > return 0; > > > -- > > > 2.34.3 > > > > >
On Wed, Dec 21, 2022 at 2:35 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > On Wed, Dec 21, 2022 at 11:23:09AM +0800, Jason Wang wrote: > > On Tue, Dec 20, 2022 at 10:02 PM Cindy Lu <lulu@redhat.com> wrote: > > > > > > The input of vhost_vdpa_iotlb_unmap() was changed in 881ac7d2314f, > > > But some function was not changed while calling this function. > > > Add this change > > > > > > Cc: stable@vger.kernel.org > > > Fixes: 881ac7d2314f ("vhost_vdpa: fix the crash in unmap a large memory") > > > > Is this commit merged into Linus tree? > > > > Btw, Michael, I'd expect there's a respin of the patch so maybe Cindy > > can squash the fix into the new version? > > > > Thanks > > Thanks, I fixed it myself already. Why do you want a respin? For some reason I miss v4, so it should be fine. Thanks > That will mean trouble as the fixed patch is now being tested. > > > > > Reported-by: kernel test robot <lkp@intel.com> > > > Signed-off-by: Cindy Lu <lulu@redhat.com> > > > --- > > > drivers/vhost/vdpa.c | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > > > index 46ce35bea705..ec32f785dfde 100644 > > > --- a/drivers/vhost/vdpa.c > > > +++ b/drivers/vhost/vdpa.c > > > @@ -66,8 +66,8 @@ static DEFINE_IDA(vhost_vdpa_ida); > > > static dev_t vhost_vdpa_major; > > > > > > static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v, > > > - struct vhost_iotlb *iotlb, > > > - u64 start, u64 last); > > > + struct vhost_iotlb *iotlb, u64 start, > > > + u64 last, u32 asid); > > > > > > static inline u32 iotlb_to_asid(struct vhost_iotlb *iotlb) > > > { > > > @@ -139,7 +139,7 @@ static int vhost_vdpa_remove_as(struct vhost_vdpa *v, u32 asid) > > > return -EINVAL; > > > > > > hlist_del(&as->hash_link); > > > - vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1); > > > + vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1, asid); > > > kfree(as); > > > > > > return 0; > > > -- > > > 2.34.3 > > > >
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index 46ce35bea705..ec32f785dfde 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -66,8 +66,8 @@ static DEFINE_IDA(vhost_vdpa_ida); static dev_t vhost_vdpa_major; static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v, - struct vhost_iotlb *iotlb, - u64 start, u64 last); + struct vhost_iotlb *iotlb, u64 start, + u64 last, u32 asid); static inline u32 iotlb_to_asid(struct vhost_iotlb *iotlb) { @@ -139,7 +139,7 @@ static int vhost_vdpa_remove_as(struct vhost_vdpa *v, u32 asid) return -EINVAL; hlist_del(&as->hash_link); - vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1); + vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1, asid); kfree(as); return 0;