From: Fan Du <fan.du@windriver.com>
To: <steffen.klassert@secunet.com>, <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Subject: [PATCHv2 net-next 3/5] {pktgen,xfrm} Construct skb dst for tunnel mode transformation
Date: Fri, 6 Dec 2013 17:53:32 +0800 [thread overview]
Message-ID: <1386323614-5077-4-git-send-email-fan.du@windriver.com> (raw)
In-Reply-To: <1386323614-5077-1-git-send-email-fan.du@windriver.com>
IPsec tunnel mode encapuslation needs to set outter ip header
with right protocol/ttl/id value with regard to skb->dst->child.
Looking up a rt in a standard way is absolutely wrong for every
packet transmission. In a simple way, construct a dst by setting
neccessary information to make tunnel mode encapuslation working.
Signed-off-by: Fan Du <fan.du@windriver.com>
---
v2:
-Point dst->child into dst itself to save space.
---
net/core/pktgen.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 717e0b7..2f4f90c 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -388,6 +388,8 @@ struct pktgen_dev {
#ifdef CONFIG_XFRM
__u32 spi;
+ struct dst_entry dst;
+ struct dst_ops dstops;
#endif
char result[512];
};
@@ -2484,6 +2486,11 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
#ifdef CONFIG_XFRM
+u32 pktgen_dst_metrics[RTAX_MAX + 1] = {
+
+ [RTAX_HOPLIMIT] = 0x5, /* Set a static hoplimit */
+};
+
static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev)
{
struct xfrm_state *x = pkt_dev->flows[pkt_dev->curfl].x;
@@ -2492,6 +2499,9 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev)
if (!x)
return 0;
+ if (x->props.mode == XFRM_MODE_TUNNEL)
+ __skb_dst_set_noref(skb, &pkt_dev->dst, true);
+
spin_lock(&x->lock);
err = x->outer_mode->output(x, skb);
@@ -3545,6 +3555,16 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
goto out2;
}
#ifdef CONFIG_XFRM
+ /* xfrm tunnel mode needs additional dst to extract outter
+ * ip header protocol/ttl/id field, here creat a phony one.
+ * instead of looking for a valid rt, which definitely hurting
+ * performance under such circumstance.
+ */
+ pkt_dev->dstops.family = AF_INET;
+ pkt_dev->dst.dev = pkt_dev->odev;
+ dst_init_metrics(&pkt_dev->dst, pktgen_dst_metrics, false);
+ pkt_dev->dst.child = &pkt_dev->dst;
+ pkt_dev->dst.ops = &pkt_dev->dstops;
#endif
return add_dev_to_thread(t, pkt_dev);
--
1.7.9.5
next prev parent reply other threads:[~2013-12-06 9:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-06 9:53 [PATCHv2 net-next 0/5] pktgen IPsec support Fan Du
2013-12-06 9:53 ` [PATCHv2 net-next 1/5] {pktgen, xfrm} Remove original pktgen ipsec fixed configuration Fan Du
2013-12-06 9:53 ` [PATCHv2 net-next 2/5] {pktgen, xfrm} Using "pgset spi xxx" to spedifiy SA for a given flow Fan Du
2013-12-06 9:53 ` Fan Du [this message]
2013-12-06 9:53 ` [PATCHv2 net-next 4/5] {pktgen, xfrm} Introduce xfrm_state_lookup_byspi for pktgen Fan Du
2013-12-06 9:53 ` [PATCHv2 net-next 5/5] {pktgen, xfrm} Correct xfrm state lock usage when transforming Fan Du
2013-12-10 0:58 ` [PATCHv2 net-next 0/5] pktgen IPsec support David Miller
2013-12-10 1:19 ` Fan Du
2013-12-10 1:23 ` David Miller
2013-12-10 2:02 ` Fan Du
2013-12-10 2:09 ` David Miller
2013-12-10 2:27 ` Fan Du
2013-12-10 5:49 ` David Miller
2013-12-11 13:42 ` Jamal Hadi Salim
2013-12-13 8:56 ` Fan Du
2013-12-13 12:13 ` Jamal Hadi Salim
2013-12-13 12:22 ` Fan Du
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386323614-5077-4-git-send-email-fan.du@windriver.com \
--to=fan.du@windriver.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).