From: David Dillow <dave@thedillows.org>
To: netdev@oss.sgi.com
Cc: linux-kernel@vger.kernel.org, dave@thedillows.org
Subject: [RFC 2.6.10 20/22] typhoon: add management of outbound bundles
Date: Thu, 30 Dec 2004 03:48:37 -0500 [thread overview]
Message-ID: <20041230035000.29@ori.thedillows.org> (raw)
In-Reply-To: 20041230035000.28@ori.thedillows.org
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/12/30 01:04:39-05:00 dave@thedillows.org
# Add the offloading of outbound bundles.
#
# This is a tricky business, because there are restrictions on
# the types and order of the xfrms we can offload. Some combinations
# also yield incorrect results, so we have to reduce the amount of
# offloading we do in those cases.
#
# Signed-off-by: David Dillow <dave@thedillows.org>
#
# drivers/net/typhoon.c
# 2004/12/30 01:04:20-05:00 dave@thedillows.org +134 -0
# Add the offloading of outbound bundles.
#
# This is a tricky business, because there are restrictions on
# the types and order of the xfrms we can offload. Some combinations
# also yield incorrect results, so we have to reduce the amount of
# offloading we do in those cases.
#
# Signed-off-by: David Dillow <dave@thedillows.org>
#
diff -Nru a/drivers/net/typhoon.c b/drivers/net/typhoon.c
--- a/drivers/net/typhoon.c 2004-12-30 01:08:06 -05:00
+++ b/drivers/net/typhoon.c 2004-12-30 01:08:06 -05:00
@@ -2587,6 +2587,140 @@
spin_unlock_bh(&tp->offload_lock);
}
+static inline int
+typhoon_max_offload(struct xfrm_bundle_list *xbl)
+{
+ /* Pre-scan the bundle to avoid offloading problematic sequences.
+ * Only reduces the offload level to keep as much advantage as
+ * possible.
+ *
+ * For 03.001.002 -- still problematic for 03.001.008, but need
+ * re-verify symptoms.
+ *
+ * inner AH tunnel, outer AH transport
+ * --> 3XP seems to put the inner hash at the wrong location
+ * inner AH tunnel, outer ESP tunnel
+ * --> 3XP corrupts outer hash, maybe wrong place?
+ * inner AH transport, outer ESP tunnel
+ * --> 3XP seems to encrypt the wrong portion of the packet
+ * inner ESP transport, outer AH tunnel
+ * --> 3XP lockup, requires reset
+ */
+ struct xfrm_bundle_list *bundle;
+ struct dst_entry *dst;
+ struct xfrm_state *x;
+ int last_was_ah = 0, last_was_tunnel = 0;
+ int max_level = 2;
+ int proto;
+
+ list_for_each_entry_reverse(bundle, &xbl->node, node) {
+ dst = bundle->dst;
+ x = dst->xfrm;
+
+ proto = x ? x->type->proto : IPPROTO_IP;
+
+ if(proto == IPPROTO_AH && x->props.mode &&
+ (last_was_ah ^ last_was_tunnel))
+ goto problem_offload;
+
+ if(proto == IPPROTO_AH && !x->props.mode &&
+ (!last_was_ah && last_was_tunnel))
+ goto problem_offload;
+
+ if(proto == IPPROTO_ESP && last_was_ah && last_was_tunnel)
+ goto problem_offload;
+
+ last_was_ah = (proto == IPPROTO_AH) ? 1 : 0;
+ last_was_tunnel = x ? x->props.mode : 0;
+ continue;
+
+problem_offload:
+ max_level--;
+ break;
+ }
+
+ return max_level;
+}
+
+static void
+typhoon_xfrm_bundle_add(struct net_device *dev, struct xfrm_bundle_list *xbl)
+{
+ /* Walk from the outermost dst back up the chain, offloading
+ * until we hit something we cannot deal with.
+ */
+ struct typhoon *tp = netdev_priv(dev);
+ struct xfrm_bundle_list *bundle;
+ struct dst_entry *dst;
+ struct xfrm_state *x;
+ struct xfrm_offload *xol;
+ struct typhoon_xfrm_offload *txo;
+ int proto;
+ int level = 0, max_level;
+ int last = -1;
+
+ smp_rmb();
+ if(tp->card_state != Running)
+ return;
+
+ max_level = typhoon_max_offload(xbl);
+
+ list_for_each_entry_reverse(bundle, &xbl->node, node) {
+ dst = bundle->dst;
+ x = dst->xfrm;
+
+ /* Only support IPv4 */
+ if(dst->ops->family != AF_INET)
+ goto cannot_offload;
+
+ proto = x ? x->type->proto : IPPROTO_IP;
+
+ switch(proto) {
+ case IPPROTO_IP:
+ case IPPROTO_IPIP:
+ if(last == IPPROTO_IP || last == IPPROTO_IPIP)
+ goto cannot_offload;
+ if(level)
+ level++;
+ last = proto;
+ continue;
+ case IPPROTO_ESP:
+ if(last != IPPROTO_AH)
+ level++;
+ break;
+ case IPPROTO_AH:
+ level++;
+ break;
+ default:
+ goto cannot_offload;
+ }
+
+ last = proto;
+ if(level > max_level)
+ goto cannot_offload;
+
+ if(dst->xfrm_offload)
+ continue;
+
+ xol = xfrm_offload_get(x, dev);
+ if(!xol) {
+ xol = typhoon_offload_ipsec(tp, x);
+ if(xol)
+ xfrm_offload_hold(xol);
+ }
+
+ if(!xol)
+ goto cannot_offload;
+
+ dst->xfrm_offload = xol;
+ txo = xfrm_offload_priv(xol);
+ if(txo->tunnel)
+ last = IPPROTO_IPIP;
+ }
+
+cannot_offload:
+ return;
+}
+
static void
typhoon_tx_timeout(struct net_device *dev)
{
next prev parent reply other threads:[~2004-12-30 8:48 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-30 8:48 [RFC 2.6.10 0/22] Add hardware assist for IPSEC crypto David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 1/22] xfrm: Add direction information to xfrm_state David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 2/22] xfrm: Add xfrm offload management calls to struct netdevice David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 3/22] xfrm: Add offload management routines David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 4/22] xfrm: Try to offload inbound xfrm_states David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 5/22] xfrm: Attempt to offload bundled xfrm_states for outbound xfrms David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 6/22] xfrm: add a parameter to xfrm_prune_bundles() David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 7/22] xfrm: Allow device drivers to force recalculation of offloads David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 8/22] skbuff: Add routines to manage applied offloads per skb David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 9/22] AH: Split header initialization from zeroing of mutable fields David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 10/22] AH, ESP: Add offloading of outbound packets David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 11/22] AH, ESP: Add offloading of inbound packets David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 12/22] ethtool: Add support for crypto offload David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 13/22] typhoon: Make the ipsec descriptor match actual usage David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 14/22] typhoon: add inbound offload result processing David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 15/22] typhoon: add outbound offload processing David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 16/22] typhoon: collect crypto offload capabilities David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 17/22] typhoon: split out setting of offloaded tasks David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 18/22] typhoon: add validation of offloaded xfrm_states David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 19/22] typhoon: add loading of xfrm_states to hardware David Dillow
2004-12-30 8:48 ` David Dillow [this message]
2004-12-30 8:48 ` [RFC 2.6.10 21/22] typhoon: add callbacks to support crypto offload David Dillow
2004-12-30 8:48 ` [RFC 2.6.10 22/22] Add some documentation for the IPSEC " David Dillow
2005-01-21 23:23 ` [RFC 2.6.10 7/22] xfrm: Allow device drivers to force recalculation of offloads David S. Miller
2005-01-22 5:53 ` David Dillow
2005-01-26 6:11 ` David S. Miller
2005-01-21 23:21 ` [RFC 2.6.10 6/22] xfrm: add a parameter to xfrm_prune_bundles() David S. Miller
2004-12-30 23:34 ` [RFC 2.6.10 5/22] xfrm: Attempt to offload bundled xfrm_states for outbound xfrms Francois Romieu
2004-12-31 3:31 ` David Dillow
2005-01-21 23:20 ` David S. Miller
2005-01-22 5:53 ` David Dillow
2005-01-26 6:11 ` David S. Miller
2005-01-21 22:56 ` [RFC 2.6.10 4/22] xfrm: Try to offload inbound xfrm_states David S. Miller
2005-01-22 5:52 ` David Dillow
2005-01-26 6:13 ` David S. Miller
2005-01-21 22:47 ` [RFC 2.6.10 3/22] xfrm: Add offload management routines David S. Miller
2005-01-22 6:00 ` David Dillow
[not found] ` <1106373038.3691.39.camel@ori.thedillows.org>
[not found] ` <20050125221608.0cb067b2.davem@davemloft.net>
2005-01-26 21:30 ` David Dillow
2005-01-21 22:40 ` [RFC 2.6.10 2/22] xfrm: Add xfrm offload management calls to struct netdevice David S. Miller
2004-12-30 9:48 ` [RFC 2.6.10 1/22] xfrm: Add direction information to xfrm_state Jan-Benedict Glaw
2004-12-30 16:16 ` Dave Dillow
2004-12-30 16:36 ` Jan-Benedict Glaw
[not found] ` <200412301436.06653.ioe-lkml@axxeo.de>
2004-12-30 16:21 ` Dave Dillow
2005-01-21 22:38 ` David S. Miller
2005-01-22 5:50 ` David Dillow
2005-01-26 6:17 ` David S. Miller
2005-01-26 21:14 ` David Dillow
2005-01-21 22:35 ` [RFC 2.6.10 0/22] Add hardware assist for IPSEC crypto David S. Miller
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=20041230035000.29@ori.thedillows.org \
--to=dave@thedillows.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.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).