Enable Wextra & fix the fallout

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>

Author: deece

Makefile.vars

@@ -16,5 +16,5 @@ LD	= $(CROSS_COMPILE)ld
 CC	= $(CROSS_COMPILE)gcc
 NM  = $(CROSS_COMPILE)nm
 OBJCOPY  = $(CROSS_COMPILE)objcopy
-CFLAGS  ?= -g -Wall -O2 -m64 -std=gnu99
+CFLAGS  ?= -g -Wall -Wextra -O2 -m64 -std=gnu99
 TESTCFLAGS  += $(CFLAGS) -O0 -DTEST_ENVIRONMENT=1 -I src -I testobj -pthread

src/afu.c

@@ -471,13 +471,12 @@ static ocxl_err afu_open(ocxl_afu *afu)
 		return rc;
 	}
 
-	if (metadata.version >= 0) {
-		afu->version_major = metadata.afu_version_major;
-		afu->version_minor = metadata.afu_version_minor;
-		afu->per_pasid_mmio.length = metadata.pp_mmio_size;
-		afu->global_mmio.length = metadata.global_mmio_size;
-		afu->pasid = metadata.pasid;
-	}
+	// Metadata version 0, always available
+	afu->version_major = metadata.afu_version_major;
+	afu->version_minor = metadata.afu_version_minor;
+	afu->per_pasid_mmio.length = metadata.pp_mmio_size;
+	afu->global_mmio.length = metadata.global_mmio_size;
+	afu->pasid = metadata.pasid;
 
 	if (afu->tracing) {
 		trace_metadata(afu);
@@ -606,7 +605,7 @@ ocxl_err ocxl_afu_open_specific(const char *name, const char *physical_function,
 		goto end;
 	}
 
-	for (int dev = 0; dev < glob_data.gl_pathc; dev++) {
+	for (size_t dev = 0; dev < glob_data.gl_pathc; dev++) {
 		const char *dev_path = glob_data.gl_pathv[dev];
 		ret = ocxl_afu_open_from_dev(dev_path, afu);
 
@@ -661,7 +660,7 @@ ocxl_err ocxl_afu_open(const char *name, ocxl_afu_h *afu)
  * @retval OCXL_NO_CONTEXT if the AFU was not opened
  * @retval OCXL_INTERNAL_ERROR if the AFU was unable to attach (check dmesg)
  */
-ocxl_err ocxl_afu_attach(ocxl_afu_h afu, uint64_t flags)
+ocxl_err ocxl_afu_attach(ocxl_afu_h afu, __attribute__((unused)) uint64_t flags)
 {
 	ocxl_afu *my_afu = (ocxl_afu *) afu;
 

src/irq.c

@@ -334,7 +334,7 @@ static ocxl_event_action read_afu_event(ocxl_afu_h afu, uint16_t event_api_versi
 
 	char buf[event_size];
 
-	int buf_used;
+	ssize_t buf_used;
 	if ((buf_used = read(my_afu->fd, buf, event_size)) < 0) {
 		if (errno == EAGAIN || errno == EWOULDBLOCK) {
 			*last = 1;
@@ -344,7 +344,7 @@ static ocxl_event_action read_afu_event(ocxl_afu_h afu, uint16_t event_api_versi
 		errmsg(afu, OCXL_INTERNAL_ERROR, "read of event header from fd %d failed: %d: %s",
 		       my_afu->fd, errno, strerror(errno));
 		return OCXL_EVENT_ACTION_FAIL;
-	} else if (buf_used < sizeof(ocxl_kernel_event_header)) {
+	} else if (buf_used < (ssize_t)sizeof(ocxl_kernel_event_header)) {
 		errmsg(afu, OCXL_INTERNAL_ERROR, "short read of event header from fd %d", my_afu->fd);
 		return OCXL_EVENT_ACTION_FAIL;
 	}

src/mmio.c

@@ -94,7 +94,7 @@ ocxl_err global_mmio_open(ocxl_afu *afu)
 {
 	char path[PATH_MAX + 1];
 	int length = snprintf(path, sizeof(path), "%s/global_mmio_area", afu->sysfs_path);
-	if (length >= sizeof(path)) {
+	if (length >= (int)sizeof(path)) {
 		ocxl_err rc = OCXL_NO_DEV;
 		errmsg(afu, rc, "global MMIO path truncated");
 		return rc;
@@ -211,7 +211,7 @@ static ocxl_err mmio_map(ocxl_afu *afu, size_t size, int prot, uint64_t flags, o
 		return rc;
 	}
 
-	void *addr = mmap(NULL, afu->per_pasid_mmio.length, prot, MAP_SHARED, afu->fd, 0);
+	void *addr = mmap(NULL, afu->per_pasid_mmio.length, prot, MAP_SHARED, afu->fd, offset);
 	if (addr == MAP_FAILED) {
 		ocxl_err rc = OCXL_NO_MEM;
 		errmsg(afu, rc, "Could not map per-PASID MMIO: %d: %s", errno, strerror(errno));
@@ -427,7 +427,7 @@ inline static ocxl_err mmio_check(ocxl_mmio_h region, off_t offset, size_t size)
 		return rc;
 	}
 
-	if (offset >= mmio->length - (size - 1)) {
+	if (offset >= (off_t)(mmio->length - (size - 1))) {
 		ocxl_err rc = OCXL_OUT_OF_BOUNDS;
 		errmsg(mmio->afu, rc, "%s MMIO access of 0x%016lx exceeds limit of 0x%016lx",
 		       mmio->type == OCXL_GLOBAL_MMIO ? "Global" : "Per-PASID",