From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 24127A00C4 for ; Fri, 25 Mar 2022 18:28:16 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EEDDB40140; Fri, 25 Mar 2022 18:28:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6165E40140 for ; Fri, 25 Mar 2022 18:28:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648229293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ozRf6GWIUmWcNJ3paldtWo1kDqV7+StVu5Pudbp8AoE=; b=D1nt2ejGTLmxIBixSm+M3+igXQb46g9rV+likPF1+MoV4tCa5SXCWlObydGI2vT7UMOwLA nPWnfQ87a1jLZE94SqbUj3U0jmSls9RBnr5EZqfFkSOSosJwEqRkCuRsyaNTOqLLSkw+hQ lUYyGEKQzeyHz+PE4LdnNyeBXiAYLfY= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-32-0SceivwZNrqdeoOkT61tlQ-1; Fri, 25 Mar 2022 13:27:53 -0400 X-MC-Unique: 0SceivwZNrqdeoOkT61tlQ-1 Received: by mail-wr1-f70.google.com with SMTP id 5-20020adf8105000000b002059d8f085bso1327650wrm.0 for ; Fri, 25 Mar 2022 10:27:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:from:to:cc:references:subject:in-reply-to :content-transfer-encoding; bh=ozRf6GWIUmWcNJ3paldtWo1kDqV7+StVu5Pudbp8AoE=; b=SFoZHHMMHNaXJEcdyEMMOn7gEwhUCuPvQaai/gqcOd2WeRR7cvp8YupPb5JL9/WpFN L5i1cBLtv5q4itF6G7QEm3KP2drrjzAKDmPk34t2PyEoiEzBzIidsNEkOv+eRZmW6MAl IS1VaBc4rBJ7Bu2/TRTQzGim09ABtD27di7uTtwgdsLSKtCinBVEd+LfOV8E4PpUA/HA /lINNgJzj8Y6M4T0T+qIqNjsnZMtL8O184hE252lE/bJYZRAR6rX1IpkXvnJF7vfz+yc WP1hcYvNdRBuyqnxTieqYhEwUojlM9lPuX1uj3ByvEhogYM7M+xICFYU07Nn2BvL0ykq JP8w== X-Gm-Message-State: AOAM531Yf5QpaLl4d7YwFOPDZEiljNDKpQxugIlEV8Y6k+As9YusErr0 Y4SZvTjIV9IAw/UhiCnMl7/NaTYEUjAC3KGz2GA6GuRR11RFyRXu7z12WuuiN5EGVHDWfrln0R6 6zSgpa5w= X-Received: by 2002:a5d:6782:0:b0:203:d6af:5869 with SMTP id v2-20020a5d6782000000b00203d6af5869mr10156573wru.213.1648229272480; Fri, 25 Mar 2022 10:27:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz19aPUcHLb7FaI7fvSpm/rt43FOj4GoKym3B4bZZKCH28u8O7UJDWxIdBgvBjvy/cpbh5ByA== X-Received: by 2002:a5d:6782:0:b0:203:d6af:5869 with SMTP id v2-20020a5d6782000000b00203d6af5869mr10156551wru.213.1648229272238; Fri, 25 Mar 2022 10:27:52 -0700 (PDT) Received: from [192.168.0.36] ([78.17.178.139]) by smtp.gmail.com with ESMTPSA id m13-20020a05600c3b0d00b0038cda9f92fasm3766836wms.0.2022.03.25.10.27.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Mar 2022 10:27:51 -0700 (PDT) Message-ID: <56002b35-2584-c8db-001e-f6673e5a40a5@redhat.com> Date: Fri, 25 Mar 2022 17:27:50 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 From: Kevin Traynor To: Gregory Etelson Cc: Viacheslav Ovsiienko , dpdk stable , Michael Baum References: <20220310121127.1324802-1-ktraynor@redhat.com> <20220310121127.1324802-12-ktraynor@redhat.com> Subject: Re: patch 'net/mlx5: fix flex item availability' has been queued to stable release 21.11.1 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org On 23/03/2022 16:03, Kevin Traynor wrote: > On 21/03/2022 17:02, Kevin Traynor wrote: >> Hi, >> >> On 10/03/2022 12:11, Kevin Traynor wrote: >>> Hi, >>> >>> FYI, your patch has been queued to stable release 21.11.1 >>> >> >> This patch seems to be causing a build failure [0] in the CI [1] with >> meson on Windows. Probably there is some piece of a dependent patch that >> is needed. >> >> Can you take a look? thanks. >> > > Hi. Any progress on this? David mentioned it could be missing > > +#include > > from: > > commit c4c3e8afefa8b7e7bc19073f9a159d50c75c8770 > Author: Michael Baum > Date: Mon Feb 14 11:35:01 2022 +0200 > > common/mlx5: share VF check function > > That patch can backport cleanly, but I don't have a windows env to test > the clang build before it hits the CI. Please advise on path forward. > Ping. I would like to resolve this on Monday if possible. Either by reverting this patch, or applying a fix. Thanks in advance. > thanks, > Kevin. > >> [0] >> [531/617] Compiling C object >> drivers/a715181@@tmp_rte_net_mlx5@sta/net_mlx5_mlx5_flow.c.obj. >> FAILED: drivers/a715181@@tmp_rte_net_mlx5@sta/net_mlx5_mlx5_flow.c.obj >> clang @drivers/a715181@@tmp_rte_net_mlx5@sta/net_mlx5_mlx5_flow.c.obj.rsp >> ../drivers/net/mlx5/mlx5_flow.c:9867:23: error: incomplete definition of >> type 'struct rte_pci_device' >> switch (priv->pci_dev->id.device_id) { >> ~~~~~~~~~~~~~^ >> ..\drivers\net/mlx5/mlx5.h:154:9: note: forward declaration of 'struct >> rte_pci_device' >> struct rte_pci_device *pci_dev; /**< Backend PCI device. */ >> ^ >> 1 error generated. >> >> [1] https://lab.dpdk.org/results/dashboard/tarballs/19198/#env-27 >> >>> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. >>> It will be pushed if I get no objections before 03/14/22. So please >>> shout if anyone has objections. >>> >>> Also note that after the patch there's a diff of the upstream commit vs the >>> patch applied to the branch. This will indicate if there was any rebasing >>> needed to apply to the stable branch. If there were code changes for rebasing >>> (ie: not only metadata diffs), please double check that the rebase was >>> correctly done. >>> >>> Queued patches are on a temporary branch at: >>> https://github.com/kevintraynor/dpdk-stable >>> >>> This queued commit can be viewed at: >>> https://github.com/kevintraynor/dpdk-stable/commit/48fe9efaf2fb974e3f805eb7c54440ec3818a4b6 >>> >>> Thanks. >>> >>> Kevin >>> >>> --- >>> From 48fe9efaf2fb974e3f805eb7c54440ec3818a4b6 Mon Sep 17 00:00:00 2001 >>> From: Gregory Etelson >>> Date: Wed, 2 Mar 2022 13:06:42 +0200 >>> Subject: [PATCH] net/mlx5: fix flex item availability >>> >>> [ upstream commit 71adf25dbfb3a60731bd922342cc0f171714db81 ] >>> >>> Flex item availability is restricted to BlueField-2 and BlueField-3 >>> PF ports. >>> >>> The patch validates port type compliance before proceeding to >>> flex item creation. >>> >>> Fixes: db25cadc0887 ("net/mlx5: add flex item operations") >>> >>> Signed-off-by: Gregory Etelson >>> Acked-by: Viacheslav Ovsiienko >>> --- >>> drivers/common/mlx5/linux/mlx5_common_os.h | 1 + >>> drivers/net/mlx5/mlx5_flow.c | 17 +++++++++++++++++ >>> 2 files changed, 18 insertions(+) >>> >>> diff --git a/drivers/common/mlx5/linux/mlx5_common_os.h b/drivers/common/mlx5/linux/mlx5_common_os.h >>> index 83066e752d..2e4ac09bbf 100644 >>> --- a/drivers/common/mlx5/linux/mlx5_common_os.h >>> +++ b/drivers/common/mlx5/linux/mlx5_common_os.h >>> @@ -10,4 +10,5 @@ >>> >>> #include >>> +#include >>> #include >>> #include >>> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c >>> index 5b36cfa042..41a648ff3f 100644 >>> --- a/drivers/net/mlx5/mlx5_flow.c >>> +++ b/drivers/net/mlx5/mlx5_flow.c >>> @@ -9854,8 +9854,25 @@ mlx5_flow_flex_item_create(struct rte_eth_dev *dev, >>> { >>> static const char err_msg[] = "flex item creation unsupported"; >>> + struct mlx5_priv *priv = dev->data->dev_private; >>> struct rte_flow_attr attr = { .transfer = 0 }; >>> const struct mlx5_flow_driver_ops *fops = >>> flow_get_drv_ops(flow_get_drv_type(dev, &attr)); >>> >>> + if (!priv->pci_dev) { >>> + rte_flow_error_set(error, ENOTSUP, >>> + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, >>> + "create flex item on PF only"); >>> + return NULL; >>> + } >>> + switch (priv->pci_dev->id.device_id) { >>> + case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF: >>> + case PCI_DEVICE_ID_MELLANOX_CONNECTX7BF: >>> + break; >>> + default: >>> + rte_flow_error_set(error, ENOTSUP, >>> + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, >>> + "flex item available on BlueField ports only"); >>> + return NULL; >>> + } >>> if (!fops->item_create) { >>> DRV_LOG(ERR, "port %u %s.", dev->data->port_id, err_msg); >> >