From patchwork Tue Jul 4 09:53:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 106926 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp827548obb; Tue, 4 Jul 2017 02:58:38 -0700 (PDT) X-Received: by 10.55.167.1 with SMTP id q1mr49636304qke.223.1499162318821; Tue, 04 Jul 2017 02:58:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499162318; cv=none; d=google.com; s=arc-20160816; b=UrXdWs6Vyr5k/17W+Nv7cjwSwlZgPSLpoXcAqLMFEwAkZHLiRvbqeSxt02NMPKcPVC TnZYGJ2FYCL330x1I7NOPRKluwNNXhtfNC3VYLb5AVDMBzslNeOgPMFfKQLHycibWwXe HJF24VetjC6oL2PmPsHPUQLpQbYo1KcymexNWk0XFmrQnDRsEllSmKgjMAfScv2EyYwn QQImBK/mqpDL1IToe+aIGL0wN9Y6/Yj0sRLUvfdoyVPYCpHPhUIoJj++OItSnqJsV3fu mdTSNbS00zcFe9f+sxtRUySVZCt0kOLGM+lzB1rqqy4FQgdNCCXjAX4UpOGrjM72mTtC 2zLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=6TpV46jdxgZT6WtW8ei/eLzPmQUv1sqgEQaiBRm1jU4=; b=Z1du4TFyksyPIY8oTmHz6BfjnwUvSRrOkBkLd24d0jRYXJyKDoMCWsoHIc4yVxZvY9 P4b4HNI7tshbxruU5CNUxt5aVVEjGJ4RLXX5Pn3PohfLbaZAMIDhbDxskINdwTwQlH4q ZyHRZnWnUwoazxYCyzIsJ5RSj/bbM07xODrQxi/AMd6C4qZlnarcuNCgd4BlUwIr0GdY gBPJtUBvvsc1/1uGTtmkbnjy7FUFThbwuRL78rG7R0c6t9aZ6JLUuKVIvjs2tjJSS5Sn 86Uyeeis3EhCgu8gKJKlDXfrUt+ufOHk7Rw7A6sEhSj+bBZtRgDtECXSNDvLg9AJ+x57 mkaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m139si17172541qke.76.2017.07.04.02.58.38; Tue, 04 Jul 2017 02:58:38 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 864A460C0B; Tue, 4 Jul 2017 09:58:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0DDEA60C14; Tue, 4 Jul 2017 09:55:58 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 218AC60C0A; Tue, 4 Jul 2017 09:55:41 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0134.outbound.protection.outlook.com [104.47.0.134]) by lists.linaro.org (Postfix) with ESMTPS id 719A260C0D for ; Tue, 4 Jul 2017 09:54:40 +0000 (UTC) Received: from DB6PR07CA0091.eurprd07.prod.outlook.com (2603:10a6:6:2b::29) by VI1PR07MB1054.eurprd07.prod.outlook.com (2a01:111:e400:5096::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6; Tue, 4 Jul 2017 09:54:38 +0000 Received: from AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::203) by DB6PR07CA0091.outlook.office365.com (2603:10a6:6:2b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6 via Frontend Transport; Tue, 4 Jul 2017 09:54:37 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.240 as permitted sender) Received: from mailrelay.int.nokia.com (131.228.2.240) by AM5EUR03FT010.mail.protection.outlook.com (10.152.16.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1220.9 via Frontend Transport; Tue, 4 Jul 2017 09:54:36 +0000 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rhOv022462 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 4 Jul 2017 12:53:43 +0300 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rhtf022443 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 4 Jul 2017 12:53:43 +0300 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Tue, 4 Jul 2017 12:53:38 +0300 Message-ID: <20170704095343.4266-2-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170704095343.4266-1-petri.savolainen@linaro.org> References: <20170704095343.4266-1-petri.savolainen@linaro.org> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.240; IPV:CAL; SCL:-1; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39410400002)(39860400002)(39850400002)(39450400003)(39840400002)(39400400002)(2980300002)(189002)(199003)(9170700003)(6666003)(77096006)(305945005)(81166006)(8676002)(8936002)(2950100002)(6916009)(5660300001)(76176999)(50986999)(86362001)(2906002)(575784001)(189998001)(47776003)(106466001)(105596002)(2351001)(1076002)(36756003)(50466002)(33646002)(498600001)(356003)(50226002)(5003940100001)(22756006)(53936002)(626005)(110136004)(38730400002)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR07MB1054; H:mailrelay.int.nokia.com; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM5EUR03FT010; 1:3QDirJfkQ7SytStZ2U173iqy/zsW35TkuzXiZMOln/dedV7QdBUXZoYI8zvoTJSlmTtJUlajJhWius5vnapbz9ZJ8vrX3QjawFj/8sEmsMf+RIV6eqIKu5OPGVUfy9J+OoVRB0zyG+qeVDyY/AMvHvvrrZktJMt54U8oJlVME5pa49cXy8rHETvfccymaaGq1TglAifrH4nTiiyRx5sBhM7650bxIIiES2pWlL69NXwQN/SgeSDN59QJpqyooXqGrxYmJbjLz0ZkgN1d4/04t25J7wUBBUiXJQpngJvmG5D7uyOCfux/Qa7iAGFwtwEzCTE9CPs9mJ+i/T1SHblc+SRr9kW2BOAyzecAdWXf6kIJEMFpySyBImEFaLGifqdRjoyNyXW3fOJjYXz/e1IywXYRGsj/jnMMu1R+tTDm4ibV2J7WO1Sn0nsa7uZnmFewdY2x8FOCGpNrD5q9xUIioNza56Xe6d01AZc/IpRDtmrHSX39eFy62ivitbNvIrjLAyZiW+pSFk1uUqchlTRMjqeEpWAjWUOU1zGSTIAWGY55o/tBuYL3iEJVX1bIR38CrFZWKSdj1VeY7+N6LkwXUoGMOSlt36x/NMVB+ovgCLkDIWoT/i9d0NxU/Jwr6rI9ZHil0t9FeL1HKJOt+zAPe4fdmXQhVqTTUxv0zvmMCSspOllRvQwfskfQq/0jALA9c8TOoUCRZq+DYRscHCpGEB6/f69DrPyZUJsq3T5jixUhlLeR6cfvV2dbgmOlcIjSGEMlNCIHE9Pnchq6uoUcMeXcAeinXqbEQEFNIN8Uu2b8ZbCQbdcOzXNH2/qQSqj871cku+p7wQKsEPDUrkgJQRp3tk2kXqapxxLQv+wx8KO4UxcID+Udi1EoadEBJsFj MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 011d3674-c9bd-469e-8fff-08d4c2c2ae6b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:VI1PR07MB1054; X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1054; 3:kTULkhp1NH/wSeM4OkpnNVS+kCrwvZbVkmF3up2wulYOMtTGT0GMg0b6IGaH2XIntFD3+dTRcQ0ZW67RaWpb2W2qbInHrJsbky/EIOjPnjLZc7ujvUymkUQK9ELTZFWjq74UU7worTY6vAsqV7lvo/orPTwhy5fkKZrmd0u98rWJOyCmLwIFOFrpHJ+yM794fstS3wKAXj1IKR1e16fQ+OUAR3+5cBHQvYXnyde8kprMFqUXkAO+PkPvqd6FYoKKE/dh9YSG+LPLOcjwcVAWuw0Z5IMAQ3tsnoenn8503cSsCDX0NKcsr3dJptPIwwfYuIW0ilrpUPex2SHqsK59nWMHVLJzHJz5W/BiaxXCab8tUXhnB64piep087u3gBMYUR+jVPlzrZlM6GBbeFUwQ1ee2kYkpudFSbCoTVqC5xVSFWPfwr0SsqlOj0AXKTFBALnhmfjx4AwbbJfovoeO0FfmF8PI8NpLO+KXap7LfkMIT3tho/M8BtZXpkYJvY81erntjMLS/UDulpeL0+ZKcNq1Ni07BHvMw5np+Kjw8ggB4YBxSWQfFptJSN6y6lHJCwQHfV/EY520J9R0HP+bUMQ20rIfwM8rxJuVoxVTeRP4vWOkw22OHaBMkCao0Ui40xHBYbnGXH0U4qprubqxgOJ/GnHIPRNTeylTKaqUfBKMNTcjAL5ZgxNfXa0pgn0QoBaBzc1bmk1+jPTunFv7jG7nYkwmwo1t4iIjkyE2Aqg1HXjMJ9HqlI5c5HVk6ybJ7OPY+qkDrjM7Vbc0sjFltvYle/gghRQ5uFp9JXkFJrmYeqOkT+tENzW+GOUQeU5s9CBBjvHfVACU7k6GKOpaqsFwyUYVpX+tZwrSB62Rz27swj0uyzH/+Bv39z7O5AQwTP8eWCwGC0xNxWeKnvkHVw== X-MS-TrafficTypeDiagnostic: VI1PR07MB1054: X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1054; 25:RG1qNGGW8IBwh3XMdWJ7DryF9MXZXsVCMb2rJJlpYi6G1M0y5STnMzp6l3fqsSQLpU/MXnDbZZth1ZJ7JFJh8vqjDj44UgVmXmuum1k+cBYzdFEP5lhqGpLPENKNMUhokBIb+4tBuzjk7EYl4bo1xbA2ELrytv4WbSLcC9nPFR/vZ8rZaAyzV54e1TyZO9XwR+VCWmy194Y5naoQilroKQN155JChlylJXq18XkUmG52SHUCd3MAbACv1hA7bf4UZj7xNfPTI8p6yaqyaGKC/NsPBUrSs1xr41W/tzUPl09Yf4Zwpy2OcxE+xWDpEaWp0+sSgPCTiZ1K6hEKutoIRexYm0TiWGdAi3YV5X1/j70y5x8Iarv0bn9q3O7S8xhCMlzEPCQtWRjBeos9pSMpZM7Rd4bByAUQaRUPkZNaXw+d+Tzf2mrxWO6TiGKuzGFyKKJgRud2PetQVjcMOto6+UL/Mi6Gwl+5a3aS3mCQ9jqxw6GMiz0zEIaUoEGVf4u4wFgX/5Ui+RD/BXFtquZ//soZD84x2gdJnuiKNP0hqi1Ds9liSwLLnHUaIXxjI3Mnm0BN/kgNA6yN2ZH8XaS0ujdIs/XK5u/nmozwuHDzfqrRVVaL93YpMoSANqq3CTXZfj3txl9u+cO7Lc8rvUudu3ayA7VQzZKGD++MEVCtFXB0Hl1UTGTaiY4KTMs0Fa+eIiNqaSlCImR10TqqzLY2sE/m61gGRhsEReIIH2fTcKTEhIexCDsrcKI4ra2FjdCpwIidpAGPgyiiRsOTUwqZ3NO8BYTnuJEdK0i1zecxA9MYPN+R/6sLhTGwiru0hfUEeJH58B1j4izWiin+uDGLJOVDqeVS9T/AJBLJgBhClf/n7lDDbWnadOwIAdc1Np8ea8639pk7vlCqLLML5TnTi7Chi56tfuq52sLFoWCLyzg= X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1054; 31:jc6KYAEmQ5gDbW42kRjAC1ZkCjNoBYVy1BT5bfL9asST0HU+aaq7Jlm9F6h8lwq5Y835SGpIJgCZsMczZyxeaOccOPVY1LOO37+VQKFVkd+02lCKO6cP0cvEgVyr8yL1CxeQHq7HwTUtuP3Qgj8s7S/4jedqU8jIT8IWGPuz6VhPYY8ThsQx7ctmL0TT9YNhywTpw3buc/6BMkVerZM+m/yWbjv67ArozD6ZEyO5767WRMoL6nInObqDXfM1WwWWnjTwuiVAVAfTl7Iov8KriMrggCrNpfeT96NJscQzIjzptCTw6dCmkLxaCJHiVRBoIArNJkzVqi6kudT22Owc4+qCvTMYygYKAT6VLmGRHEFiVSnnggYDGEarQc9mpBia486/h4hJ8hkyakB3zfEni8SITSdvEZl2TBo02ekANN2GVnG/9r6xL14H9x8Dji6eRUJSF4+fzmp+X8usCtCiBUesNTmq941qMURr3BBhFBRkGJ0SwRYtO5UUs7Xf/jtCMlKmakHpLL78CvsuUGtJWz7UpBuAN6EOb4Hcg54FpKFVkgMZ7kAxhh3blD7l/1VsCRDAFL76WvisqaqxOc2REiGvGYsBYL9psc0pPK+6vm8++MLbAAewoOmtZkeZD9zQd27FEY99+uA/mObdpMttTyqPEfeRUtCYDtZf9oAyJjtGPJNQZ/ltDf6kRu4S/7fYcai8IwpFkXNrAjyUPBtgMw== X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1054; 20:r8tdUGFGf3EPxnQ9E9bjSGHqMIek6aFs9dbw85cMDbxN+EVJB3nZiEp/m6ra0SyyE0+hjYmba1nkQZtcoZKVVZ0JuZ+77UNuQHyMPybMtYnx06nFVxbPs4qUW6YLGQ4gkrN/vjKPEM1p7p4fVJNAfg3zwgzJVOQamYcyRo+2wNVJJXeePkfp4mg0kVbUc8GcQ9eXo23VanlBFgv52/8dMNDgfYQ9urvYTDB0jhxxO1NQEyR5pXMK9Fu4AU2CG63wVx+DfvX4Qu9gvCnlANQfUn6Ppae0TBTywfzxYb0o+96aW9Qdvom5vsDm+2b/6ckppmz/0c2W2sHcKakFNK3L7B5wWvSmP1Bozn3ZYFuTqXadjcUgBXZvYWtTCG3COShah+NJHyiOtAEl/rCVGS+BGaQsNckZhiFueBlYYStM9qSYDceAOTx8EqNzitKOp2nUErxPD/ca4hgkKenXKeynXhW92/DWYEkhNRQe2egYKizfUSyvH8eI6tKd9mS+akF1de9FSNbuUmluMYXX5Jbj/Z60rOlwMLBfxPZqnflvw2EuqqP0kposxQZXb7ualU27KyJPYISkmm2S90pmJatiyUayfjlaY5P8VqMymOy0XV4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13021025)(5005006)(13013025)(8121501046)(100000703101)(100105400095)(93006095)(93003095)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123564025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR07MB1054; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR07MB1054; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR07MB1054; 4:poUJznRq3orOUk0SSUVBhvTZbmP8G78y++OYK1/+31?= L0cgU2pnc0P7DxZO//trput/mR1OtTgNJfMCAvX2O5o73onCJKWhVxe6Kx5K3lYJFsaxFsxrDT7pJqIYAI+B6iIyaNGjYc06vvo1C2poZYbmcwwV4AvWTrZz2JDXNhGVJ85hawal+t5bZ9SOqc4H7WU/v+Se6VvGSRxg7ZWhnQkPdRJ6MpDuOSnfOyxsBHtQcj20+cKm4Ys64SEdKH98GTnK68eXKjgTw4B1Mswj50Da3KEsAAhUjV6e4W5FguP38ypBFEYACqjQcPn+gRUXDocPVN+WswE3uYBmZtWKio21Q+vbrf6FpHXr/pFOyyP6XEwWt4z2lQkf9013QR/Y/7kRomWkM3ejfnUX74C244csvBMt8g9m0/PwfO2dZBFvDpIRmcR2d/UPkQlxnSXJ8Z0olQwoEx4rAnFRkw6NFNNefVJmUN9UauDvIcKeZGuavbN/mRK6vUIrVHn+bf89/JquNNjT/VkqQSvLWxePryem+fC5xW8ViMwd1RnD8PYJl8LShAY67LDdUALLDLBbIKxMPNTCTQ0EID4M1BudnBjrpt9+wSiaMcRGqa40UJss3K8zgSrQsXNbSjBRCr2HhH1tfRD1NdAJYRtOPVtN0ejYFg3tDPKWX/JxfWNuGSM4iHTwV6OVqFoK8Tm1ta/KGp4hvA6isDPiwI86vsaZq7q603S1F9GBq1sLlKmqNsRfeOlpfP3GRTxFk2lOBOhMKn4y3VTFmFWAVKCLFZnJELghvppMT30+4D3MJMF/5sxX1ASULJPrt7x8fmQPgxgx+MFshYOtz43A0AknHYVUlYz31tTrqZaFsrG8179lQvLaZr1nOkmQ+PPyvXWUw3SrUtHSTT+l5SkGktq4ru5MNfMqTuc2BdUEKTi1MDijqxAKFFuzj+BDrKUdSu6Pstl4mi/XZegQ8E3VHJTjuXkAQH5SrO3ZX1QOIunDUKpEMQCcAghQHs5ZToCQCuJ3F6LZ2ELb9n0hzIcyU8ifd8RQIE/N7HHZ6elAPdkE1QvhEjJ5W/N4NNR1/nMP+KT2ImM+CnV8TTzdxXYI8kIti0FqQqlGa534bdSXSm/i2P0G7tFR2N7sMQyAViWAxrJK9yNBn1CNxqdJvswh4g7M/e2f9+uEUXh9nv6h4UixfjAxY7biEgw0+o5DpZC2N0EJbQtvT3 X-Forefront-PRVS: 0358535363 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR07MB1054; 23:b9xQWcdmtmTNfnYRypk6GoB2JR/5qHUasnRIDhzI5?= YnRfRrYkr1qyZvfewfi133pzRPBRBFAza4nMwZ7LhAzt2Z+QAgrd948TXYamvIvQYF7uRxzDFs811qyCMl1AvpycpVFYzphNR1xeC6WGW3YPSkjun6vB556GGZEi3bLHNv9Hwc/Jx/EHW6ejuy5z47Pu+ijzpD6rFYm5XR/QHjQp66smHimJlDn2OdWhw9SAEj83KiHWUFx9g48cZmT7Z3GoUDW+vDWP3688CLevUo4BwM407QsvZXc37d4lXauwFPE6mM8sNLRAPFZz/OP2+D9f62l/EkZ7uopsKEEVSg0A4cBujq9wXTMu/+qqA0PAUvcNWZ8EV5tNMBGRib792wLsYFXAw2zwWzZpj+YNQ3oVbK0YE4K7dk1s3KqxvTugxhC7ximHTAF7EGpGxiIC7C1JrS7kf7/WY2RVFhDI1WwTFEYZUa+wjmFH9N7QGibaDsiuGobbRqNpj7YV5uIyzv3BCiXMes0w2T6uYIdrTUMT65Xn/cnNMDFvuIaaSDyHXjsU31Pf+Kz3DM2ihkFtpc07BfARfUt8NANLlRvIRykt9LYAAlECdX3m66BbzXRAw6CrPkzaf71jMtRIzB9FzCMeRhAKEwr+0ezc1Tfg62Pcqu8DfyZHpcpxpOxk6+ktGmAATVDmNoMs8hVmqTFZLCqZyF3AvdORugTghd3E1wM3j9W+cS1HAZIBwPxUMQNPVxiG+h9Ex1Di6i4CSL2GKW65j6G9UzY5+vU6QK/Xbml+eW3PMLMn1t5FfohuZhmEys55CKAsG5qGCuP21F7qei5DyjDyfKmoZophh2EtEvrC0WQ/sXnI4ZFq+5l7yX+EStSMgInGqmcT/YVXyzELOTy+NiZ8ccLpeUjzKukrxnjnjkHqSDyeO/252XJ/a/Zq4NPjloatRoqu6AebJxyg+FBSuXcHiipdFeONE8rSjjBh0hfDID3nXUH5Jd3fR6DQCzYtoGhu7jzOgS+qk8yo2f03YBBIHFdUMFEvH85T9fP0sNrqm2JjgCFhYJsoz0MTnNzAybA9WFvsasSuT/brbb2C/I91KTPC2Ed8zSr131HlClh+jQNGF08Sr2TrBxM7tE= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR07MB1054; 6:gD6RVoX6g3XYqNthYD8QymRDdMKOqnkl4HWq+GFybM?= fVoiZxN3WUEgKATqmjTPqPoLdqWIbFvwscMBp8xM0PZC7AA7DCLCqIcJclFHqMd8EpNdZfSGRSmXHAo5UPl4C6Ae6i9meoaCdEdQ+zK3QwEOgW/AKjtz+YIC9HnUdyEZtEVLOd2kq71ERIcwIadMbb72zWtsFzOSQle1qSh237heFfeYJH7ZfrhZZjYOb7hjRm/YeTgJPpWCrStil3KuEpbcA+gPKim2+AvjjMEd6+fh0OEUkG1+t1ZU9o+4VOfa9OMVeG1QZMgK5oT/m+AG2OtklH4+kiXbC/Q6i8gfDrUFfGOBYaBcskWVg+RUnivBLOtEOo/vg1jMnvV+9YZg1Nn97KECu0/f4bexuds+QSby+iJ+ylDPclxRkrHjbaX5OLRb4xMSF0c8OxTwaiOfeCRYvGI+LeoR31mSDi+ZqLvH3zIWGnGe0QkGyHCNnrbKeO3yzIra/opXBy3XE+5eCXnaOXh5IKLSvRzIfbbrquOVrj2SW091RqEeKFcKqjA7DdyVZfdRihoG6d/fON29LFYiINOx+1qcSWw9pPNuODX42tuM955e3Ib12+nnjV9+P19YY+ISKNYTtPw2dhit0+MGv124HlPwj0bebUeGpOBgrxmdd1hzJrvAzbQe+V76vyQm0jEqtHnQHIOhOONHuMSEmQG97vfBtBZz2cYYfRHdDoIF9qRh8cYH99d8NeBLCxf3yYzdXIXgRUPZgSwU38Ne2sx71H/T42dsjSFfCGQWwPZWSyL9rDd6hvcShN22KJcZniKMFcMI/7jKfTRatPEPEVGaz5xbG9JKFR/R6CVBu7qvtKweA4FwIHj3dmc1GZyZA0l2YQ/udNybzj11zh43pThScXxKJ6EXJHguen4B60iuRzV8gtZbMGm1XF2flZVLGXD+0KVae8BlXhga4BBzwsVLdl5rLpquXDASiVbFNv+2sLiR3El6WS32GKtLxS9yr7CWfLHNAuHbgRncFj X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1054; 5:EzMk7urf4xbtrydls4jF7rpUywk+kGS1i1tKlBL6vkx1dciR7dzv1xyPPdEJr6hPWEXQmmtE/RUrJcada8d1u9zyHzWHVoFvCDJe8b/I9p0omfqF0DUlNOtCgR4ixaG/rme4L9dud21uhiLNWcWkBBc4CKJ564Cicwq2F5uKBvGl3C9+DWm5UuLcF0dZZvuhteIqWb/cL1lWcF+I/07hsqO0dtsuDDmUcYeOT2XSD5GjeCmWXtgsYxiaexgO8ApX+l668dE2USV4sEHeHujJJh0fjlcpQBDBflbU7H4AyP5NcBCVLo+2K4W968qwyhMaA18CJnpcUi4Usu7VZfbNEEjT7oYh3gnwCdSwAtHR0kCEhdl5D2+cxN/RGoMibRnCd0g4jxYL/ng7UfF8kL9hG1VYEWQCReXYSkB4EThVaeLeS7lh69FypFnyFmdvKbhs5mDFhcl4We2ogDS6VBlpgIUlFkFLL1+DlZk+qnKpLAPJnwtlO0eM0/QOQugXsFsL; 24:+pIF5UJ5TwOQpwjvHI6Va9oSKLWGf+hqggoFTqCruOUg9V8hGIwxgDXfVss3l6KxZNkuLe8wgvRG7klJjxKNcv3hGXYSkD1Hb9C+h9D5STc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1054; 7:D9QsGYQo+tXMLWMAJ4XZXBWDhQOAxaYR9JIdlrUKBfVjA3nqkHJ03jEdXyIMdcYDOGu3E2Ari+yFPWhFdrxpJvNkk3wT84tQjwNAWiS/lNhFisNLe6VTaXS3Sb2iEUr26CAmtc3FO4Sh+Y28i7VWxlwAKezK696yjTeOc+SVzZO5vER+EQAC859QJuFwnz7hpQV1FdKIbTf62LVsypvmRHpF3jvplDRrA+V6W4mwGwDh/YMUflM36suWr9Vl77rkoExwe0dWLnvGh/1lOQF1FpsjllKCkx1n+7Oe0vH84RqmnhxjCpy/GnfyR379HFfJFzXlss8gDyPmfoWG5NfSWCG78ilZK/uEcsbjJHHndKTF/OUctOx5I0HnpgJX76RxBpCiyK8J9wRs95zR02O2Qq7nBNluyYGf2aVEM9baQ1bjsWqnjcVq2p6zuqPJRmtfGZcDKOh0tMJttMqT6MJ/pOj+F6vWzA8ONnrV/rd9QUstvy3TlGzJ/zlYX4qGIy3w9v9R47RIId35ZWvTdeoKZIbrxWKzdBLzKpmFU+ajdflath/IuxC/xqr+wTTvglQFCzDwhvm+cSvSE6jcUEJOIIsRZXYgB+C70XT86mGR2+lQYpjv1//o/J2aFE9uNLcrdYYvmFynyVaQm0aRd4g39xiRpeTFnb/xyJTp+BLL79zChyLeVx/p2nxxPPPqevKAI5lOfKN21kqq/QJeHMIWkio3Mqd9MHrYN1u0mOgul2GkH0J3EjaDRiu7UL4eafiOkJFUxZVrtwh6VECz1xvQ8/9QSrFnm4C0S/UGszdiD3E= X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2017 09:54:36.6811 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.240]; Helo=[mailrelay.int.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB1054 Subject: [lng-odp] [API-NEXT PATCH v2 1/6] linux-gen: cls: avoid queue conversions X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Use internal queue type instead of API handle. This way per packet queue conversions are avoided. Signed-off-by: Petri Savolainen --- platform/linux-generic/include/odp_packet_internal.h | 3 ++- platform/linux-generic/include/odp_queue_if.h | 2 ++ platform/linux-generic/odp_classification.c | 10 +++++----- platform/linux-generic/odp_packet_io.c | 4 +--- 4 files changed, 10 insertions(+), 9 deletions(-) -- 2.13.0 diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index cdd139bb..d513f05e 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -27,6 +27,7 @@ extern "C" { #include #include #include +#include /** Minimum segment length expected by packet_parse_common() */ #define PACKET_PARSE_SEG_LEN 96 @@ -126,7 +127,7 @@ typedef struct { odp_time_t timestamp; /* Classifier destination queue */ - odp_queue_t dst_queue; + queue_t dst_queue; /* Result for crypto */ odp_crypto_generic_op_result_t op_result; diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index 168d0e9e..b5cbd515 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -48,6 +48,8 @@ typedef struct { typedef struct { char dummy; } _queue_t; typedef _queue_t *queue_t; +#define QUEUE_NULL ((queue_t)NULL) + typedef int (*queue_init_global_fn_t)(void); typedef int (*queue_term_global_fn_t)(void); typedef int (*queue_init_local_fn_t)(void); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 5f153e73..cc08b9f4 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -162,7 +162,7 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) /* Packets are dropped if Queue or Pool is invalid*/ if (param->queue == ODP_QUEUE_INVALID) - queue = NULL; + queue = QUEUE_NULL; else queue = queue_fn->from_ext(param->queue); @@ -264,7 +264,7 @@ int odp_cos_queue_set(odp_cos_t cos_id, odp_queue_t queue_id) /* Locking is not required as intermittent stale data during CoS modification is acceptable*/ if (queue_id == ODP_QUEUE_INVALID) - cos->s.queue = NULL; + cos->s.queue = QUEUE_NULL; else cos->s.queue = queue_fn->from_ext(queue_id); return 0; @@ -279,7 +279,7 @@ odp_queue_t odp_cos_queue(odp_cos_t cos_id) return ODP_QUEUE_INVALID; } - if (!cos->s.queue) + if (cos->s.queue == QUEUE_NULL) return ODP_QUEUE_INVALID; return queue_fn->to_ext(cos->s.queue); @@ -841,12 +841,12 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, if (cos == NULL) return -EINVAL; - if (cos->s.queue == NULL || cos->s.pool == ODP_POOL_INVALID) + if (cos->s.queue == QUEUE_NULL || cos->s.pool == ODP_POOL_INVALID) return -EFAULT; *pool = cos->s.pool; pkt_hdr->p.input_flags.dst_queue = 1; - pkt_hdr->dst_queue = queue_fn->to_ext(cos->s.queue); + pkt_hdr->dst_queue = cos->s.queue; return 0; } diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 4dd28549..6ff35046 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -566,11 +566,9 @@ static inline int pktin_recv_buf(odp_pktin_queue_t queue, buf_hdr = packet_to_buf_hdr(pkt); if (pkt_hdr->p.input_flags.dst_queue) { - queue_t dst_queue; int ret; - dst_queue = queue_fn->from_ext(pkt_hdr->dst_queue); - ret = queue_fn->enq(dst_queue, buf_hdr); + ret = queue_fn->enq(pkt_hdr->dst_queue, buf_hdr); if (ret < 0) odp_packet_free(pkt); continue; From patchwork Tue Jul 4 09:53:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 106925 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp826700obb; Tue, 4 Jul 2017 02:57:40 -0700 (PDT) X-Received: by 10.237.58.35 with SMTP id n32mr49135486qte.109.1499162260682; Tue, 04 Jul 2017 02:57:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499162260; cv=none; d=google.com; s=arc-20160816; b=kZ6YCDc69AteFhzAaU2lb46arMPL1aLM9ZqRvOCvKVuQVw15yQFDHD2y1jikzLphTR 4RgadYypI80lmPcY8pT1Ffy3vcGHm0hgzKQAAbbcciUJ2EnsOqGqec0qyPuC6VB5/h0R AsDFrhNB0nKDnrpKn+8utK6+QXnIcGXRDclNbHlFOru8qR21CW+zkBbD86/cKIpdwrri Huzd+DHHLISaY7XqkYt9Cr094+5RiSCvtTCLa3q8cs//XT7EdceQixBrDWeGDsfUcTXt OrOgv3rX7yAXLKzMxGklMGxdluv0771L7RiXmGyBzmGrCr76V3kOxF+LmtnrRMlP5KOG gh5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=P+x6IhkqfT8Vsj6vtzPIb6eD41LAbLPxEP000jYr8A0=; b=YZu+WUiA+OijaQWTMtvCdhgfyOEGpQRQ1SY6Bb2NHfXWFvdRYHFOBdfPgQfxlR1H2C ze0FMuUr+6jR+ZzxNmFAKJfWrCOUSSh8UEmqlFRsEhmgc+MUHL8UREKula9xyJ5yS4ed EuJ16au4H6YD8OXEJjqCectJ92RelJSn1yrWWDTlF192LbtguomfwTbwGnBfyogFGh6J Ow7KhKglWKsI5slfsABc1Zybew8zcvbzQshbtvfgvTKpUczNKYvU40AuZRJTBQW1gSMO VQdK9vyzxkn37kjLepf//UWlCIdEujwHNfbiGWh+o/mWHqaiYV15/Y2KJFJmruLTSyfq RDQw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id p130si17478534qka.0.2017.07.04.02.57.40; Tue, 04 Jul 2017 02:57:40 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 61BFF60967; Tue, 4 Jul 2017 09:57:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9934160C15; Tue, 4 Jul 2017 09:55:53 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8826160A45; Tue, 4 Jul 2017 09:55:39 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0134.outbound.protection.outlook.com [104.47.2.134]) by lists.linaro.org (Postfix) with ESMTPS id A408C60C0E for ; Tue, 4 Jul 2017 09:54:39 +0000 (UTC) Received: from DB6PR07CA0004.eurprd07.prod.outlook.com (2603:10a6:6:2d::14) by AM4PR0701MB2193.eurprd07.prod.outlook.com (2603:10a6:200:49::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6; Tue, 4 Jul 2017 09:54:38 +0000 Received: from DB5EUR03FT047.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::203) by DB6PR07CA0004.outlook.office365.com (2603:10a6:6:2d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6 via Frontend Transport; Tue, 4 Jul 2017 09:54:38 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.240 as permitted sender) Received: from mailrelay.int.nokia.com (131.228.2.240) by DB5EUR03FT047.mail.protection.outlook.com (10.152.21.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1220.9 via Frontend Transport; Tue, 4 Jul 2017 09:54:37 +0000 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649ri9l022472 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 4 Jul 2017 12:53:44 +0300 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rhtg022443 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 4 Jul 2017 12:53:43 +0300 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Tue, 4 Jul 2017 12:53:39 +0300 Message-ID: <20170704095343.4266-3-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170704095343.4266-1-petri.savolainen@linaro.org> References: <20170704095343.4266-1-petri.savolainen@linaro.org> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.240; IPV:CAL; SCL:-1; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39410400002)(39840400002)(39450400003)(39400400002)(39860400002)(39850400002)(2980300002)(189002)(199003)(9170700003)(47776003)(81166006)(6916009)(1076002)(498600001)(8676002)(2351001)(8936002)(50226002)(106466001)(305945005)(105596002)(5003940100001)(2950100002)(22756006)(6666003)(2906002)(86362001)(77096006)(76176999)(36756003)(189998001)(50466002)(50986999)(110136004)(626005)(53936002)(356003)(38730400002)(33646002)(5660300001)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:AM4PR0701MB2193; H:mailrelay.int.nokia.com; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR03FT047; 1:X3AhMLUeZBruDhhFeCjdi3Aoj1DoD83OCkWuLOxWzj+YmL0a2W7hnPgnH/ZG7Aqdh+eapRvVf6HlQp3o3AUz0bW9BZBosJU6K9+qC5eKe8dqMPG10MMclS+cOUW6Ki4il+7G8lApH9frpEihNX3/7IEMWAuqUe5ODS6GOe16kyOnW09MOEHrMcdjLzVkxcbu8gxWlFpedxw7OIh8vw8xzcqyqPAcbOItF5Zl7uTjGcZLFLpXPlvhOBwBffMjGvHI64saZHDEB8eJ1xGBf790+kmuTC83SJeIdOpy2GtplOYNNWlghiqmsOV4YlNAIs/FIwTlg6rCtkob0RhwwaAW0GH9s0s5v6EynKaFVKbvz1C7iCE9SoYYsKYndpR8puP6oxhLDn2TCE1lr7yqR6ZIB9TmHnWjV+7DEUzawWTzdjG3tmtQ5L8kxF1A0ktaK0IYls0aUV0EUo300bLCmq2XdRNrKFumL9bKyXnHNFnhdokXEPJ+OqxR5oUUoNcYQVwm3/z/SFpBJ1B0TPnD3K8M7qkd1l4E5TEaD3EQnGMwirh+sB9CRRR1BndIevczaKpP4H7/nAk5swMcB4Rj0CWz2mwzvyNCRcvcYmfHG/LC6l9zoTgStmcYJ8ozPz/QaBx97GBft9TR7pXi6OhJyy8nzpSSOT88sdoOKbvv+KF+OTwsWB0w33Eu9wQO+rt459Sd0BzMxRqvsy1w1Ea/Jf8VwOa/J5j4wqzrZU3sTOo9AWnMTOSAfdA2ERdQwMDp/6VV/bm0q1bC03jaQkGJ9UomSEafKQAwTpDqG4EBtNGWFzqJcI1xp0bIzGKu8ALRTKyZ2rrJ2UZPs1DvDIlOCHP60tDOYgsGfBmDTsI3auJ4x93kxhKygRJDMQ0NDSw6Upof MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9346825b-a597-48d8-df89-08d4c2c2aef7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:AM4PR0701MB2193; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0701MB2193; 3:P4JyL4Z5hzs72xbz4ubbZZj6aTtlFKMdre2jmzLY8OVulTJjlNcvn77KMAOpe1Pqx1vRkEQOEXF6QM7VqTJFjUdClLsIimgb09YW994TrzHmLIm7g423DH/3VKCsLZOEzQ03HbSQoGwjeKTZ3r3tSP/Cz1FetRFdnN+7ge3sEYnEzVSfJR8X3wmUH6ZUx2NTU60juOM0ARgAv7uTZwrq/a1Z60teV4H+xwz4fDkq+b6WGSySgYeFgit7CVYMeEWs5QPaFz5Cu0ETHxCQuPeCLH4QYLgH4HJGOwoGBz+nUvwMz/IBoy+udfG186lq4OXwdaovJtTeMhZFaDbqyDZWRNeGtRf3yPDekXWRx2Ooc1Z3wBk9yAVGwtJEKR5hiHysjAodlg7s0OKR79vaC72BOWU7SM2W09QkfeBoKSQP8mmqS4FxkQYI4TyNrW83jWickbHsJ+yT8/lNIFZuffJgFkJY81OBuzud9LcW0RDWrdIqwWKeYTkr/9vPlvdorJfm9AOu7dYQbHDGZ5DrhhnZ5Krx37Vj4KVn+i84Xdn/fGjZ1qG0/oI3TIOs9Y3s8unEF3UDV38bkJLWALqZI1hb6zRlKYA2S+Nt9de1kT/FYecmk2F+qrIedN5er5gm7ZGroingPMxhHwrFGo6k3qimcTezBabFiRQmcZmHjw4w/zH5Gx4cYqj1VsjV4kg2+9TUOlgHK+EIlojPPvcC4z37bV9TDVoPkBGblBWK0KxfuDxKrxiQuPXmcEiv0kUnCd1Y2L27gW8XgZd+Qmml/aKznRUimLZfQocyrUC+9KRPGFgfqt693IpIOq0UW6p2zgOeGAL6z6IZJ9ISkb+llm/4s/jHGihVrgITRdcznHJOBhm1/ZD0PpQ84YMlzbmJfTtRY5sFZr2ZOxLIsccOvRNcdQ== X-MS-TrafficTypeDiagnostic: AM4PR0701MB2193: X-Microsoft-Exchange-Diagnostics: 1; AM4PR0701MB2193; 25:vG+XKn6i1DNvfkAotly0w8JUEugO6yt/EuVrwI5EJ/XGM9LyhDk2UzdusyABOWYihQtUDdKU/5eUStu115Fv3d4SlF+d0DxYY44orytkQh+rY1pngF2tyG1CQQ6MCK/Ntw/pO3Byo+WEiau3TAsPwl+4hj6GXth0ZT/IYL2WKBDIDLSBnRawsQeBT6FFK7Nz/BwQHgFuamzYZ7dKf4Iok+cXaWLAxdSEURvoe7kjZMO/2NjxE1haIdl89RRI28uHiGsLsmE/qzsdR4JOo6hkdS4ECz+zUWef35H+X4uyum7jEf/yZCyTGqjbVPKJZxVNA80UcdDxiJ3SdGvma5k7VJ+N4LFrerztHzK2b3bq/az0TesWjRTk3c4pZW+AGQD0wJjQYwmHgJSmMxVqmHW6rnlNXeB3kx8MXpR9XZB368mm2Lnb5M8V8KAmAPX+cc02C7mK6zCm+SGDtG+4y+Bdcfm9V50EYH2Hpfts9G5jSBVE817v6X8jjW+e4B99b+RqfS8tf4CRM/pH7z1rY3TIckG4vf4ows0/Mg2QfYYtrjW9Huu512jWJeCWJlb02d562apyo04APcAt/ar3W1rIPFnrnNr3Eo33vgRYu6PVUq7SeZwZ3i00L9pa0wTPOzadiGIbAs6UYfxSC6SU0v/cxil4idBun/kJ3XslDfsJopUBtv0kx1rcfKSwXrvGC5xwYRHJ4YItQ4zRaYkkmTM1/XA/evjlTIICXCX0Vj0RujikDPczKB/sHzRWWRkoqa3vcceUMn3HuReiiQeE9ALqzJtESdKW7kZ5D8H/lwwOV+SBX1c11LsO+wF45xxEELXFRWc9HTJIAXUSC+d66eBUAe61FV1eSg9qUkDuM55EHlXHUYqNAQ+MSU51MePc/lVlsm6Gyi0TFwy0h+Z4A0vZWzLB0YDP23XMDbNr2FYdnd8= X-Microsoft-Exchange-Diagnostics: 1; AM4PR0701MB2193; 31:Nnb4gb3oHZ5kIXWITtIkdMa0E3CDfYISA8o+KBHx5G4YmkxZnR9cQ1ULcu2PJVsDKu0PRwj4ja2xcgmHyKg4ffDWUVUNpJsgiBwb5zjkOveAteKGJ7uUOvRdxxHx1iZEuwJgFH/CDXgRtUjnNf36UnuF9zbGNuAyxvmgKT7OJDKKdIkYrY1Wpcn07tiUrRlKEiW8S1bzgUcly0rbza5kSVhzqWEJiczI//JnXVeNzViK30xugVt/XQXx6wyLjfcEuIrjW+m7rl9zrZpOODstDZ3MwOhEfxOg0tsZAx2sFhEANMpKHJ2j0ZbUI6HQXAvsDQxp42a/XjPA0WJ7Lx1tkMHP9FxgNAxS4B1Kf0AtCxKCML4gUTM7DplC/ZVsdmmhv5a8++S7XjgsH2AaCDLxzkKj04mj5HNaZBWnWrZBepw8HP1XekcTvLA2a9DDsO6bG/lLhI0mVfMszT9j4Hp/M8rgcPIoMGziKrk/wp9WPygtMJ+yGK5yAZHibtfTJKKIShakPSNwlEaDR05xTUhJnqt5UfBCwRqMjeA+BI9U7bZd0CV6AUT7junw6b/ChxnXVct1xMt3KWeDQOsnkewyyt/5o2njAaZ+9UPjLVSK1oiOlOmUfeZPWct4mC83KdkYXWxTA+IbHDnQ33lCa4P1o19NtJE5QmOrxdZG23DgB91AolOtBG6VWSZ4pviKVGZPMwTZdrOHA+tMS1uVPE9pmw== X-Microsoft-Exchange-Diagnostics: 1; AM4PR0701MB2193; 20:eU/sxj4M/Quw4ozXp0lMzeXkPf0yA8qDHaHyOE3I6s+H72yMoK5pqofJL+s+dHJa+FPN5LSkuRAiycQ3GETjKF69XjGnoP0RgczlsWN3/EC3koMnZmJxszdr7VMFLTgQlAxOZhw863/GhbwuJlumdaY/9sy93EX4ByTPUg2+eBOa67C6v5fmAZRSeA0Syb85yQbACRo2MU+8Nki9UdjSEtvHplQXE5B/+ofzfGrNs+bKnn90epFVTnaCHKQZxYrSNS9I8gzeF31pCTbEGWUrsKImYecldE5+8yDFZTGV7Lhv64bkwSMaZeAeZ10yTPvDpTCJV5wlT/gEPi36zR+RU7IXHH4Oxi9qaCA96QlpuvnQF/PDBFLA32Z0EPmrM2JHQyFBPUK0aDZvszknK9pmtkSMkcNXD6MB2qxWDKvdRko2yQieoqi6ix2uFD4C9bARZZfrrWJQVdEG2hbdfo512siG2ul7vc0pOcIWi6iawuJ/Ei3MAhTiGvbql+1eu/9UirZMSdl34JPIDo1tVkf8W7HdcmlTZNlm3lmXWvYueDI0dk74bKDo3LdYBdrzDzZwJIm19yDP6Ear3AfLcvyZv0NN2susMIkG2cWp1om9C78= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236129657087228)(148574349560750); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13021025)(13013025)(2017060910033)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93003095)(6055026)(6041248)(20161123558100)(20161123560025)(20161123562025)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM4PR0701MB2193; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM4PR0701MB2193; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR0701MB2193; 4:1rkZU7AJ7Ip85rZ1JwPkcf3idmzgiMaJA6axp4V/?= B08ud6hrm6pAogqw32Aw31sS03u0QueN6WS7Maz+qIhlnaqxS4TkfFJMwZ2JymqQGcEND8j3A9OxMo7gLFUmh6XZNE4iJnZQevPAg9r0jN6y7/ruz6cvcg3BlQv9qcCKrfSDL2apurhyhaBnTbWMm4iWReuKNgkW8kN3WRQvTc2xyYsy3+DUntP5slQT1tLE2X6FvREsTi6miCA6gdU6SDQdn3frymQZ3qAkvfqMucZv7rx785jtXAaIa5HLXK/WkrDzTXYm8ZiZDKjKsme0LFnIq8iErF3s5MZdKKNjc5eSOHqA+KREh9IJU46wtHF+/PSiQWSZQcWV17sY73NKgUi6KhQjnLgSpzgLV4xhJug5cXbTTqxqR6hh1U3h/vGd2YWWIeED+fDblqA2ZQZ5pJNL16QyhIR2Bl+lAxSi5GcQZ5NiEkpyef5z8V7W9oKxpcugyI+oKrNdDluvpT+amPQha2Lp01w+aO3GlaTt4RlPvaFVOVyvWqoiS/cSK9jEBo0TTwuW/KYqJEWfoZB3ck5BprkswoitdSAMtQKjO1om7vfk1Lx1fPksJBeDofLBcHwR592qehsB0aZ8T2XATlmJhBKpZ3frg/Y3Wm44ORKdYRdf4j5wzH0yjvj7eCh7fJBdDS2mhS/9N3kDpsYD5znYd4uxZ6v+ibFQpGrK7WfPEyCb8MovIsvGPQzNgCYDcptWMFW0yZ6qnBtS9HNWIQH1ZjhT3EF/UvWjTQT1F1LzpGvm9tUFB0gzTp1E+n/Mt+p/y9QdVHnt9janD/4tRd3O+7pvcw+TrE7tnSasrUD4PjT8cU+Vlry+kS2RaP4iTAOK9Rd7eFT7LGDY1WW7fZZQndo8AWmorykpQRLanM/ZBON1aFl1B/jFSVJ+9S43N+BEOM7pj5vwBJEcyv4g8SY40vBameRZ6EeevfXOY+++KKBRf/Gj/UlhUYA8+4v3ZPVsFC47MQYMFdzPmLJypUQZHlLdfothHYsx7dLoYzSnXkGYm5Qfhi/uKlCzxQzGCaKJgoLvVuSO7E5xob38g7Q8ayH+u6GUDvkk3RqBKV66saIufcdWMI23BxzSOK2t0LJtoLoTHY3jIx6zqavb1a8NSrKXYHYEiUW1QulofApPTvC5PYX+ZAt53b4VOthihLdNwNUbav8Y5CzuB3X9TMGV2pzAFmETlDD/rK9kebU7pLqUWPu7pI2VCdo7VErMCwORoqnjN+HlurRIFTHPWCFrDCVTOXQFWdVV/BlOu8Pmxeo18DjGwA4SeT6JVNfKwIg= X-Forefront-PRVS: 0358535363 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR0701MB2193; 23:oSPq3wQrieMs5ph0YlOfy2Gby2JQGuXZ7Q8T2xs?= hjLBZEIGRwqxAMHZcnhtCa2g4/91NI4GKzatsobWSwkRpQlg2o1HgljRyhGQqSf+BQFY2WQEwYuWkzw87lSnnjubaUxw0PQkfVWpAgWF6UIesAiewhqR8/8R3qOzYAnZcyg2jNZTG0W0a0XdiMufGlE9M5NiAWcS3L16JEGUKaN+lIKrZLw9eZENhiXqkPbpCCa2UTwPB1pQzWz7RH97HSqGS4RDTpbJdNtfnt44pXoOwhqbtUagEPtsNhYocbVs7r/A5j84zhcRCA65klgHwPbgEQ9GDUsY6ovlUEe7zY8lW1uu2S341YUdQ83E85rp6dciV9DA+AKXEzXgxbT7WqBJaYOpJtPk9aQxOz0VW8i4Fwit6LtOcoBl5y85vtX5o60Zr8yrX6QQBS+pcPdYyhHIpYfVGM2D5aKbopWmz9yVaZN0BbcP6C5O+SuEhpl4mAGQPSbSyOj8/q+2DhEvfmVws0ok7s6ZHqk0lc4VrSPaMrgcF5PEBFpGIdY2tgl9uM3QlLQscS4gc2RmBmUaC+AGfi3ptA7y5gaqw2EE9oQVLC2mbiJyws1EfXwyDJV2ZVJqgT+j48Krwm8X5ZycOjwTicI5ZYttVzHiFAOOCyhgds0js2wJ1RFckpBlDVJtJHUfwnWZUCctUPdEpiWLKGOpaSCsuL2jzwOJfl0Y1qsVOxGPeccwyNji1jk4yZqNCPcDqSQkQDtjI6x69AOX4jgs2Id1dEvRRyK984I4VwXtZ550BGM7knmOUMOQaUz0+PlNnAH/yRHe769dKrSONhje3Q/YcScWAv8VgZ0PtGL0vjhTGEbyDGsHhon/yeeU5eVOuSc+92h7QIMEREL45atPEMghkRh/v6zgoCaIgOjcxZ0VMob6FtiGIspO7jYaY4aPka7O5b8M9Murf5XIythlNZxfHRvjj10YUPbpylOEBrRwRnnuY6cAvxWwLSt23os94Eo4jTYovNes2U+7q2FgZ0QxQvORPzFFN7yDRRr/qINWsldmcwr5CmnPp63lnzOsTNFSMttcI+SeWqrkX/275OyChE/9/OxmpQtcs57An0w== X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR0701MB2193; 6:ZBOoTURw7rMZfjpXpQ0SIr6trXHyEYFd1eI+vUud?= bgvzYdlHigq/D2YBHLKdp+OjcVmIFatdFxOczuKzjnF2JzN0FJtnfKBRNvvMSBRJYLh8wkFKGmEW8tZOnzka9P64WJ9pFhuQNKgMFmnBrQfgO/WHMFRORxTmjVwVOP3ya4AdRmK49umik1D0cWvGKuK7hjfJvOAmQYfY2l1QidExmTjSktcUNKeHiAYXWqNSF0HzL1/3H6XnAl7HbHm77Jk/scT1KEPusQWxdbmitnb7xDSg0QaLSjL23HgFKbbVX/BSJiroHzdbDhcgqDwPmavxVsRw8+oZMmNT2cVqjhK7XsnQLVhOH7+4gGjldt/MEDVM+8XGRGjW1Lu2sK4Oubd7PYVih0IIqZReT4ul8wXG5Z8PoNwbV2qa8NeLKuELBODBzfIrgHkVRzKJ5YVRVFkxNm6gE8pmlTdiODu+rJnejvhEXLB8QNrUzflfq4zmAiUnBJoqcnLYwhrpaHWCtvzm8vl9pLJJH7fQQFHk7xaUaflGt+JDnBYu6oJUaRQ1gGAWc3bxx9gMxLfRau335K6gIoO4HVwEq/NiXCu0G1f7sRFJsssQOaMtu7xOxFy0cFWQF4VP25N/N4bJVMR2PQUGMGI9eKIyydXy4F5+Zv0xF7fgEAwOKNeE59Mv6EXOpsgyubKoXQLb66st14P0pcfcS/qaJE2Lk45shLQ/B/GreguB72DC8+CdumLIAbP/T6coVVLZ9dfVqvaGiCLJ1p9Vmx2IcK4rQ8AUabdMp4Rla/9niRwv5Zzq1SUMS+pprM8dkOYNP/fXjQ7WvMKAHBKd8yfxXJsNdepdObPJaFDVYr2IVdovWmlPeVA7+kgr2iNMbBSWLnqOjBkUrkibdtbBCCt6BkyLbdaiSxA+9nxZKK3n7FICEEzGUm6ga3BiEHKmJtRxzfiI0yWNzif8yhIND2HmPnMVs1HxQQn4xKSGDKWhqDM0xCrgMAdpUgBQK9fRe2ixmtRtWKkl0s/Mfxjj6fmKIZKh4S9tmWuUB8fWN4ASfPdX7ovZg49L0/FzjTM= X-Microsoft-Exchange-Diagnostics: 1; AM4PR0701MB2193; 5:I/LZ7gZn/J27maiFitj1BDxAVKhT/NehJrOk3r+ru4hIOKvvFQeMSO2YKFLTVRG2fTh0gS8hfGFCMqj/AscyagPYvUHuytSR71KG+epMYDDJuOrxquQOuSvt0pR2TZoTeRaq4sKYJpVoixgeb3CFtkHaOybtV6NeAjQhfResvcIe5bZSzPJEdCU1dWzA7hqJkKKlPzeI//3kl/+86eujymbz7g2DqqYpLQbBXvB9hwFh1wYoMBLfFOH3mP56FjVHqLFhHKStTKKl0g+tAO7byNvw/z/m4Zd6aTbPuLBP/1G1CFIe0TKrj0mTN6h2ZTsRQxwdHN7PrsgO+f2U6a6sL3yeMJe5iJ9iVlHhEkmvC7bpzY7Ci/mjmxNb4fj7fhigLv+qyYx4RIif0QbJqe1149/mEG3fJxR0fi+sVC/uzTAK+dbB2b1KwOln2msKZvTyMC3I7So8Icc/akfj0CCBi1TzNz5NShu7qZZ2Ym4vg2Kg+R8O82oHiQfdyczXoa9k; 24:W/7MN4AtJwvtjBQ//QA1NL7/chCjw2Ft6AlweacwHAOLYkFNeXPZGGjk85Mau/r/c+bBTY0UyvYdlTU4xiehqt1u/hIutXMQAfhbLUg0p/I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR0701MB2193; 7:MPbtURGty49a8l7DUqSPulvXy7e06r4wI9EP0D+v5E+bV5sOC0KiomWOX2uNJWiaLNbWkNzX2LY0KVmGHBXngdpAOpSedgOGFCxpIZvhNre/BGsjM2UQ1w769Pr5aGeCpcyv+IW+Auy2LAXKkZfnoUlpCCD1y1PbFpsIJWCE/Nfjnp7U/DwmpauRJzGDqMoWetNdxYUbXAwS5M2rLGO4L+0m5vcyuJF/WyyNXI/GFqb9QNSdVhvGw/XMzOp1yBYeoe+d3Mx9unf0qu2qbrbjTvTDFfiqZ27HxZieL71JYR8jFLa+ilTgX7VrP9eNi/bf0GArczG+i8HFf67+lw8QIIDYmOYwO2AKsGbmuHvGkNpGs9db1nUoZ54etulColC4BG1UcqFz2CqdGtrC9tWX86N4Q1F2DOsRR6XCl3FlEt0hnq8cKzDpb3z0pjJjGI5uFIDafxQq+zMQMwxYTOoS4ZjKzN3+s4L52zTkibM+QM7FOGFQWafyS7ZkBD7A+6tBSJaOODl3MRDjYlBo4EoHSRf1As+XH2n1azLH70y+aW9Rs89wXx36PIIK1uPSL/j9j5lUinynDKNKsZw1wROl6OJgHxLV53gR8+xhL5ddL40Y4q7ZI9YLbThuYMUTq3GOOauZGf/NszEXWTjXf2H8+7bknktz5YZtiJjrBHZ3LjKDVc7yD2JwzZ7YTX6N61eTqf4kU2bPNAg9HzP72V8azCEu+Wq6vJ4zjcEV6Wz2OdUVv7RGqjIMmbq0ava8uc7VIH0+sF+D1R4qv83Gavpbq80drcu4JX9nOzLDQFYJjN4= X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2017 09:54:37.9118 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.240]; Helo=[mailrelay.int.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0701MB2193 Subject: [lng-odp] [API-NEXT PATCH v2 2/6] linux-gen: pktio: dont use qentry for queue_t X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" These are not any more queue_entry_t* but queue_t. Align variable names with the new type. Signed-off-by: Petri Savolainen --- platform/linux-generic/odp_packet_io.c | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) -- 2.13.0 diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 6ff35046..af1307c0 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -578,42 +578,42 @@ static inline int pktin_recv_buf(odp_pktin_queue_t queue, return num_rx; } -int pktout_enqueue(queue_t qentry, odp_buffer_hdr_t *buf_hdr) +int pktout_enqueue(queue_t q_int, odp_buffer_hdr_t *buf_hdr) { odp_packet_t pkt = packet_from_buf_hdr(buf_hdr); int len = 1; int nbr; - if (sched_fn->ord_enq_multi(qentry, (void **)buf_hdr, len, &nbr)) + if (sched_fn->ord_enq_multi(q_int, (void **)buf_hdr, len, &nbr)) return (nbr == len ? 0 : -1); - nbr = odp_pktout_send(queue_fn->get_pktout(qentry), &pkt, len); + nbr = odp_pktout_send(queue_fn->get_pktout(q_int), &pkt, len); return (nbr == len ? 0 : -1); } -odp_buffer_hdr_t *pktout_dequeue(queue_t qentry ODP_UNUSED) +odp_buffer_hdr_t *pktout_dequeue(queue_t q_int ODP_UNUSED) { ODP_ABORT("attempted dequeue from a pktout queue"); return NULL; } -int pktout_enq_multi(queue_t qentry, odp_buffer_hdr_t *buf_hdr[], int num) +int pktout_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) { odp_packet_t pkt_tbl[QUEUE_MULTI_MAX]; int nbr; int i; - if (sched_fn->ord_enq_multi(qentry, (void **)buf_hdr, num, &nbr)) + if (sched_fn->ord_enq_multi(q_int, (void **)buf_hdr, num, &nbr)) return nbr; for (i = 0; i < num; ++i) pkt_tbl[i] = packet_from_buf_hdr(buf_hdr[i]); - nbr = odp_pktout_send(queue_fn->get_pktout(qentry), pkt_tbl, num); + nbr = odp_pktout_send(queue_fn->get_pktout(q_int), pkt_tbl, num); return nbr; } -int pktout_deq_multi(queue_t qentry ODP_UNUSED, +int pktout_deq_multi(queue_t q_int ODP_UNUSED, odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, int num ODP_UNUSED) { @@ -621,49 +621,49 @@ int pktout_deq_multi(queue_t qentry ODP_UNUSED, return 0; } -int pktin_enqueue(queue_t qentry ODP_UNUSED, +int pktin_enqueue(queue_t q_int ODP_UNUSED, odp_buffer_hdr_t *buf_hdr ODP_UNUSED) { ODP_ABORT("attempted enqueue to a pktin queue"); return -1; } -odp_buffer_hdr_t *pktin_dequeue(queue_t qentry) +odp_buffer_hdr_t *pktin_dequeue(queue_t q_int) { odp_buffer_hdr_t *buf_hdr; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; int pkts; - buf_hdr = queue_fn->deq(qentry); + buf_hdr = queue_fn->deq(q_int); if (buf_hdr != NULL) return buf_hdr; - pkts = pktin_recv_buf(queue_fn->get_pktin(qentry), + pkts = pktin_recv_buf(queue_fn->get_pktin(q_int), hdr_tbl, QUEUE_MULTI_MAX); if (pkts <= 0) return NULL; if (pkts > 1) - queue_fn->enq_multi(qentry, &hdr_tbl[1], pkts - 1); + queue_fn->enq_multi(q_int, &hdr_tbl[1], pkts - 1); buf_hdr = hdr_tbl[0]; return buf_hdr; } -int pktin_enq_multi(queue_t qentry ODP_UNUSED, +int pktin_enq_multi(queue_t q_int ODP_UNUSED, odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, int num ODP_UNUSED) { ODP_ABORT("attempted enqueue to a pktin queue"); return 0; } -int pktin_deq_multi(queue_t qentry, odp_buffer_hdr_t *buf_hdr[], int num) +int pktin_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) { int nbr; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; int pkts, i, j; - nbr = queue_fn->deq_multi(qentry, buf_hdr, num); + nbr = queue_fn->deq_multi(q_int, buf_hdr, num); if (odp_unlikely(nbr > num)) ODP_ABORT("queue_deq_multi req: %d, returned %d\n", num, nbr); @@ -673,7 +673,7 @@ int pktin_deq_multi(queue_t qentry, odp_buffer_hdr_t *buf_hdr[], int num) if (nbr == num) return nbr; - pkts = pktin_recv_buf(queue_fn->get_pktin(qentry), + pkts = pktin_recv_buf(queue_fn->get_pktin(q_int), hdr_tbl, QUEUE_MULTI_MAX); if (pkts <= 0) return nbr; @@ -686,7 +686,7 @@ int pktin_deq_multi(queue_t qentry, odp_buffer_hdr_t *buf_hdr[], int num) hdr_tbl[j] = hdr_tbl[i]; if (j) - queue_fn->enq_multi(qentry, hdr_tbl, j); + queue_fn->enq_multi(q_int, hdr_tbl, j); return nbr; } @@ -1193,6 +1193,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio, unsigned i; int rc; odp_queue_t queue; + queue_t q_int; odp_pktin_queue_param_t default_param; if (param == NULL) { @@ -1267,16 +1268,15 @@ int odp_pktin_queue_config(odp_pktio_t pktio, return -1; } - if (mode == ODP_PKTIN_MODE_QUEUE) { - queue_t qentry; + q_int = queue_fn->from_ext(queue); - qentry = queue_fn->from_ext(queue); - queue_fn->set_pktin(qentry, pktio, i); - queue_fn->set_enq_fn(qentry, pktin_enqueue); - queue_fn->set_deq_fn(qentry, pktin_dequeue); - queue_fn->set_enq_multi_fn(qentry, + if (mode == ODP_PKTIN_MODE_QUEUE) { + queue_fn->set_pktin(q_int, pktio, i); + queue_fn->set_enq_fn(q_int, pktin_enqueue); + queue_fn->set_deq_fn(q_int, pktin_dequeue); + queue_fn->set_enq_multi_fn(q_int, pktin_enq_multi); - queue_fn->set_deq_multi_fn(qentry, + queue_fn->set_deq_multi_fn(q_int, pktin_deq_multi); } @@ -1374,7 +1374,7 @@ int odp_pktout_queue_config(odp_pktio_t pktio, for (i = 0; i < num_queues; i++) { odp_queue_t queue; odp_queue_param_t queue_param; - queue_t qentry; + queue_t q_int; char name[ODP_QUEUE_NAME_LEN]; int pktio_id = pktio_to_id(pktio); @@ -1394,14 +1394,14 @@ int odp_pktout_queue_config(odp_pktio_t pktio, return -1; } - qentry = queue_fn->from_ext(queue); - queue_fn->set_pktout(qentry, pktio, i); + q_int = queue_fn->from_ext(queue); + queue_fn->set_pktout(q_int, pktio, i); /* Override default enqueue / dequeue functions */ - queue_fn->set_enq_fn(qentry, pktout_enqueue); - queue_fn->set_deq_fn(qentry, pktout_dequeue); - queue_fn->set_enq_multi_fn(qentry, pktout_enq_multi); - queue_fn->set_deq_multi_fn(qentry, pktout_deq_multi); + queue_fn->set_enq_fn(q_int, pktout_enqueue); + queue_fn->set_deq_fn(q_int, pktout_dequeue); + queue_fn->set_enq_multi_fn(q_int, pktout_enq_multi); + queue_fn->set_deq_multi_fn(q_int, pktout_deq_multi); entry->s.out_queue[i].queue = queue; } From patchwork Tue Jul 4 09:53:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 106923 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp825155obb; Tue, 4 Jul 2017 02:55:54 -0700 (PDT) X-Received: by 10.200.50.2 with SMTP id x2mr50828257qta.23.1499162154377; Tue, 04 Jul 2017 02:55:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499162154; cv=none; d=google.com; s=arc-20160816; b=Vc5fjSUZhW5x3CrdyQzKww/OBMYPsMGzKk0o23dodzHFAhluOOKNWYCl5zaWU9mL/Q DRvGEV+7W+LOo4my7p1RpQZJfTfEnQ5RVmTODoHAeSn9wVY8eA6/8dclbgJNzi+icxYY l91rNSe4NyWkdEO4cts+DKdtq7nSltzOZNaUqWtthjWL9LIavX0HhVZj6I8TUzjKN6fE fZM+bdCmgfeGCIZy82uYTTNJ24rEw0vgVlFFtiexqC8w3ETetS/maqc1mqz1WOy/OLVH i1oKvfiEu6+nCxLc5Y+Ryq6TYOhhDtag/dJRupyKEJrHZdcEBzm0Xdz3WPNz0lT2klU9 KWEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=G3PvvRAblAQYdqB1x7JET5WntrcFAuwYufQ6s2Ax9Vw=; b=0AJmFAZykkWzta88vo6iBm+OPIxQTtrDnELiOkH7OOzczKjyO9jGLNrf6UIlZ+7Mc+ RSxMyeS/Swm8Qb9lVJ6sNBNd1k534DiCPAIaTQlq3SJ20U/RWRinTwNv+hWvQclg0nkU k02ZqMP1NF5sh/WS7QsGqel+2wPsu/4sS8hJTU16I3s04abYbFj3b+pKqj9Bo6/wi80d VLs8tHqxxGRH23bk+5iY6413fsrctd0SmAgOgBygtRfM9cXrlqU+o55sz+A9qSiWOiVv 1pFUcRKMWp0GjAnv+y3Xen8YxSVbXkhp/cbtIbcZFRA7aShJQKYiK/66BFXlJL7ydFdB U1/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 80si16962208qkg.70.2017.07.04.02.55.54; Tue, 04 Jul 2017 02:55:54 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0D3BA60C1A; Tue, 4 Jul 2017 09:55:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 30A7760967; Tue, 4 Jul 2017 09:55:38 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6D9A360A45; Tue, 4 Jul 2017 09:55:34 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0136.outbound.protection.outlook.com [104.47.1.136]) by lists.linaro.org (Postfix) with ESMTPS id ECA906074A for ; Tue, 4 Jul 2017 09:54:35 +0000 (UTC) Received: from DB6PR07CA0096.eurprd07.prod.outlook.com (2603:10a6:6:2b::34) by HE1PR07MB1051.eurprd07.prod.outlook.com (2a01:111:e400:581d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6; Tue, 4 Jul 2017 09:54:33 +0000 Received: from AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::200) by DB6PR07CA0096.outlook.office365.com (2603:10a6:6:2b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6 via Frontend Transport; Tue, 4 Jul 2017 09:54:32 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.240 as permitted sender) Received: from mailrelay.int.nokia.com (131.228.2.240) by AM5EUR03FT010.mail.protection.outlook.com (10.152.16.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1220.9 via Frontend Transport; Tue, 4 Jul 2017 09:54:32 +0000 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rihZ022504 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 4 Jul 2017 12:53:44 +0300 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rhth022443 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 4 Jul 2017 12:53:44 +0300 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Tue, 4 Jul 2017 12:53:40 +0300 Message-ID: <20170704095343.4266-4-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170704095343.4266-1-petri.savolainen@linaro.org> References: <20170704095343.4266-1-petri.savolainen@linaro.org> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.240; IPV:CAL; SCL:-1; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39410400002)(39400400002)(39850400002)(39840400002)(39450400003)(39860400002)(2980300002)(189002)(199003)(9170700003)(47776003)(498600001)(8936002)(5003940100001)(189998001)(86362001)(1076002)(626005)(356003)(36756003)(76176999)(2950100002)(6916009)(2351001)(8676002)(2906002)(6666003)(50986999)(105596002)(77096006)(5660300001)(106466001)(305945005)(53936002)(50226002)(81166006)(22756006)(50466002)(38730400002)(33646002)(110136004)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR07MB1051; H:mailrelay.int.nokia.com; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM5EUR03FT010; 1:436MOb3a+5pvamrAScACGf1CsdCB5Ew33RbTbm068+brKBN4s7y5k6gdqYMgr+5Av187ccv5zB/3sdD/X521pNp/6SLMWad7dfcYf4rhRNmWKPVkL3YxWF/foUpCHuLa5OroKkecTDIfbzpLe/0XZEN3Qgaafhgt44RMnMa1DrNILp77pXfxQn3Sn0s0u1IIVaF/s/BJ8Jnhe6OtYodehKyjChXInptsAPQVHeG+ntyyfSP2zgS5rNqpd0Z9SUOvEvN/2CmBrs4Ox7oW3/iOs+SLHKWTgU9USeNN2R72UeF5aLu2JmZIWn06+0d0dmas7hFtcHr6SZ+kzf/WUEyqPnAwk/NzajyApXhVGsUxp9nA7s+sRzEn4Ct6DdqBPFlIaqhEzaXVvRtfqtMGrkj8NLVid2CYhO8YLFdUelMaAyHTDhPMzzG7KzoAqqASwiSt0Dhif7i1jIzZHeJhMEA9uyhU9i1qMG0VSMb/VIIXgP4YvxlRNqoyINkKhLiQKEGRvOEHMb+knVP0Wc2X6DhRI/04nUt/VH5BEmQXskyXADA+RKQ48/lIG4l4y4PjUaSd89RBuOdAZk59I8EppbdQkhsQS/EXDa/D2W28YjKO+3wOJ38Gu94/b3WPAvgbP5i6pppznoQ7YaYxzOLFnwd4agmPVkyT67O951Py89DcFVxPDiutjYRzuDTUMWzibyEot2ISbZlqhUHXsjrQyLJ89vsZPJYoTznHP91nAfIxOXWfosAjdrYuBPpyxtOkOpip7Yv4eFzyX/GWDtIKECTUM1qzAv28BPQ/f/a0WP54xQZ9l7lRpdnCviM0CAfrWQ36+7oR03s94Igv+saTp5cN2yXdgaIQsjsrfWsAze7/HzZ8eDSO5ozLz3hLQyQH/2Im MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b7d200e2-ba5e-4c29-0d14-08d4c2c2abc4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:HE1PR07MB1051; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1051; 3:vctss6OLQKifsJLiogSmq0SdWpNletT2WghmsEoaaErMY9FXwd3jPdCPoIpTGiLwDjgVNdK24iZnHKu3IOjRXHwGTIMSHvsCrcoYNyIaLbtslelUQ/pebHZGV6VQU5bMu7XvT4y9H/om9cmgvyO63V7c54EHgmDCSZURuyac3MansMNOfPW0j24gD5J/X3095wqIzgdM1Ymnrl8T0NP+6KHI9+NjUm7CvfT/zM8O7lnW4FWZGkfUCQcsDxkWmFEAFXe1GJf1hQc63VBDBbo5pK6xg2mVFwkA8b3kxGsK0xqAKsPEM9tPwK6t8GYSOV61tVuKIv5yV8TgZ3Qmuzvqn+TO1BnZ1avw+Wgd+L3yUqKj9WR7fXZk7setDHAQYLSb6yPuqEgUik5qoO0pKEvEE0BM2YDec8drBnZd6UMXa5FcNElE+EPtvZyrQLtIp43UQ7bMbbN5qlx1k9NLk3bLGET+SvNsQja7lv9fTGWHXkSRTHXNM5c6o6m/RvBYFgQbKjEHzZnWy08SHSKri+AdB+YnhgLtbWMvPUvze5ZFdOcSu93TmSOQgsxmCux8QCFZIVOy7Tdlq77HVIbzL7L9/kWd+kRaKXlZa6J3bPttWEw2lOH6jAVMURAk6wWIRk3k3kk+FKBH2DV0m0CF1RjiCi8xRV8m4LbsLh16FafHEG/6MexwudkZALc3Detq2utENfwU1UM0C26e94OXJFaTFR8a4adRB+d+MfxxvIygap6bIy6BQd4j9jFyN1o8y6jt7QAMtf97a/yEWbNM1csTMon46zeoZyTaNljbWdCd/1pHVSexrAsRT+Ww+8byQm6MDMuN8FU+ID6d1kJSc4MwRqAz4xek/BkwDTYSJT7BtroICjowZHw21l8GfwUqhXxcWMFBlJWYiA+FaKkh7g9Ojg== X-MS-TrafficTypeDiagnostic: HE1PR07MB1051: X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1051; 25:IerHQ+sGK8T8v+KTqRF4B4BWWsnaMaw6ToMHkIksS2ZtafyA3pFv80kuSftfcDkdVdRrJKiVIzE5Mm86kmZVReYUQUvrx3iwAulcebIwBcisZ177RohN01ihZ8q9AyjNcOKUl67nvdlE57HNOTicYN4ALL8iS9Pq9jlX6LEg48AlPxPuLkSpa9kC3UEXu0xni9xP7bpd+YCbpmg8jNcArPeV6VeTLBw3GKNwv6Zp3xDa0ZkRAgsXH8vk5AFUeqQfXBKfJxwV0xJT7eaJQlYppnN/7+ocPnSAoDw7YtJp69Z9JtLOs6vP8BNGGrj3peqJ3lYpLwQQBCtVHKgZSevKz7jGWzv+4XaxJ/fMBuYkO6KK7Nn/mvuYB9Xs3dINxjeWvNgBU/iAwhEQR200O6p2w6n3RNs/36jq33hLMJ2P7GUsXxQoiml19pCKiv1w8BR/jYqIwGQdp3P2Ats60f/q360wt+sFHXAzNMi8/4yF+/Dxh1r6vxrXbfZ8MPZzD1LZBDdGSA26BLp5gZKhzpFN6PmFzI1rdWDGcZbQ+Ml1IG2NH+FYdudBskPfr53zjDowKZwUae0HnhUeEcOk6a1AZtITpeM+dZ9vt+sZ1XFAoqXNAQ9hNL9OiqMMBfxY0EGE7xY+ax4I0F80a9nEFYHeH63CpJNyvghU70JrcYmzO/cn8ZplO7yXho+g2rwOYDTdCVMEsfeSqH5gn/FOfhKI5LU7FUwoXCdKCv07YVTDvgb8y04xsgfzL6/LAArGqBxFJUkFzr0l5XOhn1DuzRceT0skNJyvsf1KugnlYC4554/yxgzHi7nDoz/dYOMfqTXD3riHhezjjBfpey2fCC70WJplsXFZRvE9centp6fyHfCWvLk7x2E7lJK90bicWBV9ELfeGOu0SA5whYQQLaAT/HlDNQSDoZT9x82SvSP1PJA= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1051; 31:T9VMxfVrtMlG9P5kHUMpxUVPBjXR9Ax0vGPTCgILjmfldn8Koa47HqV+eA0a/TouWOA7yCkRTTv24jaqq0ZEzamWlv0FCwkUa95xnwyW0T1L7IYaWiDJsIzYGkoPiMQInoQ/60cUG+7GlgeiSjNJGyl6EyIyJ3nyppjQxqCFCRQEsbw383NcO1GR3FFXr6471NCPiZjIwKuahUCtRBWcmspl0b0Ch0BCb2dQ+yAAiJor9CCVnuOU9LKtmCdm+X59/OObyGYoPZu1q95zP8FI10snkZs+WDYk4Tpy1uJjvsAbIYIRq5uHTTb/IWUD8XHP7h9XkttfbMNX7hFMTxpdOVS+m8K31rySDHMqc4eyQLd8/gv5fMEdDyoJe/AQJqg4fNqO/NGLeEZiRARClofxjddkcrExso9V9LXCNpvIQ0fzDw0YQfkhjsS6REKqcn7mr9VMqYeBBLm2H7TJb5M71mInMlNaot19JrQfs5+4X3vPeFT+Nj7Yq0EuRT4iVwHICPzcLQXs0q1jSCqb+LtKem4XP141/ER0ttKMJVYyaPfoKqkM5n02K+IPrFZoZefs8/vm0ql93ws2R/ZIDTd5KrEel2Zyq9ARo74uPfQHNyHHo9T7h/KIUj6jdlFx+K90LXTh81k3YWVdRZxLEm3nZvYAg+B6/qm5yiOuGP/ADJ9kQnMRCLr/ogFLkC+bbLdqjX7BbstFjhQ06HMWZaJ+sQ== X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1051; 20:+9nhLLWvyxd3gmg4m/z1wchCrfcx+9zu9WjCFpLiQgvLhyOpRPphGNwyX3xBooAJ+PKAZc3JKhIHIcJUhm+Zg+RfSBgYFlIsj5TMuhLLV4EvxKDE7eixXoucRCNucYkN2bs+3u4BdDb9oEmPo86epQ0X7OEeB/ZgniaK8umFz8rxCuLodrYApY+6LNcqTVUdRY9pntSIzutHo96OTokkp6BdK66X57yI1tZTyMjlHuHgjHODkLw6kUrUnA8GquKpWAIJ2PznTE8Z1urOPTNA1oVPV4fnMuxlBEdJsimmL4W8P1Dz6c+Wk6qUzle6xTYSu5/m7hw6sCT1ajvgDwaQ/h6+poKQ9fO0FlbKgoUO0V4F0+C/Py+GSukVVNwaZ1PNisONWI6fPPR7YnJVbRKd7F9KAv5BIJrpirhW79h3hVIWqvkgddbSPXLgxKiG4GNRAvpLj3d9Eq1RxA/9YhePWFzR+L8/7XWpg7z7DY67l4qaf902kDgBOsW/y0vhVp57bM/MCkX7NOTsRMhd6Y8jyT91Sa8xy9Lkdc0RTK8Za5YNdGUpxSXGMU+dVvQudhSwuNb6zi7iqWWvk4+cyjf75zteBjCnhB4mRSYLGqqqAy0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(13013025)(13021025)(8121501046)(3002001)(100000703101)(100105400095)(10201501046)(93006095)(93003095)(6055026)(6041248)(20161123555025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123560025)(20161123562025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HE1PR07MB1051; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HE1PR07MB1051; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB1051; 4:GEa9ou0MKCl1dbZEqSHjQ5fp3qlMcFiZPnr7pEVxqF?= mU1WOeX11g5Xc7ele5ed39G3+8m+LhK+uLUsJ4NFNPcs+iFaTbXAkrGcEoFKQIJgjAgtSVXDbWBZOlOeNiFUysYm8eqLfZV6O6ERJiEIan2D40SfcbsVS1HZgKq5gGRbkv3PB92OtFImuWnP6RLu0p1t6gTgY7IqwGOAG5eTGGKrB+qHuaF2s6Rp3GjWDy8+Sm2cz1BQ9kZ7KRr5+sFYvO1JJq9RBmfk7G7RUdHFhdMg4WJblBcQiaYDMYv590P4AvfHqOCbRZcqjTm6kQfa6J/MXzASfkvWDg94r3KPHO6PNWykO+96CQYHqXsYBrZwumaO3ltCl2n6lP2tDdE+h8wIxX9+GtcSS7yOP7LSs6yNL1unj38N0QnauY5uCJKvZm7L21aG5lNIX70ARO5aHQKdVKzjUYViaHBozbdRhg31du8buXmBU+qjUWD6kJATFnfIC9qm5oAQdfDfps2AgexafZtfKMZEexChrtaoZ8lVf9IILPKsSCMWMi90tUknE+Pm7JzfIlqxtSrPOBABpJmSONkWSsZ7+TvksrEa1lEOPVNuLDZGH6hfKzWpj3v/BzitMVKpEajzm76LVSsTkWE7SGLX9kKjSCKJUhYOW5eiuyIWgspLfwKoNBniSO0SVTenuSN5+COx0HbD9eLllXj8sZVsCqoEJER4kRvdn9rtToQf5GfaV4gz310XiauwabDuT9BW4hlLQxcDCHqNYAlPuvB3nzRGAy6kW1cgg2bZ96VBrrJI/n5srHWETssQr7k856nwGeMFMhRpwdsn1VU0+EVvoFAdk0pgu8VR94ZkjZ4HUXzbYfK13FeNJO/TlG7huKX+/UOclWJmjrUk3whGZnEjTOQX3Acah6jZpmaPrVFlK/uTxV7RhDBJVXNRV/ZnoOKvXg2wKKMkJ9M2A0QoFt8DqJtrcobns0QAJoyFGaSyzTDkjsyI7zC1eMzdc9E0NJlxUy097HtzGt0tp1HHFHrjAKmLzq12g24ZT3uRLOZ7ntjwDdsbe1z8mc/l02E2kWj28sqJkJPoFnGd4PTjFrTeY9Z/tkLLfNDGAbfRaljdcq/PFp+Ah1oxK3JbfLu84XdhaRgk+1LY0z1pE2wQ+TkknImUn6r8j9cCm2Gj7iGIIBOQtcDFaNjz0POcxQ3NaSh+1sLG6CBb1YaJ0M X-Forefront-PRVS: 0358535363 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB1051; 23:oTopfgp15Qe3OdOcCVjMJDEdxhXCo5QQmIYnFnYVR?= XhicRxa6b83KZn0y/hi3NQLf5l3q3Aw9MijLoV1bxmFzShJtOTO4yQfg69gzZhhQ98w76hx3Tw7DeYK1W26wk21Kskk5fDhO9/2xR4SgFAwqyO9bAKw1+uzqp0HtPOjBUKSMNnbA8WxWQ5u+wRyFeC338pqxgGPeVMLCl60gr2w30J4i/P94KkDO0eF2SOjI/XMkMXklBAiotYJm0+w9svoR9Qe/usS/b9ut3J+XwqKKW0hqb36b+kUudgf8kJBa9wEwPhknVKwDdnJXHH5TkwVYE/8QM50U8HjgwgUbl3SDzD/4o0+VUxZ2bRjH692SF6y/TSsamNmngXh8h9jbZWpZcX0piYshWZUsFFuvFceBKVTjqbJor5oLdjb3P8ULXXZtbKMHdLChgvrbCMqiEMEOW/aNBSd4PmE9JmHclyDpw3MHus396L2/8gJRhm11XzoVZLLH9WTee2GM0prtomgVji8YOQcdocgdTG0b95Fp1z0+AEwFqYJIT4UQ/DS7aLG6Hi1YQnvPjgevpuBH2ebedIsrHvruwdcvNAkYZE/ZG3yCxHJEIavJKFHga69imQNONLVt38Pal+1SCmrvpJNgL2va2PPDqOl4WpgB7QP/vmlD6Euzx2sCP5/HFgG/QpciwwKZR03Us4vpAaAyJOVlGpvbD5bo/hxpog8xuFs4M2H/mochnbZnKeP1q3VTVCJusa2x9zz1qPD+b4Th+IRy7QRqdw666kgSKNUgSSixDYlDhDv0dVoefUzOaIN+XJwgZzlxI0HjAtw95iiRdBzPaDHMGfEg296MfhuXRTX9u4abrb8WI5/X59KFfOiiOOilDIkfKnDIElTVOgqtEvRtdGQtBvRepK5twj3UjotypWgVR6giciDmP1RfKlUD9p+d1aZVhq9TP5QkveEd1qOWvvqDULFKXFZhEnUQXExP4ZUq7LeAtWZEunsaz5TCAnWC2vbGvp8srFOlVtXCR9lYiG3yqZDK5cYxtSd1ozxBSggKhOPR19DIIZUznjjaUm5nUpdjFP168Zpb98Vtr8+GE5d/FE9S91MvOiF4AYYlw== X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB1051; 6:PrUOO47VJKn3wzpubOiw1k4Mi0c7Y2a2inbZMBnV+8?= XiorrqWu/Nh1dwYk05RiENUv+uPdD069KHeazZ+dfWAm8s0QN9eoQTGBdiwq8Tt9kq5BDKB50Wg4BAAfUfk5CgdMLX7yGFqSvgr6/Tf9e1B7e9NpnF8VnwBXoqagjUziLwrkKCdrkPbHAA55fLfdbPQpPmyF1aZj+Iio89ZwpDSBiUqqc5srmPLq0dt5UKr+pr+BxKFUGWaCyHssT03TIlV6XwL9BMV8T5uC8rFXlloQNbhRDcUIR8RSOlsCIcmO8RvF0cRkXbI8gLd/5fT/neiwOamXkNbd16FyluK83pBBZHq5y1TWdAQ0D+7onQH2rfiig+6GZKsX0zgyYC0qRnTPwIvqKGn3QUkUWunjWM6bMbjiCXjCrc8GC5BqudkwjcrW+Ko6U+mcP858JjoLUi/ESQUMrcEJDjZ0PYzl27qYCOIU3XICDBDp+7/otzOpFwiDBf7rXB2+F5LARjwaIdMEQMPHXlySpW0HcyAn1QSoDBYdOSKyTiG20+XFpCAprSiADZaFntcL5dS3ND3EDgDy66tY+P9z+Os2gOAedtphnPDYRR95TKkf5JEljRz7HoOnhqjGpGMZnwvyvVih0m8LVD3Z3yrfZlQ9brQm4rukhB0rifpQjwZkFjJoM8qhnVOAuryBfaNdzSTbnbhPjrGhNBLcB2D8bbBjb9XkcHU1oJZJVR4iFP0y6EdRIk2/lXYt5+RbLuZ6zJu3fCDIaC3bmrc9TXEqLpInaKxQQDNJ8m+mfnlRvs0Qzp4sUJ8qTJOLPfzRkIgcFWa5JPGrPI0949tFZ+NvmPPfPfCGoDLqe53eSyaiMOeiuEMPjAsNTILRqWiOmuzdzYGbuCLF14UrgYiLmNWYa0qwGpwGu7HDQhnemdq/eSD5pbnaYYc0qEQPfmrjK+5VnegVSBxMWXKsjENNeUB+VxyQEQsJPExKcVOV/M+Uz/uAHMh2W3g5mPDdSLH/yPZ+0soUNzePwhYqN7qXT7/romhPro3GCwqxp8eRWH48GrokHGQMC1CtE= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1051; 5:7cEk/jjsIXLqzV5+WvZjG1P2TC9hGAcM/8PC7Ecq34jXw75ZbxRiZMBatDCRvwRC1SoK8FRFtFOTHucJfAS5BB87UCL6GEw+KR2Zjn7AoIfR8TXClEpfajJq+SpVhZnKDWX4RzCYMi/XbfuRRBkkna6YsxQhX3hR+zWbHPBxX+Hn5oiOSN+kNa0pMJnbOYwercwV5E0l9GtkXBRhYGAtbsldW+BZ5R1QRwJaIyRHf6vXFBXMG0esm8KoAxZVPv1lYo1NASWExK/Fm2NtVfAeoqF6Zl2kWlUW0f+WqoThUsY4evDrKT/rqXWDPQtCfiauZQNgiiFUTh3OUSXudBzp96yj7deXnkk6vNu5S8NnBePc/9DvaJffnVdZJCWbe1PNicmD9+8CzzLYDtdnnh3IsHngMEa1N4Yc2QEjb7RKAjsE9ip2c/Aj6txh7UehuPFG2An+Ivc0wzXlU0v8zxNSHGZm/uzBLH3/BDtcSgyHxrkijjZtJ9rc9i3JwL+TsnM4; 24:gb/X5jPBsAwXpQCdBPigAdfDJAG3zKy6fYqO612ZC8GLCoFLG9kobmjEZ1s5C9fd4nZexIzQdp9grH1KtA6enCUZsOBZvBNtZdIisE5ie+o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1051; 7:J95A5426RzdQFUs8X4HMFJH1bQZ+DAOf0W1X67ZNjPQdcsrhbVRsseFUYqa0zZbfIKoUO00ZZyJiFREjoN7Z+cyO2KBHtrL1vSZ/rXLn1U9hAKv+abNFUq97tspfwSw5BP114Zb5MncoIkXUosWlQSrnMG/JhYKoWVnQ/K7W0CBZ2G1cOI1iS2AGVWvS3tsAeibzdr5+xoec3BGVrU0CjbIueqqoVMIOumFdUQ1NGjcJ9FiNPCx7vGlkId69zd47gd3BW5yU5yH9vz6MhsvEL9gUYroukoyHI9BblEp7hFMw10eczLEei6mupfL4JpX39NpBizYG3LVQR02/qkMi73/VheVO+7s0/9mjKapjzWA7unJhtOgpOv17wcIk0nx9isaSJMBXYxiZIF44TJFcUfl7twflYMxe8nV83JcEH+TK3AZe/EivYUnu4Qei6mR0ID66P6xL8eQkuy4/L4z6fj1maCWG/etOgEiRFQGM5onjXN/3vL0tk6aiBF7Gmxy4FRAOS5Xtow6JYc0hhcE7WRnVJgJolPhaXUfRoCnS8CdvAIvffIj/lepkdDNtQoLcdKw4z1WQ+re5IwhgAxTwuhr87QKfIw6LdaCtCRCKRfNTNQNHNVh+sMGgTg4FnarnWZFXXTSIqPQ3FWkKlIb/m+s1jNrc/+f2iW4k9S4R3yHhQduYOb1fSFqgfhy/zpKM4oz3L8QxzK/xzcmOeEnDmX0Ga4ebpk9ThPJH0NuLtt2RbIlhNI9Li4cAMssDKLIm+ZTEATultQ0U9+RNsVVnA2JE0zfjODCVI+YX8AVvaaI= X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2017 09:54:32.5716 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.240]; Helo=[mailrelay.int.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB1051 Subject: [lng-odp] [API-NEXT PATCH v2 3/6] linux-gen: pktio: convert queue handle only once X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Avoid queue handle conversion on fast path. Convert once after queue create and save value. Signed-off-by: Petri Savolainen --- platform/linux-generic/include/odp_packet_io_internal.h | 2 ++ platform/linux-generic/odp_packet_io.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) -- 2.13.0 diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 89bb6f3a..93040681 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -24,6 +24,7 @@ extern "C" { #include #include #include +#include #include #include @@ -165,6 +166,7 @@ struct pktio_entry { struct { odp_queue_t queue; + queue_t queue_int; odp_pktin_queue_t pktin; } in_queue[PKTIO_MAX_QUEUES]; diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index af1307c0..3ed51ac9 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -128,6 +128,7 @@ static void init_in_queues(pktio_entry_t *entry) for (i = 0; i < PKTIO_MAX_QUEUES; i++) { entry->s.in_queue[i].queue = ODP_QUEUE_INVALID; + entry->s.in_queue[i].queue_int = QUEUE_NULL; entry->s.in_queue[i].pktin = PKTIN_INVALID; } } @@ -305,6 +306,7 @@ static void destroy_in_queues(pktio_entry_t *entry, int num) if (entry->s.in_queue[i].queue != ODP_QUEUE_INVALID) { odp_queue_destroy(entry->s.in_queue[i].queue); entry->s.in_queue[i].queue = ODP_QUEUE_INVALID; + entry->s.in_queue[i].queue_int = QUEUE_NULL; } } } @@ -708,8 +710,7 @@ int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]) } for (idx = 0; idx < num_queue; idx++) { - queue_t qentry; - odp_queue_t queue; + queue_t q_int; odp_pktin_queue_t pktin = entry->s.in_queue[index[idx]].pktin; num = pktin_recv_buf(pktin, hdr_tbl, QUEUE_MULTI_MAX); @@ -722,9 +723,8 @@ int sched_cb_pktin_poll(int pktio_index, int num_queue, int index[]) return -1; } - queue = entry->s.in_queue[index[idx]].queue; - qentry = queue_fn->from_ext(queue); - queue_fn->enq_multi(qentry, hdr_tbl, num); + q_int = entry->s.in_queue[index[idx]].queue_int; + queue_fn->enq_multi(q_int, hdr_tbl, num); } return 0; @@ -1281,8 +1281,11 @@ int odp_pktin_queue_config(odp_pktio_t pktio, } entry->s.in_queue[i].queue = queue; + entry->s.in_queue[i].queue_int = q_int; + } else { entry->s.in_queue[i].queue = ODP_QUEUE_INVALID; + entry->s.in_queue[i].queue_int = QUEUE_NULL; } entry->s.in_queue[i].pktin.index = i; From patchwork Tue Jul 4 09:53:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 106927 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp828366obb; Tue, 4 Jul 2017 02:59:34 -0700 (PDT) X-Received: by 10.200.3.132 with SMTP id t4mr44105884qtg.232.1499162374068; Tue, 04 Jul 2017 02:59:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499162374; cv=none; d=google.com; s=arc-20160816; b=NZO48CKL2zMKxIPmlIrbbdZ9NAvKGtaAU6kQX3tGMnO0JlK7sWf8ibNeMiyKb+Y9Pt +F7cFMbYjiyuXAQqyU7HEbQYmsBHaGxe1aLJWsp1k0BDtDnBo3/Z8BFltJVPc3vyThgJ ZhNaaOzWyj84+S6nd2pVhUYNLaP4lpUlxP7LivHDpgN2p/euFO0wQbkHrtgvnFuXg+Y2 b0UJJDHwU7ns5RV4fZsHLuMsbs7yHOHul6mmG+zGf3xUovHOYu71+FJkRJEIje3j2p1F I2NXh5+sSx4TmHzINdUDVhazB1BaF0DmTnA5rfciDloFEicqOoDHfyGuEglWHegF75HQ GE5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=jRnQWS+DbHJaKpg/N+M2mVyE5nSj7/Dn/fyiHEnFQkk=; b=NTTLUyh+VSw9ZXr6oENAYs1eBmXn9AjycYSmkFxPywOKd25Qmc21VoUoiFVH612s4V 40bzLO2FnzlhkMu25gdoQBq151tJro3zavGcfo+BOHgMYxUqGUgebvjakdIBVC3k3kj4 EOlCmXcp9qvzer/33OYRX2L5moTXkck7YVJai+gpPDVbVqG9/BJZjLvCwhOO/pZPmjIv +BY0KuNMPWs81LZ63mk2KHqasUqcaUVPiz/UQL3zTkBz4YRjlYdFBQVj5GPX8YsPprIb BFcKOe0K0eFygpnxFjieObUybhuSTbuEY/nLxnOmz459IuLvdw+6aI0+eUMcFRYbqaRj UEcg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r8si17198980qtb.29.2017.07.04.02.59.33; Tue, 04 Jul 2017 02:59:34 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id ADAEB60967; Tue, 4 Jul 2017 09:59:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-0.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, URIBL_BLOCKED, URIBL_SBL, URIBL_SBL_A autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 7464960C1E; Tue, 4 Jul 2017 09:56:04 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5014A60C0A; Tue, 4 Jul 2017 09:55:42 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0126.outbound.protection.outlook.com [104.47.0.126]) by lists.linaro.org (Postfix) with ESMTPS id A4BA960C0F for ; Tue, 4 Jul 2017 09:54:43 +0000 (UTC) Received: from DB6PR07CA0086.eurprd07.prod.outlook.com (2603:10a6:6:2b::24) by VI1PR07MB1056.eurprd07.prod.outlook.com (2a01:111:e400:5096::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6; Tue, 4 Jul 2017 09:54:42 +0000 Received: from AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::201) by DB6PR07CA0086.outlook.office365.com (2603:10a6:6:2b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6 via Frontend Transport; Tue, 4 Jul 2017 09:54:41 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.240 as permitted sender) Received: from mailrelay.int.nokia.com (131.228.2.240) by AM5EUR03FT010.mail.protection.outlook.com (10.152.16.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1220.9 via Frontend Transport; Tue, 4 Jul 2017 09:54:40 +0000 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649riF2022518 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 4 Jul 2017 12:53:44 +0300 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rhti022443 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 4 Jul 2017 12:53:44 +0300 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Tue, 4 Jul 2017 12:53:41 +0300 Message-ID: <20170704095343.4266-5-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170704095343.4266-1-petri.savolainen@linaro.org> References: <20170704095343.4266-1-petri.savolainen@linaro.org> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.240; IPV:CAL; SCL:-1; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39400400002)(39850400002)(39840400002)(39410400002)(39450400003)(39860400002)(2980300002)(189002)(199003)(9170700003)(1076002)(626005)(305945005)(5660300001)(36756003)(2906002)(47776003)(498600001)(2351001)(106466001)(22756006)(5003940100001)(53936002)(105596002)(189998001)(50986999)(8676002)(356003)(77096006)(6916009)(81166006)(2950100002)(50466002)(33646002)(38730400002)(8936002)(110136004)(76176999)(86362001)(50226002)(6666003)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR07MB1056; H:mailrelay.int.nokia.com; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM5EUR03FT010; 1:dWZbEtuOQYgZRGIMgbfbiaXDD0J/+grISoXE2lYTor2VeyujAGYVZlsY68TTsFAg+2NAnYWypPRDp7zsjE3FwpZ6LJ2FhTMWK088980+L/PzsnsJXmjJBf8ds2g7xpY6zy+22h6Pni4e0T4NEe0y2Id1luXWaa/3PUo4352/QHdr+uPaV/+SJRynXi+r4jxwX0qIL/RuyTstt5MQAuEs8R+D3VeRinfPvc6QdufMH9An5wZYupfbENWjxP8+F/zT91+NgRqFXVN8By7wjX74QJutKwT5OyfBwjmmVHC33VZXZvkog2kOjvNo8HIzqHCHum7HdX4MKr0LGFeQdCsv6m6OFXRb7Ntex1QuN7w5tJPvolGWEC1eQ4NhRyLDFx5WOH70NgoFprCyysQKhytx7MbjfNiFePSD2H8X5XzLU0cv+oH8Ze+6wKugO88pHITPx3DYg3hc7ljRbytXYPQvDwzTkp8iFwtdJbhZp1YPJTMSlLboHHXGv21j5UGOnONv8wROZMpU3dGH1bfoEWkhTcYzORLTX9gEo1uMabaqG0hSuapZWF3rqHcaV0kj9WD5MsjeNOBfX6VeABIq3yy/6mt+IcCdQhNaI+MYLBZXTTzUN3gMv6Otq3nFD8xFnJ8HOlvkvzPAVEpLE1M0zFEKznRWsC1Ejea0XhE+imupc6ypsNv41kglRA8wiVikgDIPPFXUL8E0gb33fBmQJN0TA6VT7/WCCab/5Kkw5wlMXDkj1drchWyfwbS/jKVaKGVW7vwvPq556SlyTN6iI2Aa9qkeed9iGwTYRQufdSwHvktXuTkfguwU2m+DviDAeyTfUAzasjy0PFtiiETA+lu//lmtQ6Obx3sWRbYSncFcyqrpD7l1r0iQetnA9ukNcrnR MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 17731ad7-9fe7-4937-1692-08d4c2c2b0b6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:VI1PR07MB1056; X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1056; 3:ddPavJ8LX+NVyjkWkp8I2PcCY577BRcb0nPZaN4PV0UvIc3sqHVtNtPxtvW6kRJhoq+/uJsCOWQxqy7R9xfyjYnAdd79yNShRq+zuZedFgKmMOrASgpck7xbJf7LUA74jQayQ/C7e4izEHCRMNUvfH/k/27A8dj5iwx8RgPfMZB/goxcDgHt8UvMN6g6zYfH8N1Spb8whRL78v2Yh1acJNWa5HUQke104WA88AvRsOAQFsfWdMYnhBpe6aVABZyNCmAtFJBuSr1sJdtZYhnEo0sc5LIiaMzVthx44YkKos+6dPIHhGou0TzJKARIjNluN/zGlc6T0bpDor1bRAM0z6phkGFH5RFfhoaFYq1W/k4pmOU271EXi7uRi99WWnYhGGX98wdDBteW1kUysIgPxpqTzdluly9GuM7vW+pI2bOWMyw4QjhMSYboSg9thSpAU17KsbzZZitCxFBoNBh1lMGi+7r9uUENGY5+IBPHyri7HipPB2ZUxxLDt+V90ptKYJjZ0l2uQ8TV7t6gtM25oduKXwmKGjiY5pes+I/Od6iGISZpLksbfzNEj2QstaFmsi0BZElLHP+/f5ArlJHjSAxB3gzVVzuubQmqR28OptI5duFQLrvu8Aopbp7JGuDAZ8IkIdsxgj+b9R++DtkXMibp/1Fva23gvHaxgjx81dzEXfZDepDkBO+lAx4SFZP77X+uVA66bvct+G+e24fPt0sZpv4hdz/SA4XEM60kryt9yVYtHBTjAWIYavUn+rfz5MuFzAvqHCar1T+MU65WilLce7EN1JEoeZa5+7YI2IlTWVIKI7zOjhZSX6O8Wf0JsLFBrAOVTrUFOYfHIUA5O096f0ItQHypJiwpX9zvwb11998DIhjeD75O1Z1B8qeYbr6MyFjcWOOVA9JXChIRfA== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR07MB1056: X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1056; 25:128ASnU7sZ30OSWxlGRbt0wkqZT9n0bWkaRvO2l5zB3wX5Z+8b1+t/bSPte7P8jc+1Km7Pcd/PS4snW8xhCz5ZokFE0sLiY2LObEDGGdn/Fnl4/KgUiOXhUjh3u+Abd5/B3MRMMQaJ3Xaddf08vUhGbBvy1XaN0F+zceoQtfhg3CGwz0mYjR8KWQKjqVUtfOrNZUuKk8TqYseZQsRJFGAlnu3yn/rum5U+/MJ2HXZ1V+I/ZloIG5d8bV46mwJCkH0eDs2pZmsJtuOfVSn0gGuzuLuHb8ylv6+IXjsnZykr4wDvxHGJ7i3R3crWfDeBTMIxZN++JQaKLuLWCS0f+vOZEh4JwHmQG6f3csWnHgZYY+WycSXzIYZZYXBYiVKs8PPBm0khrZEVuK9ogwPas26DZ37xUqI6NnPxLyzdWRH5GTCPiXNeANQHh+2Ia6lBaz5cGLqEaF6EiYyBHzrD+dHUA6nwAWgLTJxAxjitwFSbVpRjBqzZO7jXC0GqpW925FoY6ng1FaKJXiqDT7g8U5c+11vV4VcwGARSxHDjCLjjKaXdXml33OvDsfByLpSvivN6WQ1KDF5tNJAjA/VpCmPwDFxqidxPb3xecSfkU7eAAJyxbSaaxdS+pss6o3DZzOckxfp3fpUh+naP26A2m6o0dOa2dNeuIj5Oi1BwOL8S0B/JT5uzb31G6qUvBb8KdK6nUvbcL8JBW/FdeAaRshs2xLc4fIHjzaSNB/X9UD5EtuyWTIr/TnWaHkSp5ybDEi1UCUtcWnySKjV0R0++aV/VRAOqToCTYWy6qJqsDWWOd5umJttqnH50CaenHmh6CVb+gGfgdHSPjaep+93lPzKFwEzQJAeomnLnjmerUPswQUQ0fibrqCZLSwvBd7o7w1m68jk0gVvBi2mojOtY3xjfx3v0YV2PY57V8LfLgjaME= X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1056; 31:IkmBP4D3sbK++sw2jeDiQq93cJfqNjVz0sOGXB1YacH2/sXVnee2JWeYXHTn325zWZoxM/oEibrZGGgnr08/+Gj4tQ+ACjJa4j2igyKzLXITE5T1di5rDsMyas/oItV06wJomlAz8yq1FoU4D7bXvRZ9weLCNusmlN3K6izukBCgopfjZmQ0bHF+wfIEI9Xx60IDy3jvOfk0M6/2BYpHJlW3MrS3ZnFaKDiMXKC+4D8DlwOiqIhOowTyW+yNTNcPvOyMlJkaXQMnFc1AABHn6ecKmoVxfh2VmCFJp+pGXXkUYsaJs04fe0GHYBZ18iicSfLv4BElFUCilC7P7oU+JPtUSm3KKQfmYNwlk8wU5Lph7qyIbwDwvaLZNUhE683QmvkKzoCUU+IsQo0JYxE1TMA8rHNN9Dl5F/k2FL1pBON0KaTeB4F5deomP765FypemvIs0vA+zu4MWRrR8o+D7iHyo8e3kkA9nRYUnm2dXneRakdMA1gggwEVY5/vXnYozKsrFfL5Yk83FNzCUd8U0usswveR8CEa776sKZVZzxSY5324+pTdJemoxah+HzULauHehL9iMoIqaJWxUUIZi5Y+qodV0J3alV4yblcLEnbQzWWs721evqxbykcl2dncchwRepdJNZpvFPs6hJ+oH9aOZOiVl8T8hgsC1ra5BKYwWpXbxGwntjpCc/M5KEz6rtLrbr1myG8v+E8ikFMt1Q== X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1056; 20:fUxyIIG+ND/PkoMNCtSRKQE8OkfJ16ZseSWBHbt7TWsLYUoMztYMSKedvW0clANxogx9XGvePZnF4DOpo+dWWnqsm47QnWnJqPWiNX1O9lGO491ncN96neXCwuYqMhC6oSwuVWIv0xlZN9XYFmRvuSXT4A86xK8xxPGISlpuLOI7jSO01uurbZjA9/X0Y/s4e9F/LYRjs1YT8f3OufyfpRRsdGRQ8pUDFchuM5dfL8CwQPkxySYaJ8gSPYbBHwawMoMXaZ8CWeKnqZmtmFmgfmcCPK0Gjt6v8Gx0X4pHXwm+/3QR7ulPyMcCYAQvVxvdXsKL5VfXLvEYZVMZITEoz2h9/QGddOL+ooYERMnfCivLGIb3tRu/gvNQM5cDrMGAySZYlwWSlH7O0zjYTB65tpPkRxoDY/PoZOWSd1AyiXs8sjNkIC13NkX8gxQVxUvxlfZpZMb77Ziw+yTG2eoZNEXFdavgm6qKCcbto3b0CKr02SHuQYpkJty0pI9JAd39UPMlTMuqgjuBkw/w6FSr4HLNUUEBf7CBD8Cx08AbzvIhW+jlp8+LBFhbz66+9STTT5Dg7ntD/7oxnrjExGhXF4jDeyvBB2Owz3uyh+x5vRM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236129657087228)(247924648384137); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13021025)(8121501046)(5005006)(13013025)(100000703101)(100105400095)(93006095)(93003095)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(20161123560025)(20161123564025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR07MB1056; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR07MB1056; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR07MB1056; 4:2n+1UhhD33iUwwXhCiKHmvJG+Z1L+0u6FhN3O6+PAL?= LjFLnkTGc2ka6nLMG3AR78HwB+dRBLilU1D11xyC2XcamA+WRmdQZXbbX2jEu+H8IP8lDewTW0LDi3SsNWUPDSFKriNQGeeQj5EZIDZYRO1JXhrztCMH4yAjHlUFJ2CHJJOX4DZYUEBlJ8Z3R4lK+1IQ2EsiGehy+t3BNPkS94HTokkSL9r4AGcTm+bkDJ486E4NG92xMuj/Y3EQwV9SEqgeavtf23mr4Fr5eusrG9BDBH0S5adZQXjWh9tA7AbmyCZ6Qm4pvBwVDE1WPywn/4/ePJivURujgbb1fbkaWIn+cZOq46K1QNbBHUi/nk5ZJJViYmeB7T58B3az+GpVDAexLwQ/oJR/s2FAnP3QldsuBqBkNWFX/Qz9OjukPymytTF5ZSd6HvfK1jME+vc0tfU9Xn+MvI/mU7beJIFuyc9MjjqTvoBCz8GGG2fCS4DZkX4c4s8ilXK3wHV2i6m5NPbvBIHSco1V8vRBPZaJm09IqthtOQPyc+Y5WjxIJj6vqNMXrQ+qrcXx1Sfzj9Hnp7wufM6oA9rD7r5c2NFKODG5ZEeVabuPn7ZHEW9cjs4zZlD6tRZ+9+qtBGesJk2ebd6mk1GJ2rz4o7F2itXyeQLuYsU7ETq+xeR5KXY0umOSnQryVZxKM8s/+5ZR5rOaha79WRN3rHzQM5mZHKK3qTHVcS3DViYF4FgYwQ6tiua9dq7wDPPO0uNNptiIaOM40MxJR0X1eymj7QLH2X7Luf1pJ4+SukFTMKHB9rGyBnPlaGv6IRxvpQxD7QPK2RKIpZ3bpBe7IyBDoGg07kpeSpreOzjRTw/oQzhCQ1HcD88T2lQZbCLkHFztWNyai1QTcM7X9AxM3181CDhaKpLy0zTRKKxTHHaS7k87KmjDe2zv13oSQWgApK7ubjbdLqAX9w1sZ2DyBy8zFDXL/qeDcFBnJMQIIDRxy/dHv47dzsVH9chIcGSBJwgdWByF91EQA1+AXXYxKgulvcBZhCEieQLuHwtAPIFhM8IMrbPO0cp4SC9JyO2dvv+4FfAScbZoNm1TDnuXaLgE1Q5nAez/+9SznBBV/+iHEaE2UotLeARkF8iF9gK+0RjVFqgmSTxoxZNn6Ia2xIILVAoShiShTZNspSeDAzhmu58j48Y5ixd/ZBy36LBpLgzRZcAJMIgsIG++sVROjB2feqG7BRefkK1RdubKDqB9MXq31jFlC4eGl02uE+WWtkedMY6LvxDQfB2sYPTMhh9BD0zyOukqB6lQ== X-Forefront-PRVS: 0358535363 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR07MB1056; 23:jMAXuy6LsJSA1lJgc+2I1Tnb6pf9Rbm5mCQ15xS3T?= sJ3EKNMM9kzqXECRtbwwUF+JHXUQ0ys0MRi203nKUKV+TboRzSpIOpwemegrhqnid1lWeIDYKA017KLQUDFxn6mH8qgsR2auZPSYk4jJQ4DlJrWdjSfURMOaAyfCyPNODY4V66XxkZQ8sJnLY5zH9y/yP8QEG9Fj0n0F21AY3hfp1jAPUPiP43jWLYA+RX/4M3Oj0pfyoIOIsFHuZaHcmxu0S9bhA16EoYunxI4DOdhwsAlZFbbK9K74TkHwnFBwS3LGrNvdsOulFMEwgVk07hD41OWRN+nFcDip02FJ2TnqReMcenban4Bd5sFk6/AsqX165QYf2QsSZ0Nnm/fSF7Gc8YNGRs0hr1b/jsFtO43goJl+xs+vqz0sPrsR1Yy98qbE59OvxSUHdomllVPMm9mLCd7b62VoGFHXWAEwyRnbigAttPT8MzQHfLK31mtEF/QpiN+eThCQ1fi2I9cipSYdNc9RF2gR67qcUzGB5K3vKi5ZBcCn4L3aKPD2HQ886vzevbls/rTk4sHqwZdn5vOhCWr/ow7PJtBqI3XZWNHJsjD71IilcmsKIiy2cTYAA8Qc7OkXGdrGtyHZeVRtQSyH5GSnXDj+E+wB3wi5VHwnl0VBn3fH5pnnAkdkYoPZVHHQCmSbi1cAdHT2n0qm6jy5RekEXvcVqO9/t1Sx52qkfN3cSWBWb932OO6la4+Mmq/w1Q2KiRxlxHA/3Bs/xbt7urJhfkZqjuE7JGIQlMaHvFUQfIlYeHdekR/2R1sqPIFiWY3uXpLYkUEl5/IpJCgsTmzttZzTW14+OqlrA7g2M0qmu+EzIVDkwQTbCb1/a9jxD0or+m8I0Aa67lIuNtAe8Lfa2C04oU1AtPnORxObaV/3McupGFpqUS0szV8gbSuZJpR0gfKZYioNwdlHD6nehNbfu3CrDJpCvnaJ92HXDdwSNoO2kblafJFEsb94DWOC6VnR/fmsSMP8OiyEn1wLD945bzgMIASulAwATppJ5jrn8WmZsI75n81QBA61YwsJuaCVplAnQ4ggPz5hfs8KYRx7e00oRGdmLO6F9HT/A== X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR07MB1056; 6:MvvH1s22lHT+aDg1HcSzf/lbAPTllBeOk5xJbN97n5?= 2/G6AdS/Cy3L0drv/Wywkn4JCG9OaPbfFcNSGqbJhlgVrE1DZ9YfBDtkqb79Y1ZIxVE1YEXlwT7RBTALAqdpJp8YhNsdSwgN8wee19A7XZJ4wE39Ql/k5LckN/mZuQT/71W9UJFjgs1m/PF79FKQ2cjakggpB4PmDiNjCXJ3wZZd3V9TW2+X0GspctV/aQnjny1uR1m/oR7gJn1yf5xfmw+9YUQ3HK2Cdk6QQ76eo4PxlrdMsVWMydv07oJxluLD/Ktv6jEI/2XfU6q8VXWZztwJlJ/VzAEVQhE3NcdymvvnqHQyt1nzwwWtw83kwWiJj4qjjhfQ5FfTT9RjcYzGBOIIwmlwxT/kmjCUq/cFp3bVZGDYlo6b3mNp3m9+M2jTkpIKvHRIXI2zba9ZCAt0mJ6I7knVFBK69LT3WC3pNnr087SX45svw+SgUrBRH1VIQPEf6N0xJNzD6aRdzLKrRm+uF16WrQXyzJOOSIy8a4MG613+ShhPjDjEmXSS1fHRJEZlclFGCxe8eFRM8RSj6MUf1ND9mlE5lve0sxXZ0VQRtEI/WB1UURvUgh6WUPjpZ8tZqV6IWuwGCErtEHTQshRJ0q4sf5pWtgYGxoVS9RYJx2YLkPBMJdVV6PyF/gNEy4yQ7XeoBaAMmgwFevSmg5Z95hDMoz79+POeliJdWP30A04kWfu6eEVStqIk5Qu9wO96uwBd7CoDdDlRP9RoEpatIK4eoskV279VrJ+ujYF+hNlPUT7HWSx67yjv3n1P+x4EWR7sJdTQkWDZmmZIRpBnJlpr6BHzvTMmHnIKS2Ot1aoqkjY+60aXaaeCMs/+rbMZ8wuRjaCcX1kwRIfHOirrXXpXvsTxXdbN0gb0v+GKmDmwAJeW0jNSRkdd6ppYwlE4yQ/Xj2p2+MmOrFLFbW8gaV7IONgjgK+MX405tcpd/rUGrilFwKsoB27r4+C2HvL+wVV8z2NPTpggYnR/Xr X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1056; 5:V7Sn8YmfswE11N3N/7uP4PsMQOmcpIvfWCYmWHb7afq7INbKsPulfJ8qEx0p+Zp9TdsbcgPMeW0IunSkV+20/K/j9cnKyDv/GYKXRnSbhWN+3/tdOVNxnzUEwaziZVSA9YjqPPqj7armbQ/RNKa2EdcU3Sx6oNXq4Uq+FnzUrlRLJmzEKYXa0SEQ4by0nnrRxQ86Xf/ylBeEVN62Q4B1GHFgnNUtmvdhOhVEY4JFAY8D8sl5ulB6WkvPY0zGN7qI3s9niBARtgKzvBXjTZnoUNY6VH6h+EfeXiBTFRl+A/fmXidqm/s7IWGs2LruKZcIy/a3onZjFgH4rphM6YaSvPHkc9J2crJxrScF2KZ/Xq4oN35SdVEzwc/IWwdFVQe/0O8IgbGx7tPI4ssaG8bhEmclgvWH5iGkNCY4V+d2oJSIZQh8arpiwB9j8dL8NNklJ9RZ+6yEBYGHApOkTfKMN0GQcFs940NF++R4ARtlQBXLBBq97syqE84k4I+ITd1b; 24:VFv8tpTZ317GYAtH+XGLv6vxGYOhnQNLhfxE2X9gYUe/Wsexaxm3SEYdDZOXy2H5KsiP3K/5dcZfcsKBPbfPVR6hzq5hdOG1xXePPWgy13g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB1056; 7:nLr4R5PhzHLIkMeGB/29gkwkPykrw7fpdCa+1mfxBeWBSpOxN3nDs3/RFc7wy3pdm5Vi3jz0/YvaB26r7x2U+JU+kNoMSKTNkwa7uaVDN/4HmU4gh26BGwmtLIfIJVuMiJE+Lin+GN2E0AiZd/+rMDZJhOLur0toucxKu2TnfUg2NnGOQaN4dri0oJFJ29iNJBoPQ3CPOzqdYTYE7014Gmn/UcKpfFoGSzk3C6xr+OiW1JdiRu6GxId5tdaWupFVwqQ+r6uNWIwRVf26XnmYNBq1dSLMPobClBDaRU/DgJmLNg3hm+n0oxHi1MbejpE68qs5cg6Ow4GH2b3hIsf482JNbIMbBCpzSkrxMTEgpLoH0QU2QvIMTjTle0KTUsksZzOLQ7c/5ilF5100DuqLa3I0Ck8HccpxD3UDwnG+CGcu6QLVoIAnBsG3YC6TYY7s/obe/QBqa3hf7VaMxCt1FdNyNff+rY4M8bUK4tIspR28fawJXBW9cj3zlbU2vgIYSOVT/XgtcGkvf3goS32dhvkuVTEgjj7IjkbVQM5yMSrURKsMdQQgph0LYe+6N+7BT/01sLIZcAWXk+x0Wz8Xl7BYvah9WXkO7wOSGTYshcVoZc/u2LMIDclZz8yc/4ZZyWARXtf8G+JAQcbOHpr3f9/OBceQERY7Pgv+yg6eLw2nDDgE9qHUGH49lsI6vB5M2ZLq8EweeP4pd3winnaOp2Swiw7H1qaSVFXcKVXABoELNDVPZDbW93qL+6Fl0C+7z1GiW0jyFxIDshmq1e4F/B3usvGThWaKccfhAIUWwi0= X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2017 09:54:40.5249 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.240]; Helo=[mailrelay.int.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB1056 Subject: [lng-odp] [API-NEXT PATCH v2 4/6] linux-gen: pktio: remove unused header file X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" odp_packet_io_queue.h is not needed anymore as the queue interface has replaced it. Signed-off-by: Petri Savolainen --- platform/linux-generic/Makefile.am | 1 - .../linux-generic/include/odp_packet_io_queue.h | 48 ---------------- platform/linux-generic/odp_packet_io.c | 66 +++++++++++----------- platform/linux-generic/odp_queue.c | 1 - platform/linux-generic/odp_queue_scalable.c | 1 - 5 files changed, 33 insertions(+), 84 deletions(-) delete mode 100644 platform/linux-generic/include/odp_packet_io_queue.h -- 2.13.0 diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 82ab4642..b46c6501 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -175,7 +175,6 @@ noinst_HEADERS = \ ${srcdir}/include/odp_packet_internal.h \ ${srcdir}/include/odp_packet_io_internal.h \ ${srcdir}/include/odp_packet_io_ipc_internal.h \ - ${srcdir}/include/odp_packet_io_queue.h \ ${srcdir}/include/odp_packet_io_ring_internal.h \ ${srcdir}/include/odp_packet_netmap.h \ ${srcdir}/include/odp_packet_dpdk.h \ diff --git a/platform/linux-generic/include/odp_packet_io_queue.h b/platform/linux-generic/include/odp_packet_io_queue.h deleted file mode 100644 index 71333ddc..00000000 --- a/platform/linux-generic/include/odp_packet_io_queue.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (c) 2013, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - - -/** - * @file - * - * ODP packet IO - implementation internal - */ - -#ifndef ODP_PACKET_IO_QUEUE_H_ -#define ODP_PACKET_IO_QUEUE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include - -/** Max nbr of pkts to receive in one burst (keep same as QUEUE_MULTI_MAX) */ -#define ODP_PKTIN_QUEUE_MAX_BURST CONFIG_BURST_SIZE -/* pktin_deq_multi() depends on the condition: */ -ODP_STATIC_ASSERT(ODP_PKTIN_QUEUE_MAX_BURST >= QUEUE_MULTI_MAX, - "ODP_PKTIN_DEQ_MULTI_MAX_ERROR"); - -int pktin_enqueue(queue_t queue, odp_buffer_hdr_t *buf_hdr); -odp_buffer_hdr_t *pktin_dequeue(queue_t queue); - -int pktin_enq_multi(queue_t queue, odp_buffer_hdr_t *buf_hdr[], int num); -int pktin_deq_multi(queue_t queue, odp_buffer_hdr_t *buf_hdr[], int num); - - -int pktout_enqueue(queue_t queue, odp_buffer_hdr_t *buf_hdr); -odp_buffer_hdr_t *pktout_dequeue(queue_t queue); - -int pktout_enq_multi(queue_t queue, odp_buffer_hdr_t *buf_hdr[], int num); -int pktout_deq_multi(queue_t queue, odp_buffer_hdr_t *buf_hdr[], int num); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 3ed51ac9..0d825f91 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -580,7 +579,7 @@ static inline int pktin_recv_buf(odp_pktin_queue_t queue, return num_rx; } -int pktout_enqueue(queue_t q_int, odp_buffer_hdr_t *buf_hdr) +static int pktout_enqueue(queue_t q_int, odp_buffer_hdr_t *buf_hdr) { odp_packet_t pkt = packet_from_buf_hdr(buf_hdr); int len = 1; @@ -593,13 +592,7 @@ int pktout_enqueue(queue_t q_int, odp_buffer_hdr_t *buf_hdr) return (nbr == len ? 0 : -1); } -odp_buffer_hdr_t *pktout_dequeue(queue_t q_int ODP_UNUSED) -{ - ODP_ABORT("attempted dequeue from a pktout queue"); - return NULL; -} - -int pktout_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) +static int pktout_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) { odp_packet_t pkt_tbl[QUEUE_MULTI_MAX]; int nbr; @@ -615,22 +608,7 @@ int pktout_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) return nbr; } -int pktout_deq_multi(queue_t q_int ODP_UNUSED, - odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, - int num ODP_UNUSED) -{ - ODP_ABORT("attempted dequeue from a pktout queue"); - return 0; -} - -int pktin_enqueue(queue_t q_int ODP_UNUSED, - odp_buffer_hdr_t *buf_hdr ODP_UNUSED) -{ - ODP_ABORT("attempted enqueue to a pktin queue"); - return -1; -} - -odp_buffer_hdr_t *pktin_dequeue(queue_t q_int) +static odp_buffer_hdr_t *pktin_dequeue(queue_t q_int) { odp_buffer_hdr_t *buf_hdr; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; @@ -652,14 +630,7 @@ odp_buffer_hdr_t *pktin_dequeue(queue_t q_int) return buf_hdr; } -int pktin_enq_multi(queue_t q_int ODP_UNUSED, - odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, int num ODP_UNUSED) -{ - ODP_ABORT("attempted enqueue to a pktin queue"); - return 0; -} - -int pktin_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) +static int pktin_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) { int nbr; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; @@ -1183,6 +1154,35 @@ int odp_pktio_stats_reset(odp_pktio_t pktio) return ret; } +static int pktin_enqueue(queue_t q_int ODP_UNUSED, + odp_buffer_hdr_t *buf_hdr ODP_UNUSED) +{ + ODP_ABORT("attempted enqueue to a pktin queue"); + return -1; +} + +static int pktin_enq_multi(queue_t q_int ODP_UNUSED, + odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, + int num ODP_UNUSED) +{ + ODP_ABORT("attempted enqueue to a pktin queue"); + return 0; +} + +static odp_buffer_hdr_t *pktout_dequeue(queue_t q_int ODP_UNUSED) +{ + ODP_ABORT("attempted dequeue from a pktout queue"); + return NULL; +} + +static int pktout_deq_multi(queue_t q_int ODP_UNUSED, + odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, + int num ODP_UNUSED) +{ + ODP_ABORT("attempted dequeue from a pktout queue"); + return 0; +} + int odp_pktin_queue_config(odp_pktio_t pktio, const odp_pktin_queue_param_t *param) { diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 4c85027b..60f88f09 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index f95f5f93..7441a2a9 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -20,7 +20,6 @@ #include #include -#include #include #include #include From patchwork Tue Jul 4 09:53:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 106928 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp829612obb; Tue, 4 Jul 2017 03:00:48 -0700 (PDT) X-Received: by 10.200.37.98 with SMTP id 31mr50048760qtn.92.1499162448846; Tue, 04 Jul 2017 03:00:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499162448; cv=none; d=google.com; s=arc-20160816; b=dW7hlQUBlu+Pej9gOL2loEB5Z/LqfEQUp9y35tJhmZOOPKdzEhwoKkgSq2RymdsRCg VZ0cWoHk818sWJkqR22RfGvbQW6WxNOrfgE9ysAsML7BX9evJ/VPsBYtQG+asl4woVgN fokP2D3d8S2vs34xNrTnEjK9HVnUCbAUdhBlVSXR0WyLsYqtrD6LK28+FIWRM62wSw2m OcY0N0Sqy+QxWgJM1clxW6rp0TSrVcH97TNBRGj8FNfe4iTf0kGmqLfIMGJIoR265Qmf M89M2Q1p2TpUEPsv70dmlUdB+3PGBJ00Y90jqtd5Nt0u2pgFlk3TeziEd1Px9+z0dUGN REOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=BGnDaLSiKVxniLzJR7sbaec+jNwEV+Y5gktuJVSRS/8=; b=h+V3gGlMNHA53mJMKwt/dW3ZlFkOSzTWiqw5skpViUGO9JQss00I/bUHUp1HKmCWN5 8FPk4FM8FoXh08ZiE2d+0LIE1h7kzcmbSYoYAHMAI6JhHLtYMtt+nQyia5baGl9bSRHF eCY3FE+kqTwbs/KEdEsn67ja9lj6pnTCnqekbINv6vAG/AFZQwU64aGHJkZ/NiBAq45o ytCR/Ztcn/sfLDooMtj1p8UIaZhM1ynziT1vQNyOuTwgL7Lpp9YDee4MaM2AQifRz/zK nyN3dhwG6VNu9m9CxKVP27pBKF/W2W9fQAhdMuyiSWQnnZ784YdIx+z6CqKsXN8nV6jX FIJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 11si17145970qko.121.2017.07.04.03.00.48; Tue, 04 Jul 2017 03:00:48 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6D39E60AEF; Tue, 4 Jul 2017 10:00:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 5FA7160C2A; Tue, 4 Jul 2017 09:56:13 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9E87F60C10; Tue, 4 Jul 2017 09:55:46 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0108.outbound.protection.outlook.com [104.47.1.108]) by lists.linaro.org (Postfix) with ESMTPS id 6117360977 for ; Tue, 4 Jul 2017 09:54:45 +0000 (UTC) Received: from DB6PR07CA0086.eurprd07.prod.outlook.com (2603:10a6:6:2b::24) by VI1PR0701MB2205.eurprd07.prod.outlook.com (2603:10a6:800:30::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6; Tue, 4 Jul 2017 09:54:43 +0000 Received: from AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::201) by DB6PR07CA0086.outlook.office365.com (2603:10a6:6:2b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6 via Frontend Transport; Tue, 4 Jul 2017 09:54:43 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.240 as permitted sender) Received: from mailrelay.int.nokia.com (131.228.2.240) by AM5EUR03FT010.mail.protection.outlook.com (10.152.16.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1220.9 via Frontend Transport; Tue, 4 Jul 2017 09:54:42 +0000 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rjKA022549 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 4 Jul 2017 12:53:45 +0300 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rhtj022443 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 4 Jul 2017 12:53:44 +0300 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Tue, 4 Jul 2017 12:53:42 +0300 Message-ID: <20170704095343.4266-6-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170704095343.4266-1-petri.savolainen@linaro.org> References: <20170704095343.4266-1-petri.savolainen@linaro.org> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.240; IPV:CAL; SCL:-1; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39840400002)(39860400002)(39850400002)(39410400002)(39400400002)(39450400003)(2980300002)(189002)(199003)(9170700003)(50986999)(105596002)(76176999)(86362001)(498600001)(47776003)(22756006)(106466001)(189998001)(81166006)(8676002)(8936002)(626005)(1076002)(356003)(50226002)(2906002)(5660300001)(36756003)(305945005)(2950100002)(77096006)(6916009)(53936002)(38730400002)(50466002)(110136004)(2351001)(5003940100001)(33646002)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0701MB2205; H:mailrelay.int.nokia.com; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM5EUR03FT010; 1:nXj/mz4YwtK+JSKuCZJYFk5fpMXFseBR+rLXpb/K8HeV3xwhkDO4b7xJ2xo1m9lZxUt0Q4bfhLfh/CoxFXMHbOOHdX6RTzIfD43v9hJP9YrzIYF/W3c/6FYxT/j43s2Y+TuDspq7+eT2cRPsdyyrvIaYY+LdHl9Qzl9nJXoVsP22/CoULhUCwWEf12f9HHf7KESBx5xZBH6OLjwMFbqfnHXtBs4TblIwIBhVfgS5+VnonpXPY9pp55gUdGKDSPfCYb9cCbeo/KaetnSeYza53eaYtb5BEn+c/fmvkt/BkyqA08fGK0EFXYsf3UcWQO5EZbyNdpMDaxfJYSiPFP0Ov3UUwf8ehgI54s1wCbmYDJy8wcrWi1f9ci8y5rBfk+1PHZoomfIaYjIBGg/S/vOZUlojBT4rxN6z++Inud3Cj+rTuLQDilQpXfrioSUbNUAafA3+4HeGwEkLWliKCNkeq4o1sekqZNvr8+6mFg7INPqH7x5IQSUr3jT0VFhDJQ0ZkBsKGAujPblcihkj1bV036xlNe3V4FYiEtmP1IfWYhnYPUw6Lf6VmKVGfCyGj93plWeoKmeRmezEVDgUmS3udIlsuFGd65ogYyIUJ+T826SHkQJNB5HNSNagaIDZ8BiLzXoC1+acysq5rvAe305bYbh1K26Ng3j7fwzVgi2xtyx6d4THdh8ZjufEJa3FEn4FV9QEIpqJallAO68DmeE+wqy4aFjYPqpENqPXM8JOkLED9tJMvX4adqJlGIKLshPftgPcsrle0/P9RMWPF5WpEBSTZXCoMghI1ct55UyMPJI/iSWOAWPsVZitYUau9ypnF0AB1Q8sJFuG6ilIfeGljBqSu5KsCkNrv2tyRH8M18b4FTLKuBBmJ+PnUrh8VjTx MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a00d42fa-6028-4230-8225-08d4c2c2b1c3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:VI1PR0701MB2205; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2205; 3:0pQkVuhJdTPgRUCg+gdnNq6va1A0/ZIumXKXr/nqAexJKOHpgToyEG6bkOIMnq3VKiAZIKr/FFL7dqKcuFwYbeU6pOO09UBHtAwvsiBzw7EewHd5DsO8hzpAM4mUyjxZPfyz0qIW9sG1EdHl3SR4vDVC/2egQ6xsWQwHpve15qnvaV5xK/GITEkr0mksGqKEUlEWo4sbJHjr5DlYUr59BVHSsppFkIqTw22wKZLd6e6ALEEiNNOaQsvcy8+OEESOnR7vJjIHPk8cL9bG1gEMOJZg6WB6oK7Qn3qjkL5OHytTJF5FS24B3V3xfA/GT1yNUdSDBNdod5SKF83Butl/3iWHUneNDGk0WxynO4BUJmNFK/y4RZ4suTtEezty8FvrMplm72431vdgNLxvB3sndP5F3GCM7nEfKVbfEzTsiBH/sxLWL3pVwv+QXEYjVOVP7gIvdVRSbIQVYXyTliVh3JNF8xIKGc1W5CvULXP3DEC+chEJRVzHKcMdD0ahcS6F/4EnuwgF6o+aYFNkxdkM+BTjlRSVDqS1k1bZWIaBvIYuDtV+ZeEeDZxjv/P2JNsfNnKKzyS5Xxymj8DhU5OKLkxf5jx+2z4GO5NoKYlWes4NGmM9MdkFXpL8tvhOpNa1aJW7GJhGdPkr6fTo5iGB8nRtLh+b7HNAFkWapU43KiYXiPkyxtyKReT4W0J62XQeulHFPK1j/+ip2kk4eyGcwmHOSyUSliDeZ7RviP4LZ8vwiepz9OLF72ELZ9MVWacljwNxUM0aoPq0rGRNjwz9oQ1DIGrcK+siusVjmB3ArvdhLvWh21NBU4vUyEcY77SVzcUNxy4KAlcnp66gyraw1yTL9AuR+1/2TfVD+vfFO7Wyw29fUkQ/3QsB5UCHKezfC1pQOd0wFUJJZzzF7jKIyQ== X-MS-TrafficTypeDiagnostic: VI1PR0701MB2205: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2205; 25:uelTpH3Nm3Po4U7ufUrP9lIliMBf8GRl7cnXfbhltPgmMbczFbFioneHDYjtC6pjaENbzqjvWnDhKkdX2vY34sJ4geqUwlDIQaHoDRv0mDou1pBqiqRK062CYp4B1njzVW1AwWsEue8ibRd+qplmiGZ6g3Sus5o4SPqD1s/+GRTToYjfzYPIwsgay0n9PoRVTkESawmp4d4ilP9P0i22ZHpoUw5Z81ks60JuQzwGJpLqiozHNq6fx8lwIYKtDePz2pnrjzCZCa0mzV7uPMU3LW436O2eBxJ8GYOwJenk+16oxTTU1xEqVCFXm4UBjaVMyi4TdJQ+2CXJeoxlXhrpNc16cq1YiJvNCoX8Kfaky17FEstpCGOAe60baxw3RON7OmlS9MpwP9+lkM0FVJeO1JjijGcW1vcFz30mS218ub3hColQlagfkmyvsapk3OryPBU4iFtS1u6jeUYcfeg6elc2VLJa8C59nPEhe77lYntgnaKwGJpmyr2vDfV5F8rSEixFMoiesiRTWWYas9pId6J3vEx7DG25aCrww31mRe5AtevFvtcrgDOT4lLrm0WQMIM3/UyrTvS8cVAj+9+Qd8V7TmA+VH3CkN9887CCFcDNIpZTkgaqWURIVooULYCUiToNxxAdko4uk0ISJ2u4M8tlQkhYNqroN9AGpnIoj5o4gksXbqMIhEQv77Rq+zsDfjN3ZgLh4R9nqLVRUyyo55OGJC68z2gFe2Rq6wRDrOTejvxsRL2TK1WItb4RCqK5Fl0fFc5tsM0Y+wE/zasPixWMO4Y/bumUm+Iz9qMzHVOqwonJm+oQXdfVsD/ugNH5t6zhKW2pVK239JYhciHVSpGy8urVpBo41N7OL6cZ618mFSH/SjNAAFWjekGZwSq/aUPU1IaMgu70O2PP5R6LSHYFYakRe+GWlvOXzzZvWkc= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2205; 31:n8LMemP+I8woFTf8LbZt1K8rA2p9QQLsEijCD0YZGh3/JCpXG2TDlgFyYskpxYQUsoQIqECwGoCIwX+ywPazuNVJvZL5BxSLKL7yBMSqNrC3myo2YsxN1PJDtYyb62dfPFSZRVxBpfX1D9auHXKREmrkqi2H8t4DI1djxwW4WoZwVn6uB646Dv9Wl2lNImaJS+vC83xYlG7cGSRlpneIF7U+jGnGS+0ku829hhTBdfrnd2pPHJNTB5q9EHFmQ27a1VBUnq72tuVRgfc9eOcssS8MsYW85xw6+ZCQJ7/fSZhC4Hw16+7NuxTT/sgrsC7KShU66dG5MyLy60+QE42dvJuU3a8RLV294T+ysnOEjHmDY977SBvhGag3VxldgeYyTBD7lDhmbomWMRHIIQxfDKzfN/gL85ITDiq/mg46jKNye9v+7JzZ4YCseK1xy19AZ8Cl+x/qCg5IUrCyTWWGhiLetIKmEF6xli071zfz+aEp/uPSLlq1NkcGQvsSVpP9ho40M5ut9G8T87A12YR3t2XmRKX8K5lzuF/npbZu55qehZq18D9j38p53bWEheDCWg1YKi9gE11COKyj5mCrOtw8aVsnYl3s9Z7BYxzgDYef0LhAgL8/oEaohliGTwMRIUfE5b6Y6WYkS8+tTHYeZBa23NCqL8KjATMNMqh/pxL2pjVVTn5mXynRkh3a80vg X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2205; 20:FhhN3slTdYeULZ9lem+gSxlOp0yhZCpEanQfVn5TKBhR/U0F3ovxhktGkCspLB83jOrY494pk7DJ4DcKiGFfqV3T543FjP9nKJt7AlkODga1WDHZG77E1Y2/eWwP4Pt66UBAsMEm/uzHoTnqbmSq3eR9hpnycxjviHfeA+Kx507vdEULUFIsoDkPQB3DWQfv0FmE2wGTCnt/eMYaWP9flEcVHGnOOvn/hmltdpEZR6VNTCQ2SInVjdjhFozoFEyvc1P+hzi7meHUz5bpwi8JeLh1VCuIR0RVyxS8SEt67Xdi2OQRFTJVbiMzCzP47ViQpmFxjGXXFeSLLZslyH65HeyTqCjK72f1yL6JrCVupqzJDvjoXCHjuS0eSsgKQwuJ+v4smZEssDt+SEZRWr8znZFR/Q3Nz9h+c86EjY7kcFrqHvQybgc2l7cInRNXKGE9LnHb4RbwE1n3Mt4g1jrJKvY3JiPJS8iyqu/Z6Q+ZDPrJ6n9Xk2CmbRlMbK02xgCX5BrJojSZVlyHYxDCsIX4mPnlP7GtfP77rrdRtR8785c3lG2em7kIi27Zj5L7/2PXRYnFQgIQg8R/6ofkVEYZtVNZyWAukQgwbfFmM++p8ug= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13013025)(13021025)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93003095)(6055026)(6041248)(20161123562025)(20161123558100)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123555025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR0701MB2205; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR0701MB2205; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0701MB2205; 4:wTmXEpCpOzJIPySkR2Jo7/MyTo9lU9baB4iFt5G8?= TUIFsg7fmwOtLb+KJouNqzyAWIMPxijXDgETcmky+7g2WEUUZoIs7OOwdza3zGrBY4A6jxUQ96wH2FNbl7Z/3ZvahkQewCyq5rqeVWPtZHch/iVU8qcjjZ83XXfRS0ETgsNb+UgD+UTOFk0+6VKv1TG5udQ2XAB1WzPa8UTeIdX1DsYAqe3aRagP5iIH4PKLfe7k6EmwW+fWoMbHi3z7SXa9Z9lf1XDecVz1vT2LF7sOhxr1IwEOp8/wmPSURdhUgDdKiFx+40VLnBAalgEuQAV60bPE+iKZsaK0fnEMjkiVeS82asO5gAjWtFkaZX9gFa7SOHeCYolAM2hfpJoF/QaXEYdladBHWlpBNLBxSohlN0tDLGupgaDtn6cx5GDC5kT2D25Sf6wnA23XhujH9a5ryV7G5DGEsY87Ihocs/+zwi58vO+GAcsjLKUr3jEnNnqhnx8AfhcHZsG6dayxQT6mgd/OlMB7VFQl8UZhX2Sjph8rcCdoPXYy18VANJ6NkPVtnGM8NgJfcwK8lcCnerRdnWP25fqQ4vxrCv0dSOrQIWauPhbmwA+klaW9l1pM5SerQAKy2i7XK+cerEU70SS+IJlpZ53yXGHRetb24F2GPZaLPfuOnypLalSjgkQG1z1UNYeywfbTtkELgZ7ONcRSO2rjESulmZS8DXWtuBsQeYiYHKPGPy0GmWfy5tYjTrHr6N0mMTJJgQ3Kn0zrjd4kUJ0yS/wrdrKymnkIiHvfnv4Ipc9CH9e7aHiUIpxVcX8DN1SGhgXpoxZeHsOe92pqHbbqXbatagYXvrcm9xDs9SI0q04D5uNpprSWk7DTeuza7y4YO90d3l+CV979pabR/3M8Y7c9eLp9AWHIt6+nafBSy0KAfcwHQy72LkM+3UewdF05Jr9F4bRvxdXlvhg+btWWQVRzQlONINjZIc1wqH9lCf1Dh1bXFXYluzWsa0CQLxEfZt1RkHYOeArLB6J4e3JgkI9I2+/W1QhAamsY/uXRwmjtjSZF+yMFukZbcCecIH0uuYiPMZ8i1toUsjXp06BPQcBGOXZUzTDauNSpg8gYtsRSR0844EnETbvLaLS/Pljk1O0ntS6WnCdNBJMR0415AEZgAhd3CiA3dmLde3fSEpaVhMu7eyREK/zQrrTxrJ43yQyEH21vxLSeLZLD X-Forefront-PRVS: 0358535363 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0701MB2205; 23:Ly6LT6TWdbu26GCbCP1aTiupQvOcf7zWNXYNlpo?= Gwy25Lu13SURaVOGiK0s3JVPfOOAguh+P0BeF3mEgadgETVcq9DORNmwiKFxZDqsEGrGq4HR3UGCuan7GwpkuorFZBA1Ou2u93ahTjWrbVJ6nwfAJKn5dJRWoPaSeaC1JZiV7io+VvcOlXjaZt5JxrB2ugLH3Cey2aJ21SeKpPG/kJ3W0qRrs9peaX65x00LMIpuLjFUDycvFDTPSNR+3Mxiev5TcUiCyCXK3wXogenoxcPNr0S7PVFb2qvRT/yZw1rBI48HyC9RCcZFkubSmtzBybIshCa8tELylqUMtzUex2Lggbp5Au3mMgGbY3jJ64X2vi7jWH29LMgcskIEZZVSr87mn2sCkHWVTQ7C+WlTvpLt5lXeifW3N3vbxK/4Ahu1xaojFeh8WE80H/zbi4hF7t7LJ/mqf+OxDJ617vT04nXXJgGT6X5Wbhltl9RS2J84+3OCmetPewcaXV8mEXD68iYANe2ey0uvR0Yatc19Zzc0sQRnvfJow5r1U4ng5oE3KdeYBXTJMl+Yyr85t3tG6MlY7XgKXSg74JJYbuim9CyD6gebgyxWdqjQmkI+Z/uAOxLzm+kw3zCTCTTntEOsczuasihdxnSI54mPbyZcL8Fu2K7XbB8Hktgbi6n7gbJX6lzQAx+Z7MLG0akicDo2bmKQHq8SHTnzcxgJN33UOF32/ITw3yYB4uCKSlczzHmqC3Q5oQtxVrpr2QfI/wBgOjBzTKQLVAd/6DwcDv4rf1Rs6WmQ6bcI0t+PM5yv8gtU/uLbrSTMFTrTkVkLs9urbY/02sbpaVP/DatEMATvtHw0d06DWe9smxYOE8YBeGca0otvY53oQdEppPOOMdmicoQ6uqTgY1lLHdTxiUvPAuR88nwIXWZl3cjJaPAdWEUJ2I+Z32KekjgC5aBZ90o8/n7YUuoesVMLbLzSU/kOWzct9XL47IjFRngjjeFOG+62G73fYbKLGfJnLK6KpPlF5mbz3WmckeUqImfaljrGHUfnGAbtf/VxyLvQMFJQPEZR0J76x+ZkkpGtlQ5F3TIGc X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0701MB2205; 6:t5WpWe3x1KHN5QQYqFdNkBrlP4M81dy0fqtxdPoY?= 9HT4a519RkVMrp7UB3c8Kn02D3kM/Rb3mcfbvAIiTfNkeYzzF5fXLyLXN44rbrcuTLSm+TGi3lflFBWxgGxy/zKMbC/nBZnQp42xw0CFlTzJdpe/YGXv6cevR/iCEABq5VOR4cbZ1t7hcK0mUgjeTrvFAl6ylvUAa0KnE7OqndAF+8vzOTE+kt/tf1ngngBoMpOu+loyDfSXWYDHWmY6fL8elJ21crRsI4OuqJHbObp7k+zVh+fpEZNWum60LJbZCpPZguTjoDlNbtUb8XQxiDudwpWatg1jIa++KAowJ88+1aZ+Oq6lmiqrh2dyX1Pq7KPw2imsvXemImpXphpBfc8QVKsOE0Pjp2yXgJOHfUoGmnZ4nCO7qvklU9VYtFOJcz47W6jGg9e+7/bHXMKaaHmUr62ObMlZ6k2dmrqOXi9oHJFuu9A0EEctK0j+Ql8Zn5RjslwAXua+PqmKyVc4Yetey9Kpgq33k4s9UKORXSX9DjkqPA4cXVuI9N56FnHI0VmMQEkPylzdeTipZX9l/4svN2SUpZ/1upHnRs0EnCi0Gpj/j61pjl/VIKh4tMxuWc2Adh0KvebsHHIP6xlOuDaTs2LEJbs0IAlYf0VYf7ByFJ+irTOWd3zR0f9g/7CIG7gg7/smPQt/Rl9tHAw1BdHATNiE5Sz5HYyQm2RLJ/3b7UhTa4tC+8DESLUCb9/gVLTwZ4gWBiJiiaXfGG2nx7Cf9vbL2JsiKExd8jbdqqSgNqXJ+JIgPnrDduD65uVLU9Rdrz4ijpLHFsu2svVPhM5/I4o8A/U4+HCKq5/qEbOPXR+HBtlkLFeqSO/ab+aw9gaVgTWloh8VpCwIjjatjnekb/mJUH8CZoLMgZAdXyesp3aKgS5s8+KUa/yHwY5igmSa+bkoyBuHNCuFdpnkx2SENfSvCDyMKu7T7lRkiZFwQZxW50ap5BWUtpW4DkD7ctE0vD5S6LuEyUeXe7JVfjn3m9o0NAcVGsyFoe+BfzifbQ== X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2205; 5:GUbesqsjxqnevFAnE2JavbUFF+tkzKB+UI4uA2gbfVR9iKuZTmyZ0EeKfR0Rh5K/VzlDO8XQ1gFS9kodhr14erFjDbqy8nFTTJpoo044Jp8osd0JpbgFtv/79qUCgPl91PN8keY4/fnkZt1aZhsJWn8eJf0cCFjKIfijPnx1zShNAEUZVb70lEYIpa88ctUzyA56V1Ga7JG/NwaTF30KzZ7ALPhrxkgf/48YcyDF0D+F2JbvwtyDA/mmXfKfJqzI3XXhcmSMKtnRJ24QL+dmf2oUDor81UGPiPnWEOmGXAF1+7JlqGrpit46AH6TmD142aPHB94cQWZzU5qbycM6RjVdzRCyG6H3ihUIT2BEyc58V2Z7gMECrXjSIllUSOtiB4T4XXNAlLMffygifBtHNMFzSTKsF9THkHJ3KyWLpTeSk39a5etomCiX9PjCM3cv7tsiRZpiL3mDMM924yn2PrkRi3QomePX6ToW2Dql8x3o79o4P9j2TLUmQPG1+kYu; 24:yxLiJvOaTQZ+5Wjk3yUC7F/qoT3YL1Cl99Kw2YIqn1uerKv3HZfizYIDmRXwggFPY59lgYzIF45NIWKkOg+71goVQPhaTdj1qxZnfe56/d0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2205; 7:TWH5PgVOcdIb1/lmCuqHj0Apt0Ub6ddnriJyd3MPbiEMRIBTpU/mrnNDzWvrxF9qKNoc9kxQfnHmx9l5ol2DN0L0DCfsvf2lPdaTmM/ujLFspYoGCokYOOlyORjH+eHWSjEpkCtYPaAiLyRnDnIBnSj37ATDDJwAPP8tiSNQ4c1bl4I2oNZMhRVoCyBs26YC76jdIv7XpWuwcbBC2AmbpHMwlltVvmDJntqPiUfp1vKIZnkQ7B5r19LxCVhdruNNnQ3EbXFlirJ7eSkiwK0BhC+lOmksoJUwFhX2/o6/+yhJubL7GSC2/TD8RhTGKU6l7BrbI641VEUtmLdH4YAnlmP8RCdzPZE2YaMw+/dO4t+FBIH+fU+DxYDtnHCnF6y70VfGgrDoovRWqCLO3fwry4oa4S1ci31NP/9eMzNC99UixGZT6sfG8z6Sl5yYogHVpgRl/8vv447iPsB9hXevAXWAE4icPGiWBvQD+bDTVReH96QzMwJ2h3teAGb/Iq8ruOUCJej0zZCASZ4Ge9uMrbTXHM+G/uoWv136BxfOOME6adU8yN4HTyEaSDRLKUCZ1GMqoaiR8eO29y8J1A8ErV/W/TpSSLDLoRGDw55rxqhOlFQNNr9Dk4bTP8gbsfnYTMT07ShD7wk50jtTFSPaRpikGkO1Mjg3sVkaWXyPtHV+I29h8ZRCNEhTfW9k/x4AvK+JE8GeDw1CiffLjtpknBA7kAimbWY/AzGBNR9cyU6p7tS2yLykIou8uwrVH94RdKOpLK51BuXStDcrA5HnFeqrE8NYGoA3mU0YObpMAYY= X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2017 09:54:42.2906 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.240]; Helo=[mailrelay.int.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB2205 Subject: [lng-odp] [API-NEXT PATCH v2 5/6] linux-gen: queue: combine queue interface set functions X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Decrease queue interface size by combining four queue operation set functions into a single function. Signed-off-by: Petri Savolainen --- platform/linux-generic/include/odp_queue_if.h | 16 +++++------ platform/linux-generic/odp_packet_io.c | 38 +++++++++++++-------------- platform/linux-generic/odp_queue.c | 34 +++++++++++------------- platform/linux-generic/odp_queue_scalable.c | 32 ++++++++++------------ platform/linux-generic/odp_traffic_mngr.c | 6 ++--- 5 files changed, 58 insertions(+), 68 deletions(-) -- 2.13.0 diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index b5cbd515..7ba5c3c5 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -66,12 +66,11 @@ typedef void (*queue_set_pktout_fn_t)(queue_t q_int, odp_pktio_t pktio, typedef odp_pktin_queue_t (*queue_get_pktin_fn_t)(queue_t q_int); typedef void (*queue_set_pktin_fn_t)(queue_t q_int, odp_pktio_t pktio, int index); -typedef void (*queue_set_enq_fn_t)(queue_t q_int, queue_enq_fn_t func); -typedef void (*queue_set_enq_multi_fn_t)(queue_t q_int, - queue_enq_multi_fn_t func); -typedef void (*queue_set_deq_fn_t)(queue_t q_int, queue_deq_fn_t func); -typedef void (*queue_set_deq_multi_fn_t)(queue_t q_int, - queue_deq_multi_fn_t func); +typedef void (*queue_set_enq_deq_fn_t)(queue_t q_int, + queue_enq_fn_t enq, + queue_enq_multi_fn_t enq_multi, + queue_deq_fn_t deq, + queue_deq_multi_fn_t deq_multi); typedef void (*queue_set_type_fn_t)(queue_t q_int, odp_queue_type_t type); /* Queue functions towards other internal components */ @@ -90,10 +89,7 @@ typedef struct { queue_set_pktout_fn_t set_pktout; queue_get_pktin_fn_t get_pktin; queue_set_pktin_fn_t set_pktin; - queue_set_enq_fn_t set_enq_fn; - queue_set_enq_multi_fn_t set_enq_multi_fn; - queue_set_deq_fn_t set_deq_fn; - queue_set_deq_multi_fn_t set_deq_multi_fn; + queue_set_enq_deq_fn_t set_enq_deq_fn; queue_set_type_fn_t set_type; } queue_fn_t; diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 0d825f91..6a181f53 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1154,30 +1154,30 @@ int odp_pktio_stats_reset(odp_pktio_t pktio) return ret; } -static int pktin_enqueue(queue_t q_int ODP_UNUSED, - odp_buffer_hdr_t *buf_hdr ODP_UNUSED) +static int abort_pktin_enqueue(queue_t q_int ODP_UNUSED, + odp_buffer_hdr_t *buf_hdr ODP_UNUSED) { ODP_ABORT("attempted enqueue to a pktin queue"); return -1; } -static int pktin_enq_multi(queue_t q_int ODP_UNUSED, - odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, - int num ODP_UNUSED) +static int abort_pktin_enq_multi(queue_t q_int ODP_UNUSED, + odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, + int num ODP_UNUSED) { ODP_ABORT("attempted enqueue to a pktin queue"); return 0; } -static odp_buffer_hdr_t *pktout_dequeue(queue_t q_int ODP_UNUSED) +static odp_buffer_hdr_t *abort_pktout_dequeue(queue_t q_int ODP_UNUSED) { ODP_ABORT("attempted dequeue from a pktout queue"); return NULL; } -static int pktout_deq_multi(queue_t q_int ODP_UNUSED, - odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, - int num ODP_UNUSED) +static int abort_pktout_deq_multi(queue_t q_int ODP_UNUSED, + odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, + int num ODP_UNUSED) { ODP_ABORT("attempted dequeue from a pktout queue"); return 0; @@ -1272,12 +1272,11 @@ int odp_pktin_queue_config(odp_pktio_t pktio, if (mode == ODP_PKTIN_MODE_QUEUE) { queue_fn->set_pktin(q_int, pktio, i); - queue_fn->set_enq_fn(q_int, pktin_enqueue); - queue_fn->set_deq_fn(q_int, pktin_dequeue); - queue_fn->set_enq_multi_fn(q_int, - pktin_enq_multi); - queue_fn->set_deq_multi_fn(q_int, - pktin_deq_multi); + queue_fn->set_enq_deq_fn(q_int, + abort_pktin_enqueue, + abort_pktin_enq_multi, + pktin_dequeue, + pktin_deq_multi); } entry->s.in_queue[i].queue = queue; @@ -1401,10 +1400,11 @@ int odp_pktout_queue_config(odp_pktio_t pktio, queue_fn->set_pktout(q_int, pktio, i); /* Override default enqueue / dequeue functions */ - queue_fn->set_enq_fn(q_int, pktout_enqueue); - queue_fn->set_deq_fn(q_int, pktout_dequeue); - queue_fn->set_enq_multi_fn(q_int, pktout_enq_multi); - queue_fn->set_deq_multi_fn(q_int, pktout_deq_multi); + queue_fn->set_enq_deq_fn(q_int, + pktout_enqueue, + pktout_enq_multi, + abort_pktout_dequeue, + abort_pktout_deq_multi); entry->s.out_queue[i].queue = queue; } diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 60f88f09..ec225d00 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -748,24 +748,25 @@ static void queue_set_pktin(queue_t q_int, odp_pktio_t pktio, int index) qentry->s.pktin.index = index; } -static void queue_set_enq_func(queue_t q_int, queue_enq_fn_t func) +static void queue_set_enq_deq_func(queue_t q_int, + queue_enq_fn_t enq, + queue_enq_multi_fn_t enq_multi, + queue_deq_fn_t deq, + queue_deq_multi_fn_t deq_multi) { - qentry_from_int(q_int)->s.enqueue = func; -} + queue_entry_t *qentry = qentry_from_int(q_int); -static void queue_set_enq_multi_func(queue_t q_int, queue_enq_multi_fn_t func) -{ - qentry_from_int(q_int)->s.enqueue_multi = func; -} + if (enq) + qentry->s.enqueue = enq; -static void queue_set_deq_func(queue_t q_int, queue_deq_fn_t func) -{ - qentry_from_int(q_int)->s.dequeue = func; -} + if (enq_multi) + qentry->s.enqueue_multi = enq_multi; -static void queue_set_deq_multi_func(queue_t q_int, queue_deq_multi_fn_t func) -{ - qentry_from_int(q_int)->s.dequeue_multi = func; + if (deq) + qentry->s.dequeue = deq; + + if (deq_multi) + qentry->s.dequeue_multi = deq_multi; } static void queue_set_type(queue_t q_int, odp_queue_type_t type) @@ -821,9 +822,6 @@ queue_fn_t queue_default_fn = { .set_pktout = queue_set_pktout, .get_pktin = queue_get_pktin, .set_pktin = queue_set_pktin, - .set_enq_fn = queue_set_enq_func, - .set_enq_multi_fn = queue_set_enq_multi_func, - .set_deq_fn = queue_set_deq_func, - .set_deq_multi_fn = queue_set_deq_multi_func, + .set_enq_deq_fn = queue_set_enq_deq_func, .set_type = queue_set_type }; diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 7441a2a9..14fa1833 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -937,24 +937,23 @@ static void queue_set_pktin(queue_t handle, odp_pktio_t pktio, int index) qentry_from_int(handle)->s.pktin.index = index; } -static void queue_set_enq_func(queue_t handle, queue_enq_fn_t func) +static void queue_set_enq_deq_func(queue_t handle, + queue_enq_fn_t enq, + queue_enq_multi_fn_t enq_multi, + queue_deq_fn_t deq, + queue_deq_multi_fn_t deq_multi) { - qentry_from_int(handle)->s.enqueue = func; -} + if (enq) + qentry_from_int(handle)->s.enqueue = enq; -static void queue_set_enq_multi_func(queue_t handle, queue_enq_multi_fn_t func) -{ - qentry_from_int(handle)->s.enqueue_multi = func; -} + if (enq_multi) + qentry_from_int(handle)->s.enqueue_multi = enq_multi; -static void queue_set_deq_func(queue_t handle, queue_deq_fn_t func) -{ - qentry_from_int(handle)->s.dequeue = func; -} + if (deq) + qentry_from_int(handle)->s.dequeue = deq; -static void queue_set_deq_multi_func(queue_t handle, queue_deq_multi_fn_t func) -{ - qentry_from_int(handle)->s.dequeue_multi = func; + if (deq_multi) + qentry_from_int(handle)->s.dequeue_multi = deq_multi; } static void queue_set_type(queue_t handle, odp_queue_type_t type) @@ -1013,9 +1012,6 @@ queue_fn_t queue_scalable_fn = { .set_pktout = queue_set_pktout, .get_pktin = queue_get_pktin, .set_pktin = queue_set_pktin, - .set_enq_fn = queue_set_enq_func, - .set_enq_multi_fn = queue_set_enq_multi_func, - .set_deq_fn = queue_set_deq_func, - .set_deq_multi_fn = queue_set_deq_multi_func, + .set_enq_deq_fn = queue_set_enq_deq_func, .set_type = queue_set_type }; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 8b5f3187..1f254d75 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -3927,9 +3927,9 @@ odp_tm_queue_t odp_tm_queue_create(odp_tm_t odp_tm, } tm_queue_obj->tm_qentry = queue_fn->from_ext(queue); queue_fn->set_type(tm_queue_obj->tm_qentry, QUEUE_TYPE_TM); - queue_fn->set_enq_fn(tm_queue_obj->tm_qentry, queue_tm_reenq); - queue_fn->set_enq_multi_fn(tm_queue_obj->tm_qentry, - queue_tm_reenq_multi); + queue_fn->set_enq_deq_fn(tm_queue_obj->tm_qentry, + queue_tm_reenq, queue_tm_reenq_multi, + NULL, NULL); tm_system->queue_num_tbl[tm_queue_obj->queue_num - 1] = tm_queue_obj; odp_ticketlock_lock(&tm_system->tm_system_lock); From patchwork Tue Jul 4 09:53:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 106924 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp825798obb; Tue, 4 Jul 2017 02:56:37 -0700 (PDT) X-Received: by 10.237.46.225 with SMTP id k88mr28259234qtd.72.1499162197209; Tue, 04 Jul 2017 02:56:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499162197; cv=none; d=google.com; s=arc-20160816; b=FbEUMYWb+mhY7ikD/lYbr9Nffb2F7COTsIPkmFE6KYnzIKOVhYcWokupPR7jbEiLF1 JcsRlyTr6XImcxw7WU4XgFsRhOjPXxOZNeySTqBPh5oVtEk+I7ocO8NZ+4wjTD6vD5Tk V4x2MMssxGyBbke9Bs7yLEY4MqVlcSv5DiuLFICOON8Op09CTQ+v9foPOFK1vuzFYK4b EjNy2O9IQI+aeyWmKlLl7qRokKIraTgr2pKTo5HHAsr/Zf6ghpDpB1kE7qY3JFApe+3k Y8cMRZf2GKLbCNJMnkeyZ9W7DIQ3PoJXIzB7FJ5yp/hMZLk0It9yclbyrMFHy3MS3isU ox8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=+xpHycasA9GKJcUcg0BuaqAoKpE58dGHBrnoqUkI+oE=; b=IcoPNNLFTJCRRMFp2SFudB6V3r8GzvA9UrXSxJErbXi1QV1cwd8hHaG4OB//S/p4Z5 9sNQa43qukXYDAUpplXlagONUa0PjO6Xy8CfRQum8k8Ghztxj+EAcmgxRKiSrduXpqXO I/Hstcv9aV+D6tsKdP6R9Oif8PiKBoLu09+xSxecvHgSjTcpWsNQfyqOAMil8crdoxTf vIBewOgd8WRxItZw0LAuumc3xRMsr02RXrw3D2HxAIwXpm02H/Tzet1Ehi5ztV1TD1eo lk5v/07YDc+NX7YqeOXVqjB1Wq+Br8y9kmWE7jJhx5mU/YDFz07TRdy3NNJYraHWi0s3 UbDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id u18si9012489qte.125.2017.07.04.02.56.37; Tue, 04 Jul 2017 02:56:37 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E1A2E60C09; Tue, 4 Jul 2017 09:56:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 8DC7D60C0A; Tue, 4 Jul 2017 09:55:44 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8498D60A45; Tue, 4 Jul 2017 09:55:35 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0103.outbound.protection.outlook.com [104.47.1.103]) by lists.linaro.org (Postfix) with ESMTPS id 6D702608C8 for ; Tue, 4 Jul 2017 09:54:38 +0000 (UTC) Received: from VI1PR07CA0007.eurprd07.prod.outlook.com (2a01:111:e400:533d::17) by HE1PR07MB1049.eurprd07.prod.outlook.com (2a01:111:e400:581d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6; Tue, 4 Jul 2017 09:54:36 +0000 Received: from VE1EUR03FT045.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::204) by VI1PR07CA0007.outlook.office365.com (2a01:111:e400:533d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.6 via Frontend Transport; Tue, 4 Jul 2017 09:54:35 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.240 as permitted sender) Received: from mailrelay.int.nokia.com (131.228.2.240) by VE1EUR03FT045.mail.protection.outlook.com (10.152.19.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1220.9 via Frontend Transport; Tue, 4 Jul 2017 09:54:35 +0000 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rj2r022589 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 4 Jul 2017 12:53:45 +0300 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v649rhtk022443 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 4 Jul 2017 12:53:45 +0300 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Tue, 4 Jul 2017 12:53:43 +0300 Message-ID: <20170704095343.4266-7-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170704095343.4266-1-petri.savolainen@linaro.org> References: <20170704095343.4266-1-petri.savolainen@linaro.org> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.240; IPV:CAL; SCL:-1; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39450400003)(39840400002)(39860400002)(39410400002)(39850400002)(39400400002)(2980300002)(189002)(199003)(9170700003)(2906002)(356003)(5660300001)(6916009)(2950100002)(8676002)(50986999)(76176999)(626005)(189998001)(5003940100001)(77096006)(8936002)(81166006)(50226002)(105596002)(305945005)(106466001)(36756003)(86362001)(1076002)(50466002)(22756006)(53936002)(47776003)(498600001)(2351001)(33646002)(110136004)(38730400002)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR07MB1049; H:mailrelay.int.nokia.com; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR03FT045; 1:udTqRFXlrdcwQblDMyJZRy00GSHwHyCq32huR+AJAR6wsbXYNNR+ScEq13hCPQJNIxRRSbUAE6vWhBUikktdtRudtKh5CgE76iU5ZMTc3ZAC32pJrIQCv3/csMfOs6xZEGw6JTG1v0Pxm3+vzE2chaI3ILGVBFNfVCRd8x7bEAiK+DWbzKf1ouetB5hihnQJMGOwdP4t18ZiCApaYNan2wol15il1k++Lvbah1EISGx3VbjyulaVjA5wkxtrX16tJzj4gm52LfszyWb5WESXNsHwrn+IVgfuJNMsw51HZYnmomwtW3E1ww6X1dFBPJHw/WrL1peP9+KIAj0Or6/4mEmipAzjDZmEKqgn9m4xS/xb/fdI3xbUPPcP7PBddC9ppdk42h8TAmaLJg4YQTMzYhRFU7SPmMbdSEKyfA9IsTfGDaEPgTgHcftMZ+tAlX+slE4x2wCVqePcn08THeknAoArgCb/TupAnq5vze5hnYO8B8Wdch24GQijxF3lrJl+50TfILJTy0ataOh2+oX3T7mCGswjTMtiiaplOmpiAIGI/szbEpg8xUfHgaeWchPiUPWOI79yvVOR3cIn8b5FOh9pHis8FF+6L66LnKftTyHxJ87Cwyjgp0BSW+tc2lriRQtOE/qMH8wtgo5aCFJ/v5DIBooORapF7nms9AYkENlPJrACxjOquxo9XniLHJHBkvpxPRyQ2CWvpyH/ejmAR5bOvcX2dS4j+rBCb72as9otcqHiOd8fLwT+Ztw8T/vX9xZUwzwvmk5YW+yz9nFwuQINbqGrtj9G5xv2eQxVeOGGpqBC90BI3tjG851ziy66yNoM/rc+4oDOO1iiZclgbThpiLQCEi640guMPbjhGqkV/zvSFmD/3vaCgrPQhb7m MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e24ad74-51f0-48b4-87ad-08d4c2c2ad88 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:HE1PR07MB1049; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1049; 3:fBV5TMmKdqmmpO3jWmSeVtgu/cPszuK3RAod/iB7pEcKp0GTVSDa7OlscNIhbkWYyNea27ih/RmIPyhfKszAmPdddGxRx8qX1tQfzkqB3UPnGfy0Q4ait+7wSqeSaCSsjis4znpLNlscBC51s0H7ntQ4b2rGRrNPn2Y3MzBZRnIDuZzhyBtQYPtmqUOk0YQ4f6/uWtvAz0wEvp5tSjlLNYlUrzg7Pd2gGRuZ5g3yBELaoBP30oSADywOmSOPtBztBTAl1eP1UWRxQ5fLFM+U+f0BF5noc/VD1EkiNQ8GjGWFlNmke1e4rvx8eo7Pt66m95UdcPDveFfGKlfqN/Hhor3q6FgjFUIKfI2pJn5EL4jDYkkY3rj2TVygEPt4MIHwBeUldDQ6S80KcRwZv+o5KVBOyiiDpPa23GueI8XacYHjWEFX4LWbJLUzbC3jf8Dy2osFd/UjrzB727De+AO2c8cUlWYwBumJc9t15M2gJsWjKD7R94/YvgZcx28+Oyeq/3T+Z092c4fF5Jgy4EO75Sk34TrCbQy/9cWk90TNgr0BH2V5VShWVhVciHAM47hyyQuzkYz2xBzW6vrcfIf6qWYSVFZGiBJeJuGrfRLyYyWe7fcSjSC/yWGiCvyBBN6N7Mt1FJI34Vb7f0WvCb1yL+3jc8sHOWU/9TFttMCxbctPCe1Zt6lCcM96fh+Esy42D7M0ZqXnUuA+SIGJCzM/fGBAg4U8nXX+GzyzQxjb5b1VpU2qVjSkue1sG4XfzYnt/I82R64SlOld42NHMfHAMBlOuB43va+v6QqjAXc94a9PA3ZpjCDxxqQJVCdfw020DpblYMKP+zXXXEK4DyFE+/CXvDxheMSgF0UKzd9vYpJKkx/QO/6Vdn8qQ4BUuBuuXc2KNvVuDuRwDhNB7w7wRw== X-MS-TrafficTypeDiagnostic: HE1PR07MB1049: X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1049; 25:hgo2OhK3mi5yEjVcVVFj04eEJtgdYjY7af7nhAdhY0Zk5z5usEwc2XUnj9JrglajZp35vgnGJQgORnwxcIDZELhRqw3f01WTYAMx2pcvIB/gORGLual7A+qlOqddX2+MAOUkSSvlJfMo6BVs+ZjERr2KgmaRIVyIpKWAbYnB6H+cIdr+Rva96WlMnNWT/Sf4IaZZ64oBywL1JT+PpSnZUSclQWJA4XLEKL2qK/dJSaVnn2dwuMPqS9AjKmLZq6COxaKC6RNYSDwHOhUwNAh9bYVGj417nn2XVj8tN4eGjyTNM3IhvXuxIgJ0TQlOIdt0+p2Rv05b976nx0hVQyh9U2NAROtZ9shcbhH9KWOcH1VfV7R2CmrK9xLAP1YuWU6lgE2ITeleW8j8+cpNYjhbJWFl8T03oRQQKOb5SD6nntbt7OhkrPSc9UaspqNxw7BKCgpsziOxfqRvyGD+12pdL6izqGs0LdDZ2DvsNe4kdyyjv88UhikV9ycSTBrfmjvNpvnDENhfl/bwxFj7QFGOVlmnnIkriyVaYq/i1lV4dRCXHTkNfF5eYBo8W47zvHraaeUt1xoKkygdx8NVzzsO5YzZ4vDsQyn+mYQvJr5VG3sRZXx6de+GvibIy3LhbzBVq82yux7A3+Y2/Dv6mhh5F4549zygCmjkrMf3i3gb9NyPvgLwR1i5HUvx2Nlz2DgrWiFV1/C96GzEKI3NHj59AqkYbnAk+dqVg3qMhhFRcasZrmr+FW5bZNm07xBoDVzJjpMC9TkY4vXaHgpcAmkTCmKif+PuFSWueyxw3VROYfyiBd+vft3k6Ski/NZG9MSOeyNarRAYb1XCyWBu9B9lhVlyIvbL93p4tkEuTjbfWvThN9uJ5DwjJdol7SHy9pdR58W9lGtI1iF3pVDjNd/i8k/ZRJ4HctPwO6UR1tpoKow= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1049; 31:OARTx2rAePmiM3tTOJ7DTdoW8UyWmS8C68/Gqs+rGOFTyG4IpcJQehnTZ7kK+VqWp6A3H1jWwniDmApIFdKTdaSN1YvH1bFFfTIDUNmcBPphu7N/kgNGgPjnMLhPI29fCJC/c1LeafkTkN6vUFIdkbPvodT5QTk9udgS/E+s8EAyLzun7ffJmSYODH1lgsi/Kca7fyaiNHRLXhTVGPl/gLtj9uk0mwskpcAFOUcTKmfMwneZz2QptlQk9Ub1DIXma9mBuWu7TwdoNhAcxav+4uwD2ijWZQtjkY42wFPGB9hteNPS01s9FZ16EKYwpH7mynamlXAtCPASKGSAlo4xHlXFDN4FYM+7Np1KM+ITFjKYaHaAQylVdvJTRPpE41f8Z31sNqniiHI8cuoEVImtA4jkk5+ql99GfMVLHl9tghMOUfSBQGWCBWk2EYvAWz67R3v8APBfPylfmeZgGSrFQVJQZk3tKHHs7XZBa+UcKZ6vLC3665iL3jGMJQC4BNshK8Di8j8bKUyvP9ePPguz16XMtkrk5+zKthmgQpfhMbB+umC9Euah3qGOxrAuh4B+NNqHG0N+8KZ4s0D0MFMnRrracIyDqN5C7NUM+nKaBLkWIEDhGny06bIsoIK+5rR4JwKUzxbdatwHuCRQwtMVePe1hL/b1aNReYZgC2iDx7+GeJlExsHHrI16Zy8AFcSYnCjlmlIn0Vhghxzu9x2RjQ== X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1049; 20:/NMBCfcJ12ejVxAWmSrjHJ8EwQRMr0A4gBjqMfBsNKIYe3ps61DcmiUNXB4oObw/1909HomNA1+GLGWo3uIcoJJIUaPgso91gI/ikTNUvhAYZ8/J7+3tU7l8YTnOlfd9CKVapifvOM3JUNX2OM5SQ80npgihLQLWQT/gOyGxilyowp9koZr4oFizF0bDcsrEMtnMLU9Obb+s+oXCMlJDL7ukv4rxq/DPA0EeNh5yzzct1H/I8h96qvAY4o6v4WZ55K6F/dfEXPnCJESHGiWr4bazXAgLOEFC7psHVUagO3jX9vvsuIx58zLSmWnkvzFefwUNsc/zOPMP2b5lUwiJi8Gb012fb2nsypu+52zxuw8gBa4Y+hdfM/HsD0w90FSzZoifpaJAv8p8dYYpbHE8RpxoX1cSmhvRWUQqr1tcAY6XDW2xv5SiYZGvd0TtdoEVyFIEd9N7AtO9DH+vTTXcbioHlWayySQP+VcSSIMh6S7s5bhBiNnVzNHCighcwi7VAL6cJ6ghSIuwV4vZD4Ou4wsuSrDVP1SwuKYZUhv7ufA3P3cVvxfhVrfS73zBp9nfTlLNS65PyYy0+U6OmM3JF9l/iQk9RE0iVmZYwBjp1q4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13021025)(8121501046)(5005006)(13013025)(10201501046)(100000703101)(100105400095)(93006095)(93003095)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061750153)(20161123555025)(20161123560025)(20161123558100)(20161123562025)(20161123564025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HE1PR07MB1049; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HE1PR07MB1049; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB1049; 4:Go07pr1gUZ7Sgauy2+M+fJdHXU23+52DqunsYkaZ1b?= HhvnWj30X7SMqORMubsGpVLTbmShg1fPbtQbIlLCy4oudHt3FEEGVBsEOM85C4Md3JLjNdCzqbPOdnA/DTPAAVIbFHtFtSETpB77JoNzyPVbAwnUZx1ilSLTaUezAdah+GG/Zw/tu9olsURQD4IcCyWPWcFvEY2XKWDzDNXeQy0KFpvOlQdSBMIzEsS/3+TgjpgShKtSN3MeTFt9M4etOHantu7o6N947ayQu+RE4NgFqV0E7iYQicmhiRuxT/+PLrnca845cYlkJIVHZehW0J49qa/QvBnsK+UTIoLyAQkuikf9dUO6KhkRkJBezxzERuU/ob6XuUUKFa6zPHcVqp+ztWp56yUiRb87KO+BJbGNzsIfynKcm3zozUeAxMxKoiZHwnvEoVWt+Ie+6ecdHBpwHQEMl1TiCCHoaQ+2f7X2aNeWvrBdt9tw4uy1TbLe9q9EgR3Gxs6QqwW4lDMMRWX2Ctfx+nNUpEQBDnSh0uO6KJlEO7djS0RjIyrG5kQ4fqkZdUW2edR1qs7C6VRyvhkf9b12+5FhKsIBUUIILOdvjPKOGGc1a9evrypJxaUXTZMeUnX6hYkHhs/30DuG5nXwW3WU1ADhmBPP03C4nRdl5lxJpa3esL82T9Y50EZ/hWQTcISGHIdxNVWYNFp3co+mXcIDwThJ0YHdNawOcn4L3YPZ00TkljdjpS0rFcfgjU84/wRzAubGOgKxrhBqOTpvAPsZyNvoVWizv9bHJYm+4zIllKJOiaOlWyIMJFxDSDovZgIdBzBbWAFEL0yMi0tOzcSTHlpd4x/7oVrNFt5xa3y51tpJWS+Zxzan1PmKTMmeHBknvX85ivjt03XYnCDxFVL9KoCt0yzvAMN6n2uB0pYDMxqHRbUPeiUWdZH9hapafAA85ot8VgesP72TfJHiDamdiEad0MyUAUHfLc+QtQW+IfiBYTTW589O6R6mudaWvMZgEe7Kdc/C73JatFjrFeAfnB1uXk26BDnKECX40ZKvHxAkH8COLHlMOev/K8a3Ux2rA0030BOwlbN7K6Fnz5HPiPxhi/ALFcBlHSS/h+X0MWZfVdHd83V+Q0xwhTrDWOL5qaDX7/0nRa8ECvDZTeBglPo32YTExXJiZgDzG6iMor41mjdmEfzkIVyGVjo9YXqqnYgpns5tNtdsrj X-Forefront-PRVS: 0358535363 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB1049; 23:etqXs/WBsEevugaGqlYnR5Kn4b/blAL7iBEPniT/0?= PGT0i/ZCsDf38Ulwzv/2ON7azEmh2WcKeDTP13kRFTVEUeycs/OzPvOvQ0a+/msnyvG08m4IukpXcPXRGUWMceDoHXAXzoOGWnn7abSMtxAIXO9uPgBNopq1Vg4VjKVdCYDRoFOwJAjBoa3UQvBl/GkPERdRClF0kb//ZMcwmoYWzwxe1IQRpTs8C83EYYSE6CEEwGbdTAhae6TgGm9XYhk+xFSuySY2C3G2Li7KQU8xwqF0el72uXQTjJ92Ar28N1do/e6rVQoigYUey0EgwHWuXWefCkBfJ1THTosgvEN1UpUYRZ3hQdrkJ54WILfSiomI03sPhn0rsUZrb7iNGhQuOlSYNuizgDt7y35/ls/Ato8HF0fvqi04waQ/EF8rb0Kbh5gRAuo2IIUIpkERnus5KnSHHyz8gm9m6t50gjCxu1kwEV+8d781tglMT6D9dU2xL79PbGq983yG4vGE/EcRO9/PJ+a/oxO3hEGDz6IQsyD4ATQ5EksxzqxKKyhMc7LcnWAqRZGM8OS5XCKz1S99vGky6f7S2bvp+hPnmbfmfyMNcKecDX5B76/g9nGMr0auM0oi0sEUwb/UspkD4Duj3wxSZPaZb2t87G1DErEGnjY5BUc/1097yfmT/2EmfJ5UbQX/kPnx0ppLeiMjms8vF3R2RriFhrfucDPVh0WR8WwHVVsxzs+jMD+7azraQ65dQOz/affxp3ayaTWljzIOVV9wnZTvWuVt4vYTFj2TTvj1UiSNobNZa2BY6eFHKn42BPLw5ylx+Z7T4aPmztMH0AKazcMpXF24yDN3j6mUFqUrjr6ASEVOG6f/ahTzqxv+oVrttDfeQDph/zRCTeSis0l0SCE+uNnD/rOJtvUdtqzvpKSf1hz/k9s4w/7LbDHGrYCPW2Eu0PzbVKCUVMw2H/8HsqqOThEcJCGoDCGamLGp9CB87e9b6+M+9De2fH2E5FZOKSeA6n/ba2NAZ6SoEeiXPazJh8ouMLFdpIJ90wvomLJp+YtboB6oNS5nbLQHpAE6qWM+H1ZIYQwzRjC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB1049; 6:ZV2u12IkpI4JZtMfrzUw0fQQbYsHsGsiXwI2s5QR5/?= PvWhIzCbgYO/ledvaQdQ5E0VaW05RhK886pPr1QlagLbcxKw0X9RwZILr3ooeOayv2iu3FBIvQHRpuqBoF181Od91/JVo/LNjlKMyvruvep13syGi8wT5TD23H+gN3ozMmys2gr2z2eygT23sU64u+F0TjdgWk0gsHLYI22LsZnCYI/7smZof72YI1vcOHII1mNZc+1XFWh/1hfbVE4a87lhfDVFqJjviEJVstvcLIcVmAEk7mrV+koQHP13Jf/Ricl8z2HSJ9fF7HwdEbxOsizivRMg9eBhJ8BV7pSwIgKPV1jBdXNiGCF1cdQE7c1EERZQdTPzKMO8eyIOUM30/oONvWxvfLtTO0/Lb22d6nnBSb1ymMacHuuAa2IRYl6bATzROxqQe+5eC3DeV3sqrxpUO6YkB2jfG1caw0gwuFEHekETT4/ZX/iN5yI915Zm/9Y4LH4UNck4aLJvnGqJqpNcfTqwsw/cDnaNY70O1N2XIXqGI9aFV6o1T6b31pQedbA7JZ4JCjaVoVNtBaCeULR72TCXcrcAiC27P2kbDe5BG8dk9Y9Sd8dJBP+LbjdtnnRAeGos+BMY/CLpTsPSl8d9NLdF9BtiascBFeQkhtoRO1VZvG8BY6/83ELnnP+IeKcYsHuO1HsA2ZF/0CJRi5R9CwKPFWsam0nSxa2n1ZH/zfed/fMg19PppVLrzYQ+J2A5zFzS9PRegWrP9U1NlENWDC4tX9+wevoZ8inh2Aobt1g0ITg3Z27r/Zu31Km6BXus3WmvCuH8iTkizpSZRFz9O8jYNZcPQ3YOL1EOoor0N45+sCtT7hQn6dm7Diu4cgj0cMjHdvW+iSQIwjF/8s1ww7k2PbhE9FhDnnSpUAQb6WkwYfBDE3kWI+pgESBzCIZdFZVWzsE9RVDFTS6xYldsZ/9Ruy3ZZKXuW7roSXpgl047rScRzaW1v/FjUm0jmOmdytNp/WrIweVccCZIvSBEIVCKr7ukfI8UpKL0HTlE8GNG+49UC/uFiiBaaEygk= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1049; 5:4oF9xNKqavl0Rz1tEsbrpnKqgvOybM/KjsP1oT2FzCoYyWXTnN4CRXY0ceulhkMcWX0ukEWq1xXVVEfZ6ahGN4QlgvasadCjq2ZfU24Ap055FxttOgmV4ryz8qzGDoYS/2xHmnkPFXOS8JagwZfROXfvXRjcHjRXAZ/8bfhY8x26VOCoGlWGcGIrKwTQ3RLeZ8ZnG83elwixxheJ4Ov0plRkjHWCJu7dvQ4kgP18rdNGPwPOzX0B8kMJYcbYiwkCBGHx2E3YuwMIffab80W6HNKTFJM/iXVIhZmf8WOkqL5SvSSJFMie0ecoz+uSidrGENzASJFCziUKWnZhr0D+Yf5VJAtfuHQPdAhqCTDpGOIVqZoqbzJD/YrnYBDNIMFwCsvKnxzDiLC1ab+PWdRBxn+ZT4Y0u/eafQclHzR4+VLBxWiErV/ndIaKt5rM5b68l1r+WtOjtbNVablTPJct8KP7TzAU7vqqu2/DQJIwU9kfWoCqkjdqdrWUtifMLHF2; 24:DDQYVe66ffG8Vi+doHK3dhPsYVJxGeOJXXEsDXv1+iab9loFMJmM8c3D84EzAMUPo048dYvPotGXq1dMzpO6pUsl22f00XVF+jPQNTRko1g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB1049; 7:1TV7u530AWfvKD2/eukuv1Fms9jGuNmvO+0GRoLLOvdrwEDvmpVGPtcw4+PWjKmb0abBGna/b3++Wwb8m+6FKrO0vkjysD6cQTTQM8mr8CK3XjkHi8MpmseUMBMIm3/hCq5p03iQwAsEaNskuppm+L8cfDKNrvZfDb2TH6mjALV1lycK/ECjenHVZD6mMmdwegh+PZLqj0qijmfBPtf/LTOp8AWMTgoV4CXh+i1u4FG7E3o1jQdGfohxRxTenxTMa5YdZuSFqKEIyIODU7+Nx0JKJhYEDj0O/zEpdzsrpplVsBWGqUmkgOOlNRelq7imHZCP0LVb6v0dN6udlObJ6luyLOUo6vtMqE/wQ07/pngqJFVuvxMHqYjepu8R9EooBvF/tAf5CJJSFImWuekOuy33pVO8eo2Ht/lCNnIQtLHcLCGh10sx2gqnjvh6xyXeEFJM4it+vAG44oatqKzfgdnmz0wvuQ7qWHsuCEAwPRHjk5EV8VQNL90sYNpijA6N5Are4tX0RpLFuHnillTsdkVds9svcb1H3kQJ9/zLAladPXax3QNY/gDMsPC3nTjs28axrBFwZP59Uap7m+E2nBRdODzstwOFAs0D+lwSXO6+mzhBhfKNDJtK1gL7+w0t1nAY8heWdGtq008NrhXgxEzpCAnz2OslIWl+95UV1KdaNYL9g2YDffLQtcMBPWZ5zBHC5Geu+Y0ajExzuEMT2rtCCmAHhL7ecmnf1TauAle/2hFpWI0KaM6uipp8kV6hLjW6HwGvWpTtUfH9ZEtY4kIPaphhBTRJzDG/sjjINPs= X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2017 09:54:35.5057 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.240]; Helo=[mailrelay.int.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB1049 Subject: [lng-odp] [API-NEXT PATCH v2 6/6] linux-gen: queue: remove type set from interface X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" TM should not modify queue type. Remove type_set queue interface function. Signed-off-by: Petri Savolainen --- platform/linux-generic/include/odp_queue_if.h | 2 -- platform/linux-generic/odp_queue.c | 8 +------- platform/linux-generic/odp_queue_scalable.c | 8 +------- platform/linux-generic/odp_traffic_mngr.c | 4 ---- 4 files changed, 2 insertions(+), 20 deletions(-) -- 2.13.0 diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index 7ba5c3c5..410c6b79 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -71,7 +71,6 @@ typedef void (*queue_set_enq_deq_fn_t)(queue_t q_int, queue_enq_multi_fn_t enq_multi, queue_deq_fn_t deq, queue_deq_multi_fn_t deq_multi); -typedef void (*queue_set_type_fn_t)(queue_t q_int, odp_queue_type_t type); /* Queue functions towards other internal components */ typedef struct { @@ -90,7 +89,6 @@ typedef struct { queue_get_pktin_fn_t get_pktin; queue_set_pktin_fn_t set_pktin; queue_set_enq_deq_fn_t set_enq_deq_fn; - queue_set_type_fn_t set_type; } queue_fn_t; extern const queue_fn_t *queue_fn; diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index ec225d00..d52814b2 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -769,11 +769,6 @@ static void queue_set_enq_deq_func(queue_t q_int, qentry->s.dequeue_multi = deq_multi; } -static void queue_set_type(queue_t q_int, odp_queue_type_t type) -{ - qentry_from_int(q_int)->s.type = type; -} - static queue_t queue_from_ext(odp_queue_t handle) { return qentry_to_int(handle_to_qentry(handle)); @@ -822,6 +817,5 @@ queue_fn_t queue_default_fn = { .set_pktout = queue_set_pktout, .get_pktin = queue_get_pktin, .set_pktin = queue_set_pktin, - .set_enq_deq_fn = queue_set_enq_deq_func, - .set_type = queue_set_type + .set_enq_deq_fn = queue_set_enq_deq_func }; diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 14fa1833..52f3915f 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -956,11 +956,6 @@ static void queue_set_enq_deq_func(queue_t handle, qentry_from_int(handle)->s.dequeue_multi = deq_multi; } -static void queue_set_type(queue_t handle, odp_queue_type_t type) -{ - qentry_from_int(handle)->s.type = type; -} - static queue_t queue_from_ext(odp_queue_t handle) { uint32_t queue_id; @@ -1012,6 +1007,5 @@ queue_fn_t queue_scalable_fn = { .set_pktout = queue_set_pktout, .get_pktin = queue_get_pktin, .set_pktin = queue_set_pktin, - .set_enq_deq_fn = queue_set_enq_deq_func, - .set_type = queue_set_type + .set_enq_deq_fn = queue_set_enq_deq_func }; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 1f254d75..ec2d331f 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -37,9 +37,6 @@ static const pkt_desc_t EMPTY_PKT_DESC = { .word = 0 }; #define MAX_PRIORITIES ODP_TM_MAX_PRIORITIES #define NUM_SHAPER_COLORS ODP_NUM_SHAPER_COLORS -/* Traffic manager queue */ -#define QUEUE_TYPE_TM 4 - static tm_prop_t basic_prop_tbl[MAX_PRIORITIES][NUM_SHAPER_COLORS] = { [0] = { [ODP_TM_SHAPER_GREEN] = { 0, DECR_BOTH }, @@ -3926,7 +3923,6 @@ odp_tm_queue_t odp_tm_queue_create(odp_tm_t odp_tm, return ODP_TM_INVALID; } tm_queue_obj->tm_qentry = queue_fn->from_ext(queue); - queue_fn->set_type(tm_queue_obj->tm_qentry, QUEUE_TYPE_TM); queue_fn->set_enq_deq_fn(tm_queue_obj->tm_qentry, queue_tm_reenq, queue_tm_reenq_multi, NULL, NULL);