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 5C9EDA04FF for ; Mon, 21 Mar 2022 18:03:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E99F4161A; Mon, 21 Mar 2022 18:03:19 +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 C61CA4161A for ; Mon, 21 Mar 2022 18:03:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647882197; 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=n/4OMD5u6TjToP7RXA5bm7NKDTRtAMhI92d72T62ciQ=; b=dW1ccl+waDwTomOSIb6yIGS17kBH8V6Tr2be+412xCOlyBiAFIqbj3cb23kVX6iuLpKZAw V8ruFZs5LS+XU9wXhG18UevB7Tzz0yBpHhKowXTtQUH+cuyPhouLI8vakRn0u/cNDObvP/ /drRS9rko/dWLAwMV5iIp4oJh7n/v/I= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-18-8UMzsZMiN76T6Td47-w-vg-1; Mon, 21 Mar 2022 13:02:57 -0400 X-MC-Unique: 8UMzsZMiN76T6Td47-w-vg-1 Received: by mail-wm1-f70.google.com with SMTP id o10-20020a1c4d0a000000b0038c6e5fcbaeso5854000wmh.9 for ; Mon, 21 Mar 2022 10:02:57 -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=n/4OMD5u6TjToP7RXA5bm7NKDTRtAMhI92d72T62ciQ=; b=0hjX1ELTsLGD0orvIk7K8wYhTp1lpkf0P/DGPTixBMhNY+YLrLRwiNUvg/l8pRaH6K z8iT5FhzvwX5mmMjkOprUNlE4d436IXebhEaXPr0PLf9rpJwa86Tf++odWru+ZS1i0y4 wpVKbZ+l+o5ETsJlantlYeYX/3eH8WlV15j3+6vV6wM38d8OOyX2qnhjGktMZJF/2O2w evzJYvzWl2j8OFWtiPia8fTH9lUBem71nsX89rRK5WhWvg0tDiuhHOICObySIlJ+q+1R fg+u8IKa1e/A9sEC66J1+HewLBkWVtAwPL0FMK/vzYG1MNaeObSU8fGWOTUvZteESPUN AOIg== X-Gm-Message-State: AOAM532utNr7+8CYkQ04VLgAElwFYVSGTvLJv4lWTa+zBml+53qyJTJj Fm+e5Du0fZ9VgJs6IRPHg5u7LoA9Xrq7Zqvr7w/9QeD7kBOuLH13tvOwZrRKzKO5SRJscmaaRsn QuhANijA= X-Received: by 2002:a1c:f20a:0:b0:38c:74ad:14eb with SMTP id s10-20020a1cf20a000000b0038c74ad14ebmr67003wmc.44.1647882176391; Mon, 21 Mar 2022 10:02:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyU5jtXWLIhiuN97vYZWERRKM230ltu+zX0tvCoXh6oVUVYZtkwrdjU9Tpe1tvsmbmTXdZKrw== X-Received: by 2002:a1c:f20a:0:b0:38c:74ad:14eb with SMTP id s10-20020a1cf20a000000b0038c74ad14ebmr66981wmc.44.1647882176184; Mon, 21 Mar 2022 10:02:56 -0700 (PDT) Received: from [192.168.0.36] ([78.17.178.139]) by smtp.gmail.com with ESMTPSA id g1-20020a1c4e01000000b003899c8053e1sm47111wmh.41.2022.03.21.10.02.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Mar 2022 10:02:55 -0700 (PDT) Message-ID: Date: Mon, 21 Mar 2022 17:02:54 +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 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: <20220310121127.1324802-12-ktraynor@redhat.com> 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 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. [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);