From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by dpdk.org (Postfix) with ESMTP id CFA00377E for ; Tue, 18 Jul 2017 13:52:55 +0200 (CEST) Received: by mail-wr0-f170.google.com with SMTP id w4so25283953wrb.2 for ; Tue, 18 Jul 2017 04:52:55 -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=LJFSzoK/zna4+5yrkkk6k/FlUtbPADFpaZdeXpCL37w=; b=DjyoBmwVqWpSCQJSdLQn1svRHC7x6JpCPI2BOIBfZNRddiik1fWQN2l/VLwumPBGis pA0Wm0foBUs1o0WrWH6qK4keyB9x07s6vjj4grFqIcpcLe6MM6pm2WSCxCEJ+JcatBMq u2+RV2r71QTBHFZ2tZjTfrSGks473vPDodtKlCAlfB7iUjyyKHQEnkAOX3Zbaj0nyoPm ZT/wwPKAyiAezEfhm8YafaB7OOkVqbfrpz8erbJNdZ2MRSZXPrHBPpjx3WTsS/Befq49 SHntCxEhZUPkzj2m4ZL9glQUpWlWK+NcOguDvPfX1X/M+TL8Y+0nJPnh3fRnfpVNloy+ pyUg== 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=LJFSzoK/zna4+5yrkkk6k/FlUtbPADFpaZdeXpCL37w=; b=Uqavt5F8sOiEpCoJFdnI7Cgr8inZ8dVmCdtae3vvdnhuou8p6s+BQeNhDBvx3rCNlf S/f0mQ169Xrzc4I53wkqyjSsrWs9w7qomWL8ATTEHWGUhizdzWyPhfgrHHAcAfjHTMpN SKIOPja0isHvIqI0N28Op2opZFaUEnX6/H0B64C/+/XJGzTMxABpZf6SzEoyr1ynl/V2 RjAKjMRdf5BQSBwOmam5vmsklDGy9PfYWxycXyNP4tkuUvm6wIfOsrMvzhA5fmhCID0y Bl15CQnnCQPt3SRA0WyHcqLv4Bb3fsJVIuoq5SRsxzIvgIBOWr3GNMft8aXbvQu5Djr/ CafQ== X-Gm-Message-State: AIVw111GmNn9QaE/EdWwht+lK6w2aw9SdW727lugHbJ9iuvj0hrpEng/ UB1EU3NPxfDNFqiy X-Received: by 10.28.111.218 with SMTP id c87mr1921839wmi.36.1500378774972; Tue, 18 Jul 2017 04:52:54 -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 12sm10704894wmr.7.2017.07.18.04.52.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 04:52:54 -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> <1500282020-23171-1-git-send-email-rasland@mellanox.com> From: Pascal Mazon Message-ID: <96a4f0b5-16c9-3f01-5eb5-848c1475b304@6wind.com> Date: Tue, 18 Jul 2017 13:52:46 +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: <1500282020-23171-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 v3] 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: Tue, 18 Jul 2017 11:52:56 -0000 Ok for me. Cheers, Pascal Acked-by: Pascal Mazon On 07/17/2017 11:00 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 does 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 | 34 +--------------------------------- > drivers/net/tap/rte_eth_tap.h | 2 -- > drivers/net/tap/tap_flow.c | 19 +++++-------------- > 3 files changed, 6 insertions(+), 49 deletions(-) > > diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c > index a4e5d11..c2b1d8a 100644 > --- a/drivers/net/tap/rte_eth_tap.c > +++ b/drivers/net/tap/rte_eth_tap.c > @@ -1166,23 +1166,6 @@ static const struct eth_dev_ops ops = { > .filter_ctrl = tap_dev_filter_ctrl, > }; > > -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(struct rte_vdev_device *vdev, char *tap_name, > @@ -1271,20 +1254,6 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, > 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; > - } > - } > > /* > * Set up everything related to rte_flow: > @@ -1378,7 +1347,6 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, > RTE_LOG(ERR, PMD, "Remote feature requires flow support.\n"); > goto error_exit; > } > - pmd->flower_support = 0; > return 0; > > error_remote: > @@ -1543,7 +1511,7 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) > 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 33e1a52..928a045 100644 > --- a/drivers/net/tap/rte_eth_tap.h > +++ b/drivers/net/tap/rte_eth_tap.h > @@ -90,8 +90,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 18425eb..77d4fc4 100644 > --- a/drivers/net/tap/tap_flow.c > +++ b/drivers/net/tap/tap_flow.c > @@ -1034,16 +1034,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, > @@ -1231,7 +1228,8 @@ tap_flow_create(struct rte_eth_dev *dev, > "Kernel refused TC filter rule creation (%d): %s\n", > errno, strerror(errno)); > rte_flow_error_set(error, EEXIST, RTE_FLOW_ERROR_TYPE_HANDLE, > - NULL, "overlapping rules"); > + NULL, > + "overlapping rules or Kernel too old for flower support"); > goto fail; > } > LIST_INSERT_HEAD(&pmd->flows, flow, next); > @@ -1276,7 +1274,8 @@ tap_flow_create(struct rte_eth_dev *dev, > errno, strerror(errno)); > rte_flow_error_set( > error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE, > - NULL, "overlapping rules"); > + NULL, > + "overlapping rules or Kernel too old for flower support"); > goto fail; > } > flow->remote_flow = remote_flow; > @@ -1393,10 +1392,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, ENOTSUP, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, > - "rte_flow isolate requires TC flower kernel support"); > if (set) > pmd->flow_isolate = 1; > else > @@ -1642,10 +1637,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)