On 8 February 2017 at 11:32, Jarno Rajahalme <ja...@ovn.org> wrote:
> We avoid calling into nf_conntrack_in() for expected connections, as
> that would remove the expectation that we want to stick around until
> we are ready to commit the connection. Instead, we do a lookup in the
> expectation table directly. However, after a successful expectation
> lookup we have set the flow key label field from the master
> connection, whereas nf_conntrack_in() does not do this. This leads to
> master's labels being inherited after an expectation lookup, but those
> labels not being inherited after the corresponding conntrack action
> with a commit flag.
>
> This patch resolves the problem by changing the commit code path to
> also inherit the master's labels to the expected connection.
> Resolving this conflict in favor or inheriting the labels allows more
*of inheriting
> information be passed from the master connection to related
> connections, which would otherwise be much harder if the 32 bits in
> the connmark are not enough. Labels can still be set explicitly, so
> this change only affects the default values of the labels in presense
> of a master connection.
>
> Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action")
> Signed-off-by: Jarno Rajahalme <ja...@ovn.org>
<snip>
> @@ -272,18 +274,32 @@ static int ovs_ct_init_labels(struct nf_conn *ct,
> struct sw_flow_key *key,
> const struct ovs_key_ct_labels *labels,
> const struct ovs_key_ct_labels *mask)
> {
> - struct nf_conn_labels *cl;
> - u32 *dst;
> - int i;
> + struct nf_conn_labels *cl, *master_cl;
> + bool have_mask = labels_nonzero(mask);
> +
> + /* Inherit master's labels to the related connection? */
> + master_cl = (ct->master) ? nf_ct_labels_find(ct->master) : NULL;
I don't think (ct->master) needs the parentheses.
