From: David Dillow <dave@thedillows.org>
To: netdev@oss.sgi.com
Cc: dave@thedillows.org
Subject: [RFC BK 15/22] xfrm offload v2: typhoon: add outbound offload processing
Date: Mon, 10 Jan 2005 10:37:01 -0500 [thread overview]
Message-ID: <20040110014300.24@ori.thedillows.org> (raw)
In-Reply-To: 20040110014300.23@ori.thedillows.org
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/01/10 00:56:27-05:00 dave@thedillows.org
# Add outbound xfrm crypto offload processing to the packet path.
#
# Signed-off-by: David Dillow <dave@thedillows.org>
#
# drivers/net/typhoon.c
# 2005/01/10 00:56:11-05:00 dave@thedillows.org +130 -0
# Add outbound xfrm crypto offload processing to the packet path.
#
# 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 2005-01-10 01:17:46 -05:00
+++ b/drivers/net/typhoon.c 2005-01-10 01:17:46 -05:00
@@ -351,6 +351,15 @@
#define TSO_OFFLOAD_ON 0
#endif
+#define IPSEC_NUM_DESCRIPTORS 1
+
+struct typhoon_xfrm_offload {
+ u16 sa_cookie;
+ u16 tunnel:1,
+ ah:1,
+ inbound:1;
+};
+
static inline void
typhoon_inc_index(u32 *index, const int count, const int num_entries)
{
@@ -778,12 +787,115 @@
tcpd->status = 0;
}
+static inline int
+typhoon_ipsec_fill(struct typhoon *tp, struct sk_buff *skb,
+ struct transmit_ring *txRing)
+{
+ struct xfrm_offload *xol;
+ struct typhoon_xfrm_offload *txo;
+ struct ipsec_desc *ipsec;
+ int last_was_esp = 0;
+ int i, entry;
+ u32 sa[3];
+
+ ipsec = (struct ipsec_desc *) (txRing->ringBase + txRing->lastWrite);
+ typhoon_inc_tx_index(&txRing->lastWrite, 1);
+
+ ipsec->flags = TYPHOON_OPT_DESC | TYPHOON_OPT_IPSEC;
+ ipsec->numDesc = 1;
+ ipsec->ipsecFlags = TYPHOON_IPSEC_USE_IV;
+ ipsec->reserved = 0;
+ sa[0] = sa[1] = sa[2] = 0;
+
+ /* Fill the offload descriptor with the cookies to indicate
+ * which key set to use when. While we're looping through the
+ * offloaded xfrms, if the last xfrm was ESP, and we're doing
+ * AH now, * then we can move the ESP part to the top of the
+ * descriptor. Otherwise, we'll need to move to the next one.
+ * We overrun into sa[2] to prevent needing to check the entry
+ * limit in the middile of things.
+ */
+ entry = i = 0;
+ xol = skb_get_xfrm_offload(skb, i++);
+ while(xol && entry < 2) {
+ xfrm_offload_hold(xol);
+ txo = xfrm_offload_priv(xol);
+ if(sa[entry] && txo->tunnel)
+ entry++;
+ if(sa[entry] & 0xffff) {
+ if(last_was_esp && txo->ah)
+ sa[entry] <<= 16;
+ else
+ entry++;
+ }
+
+ sa[entry] |= txo->sa_cookie;
+ last_was_esp = !txo->ah;
+
+ xol = skb_get_xfrm_offload(skb, i++);
+ }
+
+ /* Make sure we used all of the xfrms that were offloaded.
+ */
+ if(unlikely(entry == 2 && xol)) {
+ if(net_ratelimit())
+ printk(KERN_ERR "%s: failing to offload IPSEC packet "
+ "with too many xfrms!\n", tp->name);
+ goto bad_packet;
+ }
+
+ ipsec->sa[0] = cpu_to_le16(sa[0] & 0xffff);
+ ipsec->sa[1] = cpu_to_le16(sa[0] >> 16);
+ ipsec->sa[2] = cpu_to_le16(sa[1] & 0xffff);
+ ipsec->sa[3] = cpu_to_le16(sa[1] >> 16);
+
+ /* The current 3XP firmware seems to hang if we try to feed it
+ * the same (non-zero) SA twice on the same packet. So, detect
+ * and drop those packets as it is likely a stack bug, or
+ * misconfiguration of policy.
+ *
+ * I.e., we should never hit this.
+ */
+ if(unlikely(ipsec->sa[2])) {
+ if(unlikely(ipsec->sa[2] == ipsec->sa[3]))
+ goto avoiding_sa_hang;
+ if(unlikely(ipsec->sa[2] == ipsec->sa[0] ||
+ ipsec->sa[2] == ipsec->sa[1]))
+ goto avoiding_sa_hang;
+ if(unlikely(ipsec->sa[3] && (ipsec->sa[3] == ipsec->sa[0] ||
+ ipsec->sa[3] == ipsec->sa[1])))
+ goto avoiding_sa_hang;
+ }
+
+ if(unlikely(ipsec->sa[1] && ipsec->sa[0] == ipsec->sa[1]))
+ goto avoiding_sa_hang;
+
+ return 0;
+
+avoiding_sa_hang:
+ if(net_ratelimit())
+ printk(KERN_ERR "%s: failing attempted IPSEC offload with "
+ "duplicate SAs %08x %08x\n", tp->name,
+ sa[0], sa[1]);
+
+bad_packet:
+ /* Any xfrm_offloads we've attached to this skb will be
+ * released for us when typhoon_start_tx() calls dev_kfree_skb_any()
+ * on it.
+ *
+ * Return an error to indicate this packet cannot be offloaded as
+ * specified and should never make it to the wire.
+ */
+ return -EINVAL;
+}
+
static int
typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
{
struct typhoon *tp = netdev_priv(dev);
struct transmit_ring *txRing;
struct tx_desc *txd, *first_txd;
+ u32 origLastWrite;
dma_addr_t skb_dma;
int numDesc;
@@ -810,6 +922,9 @@
if(skb_tso_size(skb))
numDesc++;
+ if(skb_has_xfrm_offload(skb))
+ numDesc++;
+
/* When checking for free space in the ring, we need to also
* account for the initial Tx descriptor, and we always must leave
* at least one descriptor unused in the ring so that it doesn't
@@ -822,6 +937,7 @@
while(unlikely(typhoon_num_free_tx(txRing) < (numDesc + 2)))
smp_rmb();
+ origLastWrite = txRing->lastWrite;
first_txd = (struct tx_desc *) (txRing->ringBase + txRing->lastWrite);
typhoon_inc_tx_index(&txRing->lastWrite, 1);
@@ -854,6 +970,14 @@
typhoon_tso_fill(skb, txRing, tp->txlo_dma_addr);
}
+ if(skb_has_xfrm_offload(skb)) {
+ first_txd->processFlags |= TYPHOON_TX_PF_IPSEC;
+ first_txd->numDesc++;
+
+ if(typhoon_ipsec_fill(tp, skb, txRing))
+ goto error;
+ }
+
txd = (struct tx_desc *) (txRing->ringBase + txRing->lastWrite);
typhoon_inc_tx_index(&txRing->lastWrite, 1);
@@ -914,6 +1038,7 @@
* Tx header.
*/
numDesc = MAX_SKB_FRAGS + TSO_NUM_DESCRIPTORS + 1;
+ numDesc += IPSEC_NUM_DESCRIPTORS;
if(typhoon_num_free_tx(txRing) < (numDesc + 2)) {
netif_stop_queue(dev);
@@ -926,6 +1051,11 @@
netif_wake_queue(dev);
}
+ return 0;
+
+error:
+ txRing->lastWrite = origLastWrite;
+ dev_kfree_skb_any(skb);
return 0;
}
next prev parent reply other threads:[~2005-01-10 15:37 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-10 15:36 [RFC BK 0/22] xfrm offload v2: Add hardware assist for IPSEC crypto David Dillow
2005-01-10 15:36 ` [RFC BK 1/22] xfrm offload v2: Add direction information to xfrm_state David Dillow
2005-01-10 15:36 ` [RFC BK 2/22] xfrm offload v2: Add xfrm offload management calls to struct netdevice David Dillow
2005-01-10 15:36 ` [RFC BK 3/22] xfrm offload v2: Add offload management routines David Dillow
2005-01-10 15:36 ` [RFC BK 4/22] xfrm offload v2: Try to offload inbound xfrm_states David Dillow
2005-01-10 15:37 ` [RFC BK 5/22] xfrm offload v2: Attempt to offload bundled xfrm_states for outbound xfrms David Dillow
2005-01-10 15:37 ` [RFC BK 6/22] xfrm offload v2: add a parameter to xfrm_prune_bundles() David Dillow
2005-01-10 15:37 ` [RFC BK 7/22] xfrm offload v2: Allow device drivers to force recalculation of offloads David Dillow
2005-01-10 15:37 ` [RFC BK 8/22] xfrm offload v2: Add routines to manage applied offloads per skb David Dillow
2005-01-10 15:37 ` [RFC BK 9/22] xfrm offload v2: Split AH header initialization from zeroing of mutable fields David Dillow
2005-01-10 15:37 ` [RFC BK 10/22] xfrm offload v2: Add offloading of outbound AH & ESP packets David Dillow
2005-01-10 15:37 ` [RFC BK 11/22] xfrm offload v2: Add offloading of inbound " David Dillow
2005-01-10 15:37 ` [RFC BK 12/22] xfrm offload v2: Add ethtool support for crypto offload control David Dillow
2005-01-10 15:37 ` [RFC BK 13/22] xfrm offload v2: typhoon: Make the ipsec descriptor match actual usage David Dillow
2005-01-10 15:37 ` [RFC BK 14/22] xfrm offload v2: typhoon: add inbound offload result processing David Dillow
2005-01-10 15:37 ` David Dillow [this message]
2005-01-10 15:37 ` [RFC BK 16/22] xfrm offload v2: typhoon: collect crypto offload capabilities David Dillow
2005-01-10 15:37 ` [RFC BK 17/22] xfrm offload v2: typhoon: split out setting of offloaded tasks David Dillow
2005-01-10 15:37 ` [RFC BK 18/22] xfrm offload v2: typhoon: add validation of offloaded xfrm_states David Dillow
2005-01-10 15:37 ` [RFC BK 19/22] xfrm offload v2: typhoon: add loading of xfrm_states to hardware David Dillow
2005-01-10 15:37 ` [RFC BK 20/22] xfrm offload v2: typhoon: add management of outbound bundles David Dillow
2005-01-10 15:37 ` [RFC BK 21/22] xfrm offload v2: typhoon: add callbacks to support crypto offload David Dillow
2005-01-10 15:37 ` [RFC BK 22/22] xfrm offload v2: Add some documentation for the IPSEC " David Dillow
2005-01-17 19:00 ` [RFC BK 0/22] xfrm offload v2: Add hardware assist for IPSEC crypto James Morris
2005-01-20 17:22 ` Dave Dillow
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=20040110014300.24@ori.thedillows.org \
--to=dave@thedillows.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).