From patchwork Tue Nov 11 17:35:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ciprian Barbu X-Patchwork-Id: 40605 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BDDA4206A5 for ; Tue, 11 Nov 2014 17:36:48 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id h11sf1000089wiw.3 for ; Tue, 11 Nov 2014 09:36:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=w1SfuCqJfnanx0nellpLtc61Z3LcviUXAOKGjjut6a4=; b=Kt/cGGVs+QR1oElvDHjHe4xy72LQdXV01iiywaOxN9Rof8plTemHq2SmguD90eNzmR 7ZOFUzEksJ1rCNEPSSdvhQCKLR4qR3itB7+GS1cJTCZWhcFlceYzsH/2+kRtICd+dp89 oEs0VXdk7NJoYCf56oU5GwLMVBgmAad4JLLb5+a68JKbYxtIf3msVgjoGGyYNfF0Rsna bRTGJ51E7vOjq7IOJey8ajqp0Y2CggE4l1Uq+4CTF9Wz5hStruu1UsKUQmdXcEYEgbAo sjOGuDzK1g6zL4a9UKJLDBowThHjA3QWLP4ecaHHZIQK4/4AJuwVTDUxQCHECyGk3Uar Fasw== X-Gm-Message-State: ALoCoQlF8v2Io4v277pX/MMqxPcivOy3Z92FFkeZ9ENUgaes+OFQoAVMulqYL2obsfHqKFzVHULF X-Received: by 10.152.6.130 with SMTP id b2mr11054laa.10.1415727407605; Tue, 11 Nov 2014 09:36:47 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.226 with SMTP id r2ls706029lal.49.gmail; Tue, 11 Nov 2014 09:36:47 -0800 (PST) X-Received: by 10.112.136.164 with SMTP id qb4mr37729015lbb.62.1415727407446; Tue, 11 Nov 2014 09:36:47 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id y9si32210866lal.60.2014.11.11.09.36.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 09:36:47 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id pn19so10011411lab.18 for ; Tue, 11 Nov 2014 09:36:47 -0800 (PST) X-Received: by 10.152.5.38 with SMTP id p6mr37125849lap.44.1415727407348; Tue, 11 Nov 2014 09:36:47 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp295882lbc; Tue, 11 Nov 2014 09:36:46 -0800 (PST) X-Received: by 10.140.106.194 with SMTP id e60mr23030891qgf.71.1415727405913; Tue, 11 Nov 2014 09:36:45 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id l69si37734860qge.70.2014.11.11.09.36.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Nov 2014 09:36:45 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XoFMv-0004CR-7j; Tue, 11 Nov 2014 17:36:41 +0000 Received: from mail-la0-f47.google.com ([209.85.215.47]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XoFMW-0004Ak-RT for lng-odp@lists.linaro.org; Tue, 11 Nov 2014 17:36:16 +0000 Received: by mail-la0-f47.google.com with SMTP id gd6so10017033lab.34 for ; Tue, 11 Nov 2014 09:36:11 -0800 (PST) X-Received: by 10.112.135.197 with SMTP id pu5mr37389760lbb.22.1415727371228; Tue, 11 Nov 2014 09:36:11 -0800 (PST) Received: from cipriantemp.enea.se (sestofw01.enea.se. [192.36.1.252]) by mx.google.com with ESMTPSA id ql6sm6122819lbb.31.2014.11.11.09.36.10 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 09:36:10 -0800 (PST) From: Ciprian Barbu To: lng-odp@lists.linaro.org Date: Tue, 11 Nov 2014 19:35:59 +0200 Message-Id: <1415727359-22406-5-git-send-email-ciprian.barbu@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1415727359-22406-1-git-send-email-ciprian.barbu@linaro.org> References: <1415727359-22406-1-git-send-email-ciprian.barbu@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH NETMAP 4/4] Added per-device lock X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ciprian.barbu@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Ciprian Barbu --- platform/linux-netmap/include/odp_packet_netmap.h | 12 +++++- platform/linux-netmap/odp_packet_netmap.c | 49 ++++++++++++++++++----- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/platform/linux-netmap/include/odp_packet_netmap.h b/platform/linux-netmap/include/odp_packet_netmap.h index fae434f..061ce2f 100644 --- a/platform/linux-netmap/include/odp_packet_netmap.h +++ b/platform/linux-netmap/include/odp_packet_netmap.h @@ -23,6 +23,16 @@ #define NETMAP_BLOCKING_IO +/* Since we allow more than one thread to open the same device + * this struct uinquely identifies a device so that proper locking + * can be implemented + */ +typedef struct { + char ifname[IFNAMSIZ]; + odp_spinlock_t rx_lock; + odp_spinlock_t tx_lock; +} netmap_dev_t; + /** Packet socket using netmap mmaped rings for both Rx and Tx */ typedef struct { odp_buffer_pool_t pool; @@ -34,7 +44,7 @@ typedef struct { uint32_t if_flags; odp_packet_t *pkt_table;/** Used by recv_pkt_netmap */ int nb_rx; /** Used by recv_pkt_netmap */ - char ifname[IFNAMSIZ]; + netmap_dev_t *nm_dev; } pkt_netmap_t; /** diff --git a/platform/linux-netmap/odp_packet_netmap.c b/platform/linux-netmap/odp_packet_netmap.c index 37e574b..8c56a66 100644 --- a/platform/linux-netmap/odp_packet_netmap.c +++ b/platform/linux-netmap/odp_packet_netmap.c @@ -58,11 +58,17 @@ static struct nm_desc mmap_desc; /** Used to store the mmap address; filled in first time, used for subsequent calls to nm_open */ -static odp_spinlock_t mmap_desc_lock; +static odp_spinlock_t nm_global_lock; /** Global lock for mmap addr and + dev lookup */ + +#define MAX_DEVS 32 +static netmap_dev_t netmap_devs[MAX_DEVS]; +static int nm_dev_cnt; int odp_netmap_init_global(void) { - odp_spinlock_init(&mmap_desc_lock); + odp_spinlock_init(&nm_global_lock); + memset(netmap_devs, 0, sizeof(netmap_devs)); return 0; } @@ -81,7 +87,7 @@ static int nm_do_ioctl(pkt_netmap_t * const pkt_nm, unsigned long cmd, } memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, pkt_nm->ifname, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, pkt_nm->nm_dev->ifname, sizeof(ifr.ifr_name)); switch (cmd) { case SIOCSIFFLAGS: @@ -125,7 +131,12 @@ int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, const char *netdev, odp_packet_t pkt; uint8_t *pkt_buf; uint8_t *l2_hdr; - int ret; + int i, ret; + + if (nm_dev_cnt == MAX_DEVS) { + ODP_ERR("Maximum number of devices reached: %d\n", nm_dev_cnt); + return -1; + } if (pool == ODP_BUFFER_POOL_INVALID) return -1; @@ -146,10 +157,9 @@ int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, const char *netdev, odph_packet_free(pkt); - snprintf(pkt_nm->ifname, sizeof(pkt_nm->ifname), "%s", netdev); snprintf(ifname, sizeof(ifname), "netmap:%s", netdev); - odp_spinlock_lock(&mmap_desc_lock); + odp_spinlock_lock(&nm_global_lock); ODP_DBG("[%04d] Initial mmap addr: %p\n", odp_thread_id(), mmap_desc.mem); @@ -162,7 +172,7 @@ int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, const char *netdev, if (pkt_nm->desc == NULL) { ODP_ERR("Error opening nm interface: %s\n", strerror(errno)); - odp_spinlock_unlock(&mmap_desc_lock); + odp_spinlock_unlock(&nm_global_lock); return -1; } @@ -170,7 +180,23 @@ int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, const char *netdev, mmap_desc.mem = pkt_nm->desc->mem; mmap_desc.memsize = pkt_nm->desc->memsize; } - odp_spinlock_unlock(&mmap_desc_lock); + + /* Lookup dev */ + for (i = 0; i < nm_dev_cnt; i++) { + if (!strcmp(netmap_devs[i].ifname, netdev)) { + pkt_nm->nm_dev = &netmap_devs[i]; + break; + } + } + if (i == nm_dev_cnt) { + nm_dev_cnt++; + snprintf(netmap_devs[i].ifname, sizeof(netmap_devs[i].ifname), + "%s", netdev); + odp_spinlock_init(&netmap_devs[i].rx_lock); + odp_spinlock_init(&netmap_devs[i].tx_lock); + pkt_nm->nm_dev = &netmap_devs[i]; + } + odp_spinlock_unlock(&nm_global_lock); ODP_DBG("[%04d] mmap addr %p\n", odp_thread_id(), @@ -182,7 +208,7 @@ int setup_pkt_netmap(pkt_netmap_t * const pkt_nm, const char *netdev, if ((pkt_nm->if_flags & IFF_UP) == 0) { ODP_DBG("[%04d] %s is down, bringing up...\n", odp_thread_id(), - pkt_nm->ifname); + pkt_nm->nm_dev->ifname); pkt_nm->if_flags |= IFF_UP; } if (ETH_PROMISC) { @@ -293,7 +319,10 @@ int recv_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[], pkt_nm->pkt_table = pkt_table; pkt_nm->nb_rx = 0; + + odp_spinlock_lock(&pkt_nm->nm_dev->rx_lock); nm_dispatch(pkt_nm->desc, len, nm_recv_cb, (uint8_t *)pkt_nm); + odp_spinlock_unlock(&pkt_nm->nm_dev->rx_lock); if (pkt_nm->nb_rx) ODP_DBG("[%04d] <=== rcvd %03u frames from netmap adapter\n", @@ -322,6 +351,7 @@ int send_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[], ioctl(fd, NIOCTXSYNC, NULL); #endif + odp_spinlock_lock(&pkt_nm->nm_dev->tx_lock); for (nb_tx = 0; nb_tx < len; nb_tx++) { odp_packet_t pkt = pkt_table[nb_tx]; uint8_t *frame = odp_packet_l2(pkt); @@ -329,6 +359,7 @@ int send_pkt_netmap(pkt_netmap_t * const pkt_nm, odp_packet_t pkt_table[], if (nm_inject(pkt_nm->desc, frame, frame_len)) break; } + odp_spinlock_unlock(&pkt_nm->nm_dev->tx_lock); if (nb_tx) ODP_DBG("[%04d] ===> sent %03u frames to netmap adapter\n",