From patchwork Wed Oct 21 10:36:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 533749 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2851A1402B3 for ; Wed, 21 Oct 2015 21:37:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752774AbbJUKhE (ORCPT ); Wed, 21 Oct 2015 06:37:04 -0400 Received: from smtp.citrix.com ([66.165.176.89]:45975 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752174AbbJUKhA (ORCPT ); Wed, 21 Oct 2015 06:37:00 -0400 X-IronPort-AV: E=Sophos;i="5.17,711,1437436800"; d="scan'208";a="307904978" From: Paul Durrant To: , CC: Paul Durrant , Ian Campbell , Wei Liu Subject: [PATCH net-next 4/8] xen-netback: accept an L4 or L3 skb hash value from the frontend Date: Wed, 21 Oct 2015 11:36:21 +0100 Message-ID: <1445423785-4654-5-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445423785-4654-1-git-send-email-paul.durrant@citrix.com> References: <1445423785-4654-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds an indication that netback is capable of handling hash values passed from the frontend (see netif.h for details), and the code necessary to process the additional xen_netif_extra_info segment and set a hash on the skb. Signed-off-by: Paul Durrant Cc: Ian Campbell Cc: Wei Liu Reviewed-by: Wei Liu --- drivers/net/xen-netback/netback.c | 25 +++++++++++++++++++++++++ drivers/net/xen-netback/xenbus.c | 8 ++++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 9f0c9f5..3799b5a 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -1383,6 +1383,28 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, } } + if (extras[XEN_NETIF_EXTRA_TYPE_HASH - 1].type) { + struct xen_netif_extra_info *extra; + u32 hash = *(u32 *)extra->u.hash.value; + + extra = &extras[XEN_NETIF_EXTRA_TYPE_HASH - 1]; + + switch (extra->u.hash.type) { + case XEN_NETIF_HASH_TYPE_TCPV4: + case XEN_NETIF_HASH_TYPE_TCPV6: + skb_set_hash(skb, hash, PKT_HASH_TYPE_L4); + break; + + case XEN_NETIF_HASH_TYPE_IPV4: + case XEN_NETIF_HASH_TYPE_IPV6: + skb_set_hash(skb, hash, PKT_HASH_TYPE_L3); + break; + + default: + break; + } + } + XENVIF_TX_CB(skb)->pending_idx = pending_idx; __skb_put(skb, data_len); @@ -1416,6 +1438,9 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, if (extras[XEN_NETIF_EXTRA_TYPE_GSO - 1].type) queue->pending_tx_info[pending_idx].extra_count++; + if (extras[XEN_NETIF_EXTRA_TYPE_HASH - 1].type) + queue->pending_tx_info[pending_idx].extra_count++; + queue->pending_cons++; gop = xenvif_get_requests(queue, skb, txfrags, gop, diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 929a6e7..2fa8a16 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -335,6 +335,14 @@ static int netback_probe(struct xenbus_device *dev, goto abort_transaction; } + /* We support hash values. */ + err = xenbus_printf(xbt, dev->nodename, + "feature-hash", "%d", 1); + if (err) { + message = "writing feature-hash"; + goto abort_transaction; + } + err = xenbus_transaction_end(xbt, 0); } while (err == -EAGAIN);