From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6EBEFA0471 for ; Tue, 16 Jul 2019 19:18:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4B1B74C94; Tue, 16 Jul 2019 19:18:30 +0200 (CEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 67A4A4C8D for ; Tue, 16 Jul 2019 19:18:28 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id i189so9425176pfg.10 for ; Tue, 16 Jul 2019 10:18:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uGtvYoV4hbpFdvNmI+p+6gOlApFPcCWTB5PkD4OHSlA=; b=Rw/PBI7tE7kyPegEo/KGXEYtDJVWAi8fYepj8lmGzZAhqAf1pUVtNmACxY0y/7S9W6 mmap11Scd3Ix3BglwsxzixlBUk4Ao+JCYzy3o69hlFUW8lDkzChXbRzkJ20euscppbOa pH/pi/JVAoXtUOxSdvhdPPc+PdIRki+uYoj+xSYy4i9d8f5bXiubVU94KR1X6cIeuWbD PAVuDwreIw+5MKtwS4P9gF4t20D5RWAY6sOt4VJw3IQ2iBzReohRbHLmjXDQ4uoNkyDA 70jpcGyHe7YobVxg0M0VGTkVQDlNSiNsuG8qguUhlp87r/eqdveHy0CyX0pSAtHU59iu TI5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uGtvYoV4hbpFdvNmI+p+6gOlApFPcCWTB5PkD4OHSlA=; b=Ge6dxIrIZTV7Uss6svvRoyffXTTCvDWtXvXuLUj86kEiTLvZDZngwk/j7ozT3++aHT 3Y50KzVaTRzqKQ40aHO9WQ1y0UZFygeYpItrYRGr1qJQsf3ho6SXmY0HbBY4PbH3KI4D G70O13OIyUP8xWvHn20RwGGdpOIW+pLAEIrKgzUn7RhI/Jl7zKOxiJbWbcxFGdx9fijs ZACNMwnPdAlX0iaK0cnsVXOcV//2tQAR+fqTJ4XRXxur0IM+7EK7NI98/b1SN4VrxgBF qNcG8sY3FXq/cr7WyEPim+Gf+uryX4cvFMP5su7hdbHKiU1/dzRx12I9FJLLwfauGpY2 nazg== X-Gm-Message-State: APjAAAUY61k9QXZ5Y7hFtRUWzAkR0LJcHgWHHf/UMgcHF6iIc/HqqVyr P4pO9aX4gRfiyIvx3V4Og1/MG4gR X-Google-Smtp-Source: APXvYqxz3QWLphaD8uGQGTaj5sqac7KLf6ubZew2EQ1WNlZceEIlc4OzhZOlZwNhaGfzHBc2zI9bIA== X-Received: by 2002:a17:90a:ac13:: with SMTP id o19mr38201171pjq.143.1563297507077; Tue, 16 Jul 2019 10:18:27 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id u134sm20149651pfc.19.2019.07.16.10.18.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 10:18:26 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org, jgrajcia@cisco.com Cc: Stephen Hemminger Date: Tue, 16 Jul 2019 10:18:18 -0700 Message-Id: <20190716171818.20902-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190708160600.25939-1-stephen@networkplumber.org> References: <20190708160600.25939-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [RFC v2] net/memif: allow for full key size in socket name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The key size for memif is 256 but the unix domain socket structure has space for 100 bytes. Change it to use a larger buffer and not hard code the keysize everywhere. Not sure what purpose of socket is anyway since there is no code which connects to it in the current tree anyway? Still and RFC since I have no way to test this. Signed-off-by: Stephen Hemminger --- v2 - fix checkpatch warnings drivers/net/memif/memif_socket.c | 30 +++++++++++++++++++----------- drivers/net/memif/memif_socket.h | 4 +++- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c index 01a935f87c9f..fb69015694ba 100644 --- a/drivers/net/memif/memif_socket.c +++ b/drivers/net/memif/memif_socket.c @@ -860,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; @@ -876,23 +881,25 @@ 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) { + sockfd = socket(AF_UNIX, SOCK_SEQPACKET, 0); 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); @@ -928,9 +935,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(¶ms); @@ -945,7 +953,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) { @@ -956,8 +964,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, diff --git a/drivers/net/memif/memif_socket.h b/drivers/net/memif/memif_socket.h index db293e200961..9f40f8d138bb 100644 --- a/drivers/net/memif/memif_socket.h +++ b/drivers/net/memif/memif_socket.h @@ -79,9 +79,11 @@ struct memif_socket_dev_list_elt { }; #define MEMIF_SOCKET_HASH_NAME "memif-sh" +#define MEMIF_SOCKET_KEY_LEN 256 + struct memif_socket { struct rte_intr_handle intr_handle; /**< interrupt handle */ - char filename[256]; /**< socket filename */ + char filename[MEMIF_SOCKET_KEY_LEN]; /**< socket filename */ TAILQ_HEAD(, memif_socket_dev_list_elt) dev_queue; /**< Queue of devices using this socket */ -- 2.20.1