From patchwork Wed Jul 4 17:53:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Katiyar X-Patchwork-Id: 42221 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D217C1BEB6; Wed, 4 Jul 2018 11:52:54 +0200 (CEST) Received: from sesbmg23.ericsson.net (sesbmg23.ericsson.net [193.180.251.37]) by dpdk.org (Postfix) with ESMTP id 64DEE1BEB6 for ; Wed, 4 Jul 2018 11:52:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/simple; q=dns/txt; i=@ericsson.com; t=1530697973; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Vgfu0zaS+Qyc7j1m8upTTWf8kCPKRQQW0pNO2466nvY=; b=eAGkkKYYcB+vzE9+67IoSBg+Or+7wSwA+Kk0BaTpRdau+I61epPecBbv9ZoGvw3D f9EV5Loc4Pxwz1OuAzZd6zDzos+naI8M3fgM4akm6yaAV3oOsufuLmKO1oNHRcrH BGS3ppxTWBxYFy2IiY1ghzT4Zh3z1wOIPw4qGlDAV5s=; X-AuditID: c1b4fb25-202c69c000006310-18-5b3c98f5a829 Received: from ESESSMB501.ericsson.se (Unknown_Domain [153.88.183.119]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id C6.65.25360.5F89C3B5; Wed, 4 Jul 2018 11:52:53 +0200 (CEST) Received: from ESESSMB502.ericsson.se (153.88.183.163) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 4 Jul 2018 11:52:27 +0200 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB502.ericsson.se (153.88.183.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Wed, 4 Jul 2018 11:52:27 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R5btLksgZ53L+N5k01sr0FTa7HcHvXLHlbsApO3OCpg=; b=d9CX307qpOTWZThIfnk/b0dVZTQgtaZU8elrz95w8zKgjJMa40e1mmNWa5btm+pvKwho2clw9RSnxxCZsTHjzVW9XA2jmUBiCJguUeS7rlUx6S0Mfo647QayenzYTuNrtHQWURhMV4TyAfKAI9ZZKorTSKBmgVEFtc8qF6Iy8jA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=nitin.katiyar@ericsson.com; Received: from localhost.localdomain (125.16.128.122) by AM0PR0702MB3618.eurprd07.prod.outlook.com (2603:10a6:208:25::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.7; Wed, 4 Jul 2018 09:52:26 +0000 From: Nitin Katiyar To: Date: Wed, 4 Jul 2018 23:23:18 +0530 Message-Id: <1530726799-11100-1-git-send-email-nitin.katiyar@ericsson.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [125.16.128.122] X-ClientProxiedBy: PN1PR0101CA0047.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00:c::33) To AM0PR0702MB3618.eurprd07.prod.outlook.com (2603:10a6:208:25::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26691376-1ea9-463d-4719-08d5e193d9a1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:AM0PR0702MB3618; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3618; 3:XnOl6bYskjBAAgoTsyvyWMilrGNel4RI0TQ7V0i9FOs3msQoiz2wUZXBGdKaG8UqfoHzJU9HGf51F/nGWPGO4A5MOxsGF9TOV19i5ofwJP7A2kYDbZJ/PuqGzWhaS42hSQz1amOf5BFxaEvZOXsoJb6kNlkvs7rNZA5meNFe7UNEu84KaZ43MGzUjwoOJdgFa9rIVZef3EBB/SIHjQ849G8CP7f1fOZqwHyU7NaTn9ci7Du1DsBLaHQm4EGICh7N; 25:/FG8wk2B1Uq6vtgu9nNIga+ATX65njrULVXnIfjorffXWayt6HKNxaDYZPZGKfEE/S74OWuZnWGANThvsba9kMQxrvO8OVjRmh+Vi2Gg0kOZIrfwwTIUEpndAG3Kg/DDGO3AQ9GoMSGNqdGaO2AoZtj6AHBe/X3qY40hN803zkoOE+ldW5xbe0w2sUnLPuY9XbErzm8w5Dvx52T053ex6fBI+Pzt5M+DWmuSNfOWL7jSlZ1MtK5R05QUvgPb5LUALPxl6IKy1nPokrvXK1qkTiblig0ybNxePR+g0nL4fdKJBnNyeESEiQFYDTVOTathNbKA/T8uqIOB6trYY96F/Q==; 31:nuGLR0n2k3PTydYjEbSuNrlsP87v/RH2EByTmsco3sbSnpXCNwpFVb/zsGVCiTZ09u7DwS/QgGiFHZrdy+Xmuu/ot38gyvDOC7ktNGqXyGweZRU4JK9ZM58Jv7Fbt73FiG+RTrRaq6ZQzkE3FeqtN9tZT0mGEX+or8cC+5ObTDvimbgsiPMc0nxlrmQzev50ocLmo0FjxM6A5/AquUmPmgULyysDcjc5SuxIQDbS07I= X-MS-TrafficTypeDiagnostic: AM0PR0702MB3618: X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3618; 20:oAsspFPgmZ3VlJQYHvl1veWWhRlIpKJsdaKrGlAdJUFRGz/NLajO9k/lhh7Et2wrROC77E7d8DnYqDvJoHFDOPB/xRkUABzZ/4+nht19/mTN5SlxiAGAA15nxmPqEjDsFVBuIsMUeiWJkuHI9X8nlNf1zYZ/czunaDY5QbVbz05l4xM3mfGYtbFcqKxv+9Qtzm0tpmiMDZalwfHbF47dgl0QdPQGE6rGzr3MgV5V6qL/yBL8UHAPFWBGrdYgTg1SiW1gnMsRoKyPF+u10tn/A/lsl6ZG+EJuv7hEgedRmSLLrX2xsdGAJoXOG7fR4W8MEWvvNHzb3KTyxb4MqDF8OMkzsEG7WiuFTy5tBVFIGEACTCN5Fa7DtxuOqWoZJCV8ZD9+uqg766XrILhUoihcOz4IMq48PzkfgzQz6D+q4YLRln0gRUiYjElhb+hx3blt0/akiKOhUNXYUue6t6uAxK62CLZ03FGOlkOQaHGzFbaFs4wa73ATrFUzaoZTtjRk; 4:9QSa4VklmYww7Kusw44xVRBeuhUK5W2oRSje6oyvs3RCgzRxl1KvxPH7XVPYjr7pfxNigztv2AJptFmFhtpv/0BDdWSZ1bU3A759U/+b9oe+C4DhwofVafT/8lWExvg2IuLjKPiIy2MN+VtgyegUlX0046VNH4bEDHynoXFYi7zcNnzBvZ9z9KvDIAMWAJhVjBJyb7B4PyLg2U0KEVOZvq/sQtUk0wf6ph+amN8xot0WxwHLMLgPYT9kqrwp/sSlg5msnNXO3OfLVBIOuuSWv3vAce/POuWec8GwelgF+AKrTyPcesphkmuRiSyOyYMykj0hJJgsWVfEZhYHMpp4qUCVyP4TMAbsQNSPTCgYgDI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(37575265505322)(278428928389397); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:AM0PR0702MB3618; BCL:0; PCL:0; RULEID:; SRVR:AM0PR0702MB3618; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(346002)(396003)(136003)(39860400002)(376002)(366004)(189003)(199004)(81166006)(8676002)(26005)(1857600001)(305945005)(8936002)(53936002)(81156014)(186003)(55236004)(51416003)(16526019)(6506007)(386003)(52116002)(956004)(476003)(2906002)(44832011)(7736002)(2616005)(486006)(14444005)(3846002)(6116002)(47776003)(6916009)(6666003)(66066001)(86362001)(5660300001)(97736004)(50226002)(68736007)(25786009)(2351001)(106356001)(105586002)(6486002)(6512007)(2361001)(16586007)(316002)(478600001)(36756003)(50466002)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0702MB3618; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR0702MB3618; 23:gLcTODkbLHp5D0y9H1tgyrKenCUl1mALtXZz3rD?= YBlAVmpL27010aW8PT9fAuNUBtx35WRbGantDDXJh/G91RvgO38BC3SmR0EDWcFnwumrNiRysaBmf/QlDrEVyW4OuhbNXk4oNThTYsW/F52Ky87ETuksKZQdjXv5G4qDu2CrtKUEuDgd7m9DKayzY/nQFvQS58Yk2uEdkTPG5BNdJUCyCUQWqnbhBicsDQkvMJG4vd9T5ddc5ciUxFjSrnGJ5rqa6wcBzZomO7Zq0bI4tFA44v3VYPgQBWG8+tQz6WQHKTxWEBX9E+rt4QI+g1DFaM3xeNjDqIik39OhiWbnMCbEJTYDseUyI9zmf2n9V+Xqr1JsrLGIMqOAvzkL2IPlSpSAUxocCO/zrU0IXI0Y7CXBqdVxS8E25Aptx57EgDFHlEXp9vGi3Jhec+SsJAgDStFYNJlJw3qdcPTTVubpeNqnovhH+PUWVPoVw8E9T+OMSZ0K+h0oP2FaP8q019os6U3Pu9vl3jczhN7iFK+ojQ5c+7k1IPnQPlb0fZdc6Lzyn44w8SlMt4f7hvchHzOoHTNgBDutTh4+jJB7oii1QpNMVTmqgGyuka6cekFrG1/XKHw8JxC0mBIf3EQfUZwiSmhqZEv4+hGwObsSA/PXrpgUJ+Khp4TZ2fFE+G+2mnZ2QK60ZyAaERyLn8GccCg4tzW1ffvlGUD4IAVh6ODwecdUxMopvpIpCj7tGVwbus6FYgTwIMXD2KNIScV3pGRh2AZziwqqmxXmpobqT84mu/bWa3jg89itEf8ixZq2ZnyTOYU8rP3zbp3tGNWMFiJ8kvtmF0TGN2P/u0GThWFP1SjJsa9dMOPHdyGdI8n91XLJYvWGcG+cuPjR4GRZUI1WaFidHaWwNbwY6gqBNSQEEF1BcOtTzXPim55UAM1zku88rr51tz6tme0+zK+ZppsQ5S9Ylod+7dEa/MKLeNBW+GG2l1xn0JtNyJfhaFYNHkFmyHKR7ZCsAEkdZiXV6mkV6YUmk3IUMB3kJXRAf524xVMzHnIxSQAEQdDR1WdyzcyuD9wgPs0qEud62drsfU2B1ih/gJVcsMVzXRwqKktmB/XbKRPBB1tsDkmXBR6DiQhhhSAwYJTz/GoTDzWTuSXZMakpKFECK2VRKfZEI87ecEOlKeytipNRYl2rRSRIX5PVr3XW71y5tdBYruuYtQeC9GWl90pfTyZD51d9TNYC8iA== X-Microsoft-Antispam-Message-Info: 9IAQEVU0QHqYCdmwEWSrdkuk1yYZr/0lniDJWo1yAkB+POyBuTsXe98OcKBi1SESgcBbeEfBQYBinZSQVmYPwaDYnHkA9ACl35MtfytA0cV7PTOtxRCPu3LKxFFOMyBImSyApO9G2dJCU2MDg7ARvw/lXPCP7STEHGApIqZJPCUvFWl193tXzqPFbDj2m6I0D4mcUsCKqvHsBgZiGQmC2maoh/CdlhBS8GbxZ/MlmJ+BZX1uzAK8KzIR0jj2plkbJVckkeRzeABXazY5rmEcp7vExK578lMxnUE3jBhFyyDoNdcFmMSFG74x+1ua3vpGsybWEyIPdwW6njG0lPxN7qZ9+f3EeYyLvAYwXjzElbA= X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3618; 6:p3uzuEWOs+lvOK3qJKNN7xBfAem1YyLp6rX/0/1a4X/bFv9eLweTH+SO6TdR/R6zlDc56JYOKm5V6KvjiKNHZId/TATXish5dUesyGE+etZgFki0CjFDmDzYZzk3afUgUmyhbvn+E5dr0bErYfe5SaBI0dMDT7ctloFZ2zDgwxWoWF2vuQfzkw3V243dMN2bf0RHddenlhJ1OSqOuDaA95cjQhA6hH1cdcCZ/v1CcigQBGnQYsi6ETgTc2S52ijs2Ant4h56dwUgnK4pZfUY+kKK21kHxI9ZBiO5W8TYDc4wyEgyALe0ql67dH9EVsggi4mzCWfWYmh4qPoOYor1m6SS5B3HE1E4kT37rpeLBkC+fl9/bsMHWcd0aCsnQWQlvVGYbXZJgZn7OWQGZ0OXxbBv48Dr1Q99yHr8Dth1Aqqeo+mX6YqYj/AkNu7DQNOaY8R9NFHr3AQxG8BMbjquvA==; 5:mxZlcYIIhT8buTDU5LW6PO0JlRs7sb1oEAqCIDvBIBZcePlREXbX6F9krojLpBs4I0o+nQIRmAw3u/EZhvnPLVxP/J5io6KNfhQgJzE7Uf4aiWTmlG5wAkwtqctbs9fiKQeouh7V7F+pHDOpHyLsUcOnGk32X6DZsqJMXuj+OFE=; 24:+aVdB+Kv6vmVAr1Sn0lFoD2UsRXb8NkQ6pTSLq1ms/ni219WRs5b9UeLWm4s/dSrhXFcbSxIiCTZ6n6j5z7u5zxTmmBEfyOFktWBmNMMlO8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3618; 7:u7CUoQj4OwgOoiRABYV/sLLclXW37b2qnCmM9TUXajNaLfKY4Y5KbczFvZMAVxHRtnexwGhga8FRGFS73S3EuxEfKqx7vgNjV+QGvUnLpqxwYK2vW2hRw8v/q4pl8adCNOAOCVmYprcYj/YJ2iR9Am4IKV4FWxesM4SyegP7qRNOpMPocEAZScnNK3Xs4Knoq7jKJRWuhFYLUKeoLsjdZtHCQgyit57KVQ79WhTkGq5pbxlI3LXMkuLch6Dvoonv X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:52:26.5777 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26691376-1ea9-463d-4719-08d5e193d9a1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0702MB3618 X-OriginatorOrg: ericsson.com X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOIsWRmVeSWpSXmKPExsUyM2J7ue7XGTbRBo+X81q8+7SdyYHR49eC pawBjFFcNimpOZllqUX6dglcGee/LGMtaOCr+DjtG3MD41buLkZODgkBE4mOeW/Zuxi5OIQE jjJKLPmwDsr5yihxt3EuK0iVkMBiJokbW4tAEiwCE5glDn7exASSYBSIlTjXdZ8ZoqOLSeLc 4kNgHWwCBhLbL05iB7FFBIQkln68DGYLC4RIPF+0khnEZhFQlXj66iDYIF4BL4lTO3+zQ9wk J3Hy2GRWiLigxMmZT1hAbGYBCYmDL14wQ9QoSezaDLFYQmAW0N23zkKdqi7x5FE3E0SRrMTR s3NYIGxfiS2TZrJANNxmlPj7cDI7hNPELnHmx19WiCodiV03f0GNXcYu8Xr/KsYuRg4gJ1/i akcBRI23xM/ZhxlhTj3Ve44Jov4Qs8S3jeugBslIHGi8DZXYySpx4n0vM8R9qRJbbrSwQSTm 8ErMXrCZdQKj9iwkz85C8uwCRqZVjKLFqcVJuelGxnqpRZnJxcX5eXp5qSWbGIHRf3DLb9Ud jJffOB5iFOBgVOLhteqziRZiTSwrrsw9xCjBwawkwtupDxTiTUmsrEotyo8vKs1JLT7EKM3B oiTO+9B8c5SQQHpiSWp2ampBahFMlomDU6qBMU86+1vrMzXr6lLHNenrWxmDOHduvr7mSWzx LGFz2ajDb17k3+OsvMH/e/aMUymffjwrnFdX5OecedAgpazM1b8/ab/eNdf+ti2HjmzdvK/v 052514/uv6Qo934S0+24YBejQNUGC42fLw95KGwS/Dg54eQOKz/Vi0aXdE/7Cr9bZOqXteSA pxJLcUaioRZzUXEiAEwaPpj6AgAA Subject: [dpdk-dev] [PATCH] vhost: initializing iotlb memory only when IOMMU feature is enabled X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" DPDK 17.11 introduced the IOMMU feature which caused additional DPDK memory requirement per vhostuser device as part of iotlb_init(). Today this is done unconditionally (from DPDK 17.11 onwards) i.e. irrespective of IOMMU feature being enabled on the vhostuser device, iotlb is initialized. This breaks the backward compatibility for applications like OVS due to increase in the DPDK memory footprint and causes upgrade failures. This patch is to do iotlb_init only if IOMMU feature is enabled on device. Signed-off-by: Nitin Katiyar --- lib/librte_vhost/iotlb.c | 7 +++++++ lib/librte_vhost/vhost_user.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c index c11ebca..0d7c820 100644 --- a/lib/librte_vhost/iotlb.c +++ b/lib/librte_vhost/iotlb.c @@ -310,6 +310,13 @@ struct vhost_iotlb_entry { struct vhost_virtqueue *vq = dev->virtqueue[vq_index]; int socket = 0; + if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) { + RTE_LOG(ERR, VHOST_CONFIG, + "IOMMU feature is not enabled for this dev(%s)\n", + dev->ifname); + return -1; + } + if (vq->iotlb_pool) { /* * The cache has already been initialized, diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 26cfebe..ca787f3 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1274,6 +1274,13 @@ uint16_t i; uint64_t vva, len; + if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) { + RTE_LOG(ERR, VHOST_CONFIG, + "IOMMU feature is not enabled for this dev(%s)\n", + dev->ifname); + return -1; + } + switch (imsg->type) { case VHOST_IOTLB_UPDATE: len = imsg->size;