Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

targetcli: add portal info #149

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

targetcli: add portal info #149

wants to merge 1 commit into from

Conversation

richl9
Copy link
Contributor

@richl9 richl9 commented Jan 28, 2025 •
edited
Loading

Add portal numbers for each tpg.

Below is an example output:

o- iscsi
  o- iqn.2003-01.org.linux-iscsi.richl-ol9-1.x8664:sn.3c63921d5d7b (struct iscsi_tiqn * 0xffff9fa703acf000)
    o- tpgt_1 (struct se_portal_group 0xffff9fa7044b1020)
      o- acls
        o- iqn.1988-12.com.oracle:0a4e0f3bcde (struct se_node_acl * 0xffff9fa705301000)
        o- mapped_luns
          o- lun_0 (struct se_lun * 0xffff9fa70881a800) 
            o- BACKSTORE: block_backend 
            o- DEVICE: /dev/sda4
      o- luns
        o- lun_0 (struct se_lun * 0xffff9fa70881a800) 
          o- BACKSTORE: block_backend 
          o- DEVICE: /dev/sda4
      o- portals
        o- 0.0.0.0:3260
  o- iqn.2003-01.org.linux-iscsi.richl-ol9-1.x8664:sn.c22b21e47243 (struct iscsi_tiqn * 0xffff9fa704c97000)
    o- tpgt_1 (struct se_portal_group 0xffff9fa703984020)
      o- acls
        o- iqn.1988-12.com.oracle:0a4e0f3bcde (struct se_node_acl * 0xffff9fa703981000)
        o- mapped_luns
          o- lun_0 (struct se_lun * 0xffff9fa702fe8000) 
            o- BACKSTORE: block_backend 
            o- DEVICE: /dev/sda4
      o- luns
        o- lun_0 (struct se_lun * 0xffff9fa702fe8000) 
          o- BACKSTORE: block_backend 
          o- DEVICE: /dev/sda4
      o- portals
        o- 0.0.0.0:3260
  o- iqn.2003-01.org.linux-iscsi.richl-ol9-1.x8664:sn.d0d4e8ad78fe (struct iscsi_tiqn * 0xffff9fa703982000)
    o- tpgt_1 (struct se_portal_group 0xffff9fa703985020)
      o- acls
        o- iqn.1988-12.com.oracle:0a4e0f3bcde (struct se_node_acl * 0xffff9fa7044ad000)
        o- mapped_luns
          o- lun_0 (struct se_lun * 0xffff9fa702d91c00) 
            o- BACKSTORE: block_backend 
            o- DEVICE: /dev/sda4
      o- luns
        o- lun_0 (struct se_lun * 0xffff9fa702d91c00) 
          o- BACKSTORE: block_backend 
          o- DEVICE: /dev/sda4
      o- portals
        o- 0.0.0.0:3260
o- vhost
  o- tpgt_1 (struct se_portal_group 0xffff9fa70227b850) (naa.50014050507acf74)
    o- acls
      o- naa.12345678910abc45 (struct se_node_acl * 0xffff9fa952ef7000)
      o- mapped_luns
        o- lun_0 (struct se_lun * 0xffff9fa702d81c00) 
          o- BACKSTORE: block_backend 
          o- DEVICE: /dev/sda4
    o- luns
      o- lun_0 (struct se_lun * 0xffff9fa702d81c00) 
        o- BACKSTORE: block_backend 
        o- DEVICE: /dev/sda4
    o- portals

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jan 28, 2025
brenns10
brenns10 requested changes Feb 3, 2025
View reviewed changes
drgn_tools/targetcli.py Outdated
Comment on lines 60 to 62
for portal in list_for_each_entry(
"struct dentry", np_dentry.d_subdirs.address_of_(), "d_child"
):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use dentry_for_each_child() from drgn_tools/dentry.py which handles the new changes in struct dentry in Linux 6.8.

drgn_tools/targetcli.py Outdated
for portal in list_for_each_entry(
"struct dentry", np_dentry.d_subdirs.address_of_(), "d_child"
):
yield portal.d_name.name.string_().decode()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the name in this case? Is it something controlled by the user? Is it guaranteed to be ASCII? Could a user include some UTF-8 encoded non-ASCII characters?

For most stuff in the kernel we can use the above because it will generally work fine. But if it's an actual user-specified string, we need to be careful. I would suggest using escape_ascii_string() here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Name here is configured by the user through targetcli tool and conforms to the format of "ip_address: portal_number", which, in this case, should be ASCII. But let's use escape_ascii_string() just to be safe:)

@richl9 richl9 force-pushed the richard/targetcli branch from e06946a to 40a8c59 Compare February 3, 2025 22:29
@biger410
Copy link
Member

@richl9 can you post an example output of iscsi and vhost with portal info?

@richl9
Copy link
Contributor Author

richl9 commented Feb 21, 2025

@richl9 can you post an example output of iscsi and vhost with portal info?

I have attached an example output. For vhost, it seems that it doesn't have a portal configuration like iscsi.

@biger410
Copy link
Member

Did targetcli show portals for vhost? If not, we should remove it from the code.

@richl9
targetcli: add portal info
8c668a1 
Orabug: 37444641
Signed-off-by: Richard Li <[email protected]>
@richl9
Copy link
Contributor Author

richl9 commented Feb 22, 2025

Did targetcli show portals for vhost? If not, we should remove it from the code.

There is no portal configuration for vhost in targetcli. Just removed it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brenns10 brenns10 brenns10 requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@richl9 @biger410 @brenns10