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

Add support for integrated kernel driver #58

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Add support for integrated kernel driver #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions host/scripts/dss_host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,25 @@ def install_kernel_driver(align):

# Check if the kernel modules were built
kernel_modules = ["nvme-core.ko", "nvme-fabrics.ko", "nvme-tcp.ko", "nvme-rdma.ko"]
for module in kernel_modules:
if not os.path.exists(module):
os.chdir(cwd)
raise IOError("File not found: " + os.path.join(os.getcwd(), module) + ", did you forget to run config_driver?")
if not integrated_driver:
for module in kernel_modules:
if not os.path.exists(module):
os.chdir(cwd)
raise IOError("File not found: " + os.path.join(os.getcwd(), module) + ", did you forget to run config_driver?")

disconnect_cmd = "nvme disconnect-all"
rmmod = "modprobe -r nvme-tcp nvme-rdma nvme-fabrics nvme nvme-core"
rmmod = "modprobe -r nvme-tcp nvme-rdma nvme-fabrics"
# Append nvme and nvme-core if not integrated kernel driver
if not integrated_driver:
rmmod += " nvme nvme-core"
# rmmod = "rmmod nvme; rmmod nvme-tcp; rmmod nvme-rdma; rmmod nvme-fabrics; rmmod nvme-core;"
insmod = "insmod ./nvme-core.ko mem_align=%d io_timeout=300 admin_timeout=300; insmod ./nvme-fabrics.ko; \

# Use insmod if not integrated kernel driver
if not integrated_driver:
insmod = "insmod ./nvme-core.ko mem_align=%d io_timeout=300 admin_timeout=300; insmod ./nvme-fabrics.ko; \
insmod ./nvme-tcp.ko; insmod ./nvme-rdma.ko" % (align)
else:
insmod = "modprobe nvme-fabrics nvme-tcp nvme-rdma"

ret, do, err = exec_cmd(disconnect_cmd)
if ret != 0:
Expand Down Expand Up @@ -445,13 +454,14 @@ def subnet_drive_map():
for dev in subsys["Paths"]:
name = '/dev/' + dev["Name"] + 'n1'
transport = dev["Transport"]
addr = re.search(r"traddr=(\S+)", dev["Address"]).group(1)
subnet = getSubnet(addr)
if transport == "rdma":
grandsuri marked this conversation as resolved.
Show resolved Hide resolved
addr = re.search(r"traddr=(\S+)", dev["Address"]).group(1)
subnet = getSubnet(addr)

if subnet not in subnet_device_map:
subnet_device_map[subnet] = []
subnet_device_map[subnet].append(name)
addrs.append(addr)
if subnet not in subnet_device_map:
subnet_device_map[subnet] = []
subnet_device_map[subnet].append(name)
addrs.append(addr)

# We have IP octets now. Get interface and numa information for that octet.
for octet in subnet_device_map.keys():
Expand Down Expand Up @@ -1058,10 +1068,12 @@ def remove(self):
exec_cmd("rmmod nvme_tcp")
exec_cmd("rmmod nvme_rdma")
exec_cmd("rmmod nvme_fabrics")
exec_cmd("rmmod nvme")
exec_cmd("rmmod nvme_core")
# Load stock nvme driver
exec_cmd("modprobe nvme")
# Only rmmod if not integrated kernel driver
if not integrated_driver:
exec_cmd("rmmod nvme")
exec_cmd("rmmod nvme_core")
# Load stock nvme driver
exec_cmd("modprobe nvme")


if __name__ == '__main__':
Expand All @@ -1071,6 +1083,10 @@ def remove(self):
# reload(sys)
# sys.setdefaultencoding('utf8')

# Set global bool for integrated kernel driver
global integrated_driver
integrated_driver = os.getenv('INTEGRATED_DRIVER', 'False').lower() == 'true'

g_path = os.getcwd()
print("Make sure this script is executed from nkv-sdk/bin diretory, running command under path:%s" % (g_path))

Expand Down
Loading