From patchwork Mon Mar 13 13:37:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 738156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3vhfJZ2SZ3z9s1h for ; Tue, 14 Mar 2017 00:45:34 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C3543C3F; Mon, 13 Mar 2017 13:37:44 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp2.linuxfoundation.org (smtp2.linux-foundation.org [172.17.192.36]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 27A48BCF for ; Mon, 13 Mar 2017 13:37:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by smtp2.linuxfoundation.org (Postfix) with ESMTP id 39A5A1DE55 for ; Mon, 13 Mar 2017 13:37:38 +0000 (UTC) Received: from Internal Mail-Server by MTLPINE1 (envelope-from roid@mellanox.com) with ESMTPS (AES256-SHA encrypted); 13 Mar 2017 15:37:32 +0200 Received: from r-vnc05.mtr.labs.mlnx (r-vnc05.mtr.labs.mlnx [10.208.0.115]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v2DDbJZM028197; Mon, 13 Mar 2017 15:37:22 +0200 From: Roi Dayan To: dev@openvswitch.org Date: Mon, 13 Mar 2017 15:37:07 +0200 Message-Id: <1489412234-30916-18-git-send-email-roid@mellanox.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1489412234-30916-1-git-send-email-roid@mellanox.com> References: <1489412234-30916-1-git-send-email-roid@mellanox.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp2.linux-foundation.org Cc: Shahar Klein , Hadar Hen Zion , Rony Efraim , Jiri Pirko , Marcelo Ricardo Leitner , Simon Horman , Or Gerlitz , Andy Gospodarek Subject: [ovs-dev] [PATCH ovs V4 17/24] netdev-tc-offloads: Implement flow get using tc interface 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Paul Blakey Search the requested ufid for a offloaded flow, and if found, dump and parse it back to required format. Signed-off-by: Paul Blakey Reviewed-by: Roi Dayan --- lib/netdev-tc-offloads.c | 49 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 6 deletions(-) diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c index 7b21b73..b822777 100644 --- a/lib/netdev-tc-offloads.c +++ b/lib/netdev-tc-offloads.c @@ -761,13 +761,50 @@ netdev_tc_flow_put(struct netdev *netdev, int netdev_tc_flow_get(struct netdev *netdev OVS_UNUSED, - struct match *match OVS_UNUSED, - struct nlattr **actions OVS_UNUSED, - struct dpif_flow_stats *stats OVS_UNUSED, - const ovs_u128 *ufid OVS_UNUSED, - struct ofpbuf *buf OVS_UNUSED) + struct match *match, + struct nlattr **actions, + struct dpif_flow_stats *stats, + const ovs_u128 *ufid, + struct ofpbuf *buf) { - return EOPNOTSUPP; + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); + struct netdev *dev; + struct tc_flower flower; + odp_port_t in_port; + int prio = 0; + int ifindex; + int handle; + int err; + + handle = get_ufid_tc_mapping(ufid, &prio, &dev); + if (!handle) { + return ENOENT; + } + + ifindex = netdev_get_ifindex(dev); + if (ifindex < 0) { + VLOG_ERR_RL(&rl_err, "failed to get ifindex for %s: %s", + netdev_get_name(dev), ovs_strerror(-ifindex)); + return -ifindex; + } + + VLOG_DBG_RL(&rl, "flow get (dev %s prio %d handle %d)", + netdev_get_name(dev), prio, handle); + err = tc_get_flower(ifindex, prio, handle, &flower); + netdev_close(dev); + if (err) { + VLOG_ERR_RL(&rl_err, "flow get failed (dev %s prio %d handle %d): %s", + netdev_get_name(dev), prio, handle, ovs_strerror(err)); + return err; + } + + in_port = netdev_hmap_port_get_byifidx(ifindex); + parse_tc_flower_to_match(&flower, match, actions, stats, buf); + + match->wc.masks.in_port.odp_port = u32_to_odp(UINT32_MAX); + match->flow.in_port.odp_port = in_port; + + return 0; } int