From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60051.outbound.protection.outlook.com [40.107.6.51]) by dpdk.org (Postfix) with ESMTP id 2FB3B2C18 for ; Mon, 4 Mar 2019 20:19:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LPzH4cbMQANchZ2BCLUacLYfyKptWnmtDQYgOQG33sw=; b=nUM5F3hXaKdwscOqYKH/SkqOOM4P2GIrz+5FRFFhC9vNeNHqshfxh3opUBKWAp4QqmYhQMl2nU0AM1RZHAppOPWEoTdunkZzDUIb1SO26siHM5+n/HbiOSgAJ0x9XBdSZ6PiSY/g9X18XkICvgm29ay6uLL5ok2qWfbWCcJJTSQ= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB3994.eurprd05.prod.outlook.com (52.134.67.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.19; Mon, 4 Mar 2019 19:19:39 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::580c:ae7b:8278:cc50]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::580c:ae7b:8278:cc50%3]) with mapi id 15.20.1665.020; Mon, 4 Mar 2019 19:19:39 +0000 From: Yongseok Koh To: Maxime Coquelin CC: "stable@dpdk.org" , Ilya Maximets Thread-Topic: [PATCH v17.11 LTS] vhost: fix error handling when mem table gets updated Thread-Index: AQHUzbztf1k9LZ1950+rdMbh7s2NTKX74vEA Date: Mon, 4 Mar 2019 19:19:39 +0000 Message-ID: References: <20190226102027.1376-1-maxime.coquelin@redhat.com> In-Reply-To: <20190226102027.1376-1-maxime.coquelin@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3d1a0cb2-aea2-483f-39af-08d6a0d658e0 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB3994; x-ms-traffictypediagnostic: DB3PR0502MB3994: x-microsoft-exchange-diagnostics: =?us-ascii?Q?1; DB3PR0502MB3994; 23:OvcxhnkSG58hp3YOwZVh95cIl4I+Up9wZnOW3nh?= =?us-ascii?Q?JGTdkHRybZbnpt1nLe97nLp2ZlovQW4YSB9wQyl/Xm7zn+nis2wFxirP23Tr?= =?us-ascii?Q?WrBgU2IwUB0HJHtZeUyB7Xa6/ngz4HamoHAqKH8IFfmhMeZd/fsSEq/9BJgw?= =?us-ascii?Q?qZDZh9PvM6n2jo8dwsrhn++wIogHDif5PlLPT9JjeMAbO+UtCb81d0Jx+IMd?= =?us-ascii?Q?ugc8fv3oAuHPoGEWJHboi7RLKyrOU3kYobg0BvQIEkPwWoXDqv/VDejnmC5/?= =?us-ascii?Q?7ELEuO3TmzTCvR4p8+JLwG3+uXj68Y0ma3y6KIFwINEpm3QyBJ3HB4oA98xJ?= =?us-ascii?Q?1LWMK8a1zg2L/krhe+/uI9/AEoogXMAHKJAkHRMALhfSNbTzGz4GwNJDM4Oi?= =?us-ascii?Q?jPvtUJfSc81CHTt+QRZbKsN5IRrvBvZBfgI+YS1u47NSmU8qtGlS5ZC24EuF?= =?us-ascii?Q?VeqE7+kdTTpf4D03xtfW7wMJgve4YrPjgIg49Fshg3OBL7DTcThD0iiBRWu6?= =?us-ascii?Q?4ab89OaKU/vU5t+CTuk0j3Xf7+MznKprl/7ZtGx9zKqCRPpgmV8rDuD+XNr5?= =?us-ascii?Q?I/nOfOvRzLbVAZ+Mhoabd093mW+PIlEAZPz76xO6S0/fFAfYDOCwo0BaTGtV?= =?us-ascii?Q?Lt+6ZXm03MjN11TVtyp2CklHrZs6XNwnCNBPhr8H1L2l7S0o042oiLYoDmVE?= =?us-ascii?Q?3zGVN6amz2eb31kFNHJc0DcWsQOZ74dfC+jvUv2KxXbwxp39LQff7hf8eZEJ?= =?us-ascii?Q?xV3NWViqaCa8bv21wgHTc7uHWORQAaQGjPUN0WZsv9R4CZn6OL8w3IXZw1qk?= =?us-ascii?Q?Z0Dw5xMyeKpoa+/wqLe7+y0MfBYREe+trEHutUXD1ryx4zmDHJBl4oECjQlu?= =?us-ascii?Q?hF8bZ/mdHw9sxiEbD71/cVHKAjb3Ha8rsX5QLkGFJgWDKfqjOS/wMuqMP9Y8?= =?us-ascii?Q?6licjyE3zChbGHh4j77wAyYf+HXU+xejr8yap0baBbYNWJrPfrZTCNiY8CAb?= =?us-ascii?Q?gj6xOyewAAV3Nn23QN3hpsAZ6QUI5PHXrZZSepRFiFHlGl3dDH7Jom/Pcdb6?= =?us-ascii?Q?2M3qGacXIY3090++CGas7vOxbqBfaEXkkQWV3Rw6DQBm9N3btvT06yzFzLA1?= =?us-ascii?Q?YZUqze7i3mLxfUROTo5RVJhno43hz0cjRlByZWckie2MgP66Zx+PT0MnwiuW?= =?us-ascii?Q?WZLuopharEp/7NiFjsA9XpFbRUZuXPeeznVwE3MdLcUC/PKtpBndE7E9HroA?= =?us-ascii?Q?5Jytf+5n9cPYSULbeIdNU7Nj0hKmPLgIoKZaOC9O7?= x-microsoft-antispam-prvs: x-forefront-prvs: 09669DB681 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39860400002)(396003)(136003)(376002)(189003)(199004)(7736002)(305945005)(82746002)(15650500001)(229853002)(68736007)(36756003)(5660300002)(476003)(6512007)(25786009)(81166006)(478600001)(6436002)(81156014)(86362001)(99286004)(6246003)(8676002)(6486002)(256004)(76176011)(53936002)(71200400001)(83716004)(71190400001)(316002)(14454004)(54906003)(105586002)(6116002)(8936002)(3846002)(26005)(53546011)(2906002)(66066001)(106356001)(6506007)(4326008)(6916009)(2616005)(486006)(186003)(102836004)(33656002)(11346002)(97736004)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3994; H:DB3PR0502MB3980.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 8vyITS1WmzGIV133YPENdSbtQ4K8eBmouB+x7dUVUZgnX/irTlkRihPHi5JG34VR4qdWy4jsogVgdjRXrtfAOjyAh2qJs3/2qjB8XbtZjtNXr8QPklK43rX1nXz/Mm3bp5p9++2814wZ56yrPqF4UPrhUi523T9k3Uwxm3UHIY5jNO1eMt4dbk5xRnUnNB6CibGmsg+ROYt32c3+I/ogeAin/6P/v05kHfi4EZSntO2WbEd6AQ777mkThYc7807i5y1fQ1JqnqG0obwJvOMLf/V4IW2+qto63bYt1EH3h1CDTD1MpcN2kxi8wqF1iBY0KeZJR6RV7OEdkbTbGjv5Oi9752G3Ss8HGpa0GnfnR9+jASaM/78gZf5a6LQp9Kh+CPCmW2tfEzCIvWRx58t7QsJhJu0LQr+pdKgJNDy5wWc= Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d1a0cb2-aea2-483f-39af-08d6a0d658e0 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Mar 2019 19:19:39.3318 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3994 Subject: Re: [dpdk-stable] [PATCH v17.11 LTS] vhost: fix error handling when mem table gets updated X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Mar 2019 19:19:42 -0000 > On Feb 26, 2019, at 2:20 AM, Maxime Coquelin = wrote: >=20 > [ upstream commit 74ee315e4f1bcbcabae054d310b730be13e49ad4 ] >=20 > When the memory table gets updated, the rings addresses need > to be translated again. If it fails, we need to exit cleanly > by unmapping memory regions. >=20 > Fixes: 96935c61631f ("vhost: retranslate vring addr when memory table cha= nges") > Cc: stable@dpdk.org >=20 > Signed-off-by: Maxime Coquelin > Acked-by: Ilya Maximets > Signed-off-by: Maxime Coquelin > --- Applied to stable/17.11 Thanks, Yongseok > lib/librte_vhost/vhost_user.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) >=20 > diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.= c > index 9ab37ae5e..d70778b22 100644 > --- a/lib/librte_vhost/vhost_user.c > +++ b/lib/librte_vhost/vhost_user.c > @@ -761,8 +761,10 @@ vhost_user_set_mem_table(struct virtio_net **pdev, s= truct VhostUserMsg *pmsg) > vring_invalidate(dev, vq); >=20 > dev =3D translate_ring_addresses(dev, i); > - if (!dev) > - return -1; > + if (!dev) { > + dev =3D *pdev; > + goto err_mmap; > + } >=20 > *pdev =3D dev; > } > --=20 > 2.20.1 >=20