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 BB635A0505 for ; Wed, 23 Mar 2022 17:04:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9933C41140; Wed, 23 Mar 2022 17:04:11 +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 4361441140 for ; Wed, 23 Mar 2022 17:04:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648051448; 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=z8oJ316WynztFMgYr2DTxDdhQOEVunHqKR+hvWsYOZU=; b=P9GFmnDsb0kGNZVz8prs53O4EpON16LqXPC1mLOO0euowPqUjjFBmtBRdJspvm83ZU4QQy rJlQBZ74ToJfKyZK0bhN9+G7gdu5krjXF89MShrU1KOv311xbhCtZiHrQjfbSSAJgLwu7Q ZaixMbcDVNkItrnPALwY/iKlFJOoksc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-302-M8NRXZMbOn69Y5IKltM1Dg-1; Wed, 23 Mar 2022 12:03:50 -0400 X-MC-Unique: M8NRXZMbOn69Y5IKltM1Dg-1 Received: by mail-wm1-f72.google.com with SMTP id 2-20020a1c0202000000b0038c71e8c49cso2996828wmc.1 for ; Wed, 23 Mar 2022 09:03:49 -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=z8oJ316WynztFMgYr2DTxDdhQOEVunHqKR+hvWsYOZU=; b=pSl6dcGg3/bNkIcnX0fQF7T8MnSldSGyne4GZq1DiaGiQ/mI4Q6gT8yMSmSCAEDdZe 6vS849Vn2ehr8TY6sWx9TA53Avzb1yOh9FyM1Vg8oZ/BDeqEMFO9Rxm6fFEpymw72hmf sWMQGjKPCC0+MB2yYPiW57eGwWTgWg32ES7O8Hqn5MP9QkYLIVe8zIi8TqkvUSCcBdBd jxhakl4lO8xFx52nX3W8WRrsLh8bBE4oY3zxAkMETT1dvzKc/LSqpiOGn++NJeXoIt5s 06RmehgsDpV1KiMcjKuSchoE0i+aImsUe3n/udu4O7T68oyRQfKj85K8PWvYHA22RTFD T0rg== X-Gm-Message-State: AOAM533Z/KRWEZHMaQhp8M0LJdwdJLwoanN4Dkw4ObFAg0K5ODp0S8PX qQDRSKMFAOxEqjUzyfRLA3RrYKDRFiLj1QhklKpDgtzCV1O4Uxi/Uo012GIvSBsvVG19IZAmOfM FGq5Y5aM= X-Received: by 2002:a05:6000:1561:b0:204:1ba3:3b8b with SMTP id 1-20020a056000156100b002041ba33b8bmr445495wrz.325.1648051428523; Wed, 23 Mar 2022 09:03:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjUNx2OGtzod5c8aNHS1KD5iVu9z8S2/FIT8iLkHc7WZAFujinL2dg5g1vls2sL4Kfb22/KQ== X-Received: by 2002:a05:6000:1561:b0:204:1ba3:3b8b with SMTP id 1-20020a056000156100b002041ba33b8bmr445470wrz.325.1648051428243; Wed, 23 Mar 2022 09:03:48 -0700 (PDT) Received: from [192.168.0.36] ([78.17.178.139]) by smtp.gmail.com with ESMTPSA id f8-20020a5d6648000000b00203e64e3637sm202120wrw.89.2022.03.23.09.03.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Mar 2022 09:03:47 -0700 (PDT) Message-ID: Date: Wed, 23 Mar 2022 16:03:46 +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 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. 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); >