Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b23f0e authored by Steffen Klassert's avatar Steffen Klassert Committed by Benedict Wong
Browse files

UPSTREAM: flow: Extend flow informations with xfrm interface id. 



Add a new flowi_xfrm structure with informations needed to do
a xfrm lookup. At the moment it keeps the informations about
the new xfrm interface id needed to lookup xfrm interfaces
that are introduced with a followup patch. We need this new
lookup key as other possible keys, like the ifindex is
already part of the xfrm selector and used as a key to
enforce the output device after the transformation in the
policy/state lookup.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Acked-by: default avatarShannon Nelson <shannon.nelson@oracle.com>
Acked-by: default avatarBenedict Wong <benedictwong@google.com>
Tested-by: default avatarBenedict Wong <benedictwong@google.com>
Tested-by: default avatarAntony Antony <antony@phenome.org>
Reviewed-by: default avatarEyal Birger <eyal.birger@gmail.com>

(cherry picked from commit d159ce7957eec306eacda672e5909e26675ca8ef)
Signed-off-by: default avatarBenedict Wong <benedictwong@google.com>
Bug: 113046120
Change-Id: I70b520d3cf67cd663e84868b0e7cc45ffa74d080
parent 8508afd4

include/net/flow.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,10 @@ struct flowi_tunnel { 
	__be64			tun_id;

	__be64			tun_id;

};

};





struct flowi_xfrm {

	__u32			if_id;

};



struct flowi_common {

struct flowi_common {

	int	flowic_oif;

	int	flowic_oif;

	int	flowic_iif;

	int	flowic_iif;
@@ -39,6 +43,7 @@ struct flowi_common { 
#define FLOWI_FLAG_SKIP_NH_OIF		0x04

#define FLOWI_FLAG_SKIP_NH_OIF		0x04

	__u32	flowic_secid;

	__u32	flowic_secid;

	struct flowi_tunnel flowic_tun_key;

	struct flowi_tunnel flowic_tun_key;

	struct flowi_xfrm xfrm;

	kuid_t  flowic_uid;

	kuid_t  flowic_uid;

};

};
@@ -78,6 +83,7 @@ struct flowi4 { 
#define flowi4_secid		__fl_common.flowic_secid

#define flowi4_secid		__fl_common.flowic_secid

#define flowi4_tun_key		__fl_common.flowic_tun_key

#define flowi4_tun_key		__fl_common.flowic_tun_key

#define flowi4_uid		__fl_common.flowic_uid

#define flowi4_uid		__fl_common.flowic_uid

#define flowi4_xfrm		__fl_common.xfrm





	/* (saddr,daddr) must be grouped, same order as in IP header */

	/* (saddr,daddr) must be grouped, same order as in IP header */

	__be32			saddr;

	__be32			saddr;
@@ -109,6 +115,7 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif, 
	fl4->flowi4_flags = flags;

	fl4->flowi4_flags = flags;

	fl4->flowi4_secid = 0;

	fl4->flowi4_secid = 0;

	fl4->flowi4_tun_key.tun_id = 0;

	fl4->flowi4_tun_key.tun_id = 0;

	fl4->flowi4_xfrm.if_id = 0;

	fl4->flowi4_uid = uid;

	fl4->flowi4_uid = uid;

	fl4->daddr = daddr;

	fl4->daddr = daddr;

	fl4->saddr = saddr;

	fl4->saddr = saddr;
@@ -138,6 +145,7 @@ struct flowi6 { 
#define flowi6_secid		__fl_common.flowic_secid

#define flowi6_secid		__fl_common.flowic_secid

#define flowi6_tun_key		__fl_common.flowic_tun_key

#define flowi6_tun_key		__fl_common.flowic_tun_key

#define flowi6_uid		__fl_common.flowic_uid

#define flowi6_uid		__fl_common.flowic_uid

#define flowi6_xfrm		__fl_common.xfrm

	struct in6_addr		daddr;

	struct in6_addr		daddr;

	struct in6_addr		saddr;

	struct in6_addr		saddr;

	/* Note: flowi6_tos is encoded in flowlabel, too. */

	/* Note: flowi6_tos is encoded in flowlabel, too. */
@@ -185,6 +193,7 @@ struct flowi { 
#define flowi_secid	u.__fl_common.flowic_secid

#define flowi_secid	u.__fl_common.flowic_secid

#define flowi_tun_key	u.__fl_common.flowic_tun_key

#define flowi_tun_key	u.__fl_common.flowic_tun_key

#define flowi_uid	u.__fl_common.flowic_uid

#define flowi_uid	u.__fl_common.flowic_uid

#define flowi_xfrm	u.__fl_common.xfrm

} __attribute__((__aligned__(BITS_PER_LONG/8)));

} __attribute__((__aligned__(BITS_PER_LONG/8)));





static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)

static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)