From 9b516652a1b0113faf6cfa4df2039b7c8a217838 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 27 Mar 2014 14:38:57 +0000 Subject: [PATCH] recirculation: Some cosmetic fixes Wrap long lines, fix whitespaces, and fix a typo in a comment. No functional changes are intended. Cc: Andy Zhou Signed-off-by: YAMAMOTO Takashi Signed-off-by: Andy Zhou --- include/linux/openvswitch.h | 3 ++- lib/dpif-netdev.c | 3 ++- ofproto/ofproto-dpif.h | 50 ++++++++++++++++++++----------------- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h index d9282d675..3fc4978cb 100644 --- a/include/linux/openvswitch.h +++ b/include/linux/openvswitch.h @@ -549,7 +549,8 @@ enum ovs_recirc_hash_alg { * struct ovs_action_recirc - %OVS_ACTION_ATTR_RECIRC action argument. * @recirc_id: The Recirculation label, Zero is invalid. * @hash_alg: Algorithm used to compute hash prior to recirculation. - * @hash_bias: bias used for computing hash. used to compute hash prior to recirculation. + * @hash_bias: bias used for computing hash. used to compute hash prior to + * recirculation. */ struct ovs_action_recirc { uint32_t hash_alg; /* One of ovs_dp_hash_alg. */ diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 8687a4725..60e024e56 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -2117,8 +2117,9 @@ dp_execute_cb(void *aux_, struct ofpbuf *packet, case OVS_ACTION_ATTR_RECIRC: { const struct ovs_action_recirc *act; + act = nl_attr_get(a); - md->recirc_id =act->recirc_id; + md->recirc_id = act->recirc_id; md->dp_hash = 0; if (act->hash_alg == OVS_RECIRC_HASH_ALG_L4) { diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h index 93e6ec055..088ff8931 100644 --- a/ofproto/ofproto-dpif.h +++ b/ofproto/ofproto-dpif.h @@ -139,32 +139,35 @@ struct ofport_dpif *odp_port_to_ofport(const struct dpif_backer *, odp_port_t); * Recirculation * ============= * - * Recirculation is a technique to allow a frame to re-enter the packet processing - * path for one or multiple times to achieve more flexible packet processing in the - * data path. MPLS handling and selecting bond slave port of a bond ports. + * Recirculation is a technique to allow a frame to re-enter the packet + * processing path for one or multiple times to achieve more flexible packet + * processing in the data path. MPLS handling and selecting bond slave port + * of a bond ports. * * Data path and user space interface * ----------------------------------- * - * Two new fields, recirc_id and dp_hash, are added to the current flow data structure. - * They are both both of type uint32_t. In addition, a new action, RECIRC, are added. + * Two new fields, recirc_id and dp_hash, are added to the current flow data + * structure. They are both of type uint32_t. In addition, a new action, + * RECIRC, are added. * - * The value recirc_id is used to distinguish a packet from multiple iterations of - * recirculation. A packet initially received is considered of having recirc_id of 0. - * Recirc_id is managed by the user space, opaque to the data path. + * The value recirc_id is used to distinguish a packet from multiple + * iterations of recirculation. A packet initially received is considered of + * having recirc_id of 0. Recirc_id is managed by the user space, opaque to + * the data path. * * On the other hand, dp_hash can only be computed by the data path, opaque to - * the user space. In fact, user space may not able to recompute the hash value. - * The dp_hash value should be wildcarded when for a newly received packet. - * RECIRC action specifies whether the hash is computed. If computed, how many - * fields to be included in the hash computation. The computed hash value is - * stored into the dp_hash field prior to recirculation. - * - * The RECIRC action computes and set the dp_hash field, set the recirc_id field - * and then reprocess the packet as if it was received on the same input port. - * RECIRC action works like a function call; actions listed behind the RECIRC - * action will be executed after its execution. RECIRC action can be nested, - * data path implementation limits the number of recirculation executed + * the user space. In fact, user space may not able to recompute the hash + * value. The dp_hash value should be wildcarded when for a newly received + * packet. RECIRC action specifies whether the hash is computed. If computed, + * how many fields to be included in the hash computation. The computed hash + * value is stored into the dp_hash field prior to recirculation. + * + * The RECIRC action computes and set the dp_hash field, set the recirc_id + * field and then reprocess the packet as if it was received on the same input + * port. RECIRC action works like a function call; actions listed behind the + * RECIRC action will be executed after its execution. RECIRC action can be + * nested, data path implementation limits the number of recirculation executed * to prevent unreasonable nesting depth or infinite loop. * * Both flow fields and the RECIRC action are exposed as open flow fields via @@ -174,11 +177,12 @@ struct ofport_dpif *odp_port_to_ofport(const struct dpif_backer *, odp_port_t); * ------------------------ * * At the open flow level, post recirculation rules are always hidden from the - * controller. They are installed in table 254 which is set up as a hidden table - * during boot time. Those rules are managed by the local user space program only. + * controller. They are installed in table 254 which is set up as a hidden + * table during boot time. Those rules are managed by the local user space + * program only. * - * To speed up the classifier look up process, recirc_id is always reflected into - * the metadata field, since recirc_id is required to be exactly matched. + * To speed up the classifier look up process, recirc_id is always reflected + * into the metadata field, since recirc_id is required to be exactly matched. * * Classifier look up always starts with table 254. A post recirculation flow * lookup should find its hidden rule within this table. On the other hand, A -- 2.43.0