From patchwork Wed Jul 4 17:53:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Katiyar X-Patchwork-Id: 42220 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 4734F1BE8B; Wed, 4 Jul 2018 11:52:37 +0200 (CEST) Received: from sesbmg23.ericsson.net (sesbmg23.ericsson.net [193.180.251.37]) by dpdk.org (Postfix) with ESMTP id 6E3C71BE8B for ; Wed, 4 Jul 2018 11:52:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/simple; q=dns/txt; i=@ericsson.com; t=1530697956; 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=g0BWC9uBeQ8oouFIz6Zr2i2kuSwygw/H6J/FCM9ccsI=; b=gV0ZUhBG+rU9UWulw/vZO2YVqn/oj20J5EUDdBTJNbnDavnniRcLGt+VRCqyyfVk fqhtnVlk/QApG1iR4/CQFr+Xg8vDz10wKofBIiCKEZ32jaXPBHjonmynCVBIMAi6 pP8d79/2mRCS4AyFr0WCdl15N43AbSaMHURdDeKOAD8=; X-AuditID: c1b4fb25-e23ff70000006310-81-5b3c98e4c6c9 Received: from ESESSMB502.ericsson.se (Unknown_Domain [153.88.183.120]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id 6B.45.25360.4E89C3B5; Wed, 4 Jul 2018 11:52:36 +0200 (CEST) Received: from ESESSMB502.ericsson.se (153.88.183.163) 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; Wed, 4 Jul 2018 11:52:35 +0200 Received: from EUR03-VE1-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:35 +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=3AyZrDsG1w/gcAqJFD6BCVtcy5p7gHJTsUpBf2VZtXo=; b=dmKJAZ871SzsFSKvAFSvr6wXSbOdG2ADqwvbrI1xZlpfMhHNPR4/YJQV3ViMgl+Sosep+pPDl+fgY1DaoBM9+yDYfctnXTIXWQEr2qc+1SO1cPkvS+JyQDXKVm17iiBkxnep6AZQYbQDt/QfeAymehYX7qQZXDetmIQambiOWxw= 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:34 +0000 From: Nitin Katiyar To: Date: Wed, 4 Jul 2018 23:23:19 +0530 Message-Id: <1530726799-11100-2-git-send-email-nitin.katiyar@ericsson.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1530726799-11100-1-git-send-email-nitin.katiyar@ericsson.com> References: <1530726799-11100-1-git-send-email-nitin.katiyar@ericsson.com> 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: a6063541-29bb-4fc7-cccd-08d5e193de4d 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:zwCVPvpHAJM4lb2cMFE8jULs4KW/lqZMDpavDKk4WVkC9zAId45Q4Or8e48h+ZRujtL9cdbWLXkIgbDucwEYytCDndDSLySLV3V0/PHTh0YWRb5Ir/P6SEUIKbynZ6oloAhwCHvm3Sw/6uPJJWlWrjc2h13gwFt32lGOlNaeQR2mN8E/nhemVPQeMyVf31T8MTsQsvqTMBIJaZlHUFKrqhrasxduSPWaz+Ru08WBYfmlGhVsNOZeReSiCOZPbyXy; 25:54IYhBenu5pgZ6Jk40+aV/m7M3Do5n4GgtKZGe8SSU13KxuGJXwzCu1eoZqyRsJhcDy64vXOhsXQdW7mY/KvZrmUVYXOoLjsFnAeIV2GK8Nf94EzcuPaKUTGKlZ0mXTDaeXWNjb7pwMwYgFzoJDNvIOd2gAjfQcQaEsXc7lGKAlQ7tG1mWPoBHZx5JmSz2gDvK7C+pTjZi+C/ft26WfYNx1iStEywQJIKnpOMGYnCjotdDQbME0EhMVz7O1MYZ5Mccol9iOesmNtOdh8XK6BORZmQ9x6huipRHsHW004gdF116WrDu8bH1QTclu1QUhAqShbA5NlrTJ/qs7hJgOx3Q==; 31:l5b6j1R3KzzqDm1PxNwanugTVBHruuyPKSM5m9fykeJdcMEjxGayEfWa99gThBGThmjLwAxE+0tlJQYR8+9Bg8lbiG77NaEWWffLdcRFrBGQWspZ5YhEv623k04HvDhMHpY03ygAsysFh7orEXRDDvCn3/Z+0sNycwIrKUmyyty3uCBId4rDxPFYvfW/lvH9wA0feXVh1x8ohvvWEr6Us21StC0D/xgtPVfGdNL/zI4= X-MS-TrafficTypeDiagnostic: AM0PR0702MB3618: X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3618; 20:aN01jl+GrP0IYghZKEyirH1UH0/ap8lOFik3IK3uQ1ZAjS6N1qxUdVROCEE098fVbsm5g2ATqT9w8ZLiVbp2TkbhblSc8PAn53KFyEcpPDq1qshtslHKHwhtMs/W3U1dnxbps5NHS99DMrwgxdYgXB0KtHtT/4B66xZSSSxZX448pKse0bBSjL0a+8+2uEOf65KHK1A+Se39farRKEmWbziNnV7h+8mIp9YKocaugkKl8BhGqC67tDQ9alrBt8ajAR2iqdBVbd2AlQmef9CJcUjxtmprMMPWgFVEI4iGfMTI7a7BEGJzUiNRt6UvbrOQzbjEqNnagadSP6EG3dCRWt7uu7BF9eWsnCrGF2kIcuBNM03HPjvEJw6klV/XFjng8Qoa98rx1E/GZyOlQGtV/kDOfd8s0R7Ap8liPoEOLLNuq+3lzFIBWw8t5lXVlq76GNpBNrfOeTn3bw+npeZbld8g+KBYgfjuatkG3xhbBpUL0sHcUUnvO+z+s8/drnZw; 4:coZlCv23UKaeTmnzv2NU7RJ6e6Umc6QmApPKLII6ii+8omRzEw/W8mv72palYSWMcsDFKpwgsjtnbQmh8XWOdipbkmQgHl4bKO4G487IbIur2Zf5cKsFoKAmeRTNpbPmAD0AwkYU4RCLEeCIOeGSsGLIO7B3AZKE1+5C27MJAoEt8pmX6LTy18qCwsE+95RRh0aE6BMR9+ZgadRF7ALRXZB5XPWjPZ1TBhx+U6hyoabCQORZ1jtGqMvsQVr3DSqFBFgTdm2HWRhbddofG+lea0er5EBWz5iKcB7d8JimLikgTdBgrLP8/B8hhPwHAJi+NeAjzNcFKZeiT+LsiWGSrIfXdlVwPIikOnUZD8eGY48= 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)(76176011)(16526019)(6506007)(386003)(52116002)(956004)(476003)(11346002)(446003)(2906002)(44832011)(7736002)(2616005)(486006)(61373004)(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)(219693003); 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:46X8lsK7TzKcySSilN3ON3wTLW57K6lx1McQzRQ?= 917qTb7+Uc2wDvPflxL0WFfaz+HruT7PALpz3ezRJdq1ByyQT9S56A9pGtu/2QioOFY3ZhD02Bx07LGc4NIOltAlsMrbgZNVICf40yBSs4dxu7ZePfqLnSYpzOLjKxU6lMxpLFTlGjRlmbvpmXsCgiKrKdyxJByOT0XYz4lqv1bUjGPkUuKq1lbvU1+mtbrc2zm/no2WQR4fVUEjy894PeTgDJLZGFSo7xFZ9qnGs1lCj831McHHl4Vp2b7HUyN+u6uoJ6tS/s8jTFUZNw+uh5/xMvGnu2JMnzvdJvThR4oJSwmdmtrZNAl3nmuohF0vu0sEnwF1KqpBj5ULLPKPR9or7a+6XPRamNPuz2umgTdSqcfBMDlL2rsemECakuwo95ey7y73vMiik0xrtNLTtR9pkbECijJFJH11dUgrZMZz13T4roNy2zjMsE+7EF/i4F3dyjgWH1gLyyXoESxtaaX7Tt4nqSACGVN7A4cA3ezSo24Nr6ywoebr8vVOvwvYLbin+5qAYIVQVK09fPYNaNzN3V5lVfTref3x2IATAp9JYFGXgqqhvcWNaXF+NzsKtYOQE8YNMa21tQOEVSfvZEQ3vizuTFaWcKVy5VPqBPOsZ/MtRAJjpeofxEIp0bsLH7pdtFMe990iAjLPfXWjUI/VuZVemhWjHcZaRQO93Pqyobdu5yt3KrIhgJ0lJfbPqYI3mPspQejNn4+phGuaYoiaV5R/cLexhQjq7g2AxhKiyydPBUlU4S67lgFPsWFyimmUHE5lUJdNrRfHWIFkPDMnrXvirTS0z/5QcYFdFRxY9Pay+JnGBKIgu2VfDqUU3iMlcNRPUBVhBayypVQX4QTScin9inpFJGgVkAZkNWPQGj9gGz4YMOsBNBYGyu3HSfHu30k8cxBzuq7RVuSwYiw8z0hHxD2QiiLIknYAgDKpD0bhrsEUQdMz7h/y3orTts9h80rI34pUkYJFpVdpIs3ss9UZMS0R8mj+mWuSL+r3dqy4b/lUL+KfLTHMvMC+oBDTCubmxBhhBwROUmrDe8bJNN09uHa1We+z1jIhZ2kJ/31IJ2LWetFWyUei7Pv248EciuELft+Ccs45yzii117wtGJrhRzVn8p6jpkWSvyf+mBazKCARqdWiEvUv3YnlncSs+yhWZjDsmh4QNC+oFDwuJFJNqMbyC/KBgj5JgJ+jvJEYBB92QEmU/lNFxj+0wVvxnL6H3Lm01tROZgOPG/NnLa0xkNUb+H6m0ujsg1tJ+EucNUEPMLrUjQxVXZLWKF8jQ9Y8a1VmIFFYgbU8thxo X-Microsoft-Antispam-Message-Info: n4v5E5ELdQQ8iLRCZHZtzx5hJR29xPWZbw8MuViDhrPEuIUjmQlTkwtrGIerNMfxMHTGSlydaqzwfntWdbr1AjD89FqEKkrTx9VjxbE7cHjOOGgHKUTNcxB+3QNjQLs339K1Fr393TbJPkkrPdMmwQjgvtB6oeoteyjcGr+flGiFmP2pwFmXJuPxJ+IcGDoSgcLioQmFDkpdUpFrxSVAiPZsQwJq7vLOqVjabkceqxXeuKORTVZWkJSXZUoLEBGXQo8AvwmSyDBSgy2pvhkLyKZMSupMKyNHPuxhBGBqvBnDEehptqcneDdkDVseENNDIyPKFefnTdxYyUjBlHcULz7Wzt8jRbAZ3QB43MZxGSg= X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3618; 6:jmOc3mqyxJV6vYjObJWxUGEtJ+9AihyRMVKyz3AE1XMYeulEnbgy+WwUkHlbNMJXsrIvMhBIwOLHNgy1rHAen8GmukxNRi9gSDD/hdb3NqTjfV3LNQPgaEhtywL9drZEuV92chW3FYoR5CRJyiV5sCl6fZGh4T6loeZdKnndQSpge7z9sJzE8NgUsDj5nfccD+t2fezpfdpLEkwBN7SlrxwymtJyypt+PYUxofGrJvfYZZISBWfu5UG9TKpXSQ0Yaccy2eGR0/F+04003cCx42v31Z+pQswizOjtUhx/VczZsv+XV5kqThY3huVaTDh7NOH+G2PCOC0LKUipy9Jt9MWz5mlwRmFu4CNVv7Gk/I4P4Q9vV5Y01iNRRUBxUo7N0b7dxxvzEBlQKtUC+yt/wkFspC913Oe6SgN5enOqie5l7tRH6Bi38mcQdmAiDLc4PtHaLDP+zUnAU154fiXjsA==; 5:69Thxxh+hg+7XCOjZGJCEn8X1Ruo9wUPdmDqK9c5FpsRDaFp1J1p0Zo1yJpDT47+9zUCoKbnnQvUukEIpA9+LXufy49V+DPH0IXuMqUanqxxwJh0WMY9xvN1gbJpzdVGDEeDTR5GFFKowK28JyNck7615Y7wodETxp+SnHR6Ev8=; 24:Lttdv24LcEQ8ZlgVae/h7QF/Bzp4CAF4No7Mt80PT9BrjoIqPWIIOaeJfEyAfpsRoKT6hUZCEg1Pc8xSFic4Xn+g6eW+GJxSMDudKqUzdi0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3618; 7:03n5kx5KOJPCzYiiO6HFZR83P7MyYszlsC9XoMw7rxGLX7QzST2OjcswGcr30s04IXWJqwpd6oLENNJwwpujkxAAiSOqLCGKnpboNMvj6nLR7SLqIvQM35jknQ/If506i03WLJTSGRNc9cFccIQhQdkPtmTXe8kSNojBGJvgR+SCT6TMFqGTx2Qv9ahlHg+pDbM7KFpRHc40kWKwxD+rtkbvGyZS5UGpf/pZwDoZz4mSdjbPg0h0qNP5CYMq8viy X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 09:52:34.4192 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6063541-29bb-4fc7-cccd-08d5e193de4d 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+NgFnrGIsWRmVeSWpSXmKPExsUyM2J7he6TGTbRBjuXs1q8+7SdyYHR49eC pawBjFFcNimpOZllqUX6dglcGctPf2AvOMpV8frvLKYGxmMcXYycHBICJhL3ftxkBbGFBI4y SmxpNIawvzJKbJ+a18XIBWQvZpJo3DGNBcRhEZjALLGqYzYLSBWjQKzEua77zBBVXUwS2zte gCXYBAwktl+cxA5iiwgISSz9eJkdpEhYoIlF4vix72AJFgFVieWfmsEaeAW8JNa/usgGcZOc xMljk8Fu4hTwltjVd58N4iYvifNdL5kh6gUlTs58AtbLLCAhcfDFC2aIXiWJXZshLpIQmMUo seTWWajn1CWePOpmgiiSlTh6dg4LhO0r8apxCQtEw21Gib8PJ7NDOE3sEv9/n2GFqNKR2HXz F9SKZewSpz/kQNj5Et03H0Cd7S3xc/ZhRpgXTvWeY4IYdIhZ4tvGdVCDZCQONN6GSrxilZi1 cRvbBEbdWUh+moXkpwWMTKsYRYtTi5Ny042M9VKLMpOLi/Pz9PJSSzYxAmP/4JbfqjsYL79x PMQowMGoxMNr1WcTLcSaWFZcmXuIUYKDWUmEt1MfKMSbklhZlVqUH19UmpNafIhRmoNFSZz3 ofnmKCGB9MSS1OzU1ILUIpgsEwenVAOju8JnyW4uuZ9aFjVXYpoem4fldVcIbzjtH/d+dm9k 7EKzW6+7Tl+58OJ3q+O0Ri9OWYX/aWtm/GhkufzZ5stHmRCBDYF3PwiGWYhlzZa/vO7V8S1a NXvda55M6XylU7My4Mnfo8E3f598wOFVynRId4qbtemse1vbf0rvebtBd8N0b/37q1VnKrEU ZyQaajEXFScCABf9eLH5AgAA Subject: [dpdk-dev] [PATCH] vhost: initializing iotlb memory only when IOMMU feature is enabled 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. 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" 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;