From owner-svn-src-all@freebsd.org Fri Apr 13 20:42:24 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20F86FA5B7E; Fri, 13 Apr 2018 20:42:24 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A3A3822D5; Fri, 13 Apr 2018 20:42:23 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-lf0-x241.google.com with SMTP id m200-v6so14319752lfm.4; Fri, 13 Apr 2018 13:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=PumMV9+NU4/r2PfosSqZudAzRik9KDLWdHTSA47JWjQ=; b=ttItOq+r8s3GpIA/SnuKhTq5KTuuxcPy9HYGOmgEswilmbP7ckndenjzCwihG+b54g KEn1Aw6AgMge/4d1bl6B0cOhU6b1Wl4cjyZSmQ3Aa8SJ/sBhTQqEt2uu6QXW8wmSr603 6sowjE+ch0bulwkFMznusO7S9nA1AyAZydjkMSCpfNQXqnyiFAZkrnLOt+RLAo5KS+yQ n0d+a4UxRR4tF3N/DWcD0FX5aiLuT8ut2H1N1m6NPEKOiWPEdQM03ISPSCS1Cqhq9wA3 /lf86kw69ygTa6h0vVWC1RLNFTYqcKAOorASpWsZHYKXL0YRzeg+2iJN3EKaOBkYtN5c Wt7Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alumni-cwru-edu.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=PumMV9+NU4/r2PfosSqZudAzRik9KDLWdHTSA47JWjQ=; b=xB/PYZqHcSEYn1eCThuwgoO6jT7sFTLgXJ2MVDJGp5q7mlBk3XubHgoot1zqdjGXdS t2t2B3jXnd8C6AxN2H1cZH32+ubCPeEWvUXvLvZWHdnwVPxO/LAHIdJ+oF2/e2Gji+wb N5sQ8aHKOQc4mcNc04zeRY45jH/MECsOZqXRy1fKS8Ep0ABEnIMEI9Au70iATrLAw6Gf rHat9ePFOSvxz5LGeLyI+P1k/P2TyDum0SBVSgFocj+e0ocsrEzEFJaFthT8DA0Sp4oI gHUT0gDZSAZh6iU1r2VXsBAagarQzfwPtWfSbApg4OYE1107BZAXMcJ0wWUZAKdGULwF WLWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=PumMV9+NU4/r2PfosSqZudAzRik9KDLWdHTSA47JWjQ=; b=R71tTxzyQrnQ5P6wkLltguP8S6V3Luw/AoSocP/EAnOSpxLoNPrakoLWpK/r0bbk6i q9hOWXct2evxqQAh/SAYzlZe/e0l9X//iVizdpUir0pJhSclq3dHLNUTTaI+X5ZjsZL1 U2FXdJgDAOV0NiempmhT4KU1Vo/NpkszcWN+pd6AwUF7D/mzn6tEGOOMw18vUoa1EcmY wYeSXWRR/1lj7jfxRuo+i58s9s68XoD4bwEqk1VShb6zK2ynfBAQBX0UvvkEDt60IHmZ xNcCFme1H9Unj0+LRsTMiuqn6AAEgm8pMtv3ULNKHrEiIAnqqZOsPiRqqc2MjwOz0pBd CvaA== X-Gm-Message-State: ALQs6tBi6K/BKncTX3qF8SU7LfcKoB0Khnh8lKWlsvOjOGTdh6mcZX99 1t6V87IDofHf2BcpoOieaEH+7l9O8mL4vNlnD67hug== X-Google-Smtp-Source: AIpwx49AwjJIDvfqmbooi+yj+IRqjT+705Choq3k0x9JyDjvIiJd7RWWhB0gsqkVgzvTQAhI26G+95nm45MP6S8ujeE= X-Received: by 10.46.17.23 with SMTP id f23mr4117227lje.43.1523652141365; Fri, 13 Apr 2018 13:42:21 -0700 (PDT) MIME-Version: 1.0 Sender: chmeeedalf@gmail.com Received: by 10.46.104.15 with HTTP; Fri, 13 Apr 2018 13:42:20 -0700 (PDT) In-Reply-To: <201804120720.w3C7Koe4032111@repo.freebsd.org> References: <201804120720.w3C7Koe4032111@repo.freebsd.org> From: Justin Hibbits Date: Fri, 13 Apr 2018 15:42:20 -0500 X-Google-Sender-Auth: B3hTYHI3BfyWrWj2mYwshD-cx04 Message-ID: Subject: Re: svn commit: r332423 - in head/sys: conf dev/cxgbe dev/ixgbe dev/ixl dev/netmap dev/re modules/netmap net sys To: Vincenzo Maffione Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2018 20:42:24 -0000 On Thu, Apr 12, 2018 at 2:20 AM, Vincenzo Maffione wrote: > Author: vmaffione > Date: Thu Apr 12 07:20:50 2018 > New Revision: 332423 > URL: https://svnweb.freebsd.org/changeset/base/332423 > > Log: > netmap: align codebase to the current upstream (commit id 3fb001303718146) > > Changelist: > - Turn tx_rings and rx_rings arrays into arrays of pointers to kring > structs. This patch includes fixes for ixv, ixl, ix, re, cxgbe, iflib, > vtnet and ptnet drivers to cope with the change. > - Generalize the nm_config() callback to accept a struct containing many > parameters. > - Introduce NKR_FAKERING to support buffers sharing (used for netmap > pipes) > - Improved API for external VALE modules. > - Various bug fixes and improvements to the netmap memory allocator, > including support for externally (userspace) allocated memory. > - Refactoring of netmap pipes: now linked rings share the same netmap > buffers, with a separate set of kring pointers (rhead, rcur, rtail). > Buffer swapping does not need to happen anymore. > - Large refactoring of the control API towards an extensible solution; > the goal is to allow the addition of more commands and extension of > existing ones (with new options) without the need of hacks or the > risk of running out of configuration space. > A new NIOCCTRL ioctl has been added to handle all the requests of the > new control API, which cover all the functionalities so far supported. > The netmap API bumps from 11 to 12 with this patch. Full backward > compatibility is provided for the old control command (NIOCREGIF), by > means of a new netmap_legacy module. Many parts of the old netmap.h > header has now been moved to netmap_legacy.h (included by netmap.h). > > Approved by: hrs (mentor) > > Added: > head/sys/dev/netmap/netmap_legacy.c (contents, props changed) > head/sys/net/netmap_legacy.h (contents, props changed) > Modified: > head/sys/conf/files > head/sys/dev/cxgbe/t4_netmap.c > head/sys/dev/ixgbe/if_ixv.c > head/sys/dev/ixl/ixl_pf_main.c > head/sys/dev/ixl/ixl_txrx.c > head/sys/dev/netmap/if_ptnet.c > head/sys/dev/netmap/if_re_netmap.h > head/sys/dev/netmap/if_vtnet_netmap.h > head/sys/dev/netmap/netmap.c > head/sys/dev/netmap/netmap_freebsd.c > head/sys/dev/netmap/netmap_generic.c > head/sys/dev/netmap/netmap_kern.h > head/sys/dev/netmap/netmap_mem2.c > head/sys/dev/netmap/netmap_mem2.h > head/sys/dev/netmap/netmap_monitor.c > head/sys/dev/netmap/netmap_pipe.c > head/sys/dev/netmap/netmap_pt.c > head/sys/dev/netmap/netmap_vale.c > head/sys/dev/re/if_re.c > head/sys/modules/netmap/Makefile > head/sys/net/iflib.c > head/sys/net/netmap.h > head/sys/net/netmap_user.h > head/sys/net/netmap_virt.h > head/sys/sys/param.h This breaks 32-bit powerpc LINT, with errors of: /usr/src/sys/dev/netmap/netmap.c: In function 'netmap_get_na': /usr/src/sys/dev/netmap/netmap.c:1479: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] /usr/src/sys/dev/netmap/netmap.c: In function 'netmap_ioctl': /usr/src/sys/dev/netmap/netmap.c:2329: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] /usr/src/sys/dev/netmap/netmap.c:2344: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] /usr/src/sys/dev/netmap/netmap.c:2447: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] /usr/src/sys/dev/netmap/netmap.c:2466: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] among others. struct nmreq_header->nr_body is a uint64_t, casting to 32-bit pointers needs to go through uintptr_t. - Justin