From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) by dpdk.org (Postfix) with ESMTP id A6A2358CE for ; Mon, 10 Jul 2017 15:33:30 +0200 (CEST) Received: by mail-lf0-f45.google.com with SMTP id b207so60866367lfg.2 for ; Mon, 10 Jul 2017 06:33:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=MeVpmu6qo3gIrw07WKAiskSXzuFP+Q/3rr3KPhc1JrE=; b=XK/HzcEfe9/plIXuB3I2+LJo8sBQ5wFVLZriKwKckAL1w0h1A4bGEeeKzPHVKTkAkR 7feCMW8P4i/kr2rM9xN5putCu0ec8DDo/qbybD5cvgIrxuOcGkBpVpFQ9Oc1wSvI2Zzc yGB3A6EfpjZMpMxxRCWjdgMeb4A5pwNUYi3/63AyneZhPtsOoX0rLr3dpLblr6ZVsLce GZJl5DCME4firGohUQB6794X8Uhz8sgXsTf0mnihbRL8idfd/uwkHo+PCKe20awo5rdw L8K9DjNAlK3+/tyvPwH4T8zbn3NtnEBiQtQkzO8PVEgWi7ilvhfc45UcbNQi2GKOvFJu EkVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=MeVpmu6qo3gIrw07WKAiskSXzuFP+Q/3rr3KPhc1JrE=; b=n7jfxJU51KUARbU85Ki6vVbzvDhde2m2X8uDF+CHrKQIl6OffCNdNZhyAzlT1Dg431 XRaYy7ig4Q+xUKhTcd3YNaB7MOpNzgw3V1aug/R9VmgAVyk7Eybg6yfkBc5iK24JG7xN xrrlz9byorARYjgClmI+oUiIoeegv+9nK+lJC6+S/XMZim5VD6U5NHo8G7/qn96eLTMf Luf0DGVGCjkw7q3+h3b4WbA99Pa3++Np9r5Vh8bZkEKAfyIpOxx+N+SJe2pc3sn+P6LN hOdHVsL8Qi/R6Wn2XcR46se7mVwoz3VEUK2YEMPBMBHcMrmcgrNwCZ8Vt5w2OR/nPqMr iqow== X-Gm-Message-State: AIVw111Zh3C78BuqwFymPjhFYRqYQrjZW+BWAMOHDYS0BOWlC7zrT3ZW 6R61Es/+JsDxgu5k X-Received: by 10.80.159.165 with SMTP id c34mr11345122edf.11.1499693610149; Mon, 10 Jul 2017 06:33:30 -0700 (PDT) Received: from [10.16.0.184] (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id p49sm9076885edc.47.2017.07.10.06.33.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 06:33:29 -0700 (PDT) To: Raslan Darawsheh Cc: adrien.mazarguil@6wind.com, dev@dpdk.org, stephen@networkplumber.org, thomas@monjalon.net References: <1499674423-4235-1-git-send-email-rasland@mellanox.com> From: Pascal Mazon Message-ID: <4eef8e3d-00f9-6bb0-e330-76ea83ea9aea@6wind.com> Date: Mon, 10 Jul 2017 15:33:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <1499674423-4235-1-git-send-email-rasland@mellanox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [dpdk-dev] [PATCH] net/tap: remove Linux version check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jul 2017 13:33:30 -0000 Hi Raslan, Your patch looks ok at first glance. However, I couldn't test it as it does not apply on a fresh next-net branch. Can you send a v2 after rebase? Thank you. Pascal On 07/10/2017 10:13 AM, Raslan Darawsheh wrote: > Remove checks of Linux kernel version > in order to support kernel with backported features. > > The expected behavior with a kernel that doesn't > support flower and other bits is the following: > -flow validate can return successfully. > -flow create using the same rule fails. > > Using the "remote" feature without kernel flower doesn not fail silently. > The TAP instance is not initialized if the requested parameters cannot be satisfied. > > it has been tested on an old kernel without required support: > > PMD: Kernel refused TC filter rule creation (2): No such file or directory > PMD: tap0 failed to create implicit rules. > PMD: Can't set up remote feature: No such file of directory(2) > PMD: TAP Unable to initialize net_tap0 > > Signed-off-by: Raslan Darawsheh > --- > drivers/net/tap/rte_eth_tap.c | 38 +------------------------------------- > drivers/net/tap/rte_eth_tap.h | 2 -- > drivers/net/tap/tap_flow.c | 13 +------------ > 3 files changed, 2 insertions(+), 51 deletions(-) > > diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c > index e54758e..b9e3ee9 100644 > --- a/drivers/net/tap/rte_eth_tap.c > +++ b/drivers/net/tap/rte_eth_tap.c > @@ -77,9 +77,6 @@ > #define ETH_TAP_MAC_ARG "mac" > #define ETH_TAP_MAC_FIXED "fixed" > > -#define FLOWER_KERNEL_VERSION KERNEL_VERSION(4, 2, 0) > -#define FLOWER_VLAN_KERNEL_VERSION KERNEL_VERSION(4, 9, 0) > - > static struct rte_vdev_driver pmd_tap_drv; > > static const char *valid_arguments[] = { > @@ -1162,24 +1159,6 @@ static const struct eth_dev_ops ops = { > }; > > static int > -tap_kernel_support(struct pmd_internals *pmd) > -{ > - struct utsname utsname; > - int ver[3]; > - > - if (uname(&utsname) == -1 || > - sscanf(utsname.release, "%d.%d.%d", > - &ver[0], &ver[1], &ver[2]) != 3) > - return 0; > - if (KERNEL_VERSION(ver[0], ver[1], ver[2]) >= FLOWER_KERNEL_VERSION) > - pmd->flower_support = 1; > - if (KERNEL_VERSION(ver[0], ver[1], ver[2]) >= > - FLOWER_VLAN_KERNEL_VERSION) > - pmd->flower_vlan_support = 1; > - return 1; > -} > - > -static int > eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface, > int fixed_mac_type) > { > @@ -1278,20 +1257,6 @@ eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface, > if (tap_ioctl(pmd, SIOCSIFHWADDR, &ifr, 0, LOCAL_ONLY) < 0) > goto error_exit; > > - tap_kernel_support(pmd); > - if (!pmd->flower_support) { > - if (remote_iface[0]) { > - RTE_LOG(ERR, PMD, > - "%s: kernel does not support TC rules, required for remote feature.", > - pmd->name); > - goto error_exit; > - } else { > - RTE_LOG(INFO, PMD, > - "%s: kernel too old for Flow API support.\n", > - pmd->name); > - return 0; > - } > - } > > LIST_INIT(&pmd->flows); > LIST_INIT(&pmd->implicit_flows); > @@ -1382,7 +1347,6 @@ eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface, > RTE_LOG(ERR, PMD, "Remote feature requires flow support.\n"); > goto error_exit; > } > - pmd->flower_support = 0; > return 0; > > error_remote: > @@ -1546,7 +1510,7 @@ rte_pmd_tap_remove(const char *name) > return 0; > > internals = eth_dev->data->dev_private; > - if (internals->flower_support && internals->nlsk_fd) { > + if (internals->nlsk_fd) { > tap_flow_flush(eth_dev, NULL); > tap_flow_implicit_flush(internals, NULL); > nl_final(internals->nlsk_fd); > diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h > index 2f22b2d..55c0b3f 100644 > --- a/drivers/net/tap/rte_eth_tap.h > +++ b/drivers/net/tap/rte_eth_tap.h > @@ -88,8 +88,6 @@ struct pmd_internals { > int ioctl_sock; /* socket for ioctl calls */ > int nlsk_fd; /* Netlink socket fd */ > int flow_isolate; /* 1 if flow isolation is enabled */ > - int flower_support; /* 1 if kernel supports, else 0 */ > - int flower_vlan_support; /* 1 if kernel supports, else 0 */ > LIST_HEAD(tap_flows, rte_flow) flows; /* rte_flow rules */ > /* implicit rte_flow rules set when a remote device is active */ > LIST_HEAD(tap_implicit_flows, rte_flow) implicit_flows; > diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c > index ebf4564..6ade186 100644 > --- a/drivers/net/tap/tap_flow.c > +++ b/drivers/net/tap/tap_flow.c > @@ -1042,16 +1042,13 @@ priv_flow_process(struct pmd_internals *pmd, > if (err) > goto exit_item_not_supported; > if (flow && cur_item->convert) { > - if (!pmd->flower_vlan_support && > - cur_item->convert == tap_flow_create_vlan) > - goto exit_item_not_supported; > err = cur_item->convert(items, &data); > if (err) > goto exit_item_not_supported; > } > } > if (flow) { > - if (pmd->flower_vlan_support && data.vlan) { > + if (data.vlan) { > nlattr_add16(&flow->msg.nh, TCA_FLOWER_KEY_ETH_TYPE, > htons(ETH_P_8021Q)); > nlattr_add16(&flow->msg.nh, > @@ -1401,10 +1398,6 @@ tap_flow_isolate(struct rte_eth_dev *dev, > { > struct pmd_internals *pmd = dev->data->dev_private; > > - if (!pmd->flower_support) > - return -rte_flow_error_set( > - error, ENOSYS, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, > - "rte_flow isolate requires TC flower kernel support"); > if (set) > pmd->flow_isolate = 1; > else > @@ -1650,10 +1643,6 @@ tap_dev_filter_ctrl(struct rte_eth_dev *dev, > enum rte_filter_op filter_op, > void *arg) > { > - struct pmd_internals *pmd = dev->data->dev_private; > - > - if (!pmd->flower_support) > - return -ENOTSUP; > switch (filter_type) { > case RTE_ETH_FILTER_GENERIC: > if (filter_op != RTE_ETH_FILTER_GET)