From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <fyigit@ecsmtp.ir.intel.com> Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 9FAD6DE0 for <dev@dpdk.org>; Mon, 11 Apr 2016 20:30:14 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 11 Apr 2016 11:30:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,469,1455004800"; d="scan'208";a="782660317" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 11 Apr 2016 11:30:10 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u3BIU9Lp031880; Mon, 11 Apr 2016 19:30:09 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id u3BIU9ib008547; Mon, 11 Apr 2016 19:30:09 +0100 Received: (from fyigit@localhost) by sivswdev02.ir.intel.com with id u3BIU9sQ008543; Mon, 11 Apr 2016 19:30:09 +0100 From: Ferruh Yigit <ferruh.yigit@intel.com> To: dev@dpdk.org Cc: Helin Zhang <helin.zhang@intel.com>, Ferruh Yigit <ferruh.yigit@intel.com> Date: Mon, 11 Apr 2016 19:30:08 +0100 Message-Id: <1460399408-8513-1-git-send-email-ferruh.yigit@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1669957.aOl2YMNTtp@xps13> References: <1669957.aOl2YMNTtp@xps13> Subject: [dpdk-dev] [PATCH v2] kni: fix vhost-kni compile errors X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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> X-List-Received-Date: Mon, 11 Apr 2016 18:30:16 -0000 fix vhost-kni compile errors because of Linux kernel API changes - SOCK_ASYNC_WAITDATA renamed to SOCKWQ_ASYNC_WAITDATA Linux commit id: 9cd3e072 Updated in Linux kernel 4.4 - sk_alloc() gets new parameter Linux commit id: 11aa9c28b Updated in Linux kernel 4.2 New parameter is: "@kern: is this to be a kernel socket?" Reported-by: chintu hetam <rometoroam@gmail.com> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> --- Patch not tested, just fixed compiler errors. v2: * use "#ifdef SOCKWQ_ASYNC_WAITDATA" instead of version check --- lib/librte_eal/linuxapp/kni/kni_vhost.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/kni_vhost.c b/lib/librte_eal/linuxapp/kni/kni_vhost.c index 6f2a961..a3ca849 100644 --- a/lib/librte_eal/linuxapp/kni/kni_vhost.c +++ b/lib/librte_eal/linuxapp/kni/kni_vhost.c @@ -251,7 +251,11 @@ kni_sock_poll(struct file *file, struct socket *sock, poll_table * wait) mask |= POLLIN | POLLRDNORM; if (sock_writeable(&q->sk) || +#ifdef SOCKWQ_ASYNC_NOSPACE + (!test_and_set_bit(SOCKWQ_ASYNC_NOSPACE, &q->sock->flags) && +#else (!test_and_set_bit(SOCK_ASYNC_NOSPACE, &q->sock->flags) && +#endif sock_writeable(&q->sk))) mask |= POLLOUT | POLLWRNORM; @@ -619,8 +623,11 @@ kni_sk_write_space(struct sock *sk) wait_queue_head_t *wqueue; if (!sock_writeable(sk) || - !test_and_clear_bit(SOCK_ASYNC_NOSPACE, - &sk->sk_socket->flags)) +#ifdef SOCKWQ_ASYNC_NOSPACE + !test_and_clear_bit(SOCKWQ_ASYNC_NOSPACE, &sk->sk_socket->flags)) +#else + !test_and_clear_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags)) +#endif return; wqueue = sk_sleep(sk); if (wqueue && waitqueue_active(wqueue)) @@ -666,8 +673,14 @@ kni_vhost_backend_init(struct kni_dev *kni) if (kni->vhost_queue != NULL) return -1; - if (!(q = (struct kni_vhost_queue *)sk_alloc( - net, AF_UNSPEC, GFP_KERNEL, &kni_raw_proto))) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) + q = (struct kni_vhost_queue *)sk_alloc(net, AF_UNSPEC, GFP_KERNEL, + &kni_raw_proto, 0); +#else + q = (struct kni_vhost_queue *)sk_alloc(net, AF_UNSPEC, GFP_KERNEL, + &kni_raw_proto); +#endif + if (!q) return -ENOMEM; err = sock_create_lite(AF_UNSPEC, SOCK_RAW, IPPROTO_RAW, &q->sock); -- 2.5.5