From owner-svn-src-head@freebsd.org Fri Apr 13 20:48:31 2018 Return-Path: Delivered-To: svn-src-head@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 F1445F80163; Fri, 13 Apr 2018 20:48:30 +0000 (UTC) (envelope-from v.maffione@gmail.com) Received: from mail-qk0-x233.google.com (mail-qk0-x233.google.com [IPv6:2607:f8b0:400d:c09::233]) (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 DAEE482AD9; Fri, 13 Apr 2018 20:48:29 +0000 (UTC) (envelope-from v.maffione@gmail.com) Received: by mail-qk0-x233.google.com with SMTP id f9so2569401qkm.12; Fri, 13 Apr 2018 13:48:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=nA0b5mXSxOgmDf72BK8ehqXhjQ/Ov34qEPtp6zw85gk=; b=LIlS475Aoja6TTUh4v6u8OgMOOCRghAZds4yNFgziPAIl+AXV+zcrS2LYa1Cup73tD OhxdlMFl1rnUyGlBvLJeKAS7XU+Ix0tFZbEHr3DxRz0HjvtwGQFbW6zARG912U/f04D9 F5sEcYvWohSNiXwZ40hZh3z5XxTI294qxpGa3rqGq/YkeskZXBZN6oQ8l8+U9+15fkjN gGlq8WuUCCOn/blREq6p4MGfYj9pyTjv45k6pB+WLYL1WWQ7H9JQNSzSrsHdzyTIdgyN mFicc9fHfjiV0IIEwAxSDVZfVWh/J0vjzDaXVIbrxabsfnLq3jTF2TE7/lAkOLxRFiY4 9eKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=nA0b5mXSxOgmDf72BK8ehqXhjQ/Ov34qEPtp6zw85gk=; b=R2uSJMbqaEm9KEIfuJ6krordG7lx9CwdhR0wNSMkzj3SdiFL9iQOTaQo0gWCCpB92F UhdHydFcwPClo/lnjWYiXaUV/trFWIBrPsr5EW0OcE2Sn8MzGzYPaHRyyvny6TWSIa0B 5LrIH5SE0BBYvrxcqdqOokgpzUuCWLZAZA6jbnE4aM8H6fM2a13PtnC3em/75hv8k+b7 CL+qshGis161RkNTx0McfY8a3nrWhHl1yWvTe3d1pUTkpP6l5F92eLpy5Oz1TeXBiTYy oh4zgWk8HJwJdXaXWn546I8qDT4kK1b3a1osIfRxotC3uqWErJ7L/M7EQkADVeO2je3k tYDg== X-Gm-Message-State: ALQs6tCSASGqXLrE3WQLVdk0RLrxLmp2ELQA9bHmdEKg/UYuGF0XMmt2 QOXjkyKN1m3CwjbZS2OJHJ2gTv6pA3/Wc5qnChg= X-Google-Smtp-Source: AIpwx4+OqN6v+SXATa5S8cU7yNwpdWYRikZT5ClamirP94ZxkV2cm4u68d/UQBOmo4wZKF+ErFSD/fMx2ObodOKycsE= X-Received: by 10.233.235.2 with SMTP id b2mr6148541qkg.27.1523652508366; Fri, 13 Apr 2018 13:48:28 -0700 (PDT) MIME-Version: 1.0 Received: by 10.12.190.132 with HTTP; Fri, 13 Apr 2018 13:48:27 -0700 (PDT) In-Reply-To: References: <201804120720.w3C7Koe4032111@repo.freebsd.org> From: Vincenzo Maffione Date: Fri, 13 Apr 2018 22:48:27 +0200 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: Justin Hibbits Cc: Vincenzo Maffione , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2018 20:48:31 -0000 Right, sorry for that. The fix is actually already in the upstream github, I'm preparing a commit to import that. Cheers, Vincenzo 2018-04-13 22:42 GMT+02:00 Justin Hibbits : > 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 > -- Vincenzo Maffione