Track the attach state and error if we try to map a per-PASID MMIO area

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

Author: deece

src/afu.c

@@ -259,6 +259,8 @@ static void afu_init(ocxl_afu *afu)
 
 	afu->tracing = false;
 
+	afu->attached = false;
+
 #ifdef _ARCH_PPC64
 	afu->ppc64_amr = 0;
 #endif
@@ -682,6 +684,8 @@ ocxl_err ocxl_afu_attach(ocxl_afu_h afu, __attribute__((unused)) uint64_t flags)
 		return rc;
 	}
 
+	my_afu->attached = true;
+
 	return OCXL_OK;
 }
 
@@ -736,6 +740,7 @@ ocxl_err ocxl_afu_close(ocxl_afu_h afu)
 
 	close(my_afu->fd);
 	my_afu->fd = -1;
+	my_afu->attached = false;
 
 	if (my_afu->device_path) {
 		free(my_afu->device_path);

src/libocxl_internal.h

@@ -171,6 +171,8 @@ struct ocxl_afu {
 	bool tracing;
 	pthread_mutex_t trace_mutex;
 
+	bool attached;
+
 #ifdef _ARCH_PPC64
 	uint64_t ppc64_amr;
 #endif

src/mmio.c

@@ -182,7 +182,7 @@ static ocxl_err global_mmio_map(ocxl_afu *afu, size_t size, int prot, uint64_t f
  * contents of this area are specific each AFU. The size can be discovered with
  * ocxl_mmio_size().
  *
- * @pre the AFU has been opened
+ * @pre the AFU has been opened and attached
  *
  * @param afu the AFU to operate on
  * @param size the size of the MMIO region to map (or 0 to map the full region)
@@ -193,7 +193,7 @@ static ocxl_err global_mmio_map(ocxl_afu *afu, size_t size, int prot, uint64_t f
  *
  * @retval OCXL_OK on success
  * @retval OCXL_NO_MEM if the map failed
- * @retval OCXL_NO_CONTEXT if the AFU has not been opened
+ * @retval OCXL_NO_CONTEXT if the AFU has not been opened/attached
  * @retval OCXL_INVALID_ARGS if the flags are not valid
  */
 static ocxl_err mmio_map(ocxl_afu *afu, size_t size, int prot, uint64_t flags, off_t offset, ocxl_mmio_h *region)
@@ -206,12 +206,17 @@ static ocxl_err mmio_map(ocxl_afu *afu, size_t size, int prot, uint64_t flags, o
 
 	if (afu->fd < 0) {
 		ocxl_err rc = OCXL_NO_CONTEXT;
-		errmsg(afu, rc, "Could not map per-PASID MMIO on AFU '%s' as it has not been opened",
-		       afu->identifier.afu_name);
+		errmsg(afu, rc, "Could not map per-PASID MMIO as the AFU has not been opened");
+		return rc;
+	}
+
+	if (!afu->attached) {
+		ocxl_err rc = OCXL_NO_CONTEXT;
+		errmsg(afu, rc, "Could not map per-PASID MMIO as the AFU has not been attached");
 		return rc;
 	}
 
-	void *addr = mmap(NULL, afu->per_pasid_mmio.length, prot, MAP_SHARED, afu->fd, offset);
+	void *addr = mmap(NULL, size, 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));