FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-25 15:13:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule

Browse Source 
This moves the hack "net_ipvs(skb_net(skb))" up one level where it
will be easier to remove.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:02:43 -05:00 committed by Simon Horman
parent 2f3edc6a5b
commit d8f44c335a
6 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/ip_vs.h
View File

@ -487,7 +487,8 @@ struct ip_vs_protocol {
void (*exit_netns)(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd); void (*exit_netns)(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd);
int (*conn_schedule)(int af, struct sk_buff *skb, int (*conn_schedule)(struct netns_ipvs *ipvs,
int af, struct sk_buff *skb,
struct ip_vs_proto_data *pd, struct ip_vs_proto_data *pd,
int *verdict, struct ip_vs_conn **cpp, int *verdict, struct ip_vs_conn **cpp,
struct ip_vs_iphdr *iph); struct ip_vs_iphdr *iph);

11
net/netfilter/ipvs/ip_vs_core.c
View File

@ -1360,7 +1360,8 @@ ip_vs_local_reply6(void *priv, struct sk_buff *skb,
#endif #endif
static unsigned int static unsigned int
ip_vs_try_to_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, ip_vs_try_to_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,
struct ip_vs_proto_data *pd,
int *verdict, struct ip_vs_conn **cpp, int *verdict, struct ip_vs_conn **cpp,
struct ip_vs_iphdr *iph) struct ip_vs_iphdr *iph)
{ {
@ -1372,7 +1373,7 @@ ip_vs_try_to_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,
*/ */
/* Schedule and create new connection entry into cpp */ /* Schedule and create new connection entry into cpp */
if (!pp->conn_schedule(af, skb, pd, verdict, cpp, iph)) if (!pp->conn_schedule(ipvs, af, skb, pd, verdict, cpp, iph))
return 0; return 0;
} }
@ -1500,7 +1501,7 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum)
if (!sysctl_schedule_icmp(ipvs)) if (!sysctl_schedule_icmp(ipvs))
return NF_ACCEPT; return NF_ACCEPT;
if (!ip_vs_try_to_schedule(AF_INET, skb, pd, &v, &cp, &ciph)) if (!ip_vs_try_to_schedule(ipvs, AF_INET, skb, pd, &v, &cp, &ciph))
return v; return v;
new_cp = true; new_cp = true;
} }
@ -1658,7 +1659,7 @@ static int ip_vs_in_icmp_v6(struct sk_buff *skb, int *related,
if (!sysctl_schedule_icmp(ipvs)) if (!sysctl_schedule_icmp(ipvs))
return NF_ACCEPT; return NF_ACCEPT;
if (!ip_vs_try_to_schedule(AF_INET6, skb, pd, &v, &cp, &ciph)) if (!ip_vs_try_to_schedule(ipvs, AF_INET6, skb, pd, &v, &cp, &ciph))
return v; return v;
new_cp = true; new_cp = true;
@ -1799,7 +1800,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
if (unlikely(!cp)) { if (unlikely(!cp)) {
int v; int v;
if (!ip_vs_try_to_schedule(af, skb, pd, &v, &cp, &iph)) if (!ip_vs_try_to_schedule(ipvs, af, skb, pd, &v, &cp, &iph))
return v; return v;
} }

3
net/netfilter/ipvs/ip_vs_proto_ah_esp.c
View File

@ -104,7 +104,8 @@ ah_esp_conn_out_get(struct netns_ipvs *ipvs, int af, const struct sk_buff *skb,
static int static int
ah_esp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, ah_esp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,
struct ip_vs_proto_data *pd,
int *verdict, struct ip_vs_conn **cpp, int *verdict, struct ip_vs_conn **cpp,
struct ip_vs_iphdr *iph) struct ip_vs_iphdr *iph)
{ {

8
net/netfilter/ipvs/ip_vs_proto_sctp.c
View File

@ -9,20 +9,16 @@
#include <net/ip_vs.h> #include <net/ip_vs.h>
static int static int
sctp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, sctp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,
struct ip_vs_proto_data *pd,
int *verdict, struct ip_vs_conn **cpp, int *verdict, struct ip_vs_conn **cpp,
struct ip_vs_iphdr *iph) struct ip_vs_iphdr *iph)
{ {
struct net *net;
struct ip_vs_service *svc; struct ip_vs_service *svc;
struct netns_ipvs *ipvs;
sctp_chunkhdr_t _schunkh, *sch; sctp_chunkhdr_t _schunkh, *sch;
sctp_sctphdr_t *sh, _sctph; sctp_sctphdr_t *sh, _sctph;
__be16 _ports[2], *ports = NULL; __be16 _ports[2], *ports = NULL;
net = skb_net(skb);
ipvs = net_ipvs(net);
if (likely(!ip_vs_iph_icmp(iph))) { if (likely(!ip_vs_iph_icmp(iph))) {
sh = skb_header_pointer(skb, iph->len, sizeof(_sctph), &_sctph); sh = skb_header_pointer(skb, iph->len, sizeof(_sctph), &_sctph);
if (sh) { if (sh) {

8
net/netfilter/ipvs/ip_vs_proto_tcp.c
View File

@ -32,19 +32,15 @@
#include <net/ip_vs.h> #include <net/ip_vs.h>
static int static int
tcp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, tcp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,
struct ip_vs_proto_data *pd,
int *verdict, struct ip_vs_conn **cpp, int *verdict, struct ip_vs_conn **cpp,
struct ip_vs_iphdr *iph) struct ip_vs_iphdr *iph)
{ {
struct net *net;
struct ip_vs_service *svc; struct ip_vs_service *svc;
struct tcphdr _tcph, *th; struct tcphdr _tcph, *th;
struct netns_ipvs *ipvs;
__be16 _ports[2], *ports = NULL; __be16 _ports[2], *ports = NULL;
net = skb_net(skb);
ipvs = net_ipvs(net);
/* In the event of icmp, we're only guaranteed to have the first 8 /* In the event of icmp, we're only guaranteed to have the first 8
* bytes of the transport header, so we only check the rest of the * bytes of the transport header, so we only check the rest of the
* TCP packet for non-ICMP packets * TCP packet for non-ICMP packets

9
net/netfilter/ipvs/ip_vs_proto_udp.c
View File

@ -29,12 +29,11 @@
#include <net/ip6_checksum.h> #include <net/ip6_checksum.h>
static int static int
udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, udp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,
struct ip_vs_proto_data *pd,
int *verdict, struct ip_vs_conn **cpp, int *verdict, struct ip_vs_conn **cpp,
struct ip_vs_iphdr *iph) struct ip_vs_iphdr *iph)
{ {
struct net *net;
struct netns_ipvs *ipvs;
struct ip_vs_service *svc; struct ip_vs_service *svc;
struct udphdr _udph, *uh; struct udphdr _udph, *uh;
__be16 _ports[2], *ports = NULL; __be16 _ports[2], *ports = NULL;
@ -54,8 +53,6 @@ udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,
return 0; return 0;
} }
net = skb_net(skb);
ipvs = net_ipvs(net);
rcu_read_lock(); rcu_read_lock();
if (likely(!ip_vs_iph_inverse(iph))) if (likely(!ip_vs_iph_inverse(iph)))
svc = ip_vs_service_find(ipvs, af, skb->mark, iph->protocol, svc = ip_vs_service_find(ipvs, af, skb->mark, iph->protocol,
@ -67,7 +64,7 @@ udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,
if (svc) { if (svc) {
int ignored; int ignored;
if (ip_vs_todrop(net_ipvs(net))) { if (ip_vs_todrop(ipvs)) {
/* /*
* It seems that we are very loaded. * It seems that we are very loaded.
* We have to drop this packet :( * We have to drop this packet :(