mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
inet: Kill FLOWI_FLAG_PRECOW_METRICS.
No longer needed. TCP writes metrics, but now in it's own special cache that does not dirty the route metrics. Therefore there is no longer any reason to pre-cow metrics in this way. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
1d861aa4b3
commit
3e12939a2a
6 changed files with 6 additions and 18 deletions
|
@ -20,9 +20,8 @@ struct flowi_common {
|
||||||
__u8 flowic_proto;
|
__u8 flowic_proto;
|
||||||
__u8 flowic_flags;
|
__u8 flowic_flags;
|
||||||
#define FLOWI_FLAG_ANYSRC 0x01
|
#define FLOWI_FLAG_ANYSRC 0x01
|
||||||
#define FLOWI_FLAG_PRECOW_METRICS 0x02
|
#define FLOWI_FLAG_CAN_SLEEP 0x02
|
||||||
#define FLOWI_FLAG_CAN_SLEEP 0x04
|
#define FLOWI_FLAG_RT_NOCACHE 0x04
|
||||||
#define FLOWI_FLAG_RT_NOCACHE 0x08
|
|
||||||
__u32 flowic_secid;
|
__u32 flowic_secid;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -245,8 +245,6 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
|
||||||
|
|
||||||
if (inet_sk(sk)->transparent || inet_sk(sk)->hdrincl)
|
if (inet_sk(sk)->transparent || inet_sk(sk)->hdrincl)
|
||||||
flags |= FLOWI_FLAG_ANYSRC;
|
flags |= FLOWI_FLAG_ANYSRC;
|
||||||
if (sk->sk_protocol == IPPROTO_TCP)
|
|
||||||
flags |= FLOWI_FLAG_PRECOW_METRICS;
|
|
||||||
return flags;
|
return flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -278,8 +278,6 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32
|
||||||
|
|
||||||
if (inet_sk(sk)->transparent)
|
if (inet_sk(sk)->transparent)
|
||||||
flow_flags |= FLOWI_FLAG_ANYSRC;
|
flow_flags |= FLOWI_FLAG_ANYSRC;
|
||||||
if (protocol == IPPROTO_TCP)
|
|
||||||
flow_flags |= FLOWI_FLAG_PRECOW_METRICS;
|
|
||||||
if (can_sleep)
|
if (can_sleep)
|
||||||
flow_flags |= FLOWI_FLAG_CAN_SLEEP;
|
flow_flags |= FLOWI_FLAG_CAN_SLEEP;
|
||||||
|
|
||||||
|
|
|
@ -375,7 +375,7 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
|
||||||
const struct inet_request_sock *ireq = inet_rsk(req);
|
const struct inet_request_sock *ireq = inet_rsk(req);
|
||||||
struct ip_options_rcu *opt = inet_rsk(req)->opt;
|
struct ip_options_rcu *opt = inet_rsk(req)->opt;
|
||||||
struct net *net = sock_net(sk);
|
struct net *net = sock_net(sk);
|
||||||
int flags = inet_sk_flowi_flags(sk) & ~FLOWI_FLAG_PRECOW_METRICS;
|
int flags = inet_sk_flowi_flags(sk);
|
||||||
|
|
||||||
if (nocache)
|
if (nocache)
|
||||||
flags |= FLOWI_FLAG_RT_NOCACHE;
|
flags |= FLOWI_FLAG_RT_NOCACHE;
|
||||||
|
|
|
@ -1658,7 +1658,7 @@ void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
|
||||||
struct rtable *rt;
|
struct rtable *rt;
|
||||||
|
|
||||||
flowi4_init_output(&fl4, oif, mark, RT_TOS(iph->tos), RT_SCOPE_UNIVERSE,
|
flowi4_init_output(&fl4, oif, mark, RT_TOS(iph->tos), RT_SCOPE_UNIVERSE,
|
||||||
protocol, flow_flags | FLOWI_FLAG_PRECOW_METRICS,
|
protocol, flow_flags,
|
||||||
iph->daddr, iph->saddr, 0, 0);
|
iph->daddr, iph->saddr, 0, 0);
|
||||||
rt = __ip_route_output_key(net, &fl4);
|
rt = __ip_route_output_key(net, &fl4);
|
||||||
if (!IS_ERR(rt)) {
|
if (!IS_ERR(rt)) {
|
||||||
|
@ -1836,18 +1836,11 @@ static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4,
|
||||||
{
|
{
|
||||||
struct inet_peer_base *base;
|
struct inet_peer_base *base;
|
||||||
struct inet_peer *peer;
|
struct inet_peer *peer;
|
||||||
int create = 0;
|
|
||||||
|
|
||||||
/* If a peer entry exists for this destination, we must hook
|
|
||||||
* it up in order to get at cached metrics.
|
|
||||||
*/
|
|
||||||
if (fl4 && (fl4->flowi4_flags & FLOWI_FLAG_PRECOW_METRICS))
|
|
||||||
create = 1;
|
|
||||||
|
|
||||||
base = inetpeer_base_ptr(rt->_peer);
|
base = inetpeer_base_ptr(rt->_peer);
|
||||||
BUG_ON(!base);
|
BUG_ON(!base);
|
||||||
|
|
||||||
peer = inet_getpeer_v4(base, rt->rt_dst, create);
|
peer = inet_getpeer_v4(base, rt->rt_dst, 0);
|
||||||
if (peer) {
|
if (peer) {
|
||||||
__rt_set_peer(rt, peer);
|
__rt_set_peer(rt, peer);
|
||||||
rt->rt_peer_genid = rt_peer_genid();
|
rt->rt_peer_genid = rt_peer_genid();
|
||||||
|
|
|
@ -1093,7 +1093,7 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
|
||||||
memset(&fl6, 0, sizeof(fl6));
|
memset(&fl6, 0, sizeof(fl6));
|
||||||
fl6.flowi6_oif = oif;
|
fl6.flowi6_oif = oif;
|
||||||
fl6.flowi6_mark = mark;
|
fl6.flowi6_mark = mark;
|
||||||
fl6.flowi6_flags = FLOWI_FLAG_PRECOW_METRICS;
|
fl6.flowi6_flags = 0;
|
||||||
fl6.daddr = iph->daddr;
|
fl6.daddr = iph->daddr;
|
||||||
fl6.saddr = iph->saddr;
|
fl6.saddr = iph->saddr;
|
||||||
fl6.flowlabel = (*(__be32 *) iph) & IPV6_FLOWINFO_MASK;
|
fl6.flowlabel = (*(__be32 *) iph) & IPV6_FLOWINFO_MASK;
|
||||||
|
|
Loading…
Reference in a new issue