CR-1160935 : Fixed a issue for xbtest invalid card BDF #7519

saifuddin-xilinx · 2023-04-25T09:30:55Z

Problem solved by the commit

CR-1160935
xbtest VVT - Issuing an xbtest command with an invalid BDF triggers a segmentation fault

-- This is a minor issue. If we issue an xbtest command such as verify with an invalid bdf, we observe the test failing but with a segmentation_fault

Bug / issue (if any) fixed, which PR introduced the bug, how it was discovered

N/A

How problem was solved, alternative solutions (if any) and why they were rejected

-- Added a check before accessing the invalid entry of PCI device vector.

Risks (if any) associated the changes in the commit

N/A

What has been tested and how, request additional testing if necessary

Basic Validation and xbtest

Documentation impact (if any)

N/A

chvamshi-xilinx · 2023-04-25T11:16:38Z

src/runtime_src/core/pcie/linux/system_linux.cpp

@@ -131,7 +131,8 @@ get_pcidev(unsigned index, bool is_user) const
    if (index < user_ready_list.size())
      return user_ready_list[index];

-    return user_nonready_list[index - user_ready_list.size()];
+    return !user_nonready_list.size() ? NULL : 
+        user_nonready_list[index - user_ready_list.size()];


As discussed, please add a check which covers all cases.

Suggested change

user_nonready_list[index - user_ready_list.size()];

if( index - user_ready_list.size() < user_nonready_list.size() )

return user_nonready_list[index - user_ready_list.size()]

return nullptr;

Fixed as suggested. Thanks

Signed-off-by: Saifuddin <saifuddi@xilinx.com>

gbuildx · 2023-04-25T12:33:08Z

Build Failed! :(

chvamshi-xilinx · 2023-04-25T13:13:22Z

retest this please

gbuildx · 2023-04-25T17:33:10Z

Build Failed! :(

dayeh-xilinx · 2023-04-25T17:39:33Z

retest this please.

gbuildx · 2023-04-25T18:49:14Z

Build Failed! :(

dayeh-xilinx · 2023-04-25T19:51:52Z

retest this please.

gbuildx · 2023-04-26T01:35:17Z

Build Failed! :(

dayeh-xilinx · 2023-04-26T04:29:30Z

retest this please.

gbuildx · 2023-04-26T12:03:36Z

Build Failed! :(

dayeh-xilinx · 2023-04-27T21:37:45Z

retest this please.

dayeh-xilinx · 2023-04-28T00:28:55Z

retest this please.

dayeh-xilinx · 2023-04-28T04:30:08Z

retest this please.

stsoe

Same problem exist for mgmt.
I would suggest using std::vector::at(idx) for bounds checking when it can be off.
If you wrap the function body in

try {
  ...
}
catch (const std::exception&) {
  return nullptr;
}

then both cases will be handle.

stsoe · 2023-04-28T18:12:37Z

src/runtime_src/core/pcie/linux/system_linux.cpp

@@ -131,7 +131,10 @@ get_pcidev(unsigned index, bool is_user) const
    if (index < user_ready_list.size())
      return user_ready_list[index];

-    return user_nonready_list[index - user_ready_list.size()];
+    if ((index - user_ready_list.size()) < user_nonready_list.size())
+      return user_nonready_list[index - user_ready_list.size()];


Suggested change

return user_nonready_list[index - user_ready_list.size()];

return user_nonready_list.at(index - user_ready_list.size());

WIth try catch. Do same for mgmt. And no need for conditional if.

Signed-off-by: Saifuddin <saifuddi@xilinx.com>

gbuildx · 2023-05-02T20:45:07Z

Build failed :(

manikandan-xilinx · 2023-05-02T21:16:28Z

retest this please.

gbuildx · 2023-05-03T01:26:29Z

Build Passed!

* Fixed a issue for xbtest invalid card BDF * Fixed a issue for xbtest invalid card BDF Signed-off-by: Saifuddin <saifuddi@xilinx.com> * incorporate review comments Signed-off-by: Saifuddin <saifuddi@xilinx.com> --------- Signed-off-by: Saifuddin <saifuddi@xilinx.com> (cherry picked from commit e5ba80c)

* CR-1160935 : Fixed a issue for xbtest invalid card BDF (#7519) * Fixed a issue for xbtest invalid card BDF * Fixed a issue for xbtest invalid card BDF Signed-off-by: Saifuddin <saifuddi@xilinx.com> * incorporate review comments Signed-off-by: Saifuddin <saifuddi@xilinx.com> --------- Signed-off-by: Saifuddin <saifuddi@xilinx.com> (cherry picked from commit e5ba80c) * Fixed xocl driver issues (#7527) Signed-off-by: Saifuddin <saifuddi@xilinx.com> (cherry picked from commit 5cc7361)

Fixed a issue for xbtest invalid card BDF

c41febf

saifuddin-xilinx requested a review from chvamshi-xilinx April 25, 2023 09:30

saifuddin-xilinx requested a review from stsoe as a code owner April 25, 2023 09:30

saifuddin-xilinx changed the title ~~Fixed a issue for xbtest invalid card BDF~~ CR-1160935 : Fixed a issue for xbtest invalid card BDF Apr 25, 2023

chvamshi-xilinx reviewed Apr 25, 2023

View reviewed changes

Fixed a issue for xbtest invalid card BDF

cc958ed

Signed-off-by: Saifuddin <saifuddi@xilinx.com>

chvamshi-xilinx approved these changes Apr 25, 2023

View reviewed changes

stsoe requested changes Apr 28, 2023

View reviewed changes

stsoe reviewed Apr 28, 2023

View reviewed changes

incorporate review comments

dba714f

Signed-off-by: Saifuddin <saifuddi@xilinx.com>

saifuddin-xilinx requested a review from stsoe May 2, 2023 19:55

stsoe approved these changes May 2, 2023

View reviewed changes

chvamshi-xilinx merged commit e5ba80c into Xilinx:master May 3, 2023

saifuddin-xilinx mentioned this pull request May 3, 2023

Xbtest fix cherry #7519 #7533

Closed

saifuddin-xilinx mentioned this pull request May 3, 2023

Cherry picks #7519 & #7527 for 2023.1 branch #7534

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CR-1160935 : Fixed a issue for xbtest invalid card BDF #7519

CR-1160935 : Fixed a issue for xbtest invalid card BDF #7519

saifuddin-xilinx commented Apr 25, 2023

chvamshi-xilinx Apr 25, 2023

saifuddin-xilinx Apr 25, 2023

gbuildx commented Apr 25, 2023

chvamshi-xilinx commented Apr 25, 2023

gbuildx commented Apr 25, 2023

dayeh-xilinx commented Apr 25, 2023

gbuildx commented Apr 25, 2023

dayeh-xilinx commented Apr 25, 2023

gbuildx commented Apr 26, 2023

dayeh-xilinx commented Apr 26, 2023

gbuildx commented Apr 26, 2023

dayeh-xilinx commented Apr 27, 2023

dayeh-xilinx commented Apr 28, 2023

dayeh-xilinx commented Apr 28, 2023

stsoe left a comment

stsoe Apr 28, 2023 •

edited

Loading

gbuildx commented May 2, 2023

manikandan-xilinx commented May 2, 2023

gbuildx commented May 3, 2023

	return user_nonready_list[index - user_ready_list.size()];
	return user_nonready_list.at(index - user_ready_list.size());

CR-1160935 : Fixed a issue for xbtest invalid card BDF #7519

CR-1160935 : Fixed a issue for xbtest invalid card BDF #7519

Conversation

saifuddin-xilinx commented Apr 25, 2023

Problem solved by the commit

Bug / issue (if any) fixed, which PR introduced the bug, how it was discovered

How problem was solved, alternative solutions (if any) and why they were rejected

Risks (if any) associated the changes in the commit

What has been tested and how, request additional testing if necessary

Documentation impact (if any)

chvamshi-xilinx Apr 25, 2023

Choose a reason for hiding this comment

saifuddin-xilinx Apr 25, 2023

Choose a reason for hiding this comment

gbuildx commented Apr 25, 2023

chvamshi-xilinx commented Apr 25, 2023

gbuildx commented Apr 25, 2023

dayeh-xilinx commented Apr 25, 2023

gbuildx commented Apr 25, 2023

dayeh-xilinx commented Apr 25, 2023

gbuildx commented Apr 26, 2023

dayeh-xilinx commented Apr 26, 2023

gbuildx commented Apr 26, 2023

dayeh-xilinx commented Apr 27, 2023

dayeh-xilinx commented Apr 28, 2023

dayeh-xilinx commented Apr 28, 2023

stsoe left a comment

Choose a reason for hiding this comment

stsoe Apr 28, 2023 • edited Loading

Choose a reason for hiding this comment

gbuildx commented May 2, 2023

manikandan-xilinx commented May 2, 2023

gbuildx commented May 3, 2023

stsoe Apr 28, 2023 •

edited

Loading