From: "Xing, Beilei" <beilei.xing@intel.com>
To: "Rybalchenko, Kirill" <kirill.rybalchenko@intel.com>,
"dev@dpdk.org" <dev@dpdk.org>
Cc: "stable@dpdk.org" <stable@dpdk.org>,
"Chilikin, Andrey" <andrey.chilikin@intel.com>,
"Wu, Jingjing" <jingjing.wu@intel.com>
Subject: Re: [dpdk-stable] [PATCH v3] net/i40e: fix multiple DDP packages should not be allowed
Date: Mon, 5 Feb 2018 10:41:09 +0000 [thread overview]
Message-ID: <94479800C636CB44BD422CB454846E01320CDDEC@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <1517488985-5264-1-git-send-email-kirill.rybalchenko@intel.com>
> -----Original Message-----
> From: Rybalchenko, Kirill
> Sent: Thursday, February 1, 2018 8:43 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Rybalchenko, Kirill <kirill.rybalchenko@intel.com>;
> Chilikin, Andrey <andrey.chilikin@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>
> Subject: [PATCH v3] net/i40e: fix multiple DDP packages should not be
> allowed
>
> Should be not possible to load conflicting DDP profiles.
> Only DDP profiles of the same group (not 0) can be loaded together; If DDP
> profile group is 0, it is exclusive, i.e. it cannot be loaded with any other DDP
> profile; If DDP profile groups are different - these profiles cannot be loaded
> together;
>
> Fixes: b319712f53c8 ("net/i40e: extended list of operations for DDP
> processing")
>
> v3: prevent registration of read-only profiles with profile list
>
> Signed-off-by: Kirill Rybalchenko <kirill.rybalchenko@intel.com>
> ---
> drivers/net/i40e/rte_pmd_i40e.c | 40
> ++++++++++++++++++++++++++++++++++++----
> 1 file changed, 36 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/i40e/rte_pmd_i40e.c
> b/drivers/net/i40e/rte_pmd_i40e.c index 5436db4..dae59e6 100644
> --- a/drivers/net/i40e/rte_pmd_i40e.c
> +++ b/drivers/net/i40e/rte_pmd_i40e.c
> @@ -1496,7 +1496,14 @@ i40e_check_profile_info(uint16_t port, uint8_t
> *profile_info_sec)
> struct rte_pmd_i40e_profile_info *pinfo, *p;
> uint32_t i;
> int ret;
> + static const uint32_t group_mask = 0x00ff0000;
>
> + pinfo = (struct rte_pmd_i40e_profile_info *)(profile_info_sec +
> + sizeof(struct i40e_profile_section_header));
> + if (pinfo->track_id == 0) {
> + PMD_DRV_LOG(INFO, "Read-only profile.");
> + return 0;
> + }
> buff = rte_zmalloc("pinfo_list",
> (I40E_PROFILE_INFO_SIZE *
> I40E_MAX_PROFILE_NUM + 4),
> 0);
> @@ -1515,8 +1522,6 @@ i40e_check_profile_info(uint16_t port, uint8_t
> *profile_info_sec)
> return -1;
> }
> p_list = (struct rte_pmd_i40e_profile_list *)buff;
> - pinfo = (struct rte_pmd_i40e_profile_info *)(profile_info_sec +
> - sizeof(struct i40e_profile_section_header));
> for (i = 0; i < p_list->p_count; i++) {
> p = &p_list->p_info[i];
> if (pinfo->track_id == p->track_id) { @@ -1525,6 +1530,23
> @@ i40e_check_profile_info(uint16_t port, uint8_t *profile_info_sec)
> return 1;
> }
> }
> + for (i = 0; i < p_list->p_count; i++) {
> + p = &p_list->p_info[i];
> + if ((p->track_id & group_mask) == 0) {
> + PMD_DRV_LOG(INFO, "Profile of the group 0
> exists.");
> + rte_free(buff);
> + return 2;
> + }
> + }
> + for (i = 0; i < p_list->p_count; i++) {
> + p = &p_list->p_info[i];
> + if ((pinfo->track_id & group_mask) !=
> + (p->track_id & group_mask)) {
> + PMD_DRV_LOG(INFO, "Profile of different group
> exists.");
> + rte_free(buff);
> + return 3;
> + }
> + }
>
> rte_free(buff);
> return 0;
> @@ -1544,6 +1566,7 @@ rte_pmd_i40e_process_ddp_package(uint16_t
> port, uint8_t *buff,
> uint8_t *profile_info_sec;
> int is_exist;
> enum i40e_status_code status = I40E_SUCCESS;
> + static const uint32_t type_mask = 0xff000000;
>
> if (op != RTE_PMD_I40E_PKG_OP_WR_ADD &&
> op != RTE_PMD_I40E_PKG_OP_WR_ONLY &&
> @@ -1595,6 +1618,10 @@ rte_pmd_i40e_process_ddp_package(uint16_t
> port, uint8_t *buff,
> return -EINVAL;
> }
>
> + /* force read-only track_id for type 0 */
> + if ((track_id & type_mask) == 0)
> + track_id = 0;
> +
> /* Find profile segment */
> profile_seg_hdr =
> i40e_find_segment_in_package(SEGMENT_TYPE_I40E,
> pkg_hdr);
> @@ -1628,12 +1655,17 @@ rte_pmd_i40e_process_ddp_package(uint16_t
> port, uint8_t *buff,
>
> if (op == RTE_PMD_I40E_PKG_OP_WR_ADD) {
> if (is_exist) {
How about removing the above if statement since there're 3 if statements for is_exist below?
> - PMD_DRV_LOG(ERR, "Profile already exists.");
> + if (is_exist == 1)
> + PMD_DRV_LOG(ERR, "Profile already
> exists.");
> + else if (is_exist == 2)
> + PMD_DRV_LOG(ERR, "Profile of group 0
> already exists.");
> + else if (is_exist == 3)
> + PMD_DRV_LOG(ERR, "Profile of different
> group already exists");
> rte_free(profile_info_sec);
> return -EEXIST;
> }
> } else if (op == RTE_PMD_I40E_PKG_OP_WR_DEL) {
> - if (!is_exist) {
> + if (is_exist != 1) {
> PMD_DRV_LOG(ERR, "Profile does not exist.");
> rte_free(profile_info_sec);
> return -EACCES;
> --
> 2.5.5
next prev parent reply other threads:[~2018-02-05 10:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-30 18:09 [dpdk-stable] [PATCH v2] " Kirill Rybalchenko
2018-02-01 12:43 ` [dpdk-stable] [PATCH v3] " Kirill Rybalchenko
2018-02-01 13:27 ` Chilikin, Andrey
2018-02-05 10:41 ` Xing, Beilei [this message]
2018-02-05 13:58 ` Rybalchenko, Kirill
2018-02-06 2:26 ` Xing, Beilei
2018-02-06 2:27 ` Xing, Beilei
2018-02-06 15:17 ` Zhang, Helin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=94479800C636CB44BD422CB454846E01320CDDEC@SHSMSX101.ccr.corp.intel.com \
--to=beilei.xing@intel.com \
--cc=andrey.chilikin@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=kirill.rybalchenko@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).