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

Commit 02cf388d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "BACKPORT: net: xfrm: support setting an output mark."

parents ae7a00d4 bf25c79c

include/net/xfrm.h

+5 −2
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ struct xfrm_state { 
		int		header_len;

		int		trailer_len;

		u32		extra_flags;

		u32		output_mark;

	} props;



	struct xfrm_lifetime_cfg lft;
@@ -284,10 +285,12 @@ struct xfrm_policy_afinfo { 
	struct dst_entry	*(*dst_lookup)(struct net *net,

					       int tos, int oif,

					       const xfrm_address_t *saddr,

					       const xfrm_address_t *daddr);

					       const xfrm_address_t *daddr,

					       u32 mark);

	int			(*get_saddr)(struct net *net, int oif,

					     xfrm_address_t *saddr,

					     xfrm_address_t *daddr);

					     xfrm_address_t *daddr,

					     u32 mark);

	void			(*decode_session)(struct sk_buff *skb,

						  struct flowi *fl,

						  int reverse);

include/uapi/linux/xfrm.h

+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ enum xfrm_attr_type_t { 
	XFRMA_PROTO,		/* __u8 */

	XFRMA_ADDRESS_FILTER,	/* struct xfrm_address_filter */

	XFRMA_PAD,

	XFRMA_OFFLOAD_DEV,	/* struct xfrm_state_offload */

	XFRMA_OUTPUT_MARK,	/* __u32 */

	__XFRMA_MAX



#define XFRMA_MAX (__XFRMA_MAX - 1)

net/ipv4/xfrm4_policy.c

+9 −5
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ static struct xfrm_policy_afinfo xfrm4_policy_afinfo; 
static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4,

					    int tos, int oif,

					    const xfrm_address_t *saddr,

					    const xfrm_address_t *daddr)

					    const xfrm_address_t *daddr,

					    u32 mark)

{

	struct rtable *rt;
@@ -30,6 +31,7 @@ static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4, 
	fl4->daddr = daddr->a4;

	fl4->flowi4_tos = tos;

	fl4->flowi4_oif = l3mdev_master_ifindex_by_index(net, oif);

	fl4->flowi4_mark = mark;

	if (saddr)

		fl4->saddr = saddr->a4;
@@ -44,20 +46,22 @@ static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4, 


static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos, int oif,

					  const xfrm_address_t *saddr,

					  const xfrm_address_t *daddr)

					  const xfrm_address_t *daddr,

					  u32 mark)

{

	struct flowi4 fl4;



	return __xfrm4_dst_lookup(net, &fl4, tos, oif, saddr, daddr);

	return __xfrm4_dst_lookup(net, &fl4, tos, oif, saddr, daddr, mark);

}



static int xfrm4_get_saddr(struct net *net, int oif,

			   xfrm_address_t *saddr, xfrm_address_t *daddr)

			   xfrm_address_t *saddr, xfrm_address_t *daddr,

			   u32 mark)

{

	struct dst_entry *dst;

	struct flowi4 fl4;



	dst = __xfrm4_dst_lookup(net, &fl4, 0, oif, NULL, daddr);

	dst = __xfrm4_dst_lookup(net, &fl4, 0, oif, NULL, daddr, mark);

	if (IS_ERR(dst))

		return -EHOSTUNREACH;

net/ipv6/xfrm6_policy.c

+6 −3
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ static struct xfrm_policy_afinfo xfrm6_policy_afinfo; 


static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif,

					  const xfrm_address_t *saddr,

					  const xfrm_address_t *daddr)

					  const xfrm_address_t *daddr,

					  u32 mark)

{

	struct flowi6 fl6;

	struct dst_entry *dst;
@@ -38,6 +39,7 @@ static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif, 
	memset(&fl6, 0, sizeof(fl6));

	fl6.flowi6_oif = l3mdev_master_ifindex_by_index(net, oif);

	fl6.flowi6_flags = FLOWI_FLAG_SKIP_NH_OIF;

	fl6.flowi6_mark = mark;

	memcpy(&fl6.daddr, daddr, sizeof(fl6.daddr));

	if (saddr)

		memcpy(&fl6.saddr, saddr, sizeof(fl6.saddr));
@@ -54,12 +56,13 @@ static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif, 
}



static int xfrm6_get_saddr(struct net *net, int oif,

			   xfrm_address_t *saddr, xfrm_address_t *daddr)

			   xfrm_address_t *saddr, xfrm_address_t *daddr,

			   u32 mark)

{

	struct dst_entry *dst;

	struct net_device *dev;



	dst = xfrm6_dst_lookup(net, 0, oif, NULL, daddr);

	dst = xfrm6_dst_lookup(net, 0, oif, NULL, daddr, mark);

	if (IS_ERR(dst))

		return -EHOSTUNREACH;

net/xfrm/xfrm_output.c

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ static int xfrm_output_one(struct sk_buff *skb, int err) 
			goto error_nolock;

		}



		if (x->props.output_mark)

			skb->mark = x->props.output_mark;



		err = x->outer_mode->output(x, skb);

		if (err) {

			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEMODEERROR);