mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-13 20:33:15 +00:00
xfrm: remove get_mtu indirection from xfrm_type
esp4_get_mtu and esp6_get_mtu are exactly the same, the only difference is a single sizeof() (ipv4 vs. ipv6 header). Merge both into xfrm_state_mtu() and remove the indirection. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
parent
8928aa6a00
commit
c7b37c769d
@ -404,8 +404,6 @@ struct xfrm_type {
|
||||
int (*reject)(struct xfrm_state *, struct sk_buff *,
|
||||
const struct flowi *);
|
||||
int (*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);
|
||||
/* Estimate maximal size of result of transformation of a dgram */
|
||||
u32 (*get_mtu)(struct xfrm_state *, int size);
|
||||
};
|
||||
|
||||
int xfrm_register_type(const struct xfrm_type *type, unsigned short family);
|
||||
@ -1546,7 +1544,7 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si);
|
||||
void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si);
|
||||
u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq);
|
||||
int xfrm_init_replay(struct xfrm_state *x);
|
||||
int xfrm_state_mtu(struct xfrm_state *x, int mtu);
|
||||
u32 xfrm_state_mtu(struct xfrm_state *x, int mtu);
|
||||
int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload);
|
||||
int xfrm_init_state(struct xfrm_state *x);
|
||||
int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type);
|
||||
|
@ -33,8 +33,6 @@ struct esp_output_extra {
|
||||
|
||||
#define ESP_SKB_CB(__skb) ((struct esp_skb_cb *)&((__skb)->cb[0]))
|
||||
|
||||
static u32 esp4_get_mtu(struct xfrm_state *x, int mtu);
|
||||
|
||||
/*
|
||||
* Allocate an AEAD request structure with extra space for SG and IV.
|
||||
*
|
||||
@ -506,7 +504,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
|
||||
struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
|
||||
u32 padto;
|
||||
|
||||
padto = min(x->tfcpad, esp4_get_mtu(x, dst->child_mtu_cached));
|
||||
padto = min(x->tfcpad, xfrm_state_mtu(x, dst->child_mtu_cached));
|
||||
if (skb->len < padto)
|
||||
esp.tfclen = padto - skb->len;
|
||||
}
|
||||
@ -788,28 +786,6 @@ out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)
|
||||
{
|
||||
struct crypto_aead *aead = x->data;
|
||||
u32 blksize = ALIGN(crypto_aead_blocksize(aead), 4);
|
||||
unsigned int net_adj;
|
||||
|
||||
switch (x->props.mode) {
|
||||
case XFRM_MODE_TRANSPORT:
|
||||
case XFRM_MODE_BEET:
|
||||
net_adj = sizeof(struct iphdr);
|
||||
break;
|
||||
case XFRM_MODE_TUNNEL:
|
||||
net_adj = 0;
|
||||
break;
|
||||
default:
|
||||
BUG();
|
||||
}
|
||||
|
||||
return ((mtu - x->props.header_len - crypto_aead_authsize(aead) -
|
||||
net_adj) & ~(blksize - 1)) + net_adj - 2;
|
||||
}
|
||||
|
||||
static int esp4_err(struct sk_buff *skb, u32 info)
|
||||
{
|
||||
struct net *net = dev_net(skb->dev);
|
||||
@ -1035,7 +1011,6 @@ static const struct xfrm_type esp_type =
|
||||
.flags = XFRM_TYPE_REPLAY_PROT,
|
||||
.init_state = esp_init_state,
|
||||
.destructor = esp_destroy,
|
||||
.get_mtu = esp4_get_mtu,
|
||||
.input = esp_input,
|
||||
.output = esp_output,
|
||||
};
|
||||
|
@ -41,8 +41,6 @@ struct esp_skb_cb {
|
||||
|
||||
#define ESP_SKB_CB(__skb) ((struct esp_skb_cb *)&((__skb)->cb[0]))
|
||||
|
||||
static u32 esp6_get_mtu(struct xfrm_state *x, int mtu);
|
||||
|
||||
/*
|
||||
* Allocate an AEAD request structure with extra space for SG and IV.
|
||||
*
|
||||
@ -447,7 +445,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
|
||||
struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
|
||||
u32 padto;
|
||||
|
||||
padto = min(x->tfcpad, esp6_get_mtu(x, dst->child_mtu_cached));
|
||||
padto = min(x->tfcpad, xfrm_state_mtu(x, dst->child_mtu_cached));
|
||||
if (skb->len < padto)
|
||||
esp.tfclen = padto - skb->len;
|
||||
}
|
||||
@ -687,21 +685,6 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)
|
||||
{
|
||||
struct crypto_aead *aead = x->data;
|
||||
u32 blksize = ALIGN(crypto_aead_blocksize(aead), 4);
|
||||
unsigned int net_adj;
|
||||
|
||||
if (x->props.mode != XFRM_MODE_TUNNEL)
|
||||
net_adj = sizeof(struct ipv6hdr);
|
||||
else
|
||||
net_adj = 0;
|
||||
|
||||
return ((mtu - x->props.header_len - crypto_aead_authsize(aead) -
|
||||
net_adj) & ~(blksize - 1)) + net_adj - 2;
|
||||
}
|
||||
|
||||
static int esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
||||
u8 type, u8 code, int offset, __be32 info)
|
||||
{
|
||||
@ -919,7 +902,6 @@ static const struct xfrm_type esp6_type = {
|
||||
.flags = XFRM_TYPE_REPLAY_PROT,
|
||||
.init_state = esp6_init_state,
|
||||
.destructor = esp6_destroy,
|
||||
.get_mtu = esp6_get_mtu,
|
||||
.input = esp6_input,
|
||||
.output = esp6_output,
|
||||
.hdr_offset = xfrm6_find_1stfragopt,
|
||||
|
@ -275,9 +275,8 @@ bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x)
|
||||
return false;
|
||||
|
||||
if ((!dev || (dev == xfrm_dst_path(dst)->dev)) &&
|
||||
(!xdst->child->xfrm && x->type->get_mtu)) {
|
||||
mtu = x->type->get_mtu(x, xdst->child_mtu_cached);
|
||||
|
||||
(!xdst->child->xfrm)) {
|
||||
mtu = xfrm_state_mtu(x, xdst->child_mtu_cached);
|
||||
if (skb->len <= mtu)
|
||||
goto ok;
|
||||
|
||||
|
@ -27,6 +27,8 @@
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/kernel.h>
|
||||
|
||||
#include <crypto/aead.h>
|
||||
|
||||
#include "xfrm_hash.h"
|
||||
|
||||
#define xfrm_state_deref_prot(table, net) \
|
||||
@ -2403,16 +2405,38 @@ void xfrm_state_delete_tunnel(struct xfrm_state *x)
|
||||
}
|
||||
EXPORT_SYMBOL(xfrm_state_delete_tunnel);
|
||||
|
||||
int xfrm_state_mtu(struct xfrm_state *x, int mtu)
|
||||
u32 xfrm_state_mtu(struct xfrm_state *x, int mtu)
|
||||
{
|
||||
const struct xfrm_type *type = READ_ONCE(x->type);
|
||||
struct crypto_aead *aead;
|
||||
u32 blksize, net_adj = 0;
|
||||
|
||||
if (x->km.state == XFRM_STATE_VALID &&
|
||||
type && type->get_mtu)
|
||||
return type->get_mtu(x, mtu);
|
||||
if (x->km.state != XFRM_STATE_VALID ||
|
||||
!type || type->proto != IPPROTO_ESP)
|
||||
return mtu - x->props.header_len;
|
||||
|
||||
return mtu - x->props.header_len;
|
||||
aead = x->data;
|
||||
blksize = ALIGN(crypto_aead_blocksize(aead), 4);
|
||||
|
||||
switch (x->props.mode) {
|
||||
case XFRM_MODE_TRANSPORT:
|
||||
case XFRM_MODE_BEET:
|
||||
if (x->props.family == AF_INET)
|
||||
net_adj = sizeof(struct iphdr);
|
||||
else if (x->props.family == AF_INET6)
|
||||
net_adj = sizeof(struct ipv6hdr);
|
||||
break;
|
||||
case XFRM_MODE_TUNNEL:
|
||||
break;
|
||||
default:
|
||||
WARN_ON_ONCE(1);
|
||||
break;
|
||||
}
|
||||
|
||||
return ((mtu - x->props.header_len - crypto_aead_authsize(aead) -
|
||||
net_adj) & ~(blksize - 1)) + net_adj - 2;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xfrm_state_mtu);
|
||||
|
||||
int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user