Skip to content

build: platform fixes #3752

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

Merged
igaw merged 5 commits into from
Aug 6, 2026
Merged

build: platform fixes #3752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3238f0d
build: update some more platform guards
igaw Aug 5, 2026
f2d4802
libnvme/no-mi: add libnvme_transport_handle_get_mi_ep
dwsuse Aug 5, 2026
806946c
libnvme: drop duplicate accessor/ctrl-sysfs symbols from libnvme.ld
dwsuse Aug 5, 2026
022d29b
ccan/endian: guard endian defintion
dwsuse Aug 5, 2026
5a0527c
libnvme/tests: use PRIx64 for __u64 types
dwsuse Aug 5, 2026
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
4 changes: 4 additions & 0 deletions ccan/ccan/endian/endian.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,12 @@ static inline uint64_t bswap_64(uint64_t val)
#endif

/* Needed for Glibc like endiness check */
#ifndef __LITTLE_ENDIAN
#define __LITTLE_ENDIAN 1234
#endif
#ifndef __BIG_ENDIAN
#define __BIG_ENDIAN 4321
#endif

/* Sanity check the defines. We don't handle weird endianness. */
#if !HAVE_LITTLE_ENDIAN && !HAVE_BIG_ENDIAN
Expand Down
9 changes: 0 additions & 9 deletions libnvme/src/libnvme.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ LIBNVME_3 {
libnvme_create_global_ctx;
libnvme_ctrl_first_ns;
libnvme_ctrl_first_path;
libnvme_ctrl_get_command_error_count;
libnvme_ctrl_get_phy_slot;
libnvme_ctrl_get_reconnect_count;
libnvme_ctrl_get_reset_count;
libnvme_ctrl_get_src_addr;
libnvme_ctrl_get_state;
libnvme_ctrl_get_subsysnqn;
libnvme_ctrl_get_subsystem;
libnvme_ctrl_get_transport_handle;
libnvme_ctrl_identify;
Expand Down Expand Up @@ -73,16 +68,12 @@ LIBNVME_3 {
libnvme_ns_flush;
libnvme_ns_get_command_error_count;
libnvme_ns_get_command_retry_count;
libnvme_ns_get_csi;
libnvme_ns_get_ctrl;
libnvme_ns_get_eui64;
libnvme_ns_get_io_fail_no_available_path_count;
libnvme_ns_get_firmware;
libnvme_ns_get_generic_name;
libnvme_ns_get_inflights;
libnvme_ns_get_io_ticks;
libnvme_ns_get_model;
libnvme_ns_get_nguid;
libnvme_ns_get_read_ios;
libnvme_ns_get_read_sectors;
libnvme_ns_get_read_ticks;
Expand Down
6 changes: 6 additions & 0 deletions libnvme/src/nvme/no-mi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,9 @@ int libnvme_mi_admin_admin_passthru(struct libnvme_transport_handle *hdl,
{
return -ENOTSUP;
}

__shr_public struct libnvme_mi_ep *libnvme_transport_handle_get_mi_ep(
struct libnvme_transport_handle *hdl)
{
return NULL;
}
2 changes: 1 addition & 1 deletion libnvme/test/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ if want_fabrics
test('libnvme - util', test_util)
endif

if host_system != 'windows'
if host_system == 'linux'
subdir('ioctl')
subdir('sysfs')
if want_fabrics
Expand Down
58 changes: 29 additions & 29 deletions libnvme/test/register.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,22 @@ void nvme_print_registers(void *regs)
__u64 pmrmsc = nvme_mmio_read32(regs + NVME_REG_PMRMSCL) |
(__u64)nvme_mmio_read64(regs + NVME_REG_PMRMSCU) << 32;

printf("%-10s : %llx\n", "CAP", cap);
printf(" %-8s : %llx\n", "MQES", NVME_CAP_MQES(cap));
printf(" %-8s : %llx\n", "CQRS", NVME_CAP_CQR(cap));
printf(" %-8s : %llx\n", "AMS", NVME_CAP_AMS(cap));
printf(" %-8s : %llx\n", "TO", NVME_CAP_TO(cap));
printf(" %-8s : %llx\n", "DSTRD", NVME_CAP_DSTRD(cap));
printf(" %-8s : %llx\n", "NSSRC", NVME_CAP_NSSRC(cap));
printf(" %-8s : %llx\n", "CSS", NVME_CAP_CSS(cap));
printf(" %-8s : %llx\n", "BPS", NVME_CAP_BPS(cap));
printf(" %-8s : %llx\n", "CPS", NVME_CAP_CPS(cap));
printf(" %-8s : %llx\n", "MPSMIN", NVME_CAP_MPSMIN(cap));
printf(" %-8s : %llx\n", "MPSMAX", NVME_CAP_MPSMAX(cap));
printf(" %-8s : %llx\n", "PMRS", NVME_CAP_PMRS(cap));
printf(" %-8s : %llx\n", "CMBS", NVME_CAP_CMBS(cap));
printf(" %-8s : %llx\n", "NSSS", NVME_CAP_NSSS(cap));
printf(" %-8s : %llx\n", "CRMS", NVME_CAP_CRMS(cap));
printf("%-10s : %" PRIx64 "\n", "CAP", (uint64_t)cap);
printf(" %-8s : %" PRIx64 "\n", "MQES", (uint64_t)NVME_CAP_MQES(cap));
printf(" %-8s : %" PRIx64 "\n", "CQRS", (uint64_t)NVME_CAP_CQR(cap));
printf(" %-8s : %" PRIx64 "\n", "AMS", (uint64_t)NVME_CAP_AMS(cap));
printf(" %-8s : %" PRIx64 "\n", "TO", (uint64_t)NVME_CAP_TO(cap));
printf(" %-8s : %" PRIx64 "\n", "DSTRD", (uint64_t)NVME_CAP_DSTRD(cap));
printf(" %-8s : %" PRIx64 "\n", "NSSRC", (uint64_t)NVME_CAP_NSSRC(cap));
printf(" %-8s : %" PRIx64 "\n", "CSS", (uint64_t)NVME_CAP_CSS(cap));
printf(" %-8s : %" PRIx64 "\n", "BPS", (uint64_t)NVME_CAP_BPS(cap));
printf(" %-8s : %" PRIx64 "\n", "CPS", (uint64_t)NVME_CAP_CPS(cap));
printf(" %-8s : %" PRIx64 "\n", "MPSMIN", (uint64_t)NVME_CAP_MPSMIN(cap));
printf(" %-8s : %" PRIx64 "\n", "MPSMAX", (uint64_t)NVME_CAP_MPSMAX(cap));
printf(" %-8s : %" PRIx64 "\n", "PMRS", (uint64_t)NVME_CAP_PMRS(cap));
printf(" %-8s : %" PRIx64 "\n", "CMBS", (uint64_t)NVME_CAP_CMBS(cap));
printf(" %-8s : %" PRIx64 "\n", "NSSS", (uint64_t)NVME_CAP_NSSS(cap));
printf(" %-8s : %" PRIx64 "\n", "CRMS", (uint64_t)NVME_CAP_CRMS(cap));

printf("%-10s : %x\n", "VS", vs);
printf(" %-8s : %x\n", "MJR", NVME_VS_TER(vs));
Expand Down Expand Up @@ -119,8 +119,8 @@ void nvme_print_registers(void *regs)
printf(" %-8s : %x\n", "ASQS", NVME_AQA_ASQS(aqa));
printf(" %-8s : %x\n", "ACQS", NVME_AQA_ACQS(aqa));

printf("%-10s : %llx\n", "ASQ", asq);
printf("%-10s : %llx\n", "ACQ", acq);
printf("%-10s : %" PRIx64 "\n", "ASQ", (uint64_t)asq);
printf("%-10s : %" PRIx64 "\n", "ACQ", (uint64_t)acq);

printf("%-10s : %x\n", "CMBLOC", cmbloc);
printf(" %-8s : %x\n", "BIR", NVME_CMBLOC_BIR(cmbloc));
Expand All @@ -140,7 +140,7 @@ void nvme_print_registers(void *regs)
printf(" %-8s : %x\n", "WDS", NVME_CMBSZ_WDS(cmbsz));
printf(" %-8s : %x\n", "SZU", NVME_CMBSZ_SZU(cmbsz));
printf(" %-8s : %x\n", "SZ", NVME_CMBSZ_SZ(cmbsz));
printf(" %-8s : %llx\n", "bytes", nvme_cmb_size(cmbsz));
printf(" %-8s : %" PRIx64 "\n", "bytes", (uint64_t)nvme_cmb_size(cmbsz));

printf("%-10s : %x\n", "BPINFO", bpinfo);
printf(" %-8s : %x\n", "BPSZ", NVME_BPINFO_BPSZ(bpinfo));
Expand All @@ -152,12 +152,12 @@ void nvme_print_registers(void *regs)
printf(" %-8s : %x\n", "BPROF", NVME_BPRSEL_BPROF(bprsel));
printf(" %-8s : %x\n", "BPID", NVME_BPRSEL_BPID(bprsel));

printf("%-10s : %llx\n", "BPMBL", bpmbl);
printf("%-10s : %" PRIx64 "\n", "BPMBL", (uint64_t)bpmbl);

printf("%-10s : %llx\n", "CMBMSC", cmbmsc);
printf(" %-8s : %llx\n", "CRE", NVME_CMBMSC_CRE(cmbmsc));
printf(" %-8s : %llx\n", "CMSE", NVME_CMBMSC_CMSE(cmbmsc));
printf(" %-8s : %llx\n", "CBA", NVME_CMBMSC_CBA(cmbmsc));
printf("%-10s : %" PRIx64 "\n", "CMBMSC", (uint64_t)cmbmsc);
printf(" %-8s : %" PRIx64 "\n", "CRE", (uint64_t)NVME_CMBMSC_CRE(cmbmsc));
printf(" %-8s : %" PRIx64 "\n", "CMSE", (uint64_t)NVME_CMBMSC_CMSE(cmbmsc));
printf(" %-8s : %" PRIx64 "\n", "CBA", (uint64_t)NVME_CMBMSC_CBA(cmbmsc));

printf("%-10s : %x\n", "CMBSTS", cmbsts);
printf(" %-8s : %x\n", "CBAI", NVME_CMBSTS_CBAI(cmbsts));
Expand All @@ -184,16 +184,16 @@ void nvme_print_registers(void *regs)
printf(" %-8s : %x\n", "PMRSZU", NVME_PMREBS_PMRSZU(pmrebs));
printf(" %-8s : %x\n", "RBB", NVME_PMREBS_RBB(pmrebs));
printf(" %-8s : %x\n", "PMRWBZ", NVME_PMREBS_PMRWBZ(pmrebs));
printf(" %-8s : %llx\n", "bytes", nvme_pmr_size(pmrebs));
printf(" %-8s : %" PRIx64 "\n", "bytes", (uint64_t)nvme_pmr_size(pmrebs));

printf("%-10s : %x\n", "PMRSWTP", pmrswtp);
printf(" %-8s : %x\n", "PMRSWTU", NVME_PMRSWTP_PMRSWTU(pmrswtp));
printf(" %-8s : %x\n", "PMRSWTV", NVME_PMRSWTP_PMRSWTV(pmrswtp));
printf(" %-8s : %llx\n", "tput", nvme_pmr_throughput(pmrswtp));
printf(" %-8s : %" PRIx64 "\n", "tput", (uint64_t)nvme_pmr_throughput(pmrswtp));

printf("%-10s : %llx\n", "PMRMSC", pmrmsc);
printf(" %-8s : %llx\n", "CMSE", NVME_PMRMSC_CMSE(pmrmsc));
printf(" %-8s : %llx\n", "CBA", NVME_PMRMSC_CBA(pmrmsc));
printf("%-10s : %" PRIx64 "\n", "PMRMSC", (uint64_t)pmrmsc);
printf(" %-8s : %" PRIx64 "\n", "CMSE", (uint64_t)NVME_PMRMSC_CMSE(pmrmsc));
printf(" %-8s : %" PRIx64 "\n", "CBA", (uint64_t)NVME_PMRMSC_CBA(pmrmsc));
}

int main(int argc, char **argv)
Expand Down
11 changes: 7 additions & 4 deletions libnvme/test/sysfs/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
# Authors: Daniel Wagner <dwagner@suse.de>

diff = find_program('diff', required : false)
if diff.found()
bash_prog = find_program('bash', required : false)
if diff.found() and bash_prog.found()
tree_scan = executable(
'test-tree-scan',
['tree-scan.c'],
Expand All @@ -18,13 +19,14 @@ if diff.found()
'tree-apple-nvme',
]

tree_diff = find_program('tree-diff.sh')
tree_diff = files('tree-diff.sh')

foreach t_file : tree_data
test(
'libnvme - @0@'.format(t_file),
tree_diff,
bash_prog,
args : [
tree_diff,
meson.current_build_dir(),
tree_scan.full_path(),
files('data'/t_file + '.tar.xz'),
Expand All @@ -44,8 +46,9 @@ if diff.found()
foreach t_file : tree_data
test(
'libnvme - @0@-hostnqn'.format(t_file),
tree_diff,
bash_prog,
args : [
tree_diff,
meson.current_build_dir(),
tree_scan_hostnqn.full_path(),
files('data'/t_file + '.tar.xz'),
Expand Down
11 changes: 8 additions & 3 deletions plugins/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ if host_system != 'windows'
],
'netapp': ['plugins/netapp/netapp-nvme.c'],
'sandisk': ['plugins/sandisk/sandisk-nvme.c', 'plugins/sandisk/sandisk-utils.c'],
'scaleflux': ['plugins/scaleflux/sfx-nvme.c'],
'wdc': ['plugins/wdc/wdc-nvme.c', 'plugins/wdc/wdc-utils.c'],
'zns': ['plugins/zns/zns.c'],
}
else
all_plugins += {
Expand All @@ -50,6 +48,13 @@ else
}
endif

if host_system == 'linux'
all_plugins += {
'scaleflux': ['plugins/scaleflux/sfx-nvme.c'],
'zns': ['plugins/zns/zns.c'],
}
endif

# Get the list of plugins to build
selected_plugins = get_option('plugins')

Expand Down Expand Up @@ -86,7 +91,7 @@ if 'feat' in selected_plugins
subdir('feat')
endif

if 'lm' in selected_plugins and host_system != 'windows'
if 'lm' in selected_plugins and host_system == 'linux'
subdir('lm')
endif

Expand Down
Loading