From patchwork Mon Sep 3 14:18:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ophir Munk X-Patchwork-Id: 965451 X-Patchwork-Delegate: ian.stokes@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="WQyTmvMR"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 423sXQ3YtJz9s1x for ; Tue, 4 Sep 2018 00:19:01 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C0032D05; Mon, 3 Sep 2018 14:18:58 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id B55F1CA5 for ; Mon, 3 Sep 2018 14:18:57 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0078.outbound.protection.outlook.com [104.47.1.78]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id DB999D3 for ; Mon, 3 Sep 2018 14:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XSTE1hpYMRuVwOylsO14GsglH7hfgGs1uCWydFWF+FI=; b=WQyTmvMRUE0yTmTWcccAkXx/y+Bunv1+jZnArvcxEief4GCnut5fncOqIM99D0dobU6tOgnn+dW4Ne2MmnfUHQZppaPsK5Enh8EzthIko8EKW6vL2kfXqhnT3oC59qTQDbiBTAOGv5GeS3nuc/bSI0uA1I4pApfLOSPTjXtGT/8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ophirmu@mellanox.com; Received: from mellanox.com (37.142.13.130) by VI1PR0502MB3744.eurprd05.prod.outlook.com (2603:10a6:803:11::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Mon, 3 Sep 2018 14:18:50 +0000 From: Ophir Munk To: ovs-dev@openvswitch.org Date: Mon, 3 Sep 2018 14:18:40 +0000 Message-Id: <1535984320-11574-1-git-send-email-ophirmu@mellanox.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: LO2P265CA0145.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::13) To VI1PR0502MB3744.eurprd05.prod.outlook.com (2603:10a6:803:11::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e2f6d744-cd51-4a3c-46c1-08d611a82c58 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0502MB3744; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0502MB3744; 3:rKZgyhgehN5tpM926vtlxuTdTAzDygMUgL56qlOvIclxNUsuKbxx3kOPl+69pr0uQpIYDGL43T9Xg6Me3EZG0P4LfmPeA/nKAcsxn/ZRsCw851oAHqUilokKJsYbO4rYZeXhaBfQI1o3/QMbsisS5j65QTqh75O86vsW2cu7i559BzxW/hiGBYU2UmbI8WQuf99p+fAhj8oV939QhbDoDkaPAMSOyOc0w/juel1JbbJ1t1d3Ggjz5d2/gdsUXxrO; 25:bel5gI+VjQC+OUBTxgfEAd2axWpC3Mhp4x0zhhykoN48nK6fvK9SY7BNKq0l+PZCLOlimhOHTdowvO1wK7N1nhJ76lrfxnAqI0fhfgXOdZmaMgc9my6tuubIpW6ulMqGc3SWicWzdgqZOBf7G3LWqu+0+7pJw5uwE5K+uM9q8WWrwfmOlkpjBa3kbB+/xGHhgGcKWmfxRN3N6VVnvbVgB1YUEfMKSb0033vFti4uzuRvXQ9G2Zr+EDLSHbmydUn9rRVhynstuzUqg7BP20qFfBLU0q39OsbH5/zD0AY7EO2PODcFlfxT8MhSs0tsfVLnM3o53/ixtHfDqi+QeQpirA==; 31:/UxzjjFuJ2vwN9LSGWiZSS4B7LSSOM2rvfPszW32P/oJ84dLlQBVeTpk3pxhAT1OFg29lHFXKsjy3Yai65+tGnUsqmR9n0tQAHKmRDDivhoHHDPkopKf0HQD1/3VH0Tv0zUI+Z4BnFozTqvgwjrJ1hVa+zSKwVJcoU4W55pzDaLD6/2M74s47RZIjw1ExEp//0BwpKLeSTn2VwLMAKmvYdD2wHaNG20Z6OmUC81Ygr4= X-MS-TrafficTypeDiagnostic: VI1PR0502MB3744: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0502MB3744; 20:zfAW0mIa1vlgswUNTaT/ssLPk+3aNy4zh2ZcNVjehFbz8J7dGwB85EKYu7gGxovRAhEo+mqF+1rNKkn/0o7JFxsAgo1TI8Eprku4tABWS32v7NSIJ7UkPQVRBjryDRPW5STX1uXqKOMHdSXDcFBhOd9gGOHn9zON6bgcIyxXF4pKz0MqWx0zzIv3csEE98Mc6ObLcqN75FVpeUuvS/+Lm4OR64WBRkKjPbgsQ1bj9z9YNwdCHBO/sTWmKi/LxWGZRYb+SlJ00KDZEenI7ArtBQnZCHOiXMcetBs+9goUrrCRezfOv18QGQ/SukEKWeq6Z36aE1uhAbfazVUZ8INNR1ZXEx0/pwj1i7b+YaHOiGT7Qn9hTnrX02Q1FfJtA90Ga30a1XBi3jt0iPe6x0znrlWS3YiE2Ko/e+6Kl4u4DdBCygzzq8ydosLyWitF0gVHpAoLKlCYh+jA+YXqSGvaidVWZXCVnZ88y/n+j7iNUl0cXLPdJY/n9apj80E30Q9A; 4:O6xWk0DWgaoepi6pqbqp+unNNfTjoP8z9kkQAz8rZNzcgLrycZP5wl402wa/RPlSP9/FHs+vJ/t8I80KsT3xfrzWe2ToBZV0L9H0w+NrmmUIXYRbmxTj51UViFMwNVw3r1ZiX/EWN6yM6LgtA7e3IeVv26mVWF3elOgbUe5Dw0owrJgrwymdjclj3NRViuob1YeIV5csX5mDGwvX+3DKPoHwzeMIYxuXFRB+CyCv7RgRCmFN8er5XvaQPvfMXkcdJJXtaTRCXVJ4l3AHLzal2RuSkkMERE4014mLYSU5xrdex0zV7f0iGbogDCHOFm232dMrYS27WscgHlrlCGbIDw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(163750095850); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(93006095)(93001095)(10201501046)(3231311)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201708071742011)(7699016); SRVR:VI1PR0502MB3744; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0502MB3744; X-Forefront-PRVS: 0784C803FD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(39860400002)(376002)(396003)(366004)(346002)(189003)(199004)(50466002)(33026002)(14444005)(6116002)(3846002)(48376002)(21086003)(66066001)(478600001)(7696005)(47776003)(106356001)(52116002)(2361001)(51416003)(69596002)(25786009)(2351001)(105586002)(4326008)(55016002)(53936002)(386003)(186003)(5660300001)(8676002)(50226002)(8936002)(81166006)(81156014)(305945005)(97736004)(26005)(16526019)(476003)(2616005)(956004)(54906003)(7736002)(486006)(16586007)(4720700003)(6666003)(6916009)(316002)(2906002)(86362001)(575784001)(68736007)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0502MB3744; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0502MB3744; 23:HKXmr32836NEhyNDLAWUecC1jMHxrgWHjzJ7YwZ?= Abjr6mUB0r48Kbg6svyf5lIDl0swf8Mj+ZwAn5m8FNUHBJGxSF0B42Jm2v0y3dZEy9dJnEH/uchG27OR9ny4iMZGHwvnGgEeVezXV4skz0yuPYJqoXhHwVT8jatbR4YCKdaRV/FTOMz4/3x21jymtJFijk8QUrPySqbC0g3U+0vZQCnZGnQYGFtiUcHiMC5bKqRRiIj77V4JjQf49fe7t0y5S8q2a6Yft47Yau+Tlo/u1Rmdmga6z/75Kx4adjNCJnGEBSuTFLC+KKoyc1agcaCzh55G/Pj6VpXSGA3Jls+taT88jiRg9YeYbIi7+W4Brd/S81IveZO+26Uj5Xf4Fc5aTflDRhzClTHflLxkOmUVsURjdSUGKqIqEMoA/SLl89XRc023BcvMIxigAV8QzIr5K5koF2IXIqFKT/7jxlckEEHCD/xEJUfNOPUWDhMyFcqz9AB2nAbWJLsFnCz1Dym6bW7rinOVN/h33DBGyjYJB/bo59IZfwZjkyCAcJ0Je9Fz8LTau8WVqrUFl3wvEKAF1qO7UANg7PLKfm0H5QwCTakr9gUl7vOprIA92VRnVbysG/YAz6EES0yjkH4gychif6UMnxJBNA0eGrESXtLoMhrnhfB4kImp+2lWMKL0YCKOysqgNDeMgrQUI4PRsKg73Z0qdeBgN+Hr3aLkCf1ZzD/6/yk/IV596QB9C9SRK2AFrgDYC+t/HWsAdNH/Uvt3F+cYnXo2ODt6tQ3NICxE0dmYWOkvS1KQAfC7DqQalRvuPaXEu8dPAFyk9BrmRvK/oEGZtTCR+N4nZ0vRHykEvcErwnMbjESTIjf4AfVfglh9C6/z08/wl3pvdbz2qVdI8pR/8e2p/8mOHY8t/5GLKwdbFa4ynGM07Za6ic+QlrClXeu1bZ1CgBPXixq2mMyk7cGNHQl3dfZm/L/LgAzrzLEhMFNZExBUhdlJhm0AG68kqqvD7DRJPe8UCVXKKXpB6iNbvm9ApGAiknSMoAPG/rLlfP4ViD7qUmbh3lEnuKoshbFeesr4GnK2QiKCNflHUtqZwO/eMjWY/yaDuYeCiQr2iC4JoODJDmR8lLOfadJ46QEmQAvKxCGFTCz+n2ZVk0jOQxyujuMrzTFGXqE3QbVjITyiUM3gKUwq0iLTecpm5OCflMBhGOEYWA4ktHeQjMjDvJC0jJ8PQrpY1LNftnIr1WxoNksYZjcesWrlqlMsqhrexVG5JtWhRbqEuqUUPFSlYHYO/Wzjm/fB9mJSing== X-Microsoft-Antispam-Message-Info: X36NFkQ9bwFS6MYje04INYiOX6C4wEh1CS+yoQbQ0NfrmCEl2/Uxc3yHprcySOT7p7vgzjk/A9UXP5oKsag8jmeRMr605wK5PnkhQ4PhjZYxOon1KKPmvebTuMV+BMnP04+oBDZPexlj8a+0ccs8RBd55+/JxzghzpX/sYT90y/591UHugSCxys6KnzKTQ+YuHNnVGfAElRGXW8txfVY1OvDgNmnSR04slIjqAa6dh0d1fvKacqd27s/kmatEbzBsPU9IzJ3XTf7UsKjg8mi/2rzLzhvDRDrfISbDgF4lLJ3PiqJ8fBe/om5dAEbzD4Fh40rZ2chyP6M2eSQFfULcFD2ptEF8v6f1NzGjCC9O4I= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0502MB3744; 6:jGtfmyN/7crjyx8uKNhaJrFHo2eLr8qmG/0ZLDQ+4YCbZKdTmtNCJ+XWIfAs+9DshH5ySm1Z99Maz81P35n+PLJ7Yeht2gPLFNV0zw/dCS5QkhDHLPNVVmm5tCDuhJ4KmmEy12ScFAdFLOk8BjTtJvDhDLFnvuqkOwO2ayJvYD19Z8wtdxd30THiejjIUj5O8TVfYla1oFb7iYbxGpEAFCWsDPjhKwF2cgQzwyt5XnMHBNgf8LY4DnjnpDml3PiGZclFcb61OtUeyVBGMMLId8qX9KRQGvY+qbjzc8RPEnvrC7tTioUga8eqx+nr24xHGn9FvQvQcrnFhxeewr1bgjOG2pONwOBjwEw3puG0Al4bvF9culItvFw4ZlRz6jnIKb78aKGQw2nS6JcwPsc3mHGJTD2/x3nXFZh9sB+QYxL/DAkZJZNPI8+TXGMOVcd9BQd1J7LeUZO+ZDXUjOGHew==; 5:6TqEcEZzGYtoPyEMplHGPUeJMzgwdhvGe5ICgQWUUMDiocH1Syra38CF3IXoWPPntgTHG7uVwAEnHg1k71ekMv+PJJyZemmrSPwsHKkxbje7hsUaWK4UGcXqt5osm5ZrcLhwaypEUZ9cyp5lR9I9H/uG6SF2sF/AlD7hftJAwqo=; 7:7FLr4S/rbsnMsh4sMlUXTt0i1GekLMXUrHeYiijc6OAZWnLEF1UNxW+oaCLvum846nBh64a0H5H6Du+zCrkSs9Pb59qX34LB418hEW6km4fYdB+yLQ+U7uNt2/rdYkW/WN6ALJWkLqepxPXVpVcgMoNNtiqrWZa9qxDUscvwekIFtBOjQXmxQrdfawidxF5u3qYbm1sL2Rvy0QEYQAlOxJaP2al9HhCwzh+1/kpdDypXLDfXAsv9j0SgwMT7a8bd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2018 14:18:50.0508 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e2f6d744-cd51-4a3c-46c1-08d611a82c58 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0502MB3744 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Shahaf Shuler , Asaf Penso , Thomas Monjalon Subject: [ovs-dev] [dpdk-hwol PATCH v1] netdev-dpdk: Upgrade to dpdk v18.08.0 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org 1. Enable compilation and linkage with dpdk 18.08.0 The following dpdk commits which were introduced after dpdk 17.11.x require OVS updates to accommodate to the dpdk changes. - ce17eddefc20 ("ethdev: introduce Rx queue offloads API") - ab3ce1e0c193 ("ethdev: remove old offload API") - c06ddf9698e0 ("meter: add configuration profile") - e58638c32411 ("ethdev: fix TPID handling in flow API") - cd8c7c7ce241 ("ethdev: replace bus specific struct with generic dev") - ac8d22de2394 ("ethdev: flatten RSS configuration in flow API") 2. Update references to DPDK version in Documentation 3. Update DPDK version in travis' linux-build script Signed-off-by: Ophir Munk --- .travis/linux-build.sh | 2 +- Documentation/faq/releases.rst | 2 +- lib/netdev-dpdk.c | 135 +++++++++++++++++++++++++++++------------ 3 files changed, 98 insertions(+), 41 deletions(-) diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh index 4b9fc4a..c60ac71 100755 --- a/.travis/linux-build.sh +++ b/.travis/linux-build.sh @@ -83,7 +83,7 @@ fi if [ "$DPDK" ]; then if [ -z "$DPDK_VER" ]; then - DPDK_VER="17.11.3" + DPDK_VER="18.08.0" fi install_dpdk $DPDK_VER if [ "$CC" = "clang" ]; then diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst index 41d41e3..646ae09 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -168,7 +168,7 @@ Q: What DPDK version does each Open vSwitch release work with? 2.7.x 16.11.7 2.8.x 17.05.2 2.9.x 17.11.3 - 2.10.x 17.11.3 + 2.10.x 18.08.0 ============ ======= Q: Are all the DPDK releases that OVS versions work with maintained? diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index f91aa27..80d2af9 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -168,11 +168,7 @@ static const struct rte_eth_conf port_conf = { .rxmode = { .mq_mode = ETH_MQ_RX_RSS, .split_hdr_size = 0, - .header_split = 0, /* Header Split disabled */ - .hw_ip_checksum = 0, /* IP checksum offload disabled */ - .hw_vlan_filter = 0, /* VLAN filtering disabled */ - .jumbo_frame = 0, /* Jumbo Frame Support disabled */ - .hw_strip_crc = 0, + .offloads = 0, }, .rx_adv_conf = { .rss_conf = { @@ -364,6 +360,7 @@ struct dpdk_ring { struct ingress_policer { struct rte_meter_srtcm_params app_srtcm_params; struct rte_meter_srtcm in_policer; + struct rte_meter_srtcm_profile in_prof; rte_spinlock_t policer_lock; }; @@ -903,16 +900,17 @@ dpdk_eth_dev_port_config(struct netdev_dpdk *dev, int n_rxq, int n_txq) if (dev->mtu > ETHER_MTU) { rte_eth_dev_info_get(dev->port_id, &info); if (strncmp(info.driver_name, "net_nfp", 7)) { - conf.rxmode.enable_scatter = 1; + conf.rxmode.offloads |= DEV_RX_OFFLOAD_SCATTER; } } conf.intr_conf.lsc = dev->lsc_interrupt_mode; - conf.rxmode.hw_ip_checksum = (dev->hw_ol_features & - NETDEV_RX_CHECKSUM_OFFLOAD) != 0; + conf.rxmode.offloads |= ((dev->hw_ol_features & + NETDEV_RX_CHECKSUM_OFFLOAD) != 0) ? + DEV_RX_OFFLOAD_CHECKSUM : 0; if (dev->hw_ol_features & NETDEV_RX_HW_CRC_STRIP) { - conf.rxmode.hw_strip_crc = 1; + conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP; } /* A device may report more queues than it makes available (this has @@ -1932,16 +1930,18 @@ netdev_dpdk_eth_tx_burst(struct netdev_dpdk *dev, int qid, static inline bool netdev_dpdk_policer_pkt_handle(struct rte_meter_srtcm *meter, + struct rte_meter_srtcm_profile *profile, struct rte_mbuf *pkt, uint64_t time) { uint32_t pkt_len = rte_pktmbuf_pkt_len(pkt) - sizeof(struct ether_hdr); - return rte_meter_srtcm_color_blind_check(meter, time, pkt_len) == + return rte_meter_srtcm_color_blind_check(meter, profile, time, pkt_len) == e_RTE_METER_GREEN; } static int netdev_dpdk_policer_run(struct rte_meter_srtcm *meter, + struct rte_meter_srtcm_profile *profile, struct rte_mbuf **pkts, int pkt_cnt, bool should_steal) { @@ -1953,7 +1953,8 @@ netdev_dpdk_policer_run(struct rte_meter_srtcm *meter, for (i = 0; i < pkt_cnt; i++) { pkt = pkts[i]; /* Handle current packet */ - if (netdev_dpdk_policer_pkt_handle(meter, pkt, current_time)) { + if (netdev_dpdk_policer_pkt_handle(meter, profile, pkt, + current_time)) { if (cnt != i) { pkts[cnt] = pkt; } @@ -1975,8 +1976,8 @@ ingress_policer_run(struct ingress_policer *policer, struct rte_mbuf **pkts, int cnt = 0; rte_spinlock_lock(&policer->policer_lock); - cnt = netdev_dpdk_policer_run(&policer->in_policer, pkts, - pkt_cnt, should_steal); + cnt = netdev_dpdk_policer_run(&policer->in_policer, &policer->in_prof, + pkts, pkt_cnt, should_steal); rte_spinlock_unlock(&policer->policer_lock); return cnt; @@ -2767,8 +2768,15 @@ netdev_dpdk_policer_construct(uint32_t rate, uint32_t burst) policer->app_srtcm_params.cir = rate_bytes; policer->app_srtcm_params.cbs = burst_bytes; policer->app_srtcm_params.ebs = 0; + err = rte_meter_srtcm_profile_config(&policer->in_prof, + &policer->app_srtcm_params); + if (err) { + VLOG_ERR("Could not create rte meter profile for ingress policer"); + free(policer); + return NULL; + } err = rte_meter_srtcm_config(&policer->in_policer, - &policer->app_srtcm_params); + &policer->in_prof); if (err) { VLOG_ERR("Could not create rte meter for ingress policer"); free(policer); @@ -3043,13 +3051,18 @@ netdev_dpdk_get_status(const struct netdev *netdev, struct smap *args) smap_add_format(args, "if_descr", "%s %s", rte_version(), dev_info.driver_name); - if (dev_info.pci_dev) { - smap_add_format(args, "pci-vendor_id", "0x%x", - dev_info.pci_dev->id.vendor_id); - smap_add_format(args, "pci-device_id", "0x%x", - dev_info.pci_dev->id.device_id); + const struct rte_bus *bus; + const struct rte_pci_device *pci_dev; + bus = rte_bus_find_by_device(dev_info.device); + if (bus && !strcmp(bus->name, "pci")) { + pci_dev = RTE_DEV_TO_PCI(dev_info.device); + if (pci_dev) { + smap_add_format(args, "pci-vendor_id", "0x%u", + pci_dev->id.vendor_id); + smap_add_format(args, "pci-device_id", "0x%x", + pci_dev->id.device_id); + } } - return 0; } @@ -3727,6 +3740,7 @@ struct egress_policer { struct qos_conf qos_conf; struct rte_meter_srtcm_params app_srtcm_params; struct rte_meter_srtcm egress_meter; + struct rte_meter_srtcm_profile egress_prof; }; static void @@ -3749,8 +3763,16 @@ egress_policer_qos_construct(const struct smap *details, policer = xmalloc(sizeof *policer); qos_conf_init(&policer->qos_conf, &egress_policer_ops); egress_policer_details_to_param(details, &policer->app_srtcm_params); + err = rte_meter_srtcm_profile_config(&policer->egress_prof, + &policer->app_srtcm_params); + if (err) { + free(policer); + *conf = NULL; + return -err; + } err = rte_meter_srtcm_config(&policer->egress_meter, - &policer->app_srtcm_params); + &policer->egress_prof); + if (!err) { *conf = &policer->qos_conf; } else { @@ -3803,7 +3825,8 @@ egress_policer_run(struct qos_conf *conf, struct rte_mbuf **pkts, int pkt_cnt, struct egress_policer *policer = CONTAINER_OF(conf, struct egress_policer, qos_conf); - cnt = netdev_dpdk_policer_run(&policer->egress_meter, pkts, + cnt = netdev_dpdk_policer_run(&policer->egress_meter, + &policer->egress_prof, pkts, pkt_cnt, should_steal); return cnt; @@ -4103,15 +4126,15 @@ dump_flow_pattern(struct rte_flow_item *item) VLOG_DBG("rte flow vlan pattern:\n"); if (vlan_spec) { - VLOG_DBG(" Spec: tpid=0x%"PRIx16", tci=0x%"PRIx16"\n", - ntohs(vlan_spec->tpid), ntohs(vlan_spec->tci)); + VLOG_DBG(" Spec: inner_type=0x%"PRIx16", tci=0x%"PRIx16"\n", + ntohs(vlan_spec->inner_type), ntohs(vlan_spec->tci)); } else { VLOG_DBG(" Spec = null\n"); } if (vlan_mask) { - VLOG_DBG(" Mask: tpid=0x%"PRIx16", tci=0x%"PRIx16"\n", - vlan_mask->tpid, vlan_mask->tci); + VLOG_DBG(" Mask: inner_type=0x%"PRIx16", tci=0x%"PRIx16"\n", + vlan_mask->inner_type, vlan_mask->tci); } else { VLOG_DBG(" Mask = null\n"); } @@ -4281,27 +4304,56 @@ add_flow_action(struct flow_actions *actions, enum rte_flow_action_type type, actions->cnt++; } +/* + * Storage for struct rte_flow_action_rss + * including storage for key and queue array + */ +#define MAX_RSS_HASH_KEY_LENGTH 128 +#define MAX_ACTION_RSS_QUEUE_NUM 128 +struct action_rss_data { + struct rte_flow_action_rss conf; + uint16_t queue[MAX_ACTION_RSS_QUEUE_NUM]; + uint8_t key[MAX_RSS_HASH_KEY_LENGTH]; +}; + static struct rte_flow_action_rss * add_flow_rss_action(struct flow_actions *actions, struct netdev *netdev) { int i; - struct rte_flow_action_rss *rss; + struct action_rss_data *rss_data; - rss = xmalloc(sizeof(*rss) + sizeof(uint16_t) * netdev->n_rxq); - /* - * Setting it to NULL will let the driver use the default RSS - * configuration we have set: &port_conf.rx_adv_conf.rss_conf. - */ - rss->rss_conf = NULL; - rss->num = netdev->n_rxq; + if (netdev->n_rxq > MAX_ACTION_RSS_QUEUE_NUM) { + VLOG_ERR("Num of rxq (%u) must not be greater " \ + "than max rss num of queues (%u)", + netdev->n_rxq, MAX_ACTION_RSS_QUEUE_NUM); + return NULL; + } - for (i = 0; i < rss->num; i++) { - rss->queue[i] = i; + rss_data = xmalloc(sizeof(struct action_rss_data)); + *rss_data = (struct action_rss_data){ + .conf = (struct rte_flow_action_rss){ + .func = RTE_ETH_HASH_FUNCTION_DEFAULT, + .level = 0, + .types = ETH_RSS_IP, + .key_len = 0, + .queue_num = netdev->n_rxq, + .queue = rss_data->queue, + .key = rss_data->key, + }, + .key = { 0 }, + .queue = { 0 }, + }; + + /* TODO: Override key with default */ + + /* Override queue array with default */ + for (i = 0; i < rss_data->conf.queue_num; i++) { + rss_data->queue[i] = i; } - add_flow_action(actions, RTE_FLOW_ACTION_TYPE_RSS, rss); + add_flow_action(actions, RTE_FLOW_ACTION_TYPE_RSS, &rss_data->conf); - return rss; + return &rss_data->conf; } static int @@ -4365,7 +4417,7 @@ netdev_dpdk_add_rte_flow_offload(struct netdev *netdev, vlan_mask.tci = match->wc.masks.vlans[0].tci & ~htons(VLAN_CFI); /* match any protocols */ - vlan_mask.tpid = 0; + vlan_mask.inner_type = 0; add_flow_pattern(&patterns, RTE_FLOW_ITEM_TYPE_VLAN, &vlan_spec, &vlan_mask); @@ -4516,6 +4568,11 @@ end_proto_check: struct rte_flow_action_rss *rss; rss = add_flow_rss_action(&actions, netdev); + if (!rss) { + VLOG_ERR("add_flow_rss_action error.\n"); + ret = -1; + goto out; + } add_flow_action(&actions, RTE_FLOW_ACTION_TYPE_END, NULL); flow = rte_flow_create(dev->port_id, &flow_attr, patterns.items,