X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmemif%2Fmemif_socket.c;h=0c71f6c454d43fa73a4eddaa511d8cdf8856e8ca;hb=84d49664b5b2bf94264601ffca8de931dc91b8ec;hp=1e046b6b1a77ac8dde4a5d0ceca4334927fbb040;hpb=09c7e63a71f9f2a31efd7e94458019ea4dc427b6;p=dpdk.git

diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c
index 1e046b6b1a..0c71f6c454 100644
--- a/drivers/net/memif/memif_socket.c
+++ b/drivers/net/memif/memif_socket.c
@@ -256,6 +256,7 @@ memif_msg_receive_add_region(struct rte_eth_dev *dev, memif_msg_t *msg,
 			     int fd)
 {
 	struct pmd_internals *pmd = dev->data->dev_private;
+	struct pmd_process_private *proc_private = dev->process_private;
 	memif_msg_add_region_t *ar = &msg->add_region;
 	struct memif_region *r;
 
@@ -264,16 +265,16 @@ memif_msg_receive_add_region(struct rte_eth_dev *dev, memif_msg_t *msg,
 		return -1;
 	}
 
-	if (ar->index >= ETH_MEMIF_MAX_REGION_NUM || ar->index != pmd->regions_num ||
-			pmd->regions[ar->index] != NULL) {
+	if (ar->index >= ETH_MEMIF_MAX_REGION_NUM ||
+			ar->index != proc_private->regions_num ||
+			proc_private->regions[ar->index] != NULL) {
 		memif_msg_enq_disconnect(pmd->cc, "Invalid region index", 0);
 		return -1;
 	}
 
 	r = rte_zmalloc("region", sizeof(struct memif_region), 0);
 	if (r == NULL) {
-		MIF_LOG(ERR, "%s: Failed to alloc memif region.",
-			rte_vdev_device_name(pmd->vdev));
+		memif_msg_enq_disconnect(pmd->cc, "Failed to alloc memif region.", 0);
 		return -ENOMEM;
 	}
 
@@ -281,8 +282,8 @@ memif_msg_receive_add_region(struct rte_eth_dev *dev, memif_msg_t *msg,
 	r->region_size = ar->size;
 	r->addr = NULL;
 
-	pmd->regions[ar->index] = r;
-	pmd->regions_num++;
+	proc_private->regions[ar->index] = r;
+	proc_private->regions_num++;
 
 	return 0;
 }
@@ -377,8 +378,7 @@ memif_msg_receive_disconnect(struct rte_eth_dev *dev, memif_msg_t *msg)
 		rte_vdev_device_name(pmd->vdev), pmd->remote_disc_string);
 
 	memset(pmd->local_disc_string, 0, ETH_MEMIF_DISC_STRING_SIZE);
-	memif_disconnect(rte_eth_dev_allocated
-			 (rte_vdev_device_name(pmd->vdev)));
+	memif_disconnect(dev);
 	return 0;
 }
 
@@ -423,9 +423,10 @@ static int
 memif_msg_enq_add_region(struct rte_eth_dev *dev, uint8_t idx)
 {
 	struct pmd_internals *pmd = dev->data->dev_private;
+	struct pmd_process_private *proc_private = dev->process_private;
 	struct memif_msg_queue_elt *e = memif_msg_enq(pmd->cc);
 	memif_msg_add_region_t *ar;
-	struct memif_region *mr = pmd->regions[idx];
+	struct memif_region *mr = proc_private->regions[idx];
 
 	if (e == NULL)
 		return -1;
@@ -524,12 +525,17 @@ void
 memif_disconnect(struct rte_eth_dev *dev)
 {
 	struct pmd_internals *pmd = dev->data->dev_private;
+	struct pmd_process_private *proc_private = dev->process_private;
 	struct memif_msg_queue_elt *elt, *next;
 	struct memif_queue *mq;
 	struct rte_intr_handle *ih;
 	int i;
 	int ret;
 
+	dev->data->dev_link.link_status = ETH_LINK_DOWN;
+	pmd->flags &= ~ETH_MEMIF_FLAG_CONNECTING;
+	pmd->flags &= ~ETH_MEMIF_FLAG_CONNECTED;
+
 	if (pmd->cc != NULL) {
 		/* Clear control message queue (except disconnect message if any). */
 		for (elt = TAILQ_FIRST(&pmd->cc->msg_queue); elt != NULL; elt = next) {
@@ -545,8 +551,7 @@ memif_disconnect(struct rte_eth_dev *dev)
 		/* at this point, there should be no more messages in queue */
 		if (TAILQ_FIRST(&pmd->cc->msg_queue) != NULL) {
 			MIF_LOG(WARNING,
-				"%s: Unexpected message(s) in message queue.",
-				rte_vdev_device_name(pmd->vdev));
+				"Unexpected message(s) in message queue.");
 		}
 
 		ih = &pmd->cc->intr_handle;
@@ -569,9 +574,8 @@ memif_disconnect(struct rte_eth_dev *dev)
 			}
 			pmd->cc = NULL;
 			if (ret <= 0)
-				MIF_LOG(WARNING, "%s: Failed to unregister "
-					"control channel callback.",
-					rte_vdev_device_name(pmd->vdev));
+				MIF_LOG(WARNING,
+					"Failed to unregister control channel callback.");
 		}
 	}
 
@@ -592,7 +596,6 @@ memif_disconnect(struct rte_eth_dev *dev)
 			close(mq->intr_handle.fd);
 			mq->intr_handle.fd = -1;
 		}
-		mq->ring = NULL;
 	}
 	for (i = 0; i < pmd->cfg.num_m2s_rings; i++) {
 		if (pmd->role == MEMIF_ROLE_MASTER) {
@@ -610,18 +613,14 @@ memif_disconnect(struct rte_eth_dev *dev)
 			close(mq->intr_handle.fd);
 			mq->intr_handle.fd = -1;
 		}
-		mq->ring = NULL;
 	}
 
-	memif_free_regions(pmd);
+	memif_free_regions(proc_private);
 
 	/* reset connection configuration */
 	memset(&pmd->run, 0, sizeof(pmd->run));
 
-	dev->data->dev_link.link_status = ETH_LINK_DOWN;
-	pmd->flags &= ~ETH_MEMIF_FLAG_CONNECTING;
-	pmd->flags &= ~ETH_MEMIF_FLAG_CONNECTED;
-	MIF_LOG(DEBUG, "%s: Disconnected.", rte_vdev_device_name(pmd->vdev));
+	MIF_LOG(DEBUG, "Disconnected.");
 }
 
 static int
@@ -640,6 +639,7 @@ memif_msg_receive(struct memif_control_channel *cc)
 	int afd = -1;
 	int i;
 	struct pmd_internals *pmd;
+	struct pmd_process_private *proc_private;
 
 	iov[0].iov_base = (void *)&msg;
 	iov[0].iov_len = sizeof(memif_msg_t);
@@ -688,7 +688,8 @@ memif_msg_receive(struct memif_control_channel *cc)
 		if (ret < 0)
 			goto exit;
 		pmd = cc->dev->data->dev_private;
-		for (i = 0; i < pmd->regions_num; i++) {
+		proc_private = cc->dev->process_private;
+		for (i = 0; i < proc_private->regions_num; i++) {
 			ret = memif_msg_enq_add_region(cc->dev, i);
 			if (ret < 0)
 				goto exit;
@@ -851,7 +852,7 @@ memif_listener_handler(void *arg)
 	return;
 
  error:
-	if (sockfd > 0) {
+	if (sockfd >= 0) {
 		close(sockfd);
 		sockfd = -1;
 	}
@@ -859,11 +860,16 @@ memif_listener_handler(void *arg)
 		rte_free(cc);
 }
 
+#define MEMIF_SOCKET_UN_SIZE	\
+	(offsetof(struct sockaddr_un, sun_path) + MEMIF_SOCKET_KEY_LEN)
+
 static struct memif_socket *
-memif_socket_create(struct pmd_internals *pmd, char *key, uint8_t listener)
+memif_socket_create(struct pmd_internals *pmd,
+		    const char *key, uint8_t listener)
 {
 	struct memif_socket *sock;
-	struct sockaddr_un un;
+	struct sockaddr_un *un;
+	char un_buf[MEMIF_SOCKET_UN_SIZE];
 	int sockfd;
 	int ret;
 	int on = 1;
@@ -875,7 +881,7 @@ memif_socket_create(struct pmd_internals *pmd, char *key, uint8_t listener)
 	}
 
 	sock->listener = listener;
-	rte_memcpy(sock->filename, key, 256);
+	strlcpy(sock->filename, key, MEMIF_SOCKET_KEY_LEN);
 	TAILQ_INIT(&sock->dev_queue);
 
 	if (listener != 0) {
@@ -883,15 +889,16 @@ memif_socket_create(struct pmd_internals *pmd, char *key, uint8_t listener)
 		if (sockfd < 0)
 			goto error;
 
-		un.sun_family = AF_UNIX;
-		memcpy(un.sun_path, sock->filename,
-			sizeof(un.sun_path) - 1);
+		memset(un_buf, 0, sizeof(un_buf));
+		un = (struct sockaddr_un *)un_buf;
+		un->sun_family = AF_UNIX;
+		strlcpy(un->sun_path, sock->filename, MEMIF_SOCKET_KEY_LEN);
 
 		ret = setsockopt(sockfd, SOL_SOCKET, SO_PASSCRED, &on,
 				 sizeof(on));
 		if (ret < 0)
 			goto error;
-		ret = bind(sockfd, (struct sockaddr *)&un, sizeof(un));
+		ret = bind(sockfd, (struct sockaddr *)un, MEMIF_SOCKET_UN_SIZE);
 		if (ret < 0)
 			goto error;
 		ret = listen(sockfd, 1);
@@ -917,9 +924,12 @@ memif_socket_create(struct pmd_internals *pmd, char *key, uint8_t listener)
 
  error:
 	MIF_LOG(ERR, "%s: Failed to setup socket %s: %s",
-		rte_vdev_device_name(pmd->vdev), key, strerror(errno));
+		rte_vdev_device_name(pmd->vdev) ?
+		rte_vdev_device_name(pmd->vdev) : "NULL", key, strerror(errno));
 	if (sock != NULL)
 		rte_free(sock);
+	if (sockfd >= 0)
+		close(sockfd);
 	return NULL;
 }
 
@@ -927,9 +937,10 @@ static struct rte_hash *
 memif_create_socket_hash(void)
 {
 	struct rte_hash_parameters params = { 0 };
+
 	params.name = MEMIF_SOCKET_HASH_NAME;
 	params.entries = 256;
-	params.key_len = 256;
+	params.key_len = MEMIF_SOCKET_KEY_LEN;
 	params.hash_func = rte_jhash;
 	params.hash_func_init_val = 0;
 	return rte_hash_create(&params);
@@ -944,7 +955,7 @@ memif_socket_init(struct rte_eth_dev *dev, const char *socket_filename)
 	struct pmd_internals *tmp_pmd;
 	struct rte_hash *hash;
 	int ret;
-	char key[256];
+	char key[MEMIF_SOCKET_KEY_LEN];
 
 	hash = rte_hash_find_existing(MEMIF_SOCKET_HASH_NAME);
 	if (hash == NULL) {
@@ -955,8 +966,8 @@ memif_socket_init(struct rte_eth_dev *dev, const char *socket_filename)
 		}
 	}
 
-	memset(key, 0, 256);
-	rte_memcpy(key, socket_filename, strlen(socket_filename));
+	memset(key, 0, MEMIF_SOCKET_KEY_LEN);
+	strlcpy(key, socket_filename, MEMIF_SOCKET_KEY_LEN);
 	ret = rte_hash_lookup_data(hash, key, (void **)&socket);
 	if (ret < 0) {
 		socket = memif_socket_create(pmd, key,
@@ -1009,6 +1020,7 @@ memif_socket_remove_device(struct rte_eth_dev *dev)
 	struct memif_socket *socket = NULL;
 	struct memif_socket_dev_list_elt *elt, *next;
 	struct rte_hash *hash;
+	int ret;
 
 	hash = rte_hash_find_existing(MEMIF_SOCKET_HASH_NAME);
 	if (hash == NULL)
@@ -1036,7 +1048,10 @@ memif_socket_remove_device(struct rte_eth_dev *dev)
 			/* remove listener socket file,
 			 * so we can create new one later.
 			 */
-			remove(socket->filename);
+			ret = remove(socket->filename);
+			if (ret < 0)
+				MIF_LOG(ERR, "Failed to remove socket file: %s",
+					socket->filename);
 		}
 		rte_free(socket);
 	}
@@ -1112,7 +1127,7 @@ memif_connect_slave(struct rte_eth_dev *dev)
 	return 0;
 
  error:
-	if (sockfd > 0) {
+	if (sockfd >= 0) {
 		close(sockfd);
 		sockfd = -1;
 	}