From patchwork Tue Mar 5 16:49:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ophir Munk X-Patchwork-Id: 1051873 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="Ioe7e2X5"; 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 44DNVp1zcLz9s4Y for ; Wed, 6 Mar 2019 04:02:42 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 68185FD94; Tue, 5 Mar 2019 17:00:33 +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 0F9F4FCD6 for ; Tue, 5 Mar 2019 16:49:42 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20065.outbound.protection.outlook.com [40.107.2.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0364212E for ; Tue, 5 Mar 2019 16:49:41 +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=ZNKCIQP31c/yiMRyElp5CyB1wqFvH519IbRxwF4FS+A=; b=Ioe7e2X5UxZNCA7Q/iOjo95hZodv3rGtR34NpKaMKhM+oOehMjs/gnlkixpMCGxkjdc893LSBRoaPwnmIy7bagbmvG7Yu2AXPrVh2eEM06eirwNoW7grxJi3ocA+lbLniijqcjeo7CrpS3/jWoHOT8fma7Ns+P7zWzVAD9RFnqQ= Received: from AM0PR05MB4209.eurprd05.prod.outlook.com (52.134.95.150) by AM0PR05MB5315.eurprd05.prod.outlook.com (20.178.19.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.16; Tue, 5 Mar 2019 16:49:32 +0000 Received: from AM0PR05MB4209.eurprd05.prod.outlook.com ([fe80::4ca6:af92:c6a6:94a7]) by AM0PR05MB4209.eurprd05.prod.outlook.com ([fe80::4ca6:af92:c6a6:94a7%4]) with mapi id 15.20.1665.020; Tue, 5 Mar 2019 16:49:32 +0000 From: Ophir Munk To: "ovs-dev@openvswitch.org" Thread-Topic: [PATCH v6 3/3] netdev-rte-offloads: Rename netdev_dpdk_* functions Thread-Index: AQHU03Nouc4XcfByMkWNPBd7sBEKHA== Date: Tue, 5 Mar 2019 16:49:32 +0000 Message-ID: <1551804562-27777-4-git-send-email-ophirmu@mellanox.com> References: <1551804562-27777-1-git-send-email-ophirmu@mellanox.com> In-Reply-To: <1551804562-27777-1-git-send-email-ophirmu@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0097.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:c::13) To AM0PR05MB4209.eurprd05.prod.outlook.com (2603:10a6:208:61::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ophirmu@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 1.8.3.1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0df92939-ae78-40e0-3282-08d6a18a8a9d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB5315; x-ms-traffictypediagnostic: AM0PR05MB5315: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; AM0PR05MB5315; 23:EEGQDf0zNYUHEs8n5WjR5m6JHqPilD2cVmjCtYv?= =?iso-8859-1?q?P1Wv8c+n6EzSb6VkaZpreHdCN?= =?iso-8859-1?q?uyI1rPsyzNv4eCNkm8DsWnfH5uxdblQrygmHvsE3pHPrDj31jRR?= =?iso-8859-1?q?e0gsBMga1kpmUelcGCMb+sBgjgBTg00B7769eLIDeiZIMhADlMu?= =?iso-8859-1?q?OBxYE885BWYXtuihXOMNfhx3nfCNdn0mocBcemPNJJeNknRBhSI?= =?iso-8859-1?q?/NBMizLn+H7hLB1KgHW1nqNWLHMwNeloWWoTzjnfBHwCc5TtOSa?= =?iso-8859-1?q?IczuKrQWd3u6NrHWfHT602M3ULG5NV7ktUJ36XKWXyT9JjDNpsz?= =?iso-8859-1?q?FM3UtsE69rGNl3SW24me/Wuh6+EKkSNmYjJTkBZv7UMMym9SAlc?= =?iso-8859-1?q?Bq+6RUjozIq5V90cljeQi32HqWj3WV63USMgBZ8Z+c6fNf22VYP?= =?iso-8859-1?q?9iU8uX1R+b7yOLnZ2wk9qar343dB5/x+z5GhjNeQJ87ubxQESUl?= =?iso-8859-1?q?hzSOjAroGLeGrVDz+bnrMvZzyLypPYUfRSxK1+yThIK+/WiyKX1?= =?iso-8859-1?q?rlqb72ny4Jn0mnCy9hjzN8CJydakaiYazP+8forbpOp6GKHKzN7?= =?iso-8859-1?q?UADDHmkH2IcQlTYzSGbpe4b9yzgJ2eNmJuyov3tXOj+o2g1s0QI?= =?iso-8859-1?q?dM6jk9JbyRGqtSZ1pOxEUi7VM+KKHG/1mJF27MzrWRupDa3SlF4?= =?iso-8859-1?q?j3nlYKzdV1b72490cZV/jThLvZTpxsYkne49DcgqQ6LKr+99hdz?= =?iso-8859-1?q?Xy3wP2uJ6yBajSQ5jITse1IdRC1yoxb78Nxoky4cKRTz0qfsVtm?= =?iso-8859-1?q?IjuIRK/qwYZ5za1+eWmlOG8MsvOdzKGnvUZOTx3i+wzHy6aft4L?= =?iso-8859-1?q?tWYffQCsnIWSBCT6rAmyA6IHuMk2YFA2MreotL/vZ/Ud0VHQPwG?= =?iso-8859-1?q?Q/Sz5INmbSuhuzGg876T1P+NF07VCYmE20gaENVJWaXF1UgEuY6?= =?iso-8859-1?q?uCwnUSC5YFh4wSMc90GqID+PjinMPXquqiosUdv4+dYT/bR2/Bf?= =?iso-8859-1?q?Gz8mGnBbFpscqk0DvrJlgX9Mkj1xAwrsujWcghaT5WEdqz2+OJe?= =?iso-8859-1?q?56tYstO2DulbX1pEIAkeuYegi0gQMR/ZsFnYQvqumJIXWZSyICM?= =?iso-8859-1?q?lX3qCy0gT+NMhzdri8X+pmHHuXdfiUABOZNcN9qJxqAGUlky7GL?= =?iso-8859-1?q?cE4XkD/Ge06K/Zi6uQgVlWs2AS4Rnjh8SIM2TNUUapOScTl0yH5?= =?iso-8859-1?q?+UcyFVPAHXUIdhPFnsokdjDDae9JiHNUs/xHGbdNvjsnsnM+OLx?= =?iso-8859-1?q?+YgLblTrD05x6MOia2sIDdih7vuGphtKttHXR1V+hAwp41R1mGq?= =?iso-8859-1?q?WO7KZ6y0mv8EXiv3Gw45NjiHwRzS3rkde3s=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0967749BC1 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(39860400002)(366004)(396003)(346002)(376002)(189003)(199004)(2351001)(14444005)(107886003)(66066001)(25786009)(99286004)(6512007)(53936002)(36756003)(478600001)(6116002)(3846002)(2501003)(76176011)(6506007)(386003)(102836004)(52116002)(105586002)(71190400001)(26005)(106356001)(5660300002)(5640700003)(6436002)(54906003)(68736007)(71200400001)(97736004)(486006)(305945005)(8936002)(4326008)(186003)(81166006)(81156014)(8676002)(86362001)(446003)(476003)(11346002)(7736002)(6486002)(316002)(4720700003)(2616005)(50226002)(256004)(14454004)(2906002)(6916009); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB5315; H:AM0PR05MB4209.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Y6o6yQqgPIRZKUiGFbVRRda+boOR3Fg9c5uMfEPk/xSH7lnFxDhgRXjS7diqB8pleBLbkMXwRwYZvxG9ACjuA/yhNFNTo/ru1BNtliKB4Dnq0ZyEMKG2g+aC99K617hNOtfwvGh31fAVIP6XMAn9BjB/fmBadiZicuoouTIjwWbXuV+wXqX616Vl+uueCupVe+SdFM9QNsGDgMw+lwq7gk+oB0Hy5sDpcuGMH29ljVwi3kjEyXAu1LoxWZX8aj8n+2qFhJzodKnx+9IablEpGUt2a3yH7I8Oy9tU1e+LrAAGnF2e6ZFcTB//hwuI2vr6W3/8Mu4C3cgHXdyVEcPeHyTBMSIL0rh4wr4v1SArzIuovmEmXMRKNc0RVYV8h/Mljyl0cceUhN7lkBz5Umg58d4g91YDkgLw50K8ZXHcbbU= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0df92939-ae78-40e0-3282-08d6a18a8a9d X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Mar 2019 16:49:32.4722 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5315 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 , Roni Bar Yanai , Ilya Maximets Subject: [ovs-dev] [PATCH v6 3/3] netdev-rte-offloads: Rename netdev_dpdk_* functions 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 Rename all the netdev_dpdk_* functions names (originated from the file netdev-dpdk.c) into the netdev_rte_offloads_* functions names. Signed-off-by: Ophir Munk --- lib/netdev-rte-offloads.c | 45 +++++++++++++++++++++++---------------------- lib/netdev-rte-offloads.h | 17 +++++++++-------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/lib/netdev-rte-offloads.c b/lib/netdev-rte-offloads.c index e142561..d73fd0b 100644 --- a/lib/netdev-rte-offloads.c +++ b/lib/netdev-rte-offloads.c @@ -394,12 +394,12 @@ add_flow_rss_action(struct flow_actions *actions, } static int -netdev_dpdk_add_rte_flow_offload(struct netdev *netdev, - const struct match *match, - struct nlattr *nl_actions OVS_UNUSED, - size_t actions_len OVS_UNUSED, - const ovs_u128 *ufid, - struct offload_info *info) +netdev_rte_offloads_add_flow(struct netdev *netdev, + const struct match *match, + struct nlattr *nl_actions OVS_UNUSED, + size_t actions_len OVS_UNUSED, + const ovs_u128 *ufid, + struct offload_info *info) { const struct rte_flow_attr flow_attr = { .group = 0, @@ -575,7 +575,8 @@ netdev_dpdk_add_rte_flow_offload(struct netdev *netdev, rss = add_flow_rss_action(&actions, netdev); add_flow_action(&actions, RTE_FLOW_ACTION_TYPE_END, NULL); - flow = netdev_dpdk_rte_flow_create(netdev, &flow_attr,patterns.items, + flow = netdev_dpdk_rte_flow_create(netdev, &flow_attr, + patterns.items, actions.actions, &error); free(rss); @@ -599,7 +600,7 @@ out: * Check if any unsupported flow patterns are specified. */ static int -netdev_dpdk_validate_flow(const struct match *match) +netdev_rte_offloads_validate_flow(const struct match *match) { struct match match_zero_wc; const struct flow *masks = &match->wc.masks; @@ -668,9 +669,9 @@ err: } static int -netdev_dpdk_destroy_rte_flow(struct netdev *netdev, - const ovs_u128 *ufid, - struct rte_flow *rte_flow) +netdev_rte_offloads_destroy_flow(struct netdev *netdev, + const ovs_u128 *ufid, + struct rte_flow *rte_flow) { struct rte_flow_error error; int ret = netdev_dpdk_rte_flow_destroy(netdev, rte_flow, &error); @@ -689,10 +690,10 @@ netdev_dpdk_destroy_rte_flow(struct netdev *netdev, } int -netdev_dpdk_flow_put(struct netdev *netdev, struct match *match, - struct nlattr *actions, size_t actions_len, - const ovs_u128 *ufid, struct offload_info *info, - struct dpif_flow_stats *stats OVS_UNUSED) +netdev_rte_offloads_flow_put(struct netdev *netdev, struct match *match, + struct nlattr *actions, size_t actions_len, + const ovs_u128 *ufid, struct offload_info *info, + struct dpif_flow_stats *stats OVS_UNUSED) { struct rte_flow *rte_flow; int ret; @@ -703,24 +704,24 @@ netdev_dpdk_flow_put(struct netdev *netdev, struct match *match, */ rte_flow = ufid_to_rte_flow_find(ufid); if (rte_flow) { - ret = netdev_dpdk_destroy_rte_flow(netdev, ufid, rte_flow); + ret = netdev_rte_offloads_destroy_flow(netdev, ufid, rte_flow); if (ret < 0) { return ret; } } - ret = netdev_dpdk_validate_flow(match); + ret = netdev_rte_offloads_validate_flow(match); if (ret < 0) { return ret; } - return netdev_dpdk_add_rte_flow_offload(netdev, match, actions, - actions_len, ufid, info); + return netdev_rte_offloads_add_flow(netdev, match, actions, + actions_len, ufid, info); } int -netdev_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid, - struct dpif_flow_stats *stats OVS_UNUSED) +netdev_rte_offloads_flow_del(struct netdev *netdev, const ovs_u128 *ufid, + struct dpif_flow_stats *stats OVS_UNUSED) { struct rte_flow *rte_flow = ufid_to_rte_flow_find(ufid); @@ -728,5 +729,5 @@ netdev_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid, return -1; } - return netdev_dpdk_destroy_rte_flow(netdev, ufid, rte_flow); + return netdev_rte_offloads_destroy_flow(netdev, ufid, rte_flow); } diff --git a/lib/netdev-rte-offloads.h b/lib/netdev-rte-offloads.h index afdc0be..3f7d15f 100644 --- a/lib/netdev-rte-offloads.h +++ b/lib/netdev-rte-offloads.h @@ -25,15 +25,16 @@ struct nlattr; struct offload_info; struct dpif_flow_stats; -int netdev_dpdk_flow_put(struct netdev *netdev, struct match *match, - struct nlattr *actions, size_t actions_len, - const ovs_u128 *ufid, struct offload_info *info, - struct dpif_flow_stats *stats); -int netdev_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid, - struct dpif_flow_stats *stats); +int netdev_rte_offloads_flow_put(struct netdev *netdev, struct match *match, + struct nlattr *actions, size_t actions_len, + const ovs_u128 *ufid, + struct offload_info *info, + struct dpif_flow_stats *stats); +int netdev_rte_offloads_flow_del(struct netdev *netdev, const ovs_u128 *ufid, + struct dpif_flow_stats *stats); #define DPDK_FLOW_OFFLOAD_API \ - .flow_put = netdev_dpdk_flow_put, \ - .flow_del = netdev_dpdk_flow_del + .flow_put = netdev_rte_offloads_flow_put, \ + .flow_del = netdev_rte_offloads_flow_del #endif /* netdev-rte-offloads.h */