From patchwork Wed Jan 6 13:06:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 7968151 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E75DABEEE5 for ; Wed, 6 Jan 2016 13:17:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDCE020173 for ; Wed, 6 Jan 2016 13:17:52 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 196632015E for ; Wed, 6 Jan 2016 13:17:52 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aGntX-0002Iv-H2; Wed, 06 Jan 2016 13:12:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aGntW-0002Ih-42 for xen-devel@lists.xenproject.org; Wed, 06 Jan 2016 13:12:54 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id AF/D5-28221-5D21D865; Wed, 06 Jan 2016 13:12:53 +0000 X-Env-Sender: prvs=80683a78a=Paul.Durrant@citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1452085969!14985740!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40853 invoked from network); 6 Jan 2016 13:12:50 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 6 Jan 2016 13:12:50 -0000 X-IronPort-AV: E=Sophos;i="5.20,529,1444694400"; d="scan'208";a="323178301" From: Paul Durrant To: Date: Wed, 6 Jan 2016 13:06:56 +0000 Message-ID: <1452085616-3857-4-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452085616-3857-1-git-send-email-paul.durrant@citrix.com> References: <1452085616-3857-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Keir Fraser , Ian Campbell , Tim Deegan , Ian Jackson , Paul Durrant , Jan Beulich Subject: [Xen-devel] [PATCH v2 3/3] public/io/netif.h: document new extra info for passing hash values X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To properly support NDIS RSS, the Windows frontend PV driver needs the toeplitz hash value calculated by the backend (otherwise it would have to duplicate the calculation). This patch adds documentation for "feature-hash" and a definition of a new XEN_NETIF_EXTRA_TYPE_HASH extra info segment which both frontends and backends can use to pass hash values to the other end. Signed-off-by: Paul Durrant Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan --- xen/include/public/io/netif.h | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h index ace74f3..e12c73f 100644 --- a/xen/include/public/io/netif.h +++ b/xen/include/public/io/netif.h @@ -151,6 +151,12 @@ */ /* + * "feature-hash" advertises the capability to accept extra info slots of + * type XEN_NETIF_EXTRA_TYPE_HASH. They will not be sent by either end + * unless the other end advertises this feature. + */ + +/* * Control ring * ============ * @@ -574,6 +580,18 @@ DEFINE_RING_TYPES(netif_ctrl, struct netif_ctrl_request, struct netif_ctrl_respo * type: Must be XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL} * flags: XEN_NETIF_EXTRA_FLAG_* * addr: address to add/remove + * + * XEN_NETIF_EXTRA_TYPE_HASH: + * + * 0 1 2 3 4 5 6 7 octet + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * |type |flags|htype| pad |LSB ---- value ---- MSB| + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * + * type: Must be XEN_NETIF_EXTRA_TYPE_HASH + * flags: XEN_NETIF_EXTRA_FLAG_* + * htype: XEN_NETIF_HASH_TYPE_* + * value: Hash value */ /* Protocol checksum field is blank in the packet (hardware offload)? */ @@ -607,7 +625,8 @@ typedef struct netif_tx_request netif_tx_request_t; #define XEN_NETIF_EXTRA_TYPE_GSO (1) /* u.gso */ #define XEN_NETIF_EXTRA_TYPE_MCAST_ADD (2) /* u.mcast */ #define XEN_NETIF_EXTRA_TYPE_MCAST_DEL (3) /* u.mcast */ -#define XEN_NETIF_EXTRA_TYPE_MAX (4) +#define XEN_NETIF_EXTRA_TYPE_HASH (4) /* u.hash */ +#define XEN_NETIF_EXTRA_TYPE_MAX (5) /* netif_extra_info_t flags. */ #define _XEN_NETIF_EXTRA_FLAG_MORE (0) @@ -619,6 +638,16 @@ typedef struct netif_tx_request netif_tx_request_t; #define XEN_NETIF_GSO_TYPE_TCPV6 (2) /* + * Hash types. (See NETIF_CTRL_TOEPLITZ_FLAG_* definitions above + * for more information). + */ +#define XEN_NETIF_HASH_TYPE_NONE 0 +#define XEN_NETIF_HASH_TYPE_IPV4 1 +#define XEN_NETIF_HASH_TYPE_IPV4_TCP 2 +#define XEN_NETIF_HASH_TYPE_IPV6 3 +#define XEN_NETIF_HASH_TYPE_IPV6_TCP 4 + +/* * This structure needs to fit within both netif_tx_request_t and * netif_rx_response_t for compatibility. */ @@ -635,6 +664,11 @@ struct netif_extra_info { struct { uint8_t addr[6]; } mcast; + struct { + uint8_t type; + uint8_t pad; + uint8_t value[4]; + } hash; uint16_t pad[3]; } u; };