From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Zhang, Helin" <helin.zhang@intel.com>
Subject: Re: [PATCH v2 3/4] kni: fix function parameter
	from	proto_ops pointers
Date: Fri, 10 Jul 2015 15:34:40 +0000
Message-ID: <F35DEAC7BCE34641BA9FAC6BCA4A12E70A891A2A@SHSMSX104.ccr.corp.intel.com>
References: <1435259380-26251-1-git-send-email-miguel.bernal.marin@linux.intel.com>
 <1435356878-10304-1-git-send-email-miguel.bernal.marin@linux.intel.com>
 <1435356878-10304-4-git-send-email-miguel.bernal.marin@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Cc: "dev@dpdk.org" <dev@dpdk.org>
To: "Xie, Huawei" <huawei.xie@intel.com>, "Ouyang, Changchun"
 <changchun.ouyang@intel.com>, "Liang, Cunming" <cunming.liang@intel.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by dpdk.org (Postfix) with ESMTP id 5B859C3B4
 for <dev@dpdk.org>; Fri, 10 Jul 2015 17:34:46 +0200 (CEST)
In-Reply-To: <1435356878-10304-4-git-send-email-miguel.bernal.marin@linux.intel.com>
Content-Language: en-US
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Could one of you guys help to review the KNI vhost part?

Thanks,
Helin

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Miguel Bernal Marin
> Sent: Friday, June 26, 2015 3:15 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v2 3/4] kni: fix function parameter from proto=
_ops
> pointers
>=20
> Parameters from sendmsg and recvmsg has been changed in 4.1 kernel.
> The function pointers belong to proto_ops structure were updated removing=
 the
> struct kiocb parameter.
>=20
> Fixes: 1b784140474e ("net: Remove iocb argument from sendmsg and recvmsg"=
)
>=20
> Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
> ---
>  lib/librte_eal/linuxapp/kni/compat.h    |  4 ++++
>  lib/librte_eal/linuxapp/kni/kni_vhost.c | 10 ++++++++++
>  2 files changed, 14 insertions(+)
>=20
> diff --git a/lib/librte_eal/linuxapp/kni/compat.h
> b/lib/librte_eal/linuxapp/kni/compat.h
> index 1ad22ba..cf100b6 100644
> --- a/lib/librte_eal/linuxapp/kni/compat.h
> +++ b/lib/librte_eal/linuxapp/kni/compat.h
> @@ -23,3 +23,7 @@
>  #if LINUX_VERSION_CODE >=3D KERNEL_VERSION(3,19,0)  #define
> HAVE_IOV_ITER_MSGHDR  #endif
> +
> +#if ( LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) ) #define
> +HAVE_KIOCB_MSG_PARAM #endif /* < 4.1.0 */
> diff --git a/lib/librte_eal/linuxapp/kni/kni_vhost.c
> b/lib/librte_eal/linuxapp/kni/kni_vhost.c
> index e01420a..f21b47e 100644
> --- a/lib/librte_eal/linuxapp/kni/kni_vhost.c
> +++ b/lib/librte_eal/linuxapp/kni/kni_vhost.c
> @@ -353,8 +353,13 @@ except:
>  }
>=20
>  static int
> +#ifdef HAVE_KIOCB_MSG_PARAM
>  kni_sock_sndmsg(struct kiocb *iocb, struct socket *sock,
>  	   struct msghdr *m, size_t total_len)
> +#else
> +kni_sock_sndmsg(struct socket *sock,
> +	   struct msghdr *m, size_t total_len) #endif /*
> HAVE_KIOCB_MSG_PARAM
> +*/
>  {
>  	struct kni_vhost_queue *q =3D
>  		container_of(sock->sk, struct kni_vhost_queue, sk); @@ -387,8
> +392,13 @@ kni_sock_sndmsg(struct kiocb *iocb, struct socket *sock,  }
>=20
>  static int
> +#ifdef HAVE_KIOCB_MSG_PARAM
>  kni_sock_rcvmsg(struct kiocb *iocb, struct socket *sock,
>  	   struct msghdr *m, size_t len, int flags)
> +#else
> +kni_sock_rcvmsg(struct socket *sock,
> +	   struct msghdr *m, size_t len, int flags) #endif /*
> +HAVE_KIOCB_MSG_PARAM */
>  {
>  	int vnet_hdr_len =3D 0;
>  	int pkt_len =3D 0;
> --
> 2.4.4