From owner-freebsd-current@FreeBSD.ORG Sun Jan 12 01:42:01 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2206AF96 for ; Sun, 12 Jan 2014 01:42:01 +0000 (UTC) Received: from mail-ig0-f178.google.com (mail-ig0-f178.google.com [209.85.213.178]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DEE131748 for ; Sun, 12 Jan 2014 01:42:00 +0000 (UTC) Received: by mail-ig0-f178.google.com with SMTP id ut6so2588406igb.5 for ; Sat, 11 Jan 2014 17:41:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=jSl1nPsrXJ0LPjyx1gT7kJErpKNipTxFyYBCEwr4FU8=; b=AeZK9NJrXuadEuFlHezB38xfD4fUT3m80K7aMiJPSqcs9Mwr3COIBEUuZ/NzPrLNeT 4/HUuHdicfWnQIeb07BCefhH8qSjRB/i2DS4kLOklRCa2x02acgUdYkYWgjI+6zUaA5y oRN6KlWqn/L3Wp51xEvcF+8xktVt9bRD8rdLex3FwUjRfsybuQTHbodatjxYOUiFQheq mowD2vG04Aehu0vefSGIBYBVkIG7gELfaHebsHecWWsRza9aaSxq/Mxd4FZ1zYm/322O 9fKvdXL+lYMtMtpKzipVuB5zuYt2ozp0V/sVp5Aoi+gnEfgHa3DWbGtJs60P2rFbKpEK TbAw== X-Gm-Message-State: ALoCoQmOIBSThSZnbQ1Iv/PdlZruE9FQ6adO+qKpMs5e34Nx2fzHEIB1KCRm7ZsbXbCpqZIxkSoHp94SbMcglrOT0U238uAtFW7BIGuY2jwQ3vbXFuFfsUY= MIME-Version: 1.0 X-Received: by 10.50.227.139 with SMTP id sa11mr11812666igc.46.1389490914341; Sat, 11 Jan 2014 17:41:54 -0800 (PST) Received: by 10.42.128.200 with HTTP; Sat, 11 Jan 2014 17:41:54 -0800 (PST) In-Reply-To: <5D553C7E-C48D-4C45-A076-7D45D474A5C8@felyko.com> References: <52CF9C29.7080306@bitfrost.no> <5D553C7E-C48D-4C45-A076-7D45D474A5C8@felyko.com> Date: Sun, 12 Jan 2014 10:41:54 +0900 Message-ID: Subject: Re: Move 3G modem from u3g to uhso? From: "Lundberg, Johannes" To: Rui Paulo Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: Hans Petter Selasky , FreeBSD Current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 01:42:01 -0000 Thanks a lot you both. On Sunday, January 12, 2014, Rui Paulo wrote: > On 10 Jan 2014, at 02:54, Lundberg, Johannes < > johannes@brilliantservice.co.jp > wrote: > > > Ah I see. Of course usb.conf is generated automatically :) I guess it is > > generated at make buildkernel and the new one can be found in obj folder? > > It's generated using src/tools/tools/bus_autoconf. > > -- > Rui Paulo > > > > -- -- Johannes Lundberg BRILLIANTSERVICE CO., LTD. -- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- $BHkL)J];}$K$D$$$F!'$3$NEE;R%a!<%k$O!"L>08?M$KAw?.$7$?$b$N$G$"$j!"HkF?FC8"$NBP>]$H$J$k>pJs$r4^$s$G$$$^$9!#(B $B$b$7!"L>08?M0J30$NJ}$,l9g!"$3$N%a!<%k$NGK4~!"$*$h$S$3$N%a!<%k$K4X$9$k0l@Z$N3+<(!"(B $BJ#$NMxMQ!"$^$?$O5-:\FbMF$K4p$E$/$$$+$J$k9TF0$b$5$l$J$$$h$&$*4j$$?=$7>e$2$^$9!#(B --- CONFIDENTIALITY NOTE: The information in this email is confidential and intended solely for the addressee. Disclosure, copying, distribution or any other action of use of this email by person other than intended recipient, is prohibited. If you are not the intended recipient and have received this email in error, please destroy the original message. From owner-freebsd-current@FreeBSD.ORG Sun Jan 12 02:01:01 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9161364; Sun, 12 Jan 2014 02:01:01 +0000 (UTC) Received: from smtpo.poczta.interia.pl (smtpo.poczta.interia.pl [217.74.65.232]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 496DF1859; Sun, 12 Jan 2014 02:01:00 +0000 (UTC) Date: Sun, 12 Jan 2014 03:00:53 +0100 From: vermaden Subject: PKGNG: virtualbox-ose wants lang/gcc AND pdftk wants lang/gcc46 To: freebsd-current@freebsd.org, freebsd-stable@FreeBSD.org X-Mailer: interia.pl/pf09 X-Originating-IP: 5.174.11.230 Message-Id: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1389492053; bh=cdvOqpEJ8QD4HxQByOXEiUxUV0tlWHGATJbJ2mXtf/4=; h=Date:From:Subject:To:X-Mailer:X-Originating-IP:Message-Id: MIME-Version:Content-Type; b=pubvD3W3JB7LIYydhv8w1+Wk4OIgbDvygikEbWgq3GS6TlBFFW6TxWeW4PwEoj8NQ q5+94FL2tYa0xSCvzOvOWbZK0RnGaa6uGFD3HO/JnqauzIaRLgPZwoy7p2AMU4/64p 54+o0NXIygX6jqrFfRB2hFl8BqdADxvsNyZC13GM= X-Mailman-Approved-At: Sun, 12 Jan 2014 04:33:49 +0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.17 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 02:01:01 -0000 Where is the logic?I can not install lang/gcc and lang/gcc46 both at the sa= me time.Any hints? How to use BOTH virtualbox and pdftk using PKGNG?Regards= ,vermaden# pkg install virtualbox-oseUpdating repository catalogueThe follo= wing 50 packages will be installed:      &nbs= p; Reinstalling mkfontdir-1.0.7 (direct dependency changed)  &nbs= p;     Upgrading freetype2: 2.5.0.1 -> 2.5.2 &n= bsp;      Upgrading font-util: 1.3.0 -> 1.3.0_1=         Upgrading libffi: 3.0.13 -> 3= .0.13_1        Reinstalling libdrm-2.4.1= 7_1 (direct dependency changed)-->   Installing gcc: 4.6.4 &nb= sp;      Reinstalling curl-7.33.0_2 (options chang= ed)        Upgrading py27-setuptools: 1.= 1.7_1 -> 2.0.1        Upgrading fontc= onfig: 2.10.95,1 -> 2.11.0_1,1       = Upgrading font-misc-ethiopic: 1.0.3 -> 1.0.3_1    &= nbsp;   Upgrading font-bh-ttf: 1.0.3 -> 1.0.3_1  &nb= sp;     Upgrading encodings: 1.0.4,1 -> 1.0.4_1,1&nb= sp;       Reinstalling dejavu-2.34 (direct de= pendency changed)        Reinstalling gl= ib-2.36.3_1 (direct dependency changed)      =   Reinstalling libGL-7.6.1_4 (direct dependency changed)  &n= bsp;     Reinstalling libXft-2.3.1 (direct dependency c= hanged)        Reinstalling cairo-1.10.2= _7,2 (direct dependency changed)        = Reinstalling shared-mime-info-1.1 (direct dependency changed)  &n= bsp;     Reinstalling libGLU-9.0.0 (direct dependency c= hanged)        Reinstalling freeglut-2.8= .1 (direct dependency changed)        Re= installing atk-2.8.0 (direct dependency changed)    &nb= sp;   Reinstalling sdl-1.2.15_2,2 (direct dependency changed)&nbs= p;       Reinstalling gobject-introspection-1= .36.0_2 (direct dependency changed)      &nbs= p; Reinstalling libIDL-0.8.14_1 (direct dependency changed)  &nbs= p;     Upgrading font-misc-meltho: 1.0.3 -> 1.0.3_1&= nbsp;       Reinstalling qt4-corelib-4.8.5 (d= irect dependency changed)        Upgradi= ng harfbuzz: 0.9.19 -> 0.9.25        = Reinstalling qt4-network-4.8.5 (direct dependency changed)   = ;     Reinstalling tiff-4.0.3 (direct dependency change= d)        Reinstalling qt4-xml-4.8.5 (di= rect dependency changed)        Reinstal= ling gstreamer-0.10.36 (direct dependency changed)    &= nbsp;   Reinstalling qt4-xmlpatterns-4.8.5 (direct dependency cha= nged)        Reinstalling qt4-script-4.8= .5 (direct dependency changed)        Re= installing qt4-sql-4.8.5 (direct dependency changed)    = ;    Reinstalling qt4-clucene-4.8.5 (direct dependency chang= ed)        Reinstalling qt4-sqlite-plugi= n-4.8.5 (direct dependency changed)      &nbs= p; Reinstalling xorg-fonts-truetype-7.7_1 (direct dependency changed) =        Reinstalling pango-1.34.1_1 (direct de= pendency changed)        Reinstalling gd= k-pixbuf2-2.28.2 (direct dependency changed)     &= nbsp;  Reinstalling gstreamer-plugins-0.10.36_3,3 (direct dependency c= hanged)        Reinstalling qt4-gui-4.8.= 5 (direct dependency changed)        Rei= nstalling gtk-update-icon-cache-2.24.22 (direct dependency changed) &n= bsp;      Reinstalling qt4-svg-4.8.5 (direct depen= dency changed)        Reinstalling qt4-h= elp-4.8.5 (direct dependency changed)      &n= bsp; Reinstalling qt4-opengl-4.8.5 (direct dependency changed)  &= nbsp;     Reinstalling qt4-declarative-4.8.5 (direct de= pendency changed)        Reinstalling qt= 4-webkit-4.8.5 (direct dependency changed)     &nb= sp;  Reinstalling qt4-assistant-4.8.5 (direct dependency changed) = ;       Reinstalling qt4-linguist-4.8.5 (dire= ct dependency changed)        Installing= virtualbox-ose: 4.2.20_2The installation will require 745 MB more space0 B= to be downloadedProceed with installing packages [y/N]: ^C# pkg install pd= ftk         Updating repository cat= alogueThe following 2 packages will be installed:-->   Installing g= cc46: 4.6.4_1,1        Installing pdftk:= 2.02The installation will require 570 MB more space0 B to be downloadedPro= ceed with installing packages [y/N]: ^C From owner-freebsd-current@FreeBSD.ORG Sun Jan 12 05:26:34 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B1EEF87 for ; Sun, 12 Jan 2014 05:26:34 +0000 (UTC) Received: from mail-lb0-x22e.google.com (mail-lb0-x22e.google.com [IPv6:2a00:1450:4010:c04::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7C95D159E for ; Sun, 12 Jan 2014 05:26:33 +0000 (UTC) Received: by mail-lb0-f174.google.com with SMTP id p9so2586388lbv.19 for ; Sat, 11 Jan 2014 21:26:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=1C1rMNZbdfRaXRtIlYCIaXehiO1Z61P08QFC2hTptJg=; b=MIAmyosL8182cJCPpAMuLsQdzkYYnA0kQ3U26MIiP4IhQ9ujQ+4K6Q2C4ZSmgD3SyU eVTbUfQV04/rNs+wzNbsSAhE2zLr6JWPfXxP6XT1w+nR80bqWyJ5+tjdlzBHMbyGNxGN uWEDoZP5QdKgSgwsjtJ6IX+nE3xl7bjDBcJeyOj6C1bXrPiH9YrPCdO0XV3uESVMPE5/ hCh73LPEjLdBBcmNLmGcyeZi4rnaKd0/Lzs/ii3NvJpASVoJETM0iT5VUp92cBPObWHN rE+06x8XmD7F1ShXUvUfZth/onYBFhweiRFSrUBUhjKU6pfY42LwRwdlOcF0UUK2lvLV R6dQ== MIME-Version: 1.0 X-Received: by 10.152.5.8 with SMTP id o8mr41610lao.89.1389504391241; Sat, 11 Jan 2014 21:26:31 -0800 (PST) Sender: crodr001@gmail.com Received: by 10.112.38.43 with HTTP; Sat, 11 Jan 2014 21:26:31 -0800 (PST) In-Reply-To: <52CF8479.4010105@glup.org> References: <20140109161818.GK64543@glenbarber.us> <20140110114102.692560fe@X220.alogt.com> <52CF6E7A.1020309@allanjude.com> <52CF8479.4010105@glup.org> Date: Sat, 11 Jan 2014 21:26:31 -0800 X-Google-Sender-Auth: e3zrq0gEYUZw3WCv4L6xnQd9OYA Message-ID: Subject: Re: FreeBSD 10.0-RC5 Now Available From: Craig Rodrigues To: john hood Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: freebsd-current Current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 05:26:34 -0000 On Thu, Jan 9, 2014 at 9:26 PM, john hood wrote: > On 1/9/14 10:52 PM, Allan Jude wrote: > >> Another user had this problem this morning, try reinstalling or >> recompiling hald >> > I had this too today. There's an easier, lamer workaround: > > Put > > moused_nondefault_enable="NO" > > in your /etc/rc.conf, and unplug/plug your USB mouse (or kill moused), and > restart your X server or login manager. This costs you 1 mouse pointer in > text mode. > > I had the same issue when I tried to install FreeBSD 10.0-RC5 on a desktop system with a USB mouse. I installed all the packages via the 'pkg' command. Your workaround worked for me. This seems to be a known issue because it has been mentioned elsewhere: http://lists.freebsd.org/pipermail/freebsd-current/2013-September/044594.html Is this workaround necessary in the future, or is there a newer precompiled hald package which solves this so that you dont need to set moused_nondefault_enable in /etc/rc.conf? -- Craig From owner-freebsd-current@FreeBSD.ORG Sun Jan 12 07:49:20 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E071B2A for ; Sun, 12 Jan 2014 07:49:20 +0000 (UTC) Received: from mail-ig0-f170.google.com (mail-ig0-f170.google.com [209.85.213.170]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3BCD31D67 for ; Sun, 12 Jan 2014 07:49:19 +0000 (UTC) Received: by mail-ig0-f170.google.com with SMTP id m12so1937923iga.1 for ; Sat, 11 Jan 2014 23:49:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to :content-type; bh=0oQVH+xe1pHhBVIO4wvY+/0fsa15uesq2hwNg5XtzTA=; b=cYsu6IMpJQXK02iJejABtbPgSTLHjUa3/qr5g6wB1RRK4kGnIt+byQL0F63E1Nl3jw 4VJKJtwgH59Yegwer7fvPBCDXGFWWQPdLAWj86AIabwYr8kV/EalZQBwzLzOuJmkdJQC hLH1opFyRyZtzFZFhhoc73IRctIdMpeeAeXb1V0wnPYPu73cHYtCiUmpfj2IL+tS5lY9 hljzBJNxr/aB8we8DIKXnVWLldcpUC2B6js6jJj7C0XVHN5Gv3ApomKKeAx44/8Tdt0Q VaTnSgscZvytJbYG/3ESg99BuWo9cB3TZVsZ9S9EPb7X7LMEVBf3FaKVWEAiqvXRhd8j yjuQ== X-Gm-Message-State: ALoCoQnMYIuYtgMSQKF5HjOOYsrGeyVk3cVx9/VNQVp7UEgwsSSV/q7POYOhQGs+LJPJLY3S8eXreSXbknknphZnLfF3Vs3jiOxiKqpFrxY9EJelTRFt9AQ= X-Received: by 10.50.70.104 with SMTP id l8mr13559015igu.1.1389512952759; Sat, 11 Jan 2014 23:49:12 -0800 (PST) MIME-Version: 1.0 Received: by 10.42.128.200 with HTTP; Sat, 11 Jan 2014 23:48:57 -0800 (PST) From: "Lundberg, Johannes" Date: Sun, 12 Jan 2014 16:48:57 +0900 Message-ID: Subject: newcons + splash image To: FreeBSD Current Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.17 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 07:49:20 -0000 Hi Does newcons yet support splash images the same way syscons do? What is the current plan around this? Will there be any way to easily display image / animation during boot or is one expected to write a separate program for showing alternate boot or splash image? Best regards -- Johannes Lundberg -- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- $BHkL)J];}$K$D$$$F!'$3$NEE;R%a!<%k$O!"L>08?M$KAw?.$7$?$b$N$G$"$j!"HkF?FC8"$NBP>]$H$J$k>pJs$r4^$s$G$$$^$9!#(B $B$b$7!"L>08?M0J30$NJ}$,l9g!"$3$N%a!<%k$NGK4~!"$*$h$S$3$N%a!<%k$K4X$9$k0l@Z$N3+<(!"(B $BJ#$NMxMQ!"$^$?$O5-:\FbMF$K4p$E$/$$$+$J$k9TF0$b$5$l$J$$$h$&$*4j$$?=$7>e$2$^$9!#(B --- CONFIDENTIALITY NOTE: The information in this email is confidential and intended solely for the addressee. Disclosure, copying, distribution or any other action of use of this email by person other than intended recipient, is prohibited. If you are not the intended recipient and have received this email in error, please destroy the original message. From owner-freebsd-current@FreeBSD.ORG Sun Jan 12 11:15:31 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2CBE74C2; Sun, 12 Jan 2014 11:15:31 +0000 (UTC) Received: from mailrelay010.isp.belgacom.be (mailrelay010.isp.belgacom.be [195.238.6.177]) by mx1.freebsd.org (Postfix) with ESMTP id 9769018A0; Sun, 12 Jan 2014 11:15:30 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: An0GAOh40lJR8ZmB/2dsb2JhbABagwu3boJ+AQmBBRd0giUBAQEEOhwYCxALGAklDyoeBogbAcQIF48HB4Q3AQOYFpIWgy47 Received: from 129.153-241-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.241.153.129]) by relay.skynet.be with ESMTP; 12 Jan 2014 12:15:22 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id s0CBFLxj001253; Sun, 12 Jan 2014 12:15:22 +0100 (CET) (envelope-from tijl@coosemans.org) Date: Sun, 12 Jan 2014 12:15:20 +0100 From: Tijl Coosemans To: vermaden Subject: Re: PKGNG: virtualbox-ose wants lang/gcc AND pdftk wants lang/gcc46 Message-ID: <20140112121520.3f868631@kalimero.tijl.coosemans.org> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org, freebsd-stable@FreeBSD.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 11:15:31 -0000 On Sun, 12 Jan 2014 03:00:53 +0100 vermaden wrote: > Where is the logic?I can not install lang/gcc and lang/gcc46 both at > the same time.Any hints? How to use BOTH virtualbox and pdftk using > PKGNG? Please send ports/package related emails to the freebsd-ports mailing list. To answer your question you need pdftk-2.02_1 which should be on all pkg mirrors now. You can check with "pkg search pdftk". From owner-freebsd-current@FreeBSD.ORG Sun Jan 12 12:14:51 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F8123B5; Sun, 12 Jan 2014 12:14:51 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 12BDB1D34; Sun, 12 Jan 2014 12:14:51 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id A2B01BDC44; Sun, 12 Jan 2014 13:14:49 +0100 (CET) Received: from atuin.in.mat.cc (atuin.in.mat.cc [79.143.241.205]) by prod2.absolight.net (Postfix) with ESMTPA id 83580BDC64; Sun, 12 Jan 2014 13:14:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by atuin.in.mat.cc (Postfix) with ESMTP id A01B6CC22B3B; Sun, 12 Jan 2014 13:14:47 +0100 (CET) Date: Sun, 12 Jan 2014 13:14:44 +0100 From: Mathieu Arnold To: vermaden , freebsd-current@freebsd.org, freebsd-stable@FreeBSD.org, freebsd-ports@FreeBSD.org Subject: Re: PKGNG: virtualbox-ose wants lang/gcc AND pdftk wants lang/gcc46 Message-ID: <7459C84BB875D54523A2FB26@atuin.in.mat.cc> In-Reply-To: References: X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 12:14:51 -0000 +--On 12 janvier 2014 03:00:53 +0100 vermaden wrote: | Where is the logic?I can not install lang/gcc and lang/gcc46 both at the | same time.Any hints? How to use BOTH virtualbox and pdftk using | PKGNG? Hum, I fixed this on January 4th[1], so it should be fixed in the current packages set. 1: -- Mathieu Arnold From owner-freebsd-current@FreeBSD.ORG Sun Jan 12 13:27:01 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF7CC6AD for ; Sun, 12 Jan 2014 13:27:01 +0000 (UTC) Received: from mail-ob0-x234.google.com (mail-ob0-x234.google.com [IPv6:2607:f8b0:4003:c01::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86B091173 for ; Sun, 12 Jan 2014 13:27:01 +0000 (UTC) Received: by mail-ob0-f180.google.com with SMTP id wm4so345230obc.39 for ; Sun, 12 Jan 2014 05:27:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=1vG9hPkdSqICf9g+B1joIyVQG561DHZ3idw13aIu8PE=; b=VvbIRDM7WdHxGg+1yBP8BAwlidek0EGD6xRo2R2WrcGb/h/fLvIiVUSjZ8XcaudM+/ TGie3SLQm8CLOXZ0Yrs5pKzqz3avSP7wCK3g6qJeKqacpmMCURVU3s3CVHONXP5ti/5L l/IGgBLH+GhWyB5ZdDaSTUtEAZmCkW95FVs/M89EY4aJjy065IRkxsj2NXSl/7sdewEy Fiq7lKhbVJMCvSdk+bBwl1gT9EJei3gN7V9VliowHEXW27YhbRG2UG3dWYivDtQh4F8x PP94SCZID8TH2ExDdGpqiK4Qogzh/fKGsSOFbt25apW51JczFHdotNMyK06hC2ucfJuD qslw== MIME-Version: 1.0 X-Received: by 10.60.144.228 with SMTP id sp4mr16064851oeb.29.1389533220570; Sun, 12 Jan 2014 05:27:00 -0800 (PST) Received: by 10.182.80.7 with HTTP; Sun, 12 Jan 2014 05:27:00 -0800 (PST) Date: Sun, 12 Jan 2014 14:27:00 +0100 Message-ID: Subject: iwn0: iwn_intr: fatal firmware error (10-STABLE + iwn2230) From: Oliver Pinter To: current@freebsd.org Content-Type: multipart/mixed; boundary=047d7b41ccbc043f5504efc5ea94 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 13:27:01 -0000 --047d7b41ccbc043f5504efc5ea94 Content-Type: text/plain; charset=ISO-8859-1 Hi all! I got this firmware crash with 10-STABLE + backported iwn patches from CURRENT: iwn0: device timeout wlan0: link state changed to UP wlan0: link state changed to DOWN wlan0: link state changed to UP iwn0: device timeout iwn0: iwn_intr: fatal firmware error firmware error log: error type = "UNKNOWN" (0x0000102C) program counter = 0x0000D978 source line = 0x000006A4 error data = 0x000000FE00000000 branch link = 0x0000D88A0000D88A interrupt link = 0x0000EC7A00000000 time = 17657601 driver status: tx ring 0: qid=0 cur=2 queued=2 tx ring 1: qid=1 cur=0 queued=0 tx ring 2: qid=2 cur=0 queued=0 tx ring 3: qid=3 cur=0 queued=0 tx ring 4: qid=4 cur=0 queued=0 tx ring 5: qid=5 cur=0 queued=0 tx ring 6: qid=6 cur=0 queued=0 tx ring 7: qid=7 cur=0 queued=0 tx ring 8: qid=8 cur=0 queued=0 tx ring 9: qid=9 cur=18 queued=0 tx ring 10: qid=10 cur=0 queued=0 tx ring 11: qid=11 cur=0 queued=0 tx ring 12: qid=12 cur=0 queued=0 tx ring 13: qid=13 cur=0 queued=0 tx ring 14: qid=14 cur=0 queued=0 tx ring 15: qid=15 cur=0 queued=0 tx ring 16: qid=16 cur=0 queued=0 tx ring 17: qid=17 cur=0 queued=0 tx ring 18: qid=18 cur=0 queued=0 tx ring 19: qid=19 cur=0 queued=0 rx ring: cur=36 wlan0: link state changed to DOWN wlan0: link state changed to UP wlan0: link state changed to DOWN iwn0: device timeout The hardware is: iwn0@pci0:4:0:0: class=0x028000 card=0x40628086 chip=0x08878086 rev=0xc4 hdr=0x00 vendor = 'Intel Corporation' device = 'Centrino Wireless-N 2230' class = network Attached the patch, that I use to support 2230 in 10-STABLE. And attached the output of: git diff op/stable/10/iwn origin/master -- sys/dev/iwn/ as iwn_-_10_-_current.diff and git diff op/stable/10/iwn origin/master -- sys/dev/net80211/ as net80211_-_10_-_current.diff The git repo mirrored from FreeBSD's github repo. --047d7b41ccbc043f5504efc5ea94 Content-Type: text/plain; charset=US-ASCII; name="net80211_-_10_-_current.diff" Content-Disposition: attachment; filename="net80211_-_10_-_current.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: file3 ZGlmZiAtLWdpdCBhL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfYWxxLmMgYi9zeXMvbmV0ODAyMTEv aWVlZTgwMjExX2FscS5jCmluZGV4IGU2NTE1NzQuLmE1MjEwM2EgMTAwNjQ0Ci0tLSBhL3N5cy9u ZXQ4MDIxMS9pZWVlODAyMTFfYWxxLmMKKysrIGIvc3lzL25ldDgwMjExL2llZWU4MDIxMV9hbHEu YwpAQCAtNTMsMTAgKzUzLDggQEAgX19GQlNESUQoIiRGcmVlQlNEJCIpOwogCiAjaW5jbHVkZSA8 bmV0L2lmLmg+CiAjaW5jbHVkZSA8bmV0L2lmX3Zhci5oPgotI2luY2x1ZGUgPG5ldC9pZl9kbC5o PgotI2luY2x1ZGUgPG5ldC9pZl9jbG9uZS5oPgogI2luY2x1ZGUgPG5ldC9pZl9tZWRpYS5oPgot I2luY2x1ZGUgPG5ldC9pZl90eXBlcy5oPgorI2luY2x1ZGUgPG5ldC9ldGhlcm5ldC5oPgogCiAj aW5jbHVkZSA8bmV0ODAyMTEvaWVlZTgwMjExX3Zhci5oPgogI2luY2x1ZGUgPG5ldDgwMjExL2ll ZWU4MDIxMV9mcmVlYnNkLmg+CmRpZmYgLS1naXQgYS9zeXMvbmV0ODAyMTEvaWVlZTgwMjExX2Ft cnIuYyBiL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfYW1yci5jCmluZGV4IGM3NDViMDUuLmFiMWYw MzMgMTAwNjQ0Ci0tLSBhL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfYW1yci5jCisrKyBiL3N5cy9u ZXQ4MDIxMS9pZWVlODAyMTFfYW1yci5jCkBAIC00MCw2ICs0MCw3IEBAIF9fRkJTRElEKCIkRnJl ZUJTRCQiKTsKICNpbmNsdWRlIDxuZXQvaWYuaD4KICNpbmNsdWRlIDxuZXQvaWZfdmFyLmg+CiAj aW5jbHVkZSA8bmV0L2lmX21lZGlhLmg+CisjaW5jbHVkZSA8bmV0L2V0aGVybmV0Lmg+CiAKICNp ZmRlZiBJTkVUCiAjaW5jbHVkZSA8bmV0aW5ldC9pbi5oPgpAQCAtMTMwLDYgKzEzMSwxMiBAQCBh bXJyX2RlaW5pdChzdHJ1Y3QgaWVlZTgwMjExdmFwICp2YXApCiAJZnJlZSh2YXAtPml2X3JzLCBN XzgwMjExX1JBVEVDVEwpOwogfQogCisvKgorICogUmV0dXJuIHdoZXRoZXIgMTFuIHJhdGVzIGFy ZSBwb3NzaWJsZS4KKyAqCisgKiBTb21lIDExbiBkZXZpY2VzIG1heSByZXR1cm4gSFQgaW5mb3Jt YXRpb24gYnV0IG5vIEhUIHJhdGVzLgorICogVGh1cywgd2Ugc2hvdWxkbid0IHRyZWF0IHRoZW0g YXMgYW4gMTFuIG5vZGUuCisgKi8KIHN0YXRpYyBpbnQKIGFtcnJfbm9kZV9pc18xMW4oc3RydWN0 IGllZWU4MDIxMV9ub2RlICpuaSkKIHsKQEAgLTEzOCw2ICsxNDUsOCBAQCBhbXJyX25vZGVfaXNf MTFuKHN0cnVjdCBpZWVlODAyMTFfbm9kZSAqbmkpCiAJCXJldHVybiAoMCk7CiAJaWYgKG5pLT5u aV9jaGFuID09IElFRUU4MDIxMV9DSEFOX0FOWUMpCiAJCXJldHVybiAoMCk7CisJaWYgKElFRUU4 MDIxMV9JU19DSEFOX0hUKG5pLT5uaV9jaGFuKSAmJiBuaS0+bmlfaHRyYXRlcy5yc19ucmF0ZXMg PT0gMCkKKwkJcmV0dXJuICgwKTsKIAlyZXR1cm4gKElFRUU4MDIxMV9JU19DSEFOX0hUKG5pLT5u aV9jaGFuKSk7CiB9CiAKQEAgLTE5MCwxMyArMTk5LDEzIEBAIGFtcnJfbm9kZV9pbml0KHN0cnVj dCBpZWVlODAyMTFfbm9kZSAqbmkpCiAJICAgIGFtbi0+YW1uX3JpeC0tKSB7CiAJCS8qIGxlZ2Fj eSAtIGFueXRoaW5nIDwgMzZtYml0LCBzdG9wIHNlYXJjaGluZyAqLwogCQkvKiAxMW4gLSBzdG9w IGF0IE1DUzQgLyBNQ1MxMiAvIE1DUzI4ICovCi0JCWlmIChhbXJyX25vZGVfaXNfMTFuKG5pKSAm JgotCQkgICAgKHJzLT5yc19yYXRlc1thbW4tPmFtbl9yaXhdICYgMHg3KSA8IDQpCi0JCQlicmVh azsKLQkJZWxzZSBpZiAoKHJzLT5yc19yYXRlc1thbW4tPmFtbl9yaXhdICYgSUVFRTgwMjExX1JB VEVfVkFMKSA8PSA3MikKKwkJaWYgKGFtcnJfbm9kZV9pc18xMW4obmkpKSB7CisJCQlpZiAoKHJz LT5yc19yYXRlc1thbW4tPmFtbl9yaXhdICYgMHg3KSA8IDQpCisJCQkJYnJlYWs7CisJCX0gZWxz ZSBpZiAoKHJzLT5yc19yYXRlc1thbW4tPmFtbl9yaXhdICYgSUVFRTgwMjExX1JBVEVfVkFMKSA8 PSA3MikKIAkJCWJyZWFrOwotCQlyYXRlID0gcnMtPnJzX3JhdGVzW2Ftbi0+YW1uX3JpeF0gJiBJ RUVFODAyMTFfUkFURV9WQUw7CiAJfQorCXJhdGUgPSBycy0+cnNfcmF0ZXNbYW1uLT5hbW5fcml4 XSAmIElFRUU4MDIxMV9SQVRFX1ZBTDsKIAogCS8qIGlmIHRoZSByYXRlIGlzIGFuIDExbiByYXRl LCBlbnN1cmUgdGhlIE1DUyBiaXQgaXMgc2V0ICovCiAJaWYgKGFtcnJfbm9kZV9pc18xMW4obmkp KQpkaWZmIC0tZ2l0IGEvc3lzL25ldDgwMjExL2llZWU4MDIxMV9kZnMuYyBiL3N5cy9uZXQ4MDIx MS9pZWVlODAyMTFfZGZzLmMKaW5kZXggYWY1MGNiNS4uNWZhOWJhNCAxMDA2NDQKLS0tIGEvc3lz L25ldDgwMjExL2llZWU4MDIxMV9kZnMuYworKysgYi9zeXMvbmV0ODAyMTEvaWVlZTgwMjExX2Rm cy5jCkBAIC01MCw2ICs1MCw3IEBAIF9fRkJTRElEKCIkRnJlZUJTRCQiKTsKICNpbmNsdWRlIDxu ZXQvaWYuaD4KICNpbmNsdWRlIDxuZXQvaWZfdmFyLmg+CiAjaW5jbHVkZSA8bmV0L2lmX21lZGlh Lmg+CisjaW5jbHVkZSA8bmV0L2V0aGVybmV0Lmg+CiAKICNpbmNsdWRlIDxuZXQ4MDIxMS9pZWVl ODAyMTFfdmFyLmg+CiAKZGlmZiAtLWdpdCBhL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfcGh5LmMg Yi9zeXMvbmV0ODAyMTEvaWVlZTgwMjExX3BoeS5jCmluZGV4IDkyMzI2NmMuLjQyNDJhYzAgMTAw NjQ0Ci0tLSBhL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfcGh5LmMKKysrIGIvc3lzL25ldDgwMjEx L2llZWU4MDIxMV9waHkuYwpAQCAtMzUsMTIgKzM1LDE2IEBAIF9fRkJTRElEKCIkRnJlZUJTRCQi KTsKICNpbmNsdWRlIDxzeXMvcGFyYW0uaD4KICNpbmNsdWRlIDxzeXMva2VybmVsLmg+CiAjaW5j bHVkZSA8c3lzL3N5c3RtLmg+CisjaW5jbHVkZSA8c3lzL21hbGxvYy5oPgogCiAjaW5jbHVkZSA8 c3lzL3NvY2tldC5oPgogCiAjaW5jbHVkZSA8bmV0L2lmLmg+CiAjaW5jbHVkZSA8bmV0L2lmX21l ZGlhLmg+CiAKKyNpbmNsdWRlIDxuZXQvZXRoZXJuZXQuaD4KKyNpbmNsdWRlIDxuZXQvcm91dGUu aD4KKwogI2luY2x1ZGUgPG5ldDgwMjExL2llZWU4MDIxMV92YXIuaD4KICNpbmNsdWRlIDxuZXQ4 MDIxMS9pZWVlODAyMTFfcGh5Lmg+CiAKZGlmZiAtLWdpdCBhL3N5cy9uZXQ4MDIxMS9pZWVlODAy MTFfcmFkaW90YXAuYyBiL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfcmFkaW90YXAuYwppbmRleCA2 YzczZTAyLi41NjM4ZjUyIDEwMDY0NAotLS0gYS9zeXMvbmV0ODAyMTEvaWVlZTgwMjExX3JhZGlv dGFwLmMKKysrIGIvc3lzL25ldDgwMjExL2llZWU4MDIxMV9yYWRpb3RhcC5jCkBAIC00NSw2ICs0 NSw3IEBAIF9fRkJTRElEKCIkRnJlZUJTRCQiKTsKICNpbmNsdWRlIDxuZXQvaWZfdmFyLmg+CiAj aW5jbHVkZSA8bmV0L2lmX2xsYy5oPgogI2luY2x1ZGUgPG5ldC9pZl9tZWRpYS5oPgorI2luY2x1 ZGUgPG5ldC9ldGhlcm5ldC5oPgogCiAjaW5jbHVkZSA8bmV0ODAyMTEvaWVlZTgwMjExX3Zhci5o PgogCmRpZmYgLS1naXQgYS9zeXMvbmV0ODAyMTEvaWVlZTgwMjExX3JhdGVjdGwuYyBiL3N5cy9u ZXQ4MDIxMS9pZWVlODAyMTFfcmF0ZWN0bC5jCmluZGV4IDBhZDQ2YmQzLi4zZWZmODk4IDEwMDY0 NAotLS0gYS9zeXMvbmV0ODAyMTEvaWVlZTgwMjExX3JhdGVjdGwuYworKysgYi9zeXMvbmV0ODAy MTEvaWVlZTgwMjExX3JhdGVjdGwuYwpAQCAtMzAsOSArMzAsMTIgQEAgX19GQlNESUQoIiRGcmVl QlNEJCIpOwogI2luY2x1ZGUgPHN5cy9rZXJuZWwuaD4KICNpbmNsdWRlIDxzeXMvc3lzdG0uaD4K ICNpbmNsdWRlIDxzeXMvc29ja2V0Lmg+CisjaW5jbHVkZSA8c3lzL21hbGxvYy5oPgogCiAjaW5j bHVkZSA8bmV0L2lmLmg+CiAjaW5jbHVkZSA8bmV0L2lmX21lZGlhLmg+CisjaW5jbHVkZSA8bmV0 L2V0aGVybmV0Lmg+CisjaW5jbHVkZSA8bmV0L3JvdXRlLmg+CiAKICNpbmNsdWRlIDxuZXQ4MDIx MS9pZWVlODAyMTFfdmFyLmg+CiAjaW5jbHVkZSA8bmV0ODAyMTEvaWVlZTgwMjExX3JhdGVjdGwu aD4KZGlmZiAtLWdpdCBhL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfcmF0ZWN0bF9ub25lLmMgYi9z eXMvbmV0ODAyMTEvaWVlZTgwMjExX3JhdGVjdGxfbm9uZS5jCmluZGV4IDBlZGVjNDQuLmEwMDU2 ZjMgMTAwNjQ0Ci0tLSBhL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfcmF0ZWN0bF9ub25lLmMKKysr IGIvc3lzL25ldDgwMjExL2llZWU4MDIxMV9yYXRlY3RsX25vbmUuYwpAQCAtMjksMTMgKzI5LDE2 IEBAIF9fRkJTRElEKCIkRnJlZUJTRCQiKTsKICNpbmNsdWRlICJvcHRfd2xhbi5oIgogCiAjaW5j bHVkZSA8c3lzL3BhcmFtLmg+CisjaW5jbHVkZSA8c3lzL3N5c3RtLmg+CiAjaW5jbHVkZSA8c3lz L2tlcm5lbC5oPgorI2luY2x1ZGUgPHN5cy9tYWxsb2MuaD4KICNpbmNsdWRlIDxzeXMvbW9kdWxl Lmg+CiAjaW5jbHVkZSA8c3lzL3NvY2tldC5oPgogI2luY2x1ZGUgPHN5cy9zeXNjdGwuaD4KIAog I2luY2x1ZGUgPG5ldC9pZi5oPgogI2luY2x1ZGUgPG5ldC9pZl9tZWRpYS5oPgorI2luY2x1ZGUg PG5ldC9ldGhlcm5ldC5oPgogCiAjaWZkZWYgSU5FVAogI2luY2x1ZGUgPG5ldGluZXQvaW4uaD4K ZGlmZiAtLWdpdCBhL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfcmVnZG9tYWluLmMgYi9zeXMvbmV0 ODAyMTEvaWVlZTgwMjExX3JlZ2RvbWFpbi5jCmluZGV4IGU3ZWZiN2UuLmVkN2Y0MjIgMTAwNjQ0 Ci0tLSBhL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfcmVnZG9tYWluLmMKKysrIGIvc3lzL25ldDgw MjExL2llZWU4MDIxMV9yZWdkb21haW4uYwpAQCAtNDEsNiArNDEsNyBAQCBfX0ZCU0RJRCgiJEZy ZWVCU0QkIik7CiAjaW5jbHVkZSA8bmV0L2lmLmg+CiAjaW5jbHVkZSA8bmV0L2lmX3Zhci5oPgog I2luY2x1ZGUgPG5ldC9pZl9tZWRpYS5oPgorI2luY2x1ZGUgPG5ldC9ldGhlcm5ldC5oPgogCiAj aW5jbHVkZSA8bmV0ODAyMTEvaWVlZTgwMjExX3Zhci5oPgogI2luY2x1ZGUgPG5ldDgwMjExL2ll ZWU4MDIxMV9yZWdkb21haW4uaD4KZGlmZiAtLWdpdCBhL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFf cnNzYWRhcHQuYyBiL3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfcnNzYWRhcHQuYwppbmRleCBhYWY0 MDU3Li5mMjMwZjYwIDEwMDY0NAotLS0gYS9zeXMvbmV0ODAyMTEvaWVlZTgwMjExX3Jzc2FkYXB0 LmMKKysrIGIvc3lzL25ldDgwMjExL2llZWU4MDIxMV9yc3NhZGFwdC5jCkBAIC0zMywxMyArMzMs MTcgQEAKICNpbmNsdWRlICJvcHRfd2xhbi5oIgogCiAjaW5jbHVkZSA8c3lzL3BhcmFtLmg+Cisj aW5jbHVkZSA8c3lzL3N5c3RtLmg+CiAjaW5jbHVkZSA8c3lzL2tlcm5lbC5oPgorI2luY2x1ZGUg PHN5cy9tYWxsb2MuaD4KICNpbmNsdWRlIDxzeXMvbW9kdWxlLmg+CiAjaW5jbHVkZSA8c3lzL3Nv Y2tldC5oPgogI2luY2x1ZGUgPHN5cy9zeXNjdGwuaD4KIAogI2luY2x1ZGUgPG5ldC9pZi5oPgor I2luY2x1ZGUgPG5ldC9pZl92YXIuaD4KICNpbmNsdWRlIDxuZXQvaWZfbWVkaWEuaD4KKyNpbmNs dWRlIDxuZXQvZXRoZXJuZXQuaD4KIAogI2luY2x1ZGUgPG5ldDgwMjExL2llZWU4MDIxMV92YXIu aD4KICNpbmNsdWRlIDxuZXQ4MDIxMS9pZWVlODAyMTFfcnNzYWRhcHQuaD4KZGlmZiAtLWdpdCBh L3N5cy9uZXQ4MDIxMS9pZWVlODAyMTFfc2Nhbl9zdGEuYyBiL3N5cy9uZXQ4MDIxMS9pZWVlODAy MTFfc2Nhbl9zdGEuYwppbmRleCA3NWFiYjJiLi42ZGEwNmZkIDEwMDY0NAotLS0gYS9zeXMvbmV0 ODAyMTEvaWVlZTgwMjExX3NjYW5fc3RhLmMKKysrIGIvc3lzL25ldDgwMjExL2llZWU4MDIxMV9z Y2FuX3N0YS5jCkBAIC03MzMsNyArNzMzLDcgQEAgc3RhX2NhbmNlbChzdHJ1Y3QgaWVlZTgwMjEx X3NjYW5fc3RhdGUgKnNzLCBzdHJ1Y3QgaWVlZTgwMjExdmFwICp2YXApCiAJcmV0dXJuIDA7CiB9 CiAKLS8qIHVuYWxsaWduZWQgbGl0dGxlIGVuZGlhbiBhY2Nlc3MgKi8gICAgIAorLyogdW5hbGln bmVkIGxpdHRsZSBlbmRpYW4gYWNjZXNzICovICAgICAKICNkZWZpbmUgTEVfUkVBRF8yKHApCQkJ CQlcCiAJKCh1aW50MTZfdCkJCQkJCVwKIAkgKCgoKGNvbnN0IHVpbnQ4X3QgKikocCkpWzBdICAg ICAgKSB8CQlcCmRpZmYgLS1naXQgYS9zeXMvbmV0ODAyMTEvaWVlZTgwMjExX3N1cGVyZy5jIGIv c3lzL25ldDgwMjExL2llZWU4MDIxMV9zdXBlcmcuYwppbmRleCAyMWYzYjk5Li45NGFmNzBkIDEw MDY0NAotLS0gYS9zeXMvbmV0ODAyMTEvaWVlZTgwMjExX3N1cGVyZy5jCisrKyBiL3N5cy9uZXQ4 MDIxMS9pZWVlODAyMTFfc3VwZXJnLmMKQEAgLTM4LDExICszOCwxMiBAQCBfX0ZCU0RJRCgiJEZy ZWVCU0QkIik7CiAKICNpbmNsdWRlIDxzeXMvc29ja2V0Lmg+CiAgCi0jaW5jbHVkZSA8bmV0L2Jw Zi5oPgotI2luY2x1ZGUgPG5ldC9ldGhlcm5ldC5oPgogI2luY2x1ZGUgPG5ldC9pZi5oPgorI2lu Y2x1ZGUgPG5ldC9pZl92YXIuaD4KICNpbmNsdWRlIDxuZXQvaWZfbGxjLmg+CiAjaW5jbHVkZSA8 bmV0L2lmX21lZGlhLmg+CisjaW5jbHVkZSA8bmV0L2JwZi5oPgorI2luY2x1ZGUgPG5ldC9ldGhl cm5ldC5oPgogCiAjaW5jbHVkZSA8bmV0ODAyMTEvaWVlZTgwMjExX3Zhci5oPgogI2luY2x1ZGUg PG5ldDgwMjExL2llZWU4MDIxMV9pbnB1dC5oPgo= --047d7b41ccbc043f5504efc5ea94 Content-Type: application/octet-stream; name="diff.xz" Content-Disposition: attachment; filename="diff.xz" Content-Transfer-Encoding: base64 X-Attachment-Id: file1 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 ApjhD/ywU4SxxGf7AgAAAAAEWVo= --047d7b41ccbc043f5504efc5ea94 Content-Type: application/octet-stream; name=difflog Content-Disposition: attachment; filename=difflog Content-Transfer-Encoding: base64 X-Attachment-Id: file2 T2xpdmVyIFBpbnRlciAoMSk6CiAgICAgIGtlcm5lbDogdXBkYXRlIE9QIGtlcm5lbCBjb25maWcs IGFkZGVkIGl3bjIwMzBmdwoKYWRyaWFuICg0NCk6CiAgICAgIEFkZCAjaWZkZWYgd3JhcHBlciBh cm91bmQgZGVmaW5pdGlvbnMgc28gdGhleSBhcmVuJ3QgaW5jbHVkZWQgbXVsdGlwbGUgICAgIHRp bWVzLgogICAgICBCcmVhayBvdXQgdGhlIGRlYnVnIGNvZGUgaW50byBhIG5ldyBpbmNsdWRlIGZp bGUgaW4gcHJlcGFyYXRpb24gZm9yICAgICBzb21lIG1vcmUgaXduIHdvcmsuCiAgICAgIFRlbXBv cmFyaWx5IGRpc2FibGUgbXVsdGktcmF0ZSByZXRyeSAobGluayBxdWFsaXR5KSBhbmQgZWxpbWlu YXRlIHJhdGUgICAgIGluZGV4IGxvb2t1cHMuCiAgICAgIEJlZ2luIGZsZXNoaW5nIG91dCBhIGtu b2IgdG8gZW5hYmxlL2Rpc2FibGUgYmx1ZXRvb3RoIGNvZXhpc3RlbmNlLgogICAgICBhZGQgMHg4 YiwgbGlmdGVkIGZyb20gTGludXggaXdsZWdhY3kvY29tbWFuZHMuaAogICAgICBGaXggdGhlIFBM Q1AgbG9va3VwIGNvZGUgaW4gaXduKDQpIHRvIGJhc2UgdGhlIDExbiBkZWNpc2lvbiBvbiB3aGV0 aGVyICAgICB0aGUgcmF0ZSBpcyAxMW4sIHJhdGhlciB0aGFuIHdoZXRoZXIgdGhlIGNoYW5uZWwg aXMgMTFuLgogICAgICBEb24ndCBiYXNlIHRoZSByYXRlIHRhYmxlIHNlbGVjdGlvbiBiYXNlZCBv biB0aGUgY2hhbm5lbCBtb2RlOyAgICAgaXQgbmVlZHMgdG8gY2hlY2sgd2hldGhlciB0aGVyZSBh cmUgcmF0ZSBlbnRyaWVzIGluIHRoZXJlIG9yIG5vdC4KICAgICAgUmVtb3ZlIHRyYWlsaW5nIHdo aXRlc3BhY2UuCiAgICAgIEFkZCBkZXZpY2UgaWRzIGZvciB0aGUgQ2VudHJpbm8gMngwMCBkZXZp Y2VzLgogICAgICBBZGQgQmx1ZXRvb3RoL1BBTiAocGVyc29uYWwgYXJlYSBuZXR3b3JraW5nKSBj b21tYW5kcy4KICAgICAgQWRkIHNvbWUgbmV3IGRyaXZlciBkZWZpbml0aW9ucyBhcyBwYXJ0IG9m IHRoZSBjaGlwIHN1cHBvcnQgdXBkYXRlczoKICAgICAgU2VuZCBFQVBPTCBmcmFtZXMgYXQgdGhl IG1hbmFnZW1lbnQgcmF0ZSwgbm90IHRoZSBkYXRhIHJhdGUuCiAgICAgIFVzZSBJV05fTkJBTkRT IHJhdGhlciB0aGFuIGEgaGFyZC1jb2RlZCBsaW1pdC4KICAgICAgRml4IG9mZi1ieS1vbmUuIFNv cnJ5IQogICAgICBSZXBsYWNlIHRoZSBoYXJkLWNvZGVkIFJYIHF1ZXVlIHZhbHVlIGNoZWNrIHdp dGggSVdOX1VOU09MSUNJVEVEX1JYX05PVElGLgogICAgICBJZiBBLU1QRFUgdHJhbnNtaXNzaW9u IGZhaWxzIGVudGlyZWx5LCB0aGVuIG5vIEJBIGlzIHJlY2VpdmVkIGZyb20gdGhlICAgICBOSUMg YW5kIHB1c2hlZCB1cCB0byB0aGUgZHJpdmVyLiAgVW5mb3J0dW5hdGVseSB0aGlzIG1lYW5zIHRo ZXJlJ3MgICAgIG5vIHJhdGUgY29udHJvbCBub3RpZmljYXRpb24gZG9uZS4gIFRodXMsIGlmIHRo ZSByYXRlIGNvbnRyb2wgY29kZSAgICAgbWFrZXMgYSBkZWNpc2lvbiB0aGF0IGhpdHMgYSBjcmFw cHkgcmF0ZSB0aGF0IGNhbid0IHN1Y2NlZWQsIHRoZSAgICAgcmF0ZSBjb2RlIHdvdWxkIG5ldmVy IGxvd2VyIHRoZSByYXRlIGFuZCBwYWNrZXQgbG9zcyB3b3VsZCBjb250aW51ZS4KICAgICAgRG9u J3QgZGVmYXVsdCB0byBhbnRlbm5hcyBBK0I7IHNvbWUgTklDcyB1c2UgQW50ZW5uYXMgQitDIHRv IHRyYW5zbWl0LgogICAgICBDb21tZW50IHdoYXQgJ21pbW8nIGRvZXMgaW4gdGhlIGxpbmsgcXVh bGl0eSB0YWJsZS4KICAgICAgVXNlIHRoZSBuZWdvdGlhdGVkIEhUIHJhdGUgc2V0IHdoZW4gZ2Vu ZXJhdGluZyB0aGUgbGluayBxdWFsaXR5IHRhYmxlLgogICAgICBHcnIuIEZvciBzb21lIG9kZCBy ZWFzb24sIHNldHRpbmcgdGhpcyB0byBhIHNpbmdsZSBhbnRlbm5hIG9uIG15IDUxMDAgICAgICh3 aGljaCBpcyBhIDF4MiBkZXZpY2UpIHBhbmljcyB0aGUgZmlybXdhcmUuCiAgICAgIEZpeCB1cCB0 aGUgbGluayBxdWFsaXR5IGxvb2t1cCBhbmQgcmUtZW5hYmxlIG11bHRpLXJhdGUgcmV0cnkuCiAg ICAgIENvbW1pdCBvdmVyIHNvbWUgd29yayB0byBwcmVwYXJlIHRoZSBpd24oNCkgZHJpdmVyIGZv ciBmdXJ0aGVyIGNoaXBzZXQgICAgIHN1cHBvcnQuCiAgICAgIENvcnJlY3RseSBpbml0aWFsaXNl IHRoZSAyLWNoYWluIGFudGVubmEgbWFzayBpbiB0aGUgbGluayBxdWFsaXR5IHRhYmxlLgogICAg ICBMZWF2ZSBhIG5vdGUgdGhhdCB0aGUgNTMwMCBpcyBhIDN4MyBOSUMuCiAgICAgIFRoaXMgaXMg InNjYW5fZmxhZ3MiIGZyb20gTGludXguCiAgICAgIEZpeCAoSSB0aGluayEpIHRoZSBzY2FuIHRp bWVvdXRzIG9uIHRoZSBpbnRlbCBOSUNzLgogICAgICBBZGQgYSBuZXcgZGVidWcgc2VjdGlvbi4K ICAgICAgQWRkIGRlZmluaXRpb25zIGZvciB0aGUgbWljcm9jb2RlIFRMViBmbGFncyBlbnRyeSAo dHlwZSAxOC4pCiAgICAgIFVzZSB0aGUgY29ycmVjdCBlbmRpYW4tbmVzcyBhY2Nlc3NvciBmb3Ig dGhpcyBUTFYgZmllbGQuICAgICAoSXQncyBjb21pbmcgZnJvbSBmaXJtd2FyZSBhbmQgdGh1cyBp dCdzIGRlZmluZWQgYXMgbGl0dGxlLWVuZGlhbi4pCiAgICAgIERpc2FibGUgdGhpcyBkZWJ1Z2dp bmcgLSBpdCdzIGZhciB0b28gdmVyYm9zZSB3aGVuIGRvaW5nIFRYIHJhdGUgZGVidWdnaW5nLgog ICAgICBBZGQgc29tZSBjb2RlIHRvIGRvdWJsZS1jaGVjayB3aGV0aGVyIHdlJ3JlIGNvcnJlY3Rs eSBwb3B1bGF0aW5nIHRoZSAgICAgVFggcmluZyBhY2NvcmRpbmcgdG8gd2hhdCB0aGUgZmlybXdh cmUgcmVxdWlyZXMuCiAgICAgIEFkZCBzb21lIHNhbml0eSBjaGVja3MgdG8gdGhlIFRMViBmZXRj aC4KICAgICAgT29wcyAtIGZpeCBiYWQgaW5kZW50LiBTb3JyeSEKICAgICAgTG9nIHRoZSByeCBy aW5nIG9mZnNldCBhcyBwYXJ0IG9mIHRoZSBkZWJ1ZyBtZXNzYWdlLgogICAgICBPdmVyaGF1bCB0 aGUgaXduKDQpIHNjYW4gaW5mcmFzdHJ1Y3R1cmUgdG8gYmUgc2xpZ2h0bHkgbW9yZSAiY29ycmVj dCIgICAgIGZvciB0aGVzZSBjaGlwc2V0cy4KICAgICAgKiBTb3J0IHRoZSBjb3B5cmlnaHQgbGlu ZXMgYnkgZGF0ZSAgICAgKiBPayBvaywgSSd2ZSB0b3VjaGVkIHRoaXMgZW5vdWdoIHRvIGNsYWlt IHBhcnQgb2YgaXQuCiAgICAgIEFkZCBzb21lIFBMQ1AgdGhyZXNob2xkcyBmcm9tIExpbnV4IGl3 bHdpZmkgZHJpdmVyIGluIHByZXBhcmF0aW9uIGZvciAgICAgd29ya2luZyBvbiBzb21lIFJGIHR1 bmluZyBpc3N1ZXMuCiAgICAgIEJlZ2luIGZsZXNoaW5nIG91dCBzb21lIGNvZGUgdG8gaGFuZGxl IHRyYWNraW5nIFBMQ1AgZXJyb3IgcmF0ZXMgICAgIGluIHByZXBhcmF0aW9uIGZvciB0aGUgc2Nh biBiYXNlZCByZXR1bmUgbG9naWMuCiAgICAgIFJlZmFjdG9yIG91dCB0aGUgc2NhbiBjaGFubmVs IHRvIGJlIGFzc2lnbmVkIGVhcmx5IG9uIGluIGl3bl9zY2FuKCkgICAgIHJhdGhlciB0aGFuIGl0 IGFsbCBiZWluZyBhIG1lc3Mgb2YgJ2MnIGFuZCAnaWMtPmljX2N1cmNoYW4nLgogICAgICBBZGQg YSBjaGFubmVsIHBhcmFtZXRlciB0byBpd25fc2NhbigpLgogICAgICBSZWZhY3RvciBvdXQgdGhl IHNjYW4gaWQgYW5kIHNjYW4gdmFwIGFzIHBhcnQgb2YgdGhlIHNjYW4gd29yay4KICAgICAgQWRk IHNvbWUgaW5pdGlhbCBzdXBwb3J0IGZvciB0aGUgSW50ZWwgNjIzNS4KICAgICAgRml4IHRoZSBJ bnRlbCA2MTUwIHN1cHBvcnQuCiAgICAgIE1vdmUgdGhlIHJldHVuZSBub3RpZmljYXRpb24gcHJp bnQgdG8gYSBkZWJ1ZyBwcmludC4KCmVhZGxlciAoMSk6CiAgICAgIENlbnRyaW5vIFdpcmVsZXNz LU4gMjIwMCBkb2VzIG5vdCBoYXZlIGJsdWV0b290aCBzdXBwb3J0LgoKZ2F2aW4gKDEpOgogICAg ICBBZGQgc3VwcG9ydCBmb3IgdGhlIEludGVsIENlbnRyaW5vIFdpcmVsZXNzLU4gMTM1IGNoaXBz ZXQuCgpnbGViaXVzICgxKToKICAgICAgVGhlIHI0ODU4OSBwcm9taXNlZCB0byByZW1vdmUgaW1w bGljaXQgaW5jbHVzaW9uIG9mIGlmX3Zhci5oIHNvb24uIFByZXBhcmUgICAgIHRvIHRoaXMgZXZl bnQsIGFkZGluZyBpZl92YXIuaCB0byBmaWxlcyB0aGF0IGRvIG5lZWQgaXQuIEFsc28sIGluY2x1 ZGUgICAgIGFsbCBpbmNsdWRlcyB0aGF0IG5vdyBhcmUgaW5jbHVkZWQgZHVlIHRvIGltcGxpY2l0 IHBvbGx1dGlvbiB2aWEgaWZfdmFyLmgKCmtldmxvICgxKToKICAgICAgUmVuYW1lIGRlZmluaXRp b24gb2YgSUVFRTgwMjExX0ZDMV9XRVAgdG8gSUVFRTgwMjExX0ZDMV9QUk9URUNURUQuCgptYXJp dXMgKDIpOgogICAgICAtIFRoZXJlJ3Mgbm8gbmVlZCB0byBrZWVwIHRyYWNrIG9mIHJlc291cmNl IElEcy4gICAgIC0gU2ltcGxpZnkgTVNJIGFsbG9jYXRpb24gYW5kIHJlbGVhc2UuIEZvciBhIHNp bmdsZSBvbmUsIHdlIGRvbid0IG5lZWQgdG8gICAgICAgZmlkZGxlIHdpdGggdGhlIE1TSSBjb3Vu dCBhbmQgcGNpX3JlbGVhc2VfbXNpKDkpIGlzIHNtYXJ0IGVub3VnaCB0byBqdXN0ICAgICAgIGRv IG5vdGhpbmcgaW4gY2FzZSBvZiBJTlR4LiAgICAgLSBEb24ndCBhbGxvY2F0ZSBNU0kgYXMgUkZf U0hBUkVBQkxFLiAgICAgLSBVc2UgREVWTUVUSE9EX0VORC4gICAgIC0gVXNlIE5VTEwgaW5zdGVh ZCBvZiAwIGZvciBwb2ludGVycy4KICAgICAgLSBQcm9iZSB3aXRoIEJVU19QUk9CRV9ERUZBVUxU IGluc3RlYWQgb2YgMC4gICAgIC0gUmVtb3ZlIGNsZWFyaW5nIFBDSU1fQ01EX0lOVHhESVM7IHBj aSg0KSB3aWxsIGRvIHRoYXQgYXMgYXBwcm9wcmlhdGUgc2luY2UgICAgICAgcjE4OTM2Ny4KCg== --047d7b41ccbc043f5504efc5ea94 Content-Type: text/plain; charset=US-ASCII; name="iwn_-_10_-_current.diff" Content-Disposition: attachment; filename="iwn_-_10_-_current.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: file4 ZGlmZiAtLWdpdCBhL3N5cy9kZXYvaXduL2lmX2l3bnJlZy5oIGIvc3lzL2Rldi9pd24vaWZfaXdu cmVnLmgKaW5kZXggYjE5YThiOC4uNWI2MTFiMCAxMDA2NDQKLS0tIGEvc3lzL2Rldi9pd24vaWZf aXducmVnLmgKKysrIGIvc3lzL2Rldi9pd24vaWZfaXducmVnLmgKQEAgLTIwMCw3ICsyMDAsNyBA QAogI2RlZmluZSBJV05fUkVTRVRfU1cJCQkoMSA8PCA3KQogI2RlZmluZSBJV05fUkVTRVRfTUFT VEVSX0RJU0FCTEVECSgxIDw8IDgpCiAjZGVmaW5lIElXTl9SRVNFVF9TVE9QX01BU1RFUgkJKDEg PDwgOSkKLSNkZWZpbmUgSVdOX1JFU0VUX0xJTktfUFdSX01HTVRfRElTCSgxIDw8IDMxKQorI2Rl ZmluZSBJV05fUkVTRVRfTElOS19QV1JfTUdNVF9ESVMJKDFVIDw8IDMxKQogCiAvKiBQb3NzaWJs ZSBmbGFncyBmb3IgcmVnaXN0ZXIgSVdOX0dQX0NOVFJMLiAqLwogI2RlZmluZSBJV05fR1BfQ05U UkxfTUFDX0FDQ0VTU19FTkEJKDEgPDwgMCkKQEAgLTI2NSw3ICsyNjUsNyBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IHsKIAogLyogUG9zc2libGUgZmxhZ3MgZm9yIHJlZ2lzdGVyIElXTl9EUkFNX0lO VF9UQkwuICovCiAjZGVmaW5lIElXTl9EUkFNX0lOVF9UQkxfV1JBUF9DSEVDSwkoMSA8PCAyNykK LSNkZWZpbmUgSVdOX0RSQU1fSU5UX1RCTF9FTkFCTEUJCSgxIDw8IDMxKQorI2RlZmluZSBJV05f RFJBTV9JTlRfVEJMX0VOQUJMRQkJKDFVIDw8IDMxKQogCiAvKiBQb3NzaWJsZSB2YWx1ZXMgZm9y IHJlZ2lzdGVyIElXTl9BTkFfUExMLiAqLwogI2RlZmluZSBJV05fQU5BX1BMTF9JTklUCTB4MDA4 ODAzMDAKQEAgLTI3NSw3ICsyNzUsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHsKIAogLyogUG9z c2libGUgZmxhZ3MgZm9yIHJlZ2lzdGVyIElXTl9CU01fV1JfQ1RSTC4gKi8KICNkZWZpbmUgSVdO X0JTTV9XUl9DVFJMX1NUQVJUX0VOCSgxIDw8IDMwKQotI2RlZmluZSBJV05fQlNNX1dSX0NUUkxf U1RBUlQJCSgxIDw8IDMxKQorI2RlZmluZSBJV05fQlNNX1dSX0NUUkxfU1RBUlQJCSgxVSA8PCAz MSkKIAogLyogUG9zc2libGUgZmxhZ3MgZm9yIHJlZ2lzdGVyIElXTl9JTlQuICovCiAjZGVmaW5l IElXTl9JTlRfQUxJVkUJCSgxIDw8ICAwKQpAQCAtMjg4LDcgKzI4OCw3IEBAIHN0YXRpYyBjb25z dCBzdHJ1Y3QgewogI2RlZmluZSBJV05fSU5UX0ZIX1RYCQkoMSA8PCAyNykKICNkZWZpbmUgSVdO X0lOVF9SWF9QRVJJT0RJQwkoMSA8PCAyOCkKICNkZWZpbmUgSVdOX0lOVF9IV19FUlIJCSgxIDw8 IDI5KQotI2RlZmluZSBJV05fSU5UX0ZIX1JYCQkoMSA8PCAzMSkKKyNkZWZpbmUgSVdOX0lOVF9G SF9SWAkJKDFVIDw8IDMxKQogCiAvKiBTaG9ydGN1dC4gKi8KICNkZWZpbmUgSVdOX0lOVF9NQVNL X0RFRgkJCQkJCVwKQEAgLTMwOCw3ICszMDgsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHsKIAog LyogUG9zc2libGUgZmxhZ3MvdmFsdWVzIGZvciByZWdpc3RlciBJV05fRkhfVFhfQ09ORklHLiAq LwogI2RlZmluZSBJV05fRkhfVFhfQ09ORklHX0RNQV9QQVVTRQkJMAotI2RlZmluZSBJV05fRkhf VFhfQ09ORklHX0RNQV9FTkEJCSgxIDw8IDMxKQorI2RlZmluZSBJV05fRkhfVFhfQ09ORklHX0RN QV9FTkEJCSgxVSA8PCAzMSkKICNkZWZpbmUgSVdOX0ZIX1RYX0NPTkZJR19DSVJRX0hPU1RfRU5E VEZECSgxIDw8IDIwKQogCiAvKiBQb3NzaWJsZSBmbGFncy92YWx1ZXMgZm9yIHJlZ2lzdGVyIElX Tl9GSF9UWEJVRl9TVEFUVVMuICovCkBAIC0zMjMsNyArMzIzLDcgQEAgc3RhdGljIGNvbnN0IHN0 cnVjdCB7CiAjZGVmaW5lIElXTl9GSF9UWF9TVEFUVVNfSURMRShjaG5sKQkoMSA8PCAoKGNobmwp ICsgMTYpKQogCiAvKiBQb3NzaWJsZSBmbGFncyBmb3IgcmVnaXN0ZXIgSVdOX0ZIX1JYX0NPTkZJ Ry4gKi8KLSNkZWZpbmUgSVdOX0ZIX1JYX0NPTkZJR19FTkEJCSgxIDw8IDMxKQorI2RlZmluZSBJ V05fRkhfUlhfQ09ORklHX0VOQQkJKDFVIDw8IDMxKQogI2RlZmluZSBJV05fRkhfUlhfQ09ORklH X05SQkQoeCkJKCh4KSA8PCAyMCkKICNkZWZpbmUgSVdOX0ZIX1JYX0NPTkZJR19SQl9TSVpFXzhL CSgxIDw8IDE2KQogI2RlZmluZSBJV05fRkhfUlhfQ09ORklHX1NJTkdMRV9GUkFNRQkoMSA8PCAx NSkKQEAgLTMzMiw3ICszMzIsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHsKICNkZWZpbmUgSVdO X0ZIX1JYX0NPTkZJR19JR05fUlhGX0VNUFRZCSgxIDw8ICAyKQogCiAvKiBQb3NzaWJsZSBmbGFn cyBmb3IgcmVnaXN0ZXIgSVdOX0ZIX1RYX0NPTkZJRy4gKi8KLSNkZWZpbmUgSVdOX0ZIX1RYX0NP TkZJR19ETUFfRU5BCSgxIDw8IDMxKQorI2RlZmluZSBJV05fRkhfVFhfQ09ORklHX0RNQV9FTkEJ KDFVIDw8IDMxKQogI2RlZmluZSBJV05fRkhfVFhfQ09ORklHX0RNQV9DUkVESVRfRU5BCSgxIDw8 ICAzKQogCiAvKiBQb3NzaWJsZSBmbGFncyBmb3IgcmVnaXN0ZXIgSVdOX0VFUFJPTS4gKi8KQEAg LTM4MCw3ICszODAsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHsKICNkZWZpbmUgSVdOX0FQTUdf UENJX1NUVF9MMUFfRElTCSgxIDw8IDExKQogCiAvKiBQb3NzaWJsZSBmbGFncyBmb3IgcmVnaXN0 ZXIgSVdOX0JTTV9EUkFNX1RFWFRfU0laRS4gKi8KLSNkZWZpbmUgSVdOX0ZXX1VQREFURUQJKDEg PDwgMzEpCisjZGVmaW5lIElXTl9GV19VUERBVEVECSgxVSA8PCAzMSkKIAogI2RlZmluZSBJV05f U0NIRURfV0lOU1oJCTY0CiAjZGVmaW5lIElXTl9TQ0hFRF9MSU1JVAkJNjQK --047d7b41ccbc043f5504efc5ea94-- From owner-freebsd-current@FreeBSD.ORG Sun Jan 12 15:44:16 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2680A7C5 for ; Sun, 12 Jan 2014 15:44:16 +0000 (UTC) Received: from mail-qe0-x235.google.com (mail-qe0-x235.google.com [IPv6:2607:f8b0:400d:c02::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D9E311AB0 for ; Sun, 12 Jan 2014 15:44:15 +0000 (UTC) Received: by mail-qe0-f53.google.com with SMTP id t7so6206563qeb.26 for ; Sun, 12 Jan 2014 07:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=J1NPF3D75jTAdcfcSHe+ydr6c1iDGQVspdTsMzYQ2qc=; b=a1Q8+u/fzIGcQJyFNZ0H4PFq3vWgpDYahCY+ZAMLQoOqWpYEXkGeSf3Bk3esZVA8LH vbvLK6dLnjFw4N4cFlPns8nnst8Q4M/90gQDH2JNrSIFz+RrdaQSB+SE99ZVNySLFG5Z +4Ycx1OU246xqELqyc+bX9cHMqmgttQPKwBcHjM/CpAtYQJkE+BENgc2S1iM83ubAVNt j3mRv8lzztqWZZqjEpRJvdNqwHBsximBlzptFTdJotyuOKiqVzuJitkTPTZb/7IxVXii rAOTyc5cpnvx7saJUczzmDc6W7jSk8xqhpbVSc/8FErvJMIUKhQo5hOhTYzYeUZdwat7 8CPg== MIME-Version: 1.0 X-Received: by 10.224.13.147 with SMTP id c19mr15323292qaa.76.1389541455155; Sun, 12 Jan 2014 07:44:15 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.224.52.8 with HTTP; Sun, 12 Jan 2014 07:44:15 -0800 (PST) In-Reply-To: References: Date: Sun, 12 Jan 2014 07:44:15 -0800 X-Google-Sender-Auth: N4hcOArm_5IgxVazowTIqm4phYo Message-ID: Subject: Re: iwn0: iwn_intr: fatal firmware error (10-STABLE + iwn2230) From: Adrian Chadd To: Oliver Pinter Content-Type: text/plain; charset=ISO-8859-1 Cc: "current@freebsd.org" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 15:44:16 -0000 Just try copying the whole iwn driver from -head to -10. -a On 12 January 2014 05:27, Oliver Pinter wrote: > Hi all! > > I got this firmware crash with 10-STABLE + backported iwn patches from CURRENT: > > iwn0: device timeout > wlan0: link state changed to UP > wlan0: link state changed to DOWN > wlan0: link state changed to UP > iwn0: device timeout > iwn0: iwn_intr: fatal firmware error > firmware error log: > error type = "UNKNOWN" (0x0000102C) > program counter = 0x0000D978 > source line = 0x000006A4 > error data = 0x000000FE00000000 > branch link = 0x0000D88A0000D88A > interrupt link = 0x0000EC7A00000000 > time = 17657601 > driver status: > tx ring 0: qid=0 cur=2 queued=2 > tx ring 1: qid=1 cur=0 queued=0 > tx ring 2: qid=2 cur=0 queued=0 > tx ring 3: qid=3 cur=0 queued=0 > tx ring 4: qid=4 cur=0 queued=0 > tx ring 5: qid=5 cur=0 queued=0 > tx ring 6: qid=6 cur=0 queued=0 > tx ring 7: qid=7 cur=0 queued=0 > tx ring 8: qid=8 cur=0 queued=0 > tx ring 9: qid=9 cur=18 queued=0 > tx ring 10: qid=10 cur=0 queued=0 > tx ring 11: qid=11 cur=0 queued=0 > tx ring 12: qid=12 cur=0 queued=0 > tx ring 13: qid=13 cur=0 queued=0 > tx ring 14: qid=14 cur=0 queued=0 > tx ring 15: qid=15 cur=0 queued=0 > tx ring 16: qid=16 cur=0 queued=0 > tx ring 17: qid=17 cur=0 queued=0 > tx ring 18: qid=18 cur=0 queued=0 > tx ring 19: qid=19 cur=0 queued=0 > rx ring: cur=36 > wlan0: link state changed to DOWN > wlan0: link state changed to UP > wlan0: link state changed to DOWN > iwn0: device timeout > > The hardware is: > > iwn0@pci0:4:0:0: class=0x028000 card=0x40628086 chip=0x08878086 > rev=0xc4 hdr=0x00 > vendor = 'Intel Corporation' > device = 'Centrino Wireless-N 2230' > class = network > > Attached the patch, that I use to support 2230 in 10-STABLE. > > And attached the output of: > git diff op/stable/10/iwn origin/master -- sys/dev/iwn/ as > iwn_-_10_-_current.diff > and > git diff op/stable/10/iwn origin/master -- sys/dev/net80211/ as > net80211_-_10_-_current.diff > > The git repo mirrored from FreeBSD's github repo. > > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" From owner-freebsd-current@FreeBSD.ORG Mon Jan 13 02:10:24 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF8E7E0E; Mon, 13 Jan 2014 02:10:24 +0000 (UTC) Received: from mail-pd0-x233.google.com (mail-pd0-x233.google.com [IPv6:2607:f8b0:400e:c02::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 760B61583; Mon, 13 Jan 2014 02:10:24 +0000 (UTC) Received: by mail-pd0-f179.google.com with SMTP id y13so4301385pdi.38 for ; Sun, 12 Jan 2014 18:10:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=9TRPHy68mjHw0UHL+L1nJvQ3/tSxVDzfDfij228eiqA=; b=sRF7YlxnydUgOfRAfuHyMuRvjPbVZ5UcAz3t8buIyJ2OsFGx5tk6etSSVP0pFyiTI5 of2/IRJ+A8rPyCEze/j6xsSzzDrFaxzm5EA6DvrRE4iETYFlWwkKsplNAsoSE5K8FK5B EcgarAFsZxCIeDjJtLT6FI2KX8QW3xKFW8YW/jYxHVO1gi5m5xM7OKH6PhwbMCP7k7yH +t15X1ZBHdbDpppzBEBC0HkZSMSZf5JxJBHAbZBPJoXsyDmfyegrQcxTY7xY4ZL5YzVh emr/JeQSxfDnl9ltf2JLza+HFz6vc5kAtgnmcY6pcBSNWk9d0h6A0Tvu56Z2+faLIwe2 7sDw== X-Received: by 10.66.158.132 with SMTP id wu4mr27102773pab.66.1389579024182; Sun, 12 Jan 2014 18:10:24 -0800 (PST) Received: from pyunyh@gmail.com (lpe4.p59-icn.cdngp.net. [114.111.62.249]) by mx.google.com with ESMTPSA id y9sm43576841pas.10.2014.01.12.18.10.20 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 12 Jan 2014 18:10:23 -0800 (PST) Received: by pyunyh@gmail.com (sSMTP sendmail emulation); Mon, 13 Jan 2014 11:10:18 +0900 From: Yonghyeon PYUN Date: Mon, 13 Jan 2014 11:10:18 +0900 To: Gleb Smirnoff Subject: Re: FreeBSD 10-RC4: Got crash in igb driver Message-ID: <20140113021018.GA3500@michelle.cdnetworks.com> References: <48005124.ny58tnLn4d@pc-alex> <20140110012114.GA3103@michelle.cdnetworks.com> <20140110103529.GE73147@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140110103529.GE73147@FreeBSD.org> User-Agent: Mutt/1.4.2.3i Cc: jfv@freebsd.org, Alexandre Martins , freebsd-current@freebsd.org, fabien.thomas@netasq.com, damien.deville@netasq.com X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: pyunyh@gmail.com List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jan 2014 02:10:24 -0000 On Fri, Jan 10, 2014 at 02:35:29PM +0400, Gleb Smirnoff wrote: > Yonghyeon, > > On Fri, Jan 10, 2014 at 10:21:14AM +0900, Yonghyeon PYUN wrote: > Y> > I experience some troubles with the igb device driver on FreeBSD 10-RC4. > Y> > > Y> > The kernel make a pagefault in the igb_tx_ctx_setup function when accessing to > Y> > a IPv6 header. > Y> > > Y> > The network configuration is the following: > Y> > - box acting as an IPv6 router > Y> > - one interface with an IPv6 (igb0) > Y> > - another interface with a vlan, and IPv6 on it (vlan0 on igb1) > Y> > > Y> > Vlan Hardware tagging is set on both interfaces. > Y> > > Y> > The packet that cause the crash come from igb0 and go to vlan0. > Y> > > Y> > After investigation, i see that the mbuf is split in two. The first one carry > Y> > the ethernet header, the second, the IPv6 header and data payload. > Y> > > Y> > The split is due to the "m_copy" done in ip6_forward, that make the mbuf not > Y> > writable and the "M_PREPEND" in ether_output that insert the new mbuf before > Y> > the original one. > Y> > > Y> > The kernel crashes only if the newly allocated mbuf is at the end of a memory > Y> > page, and no page is available after this one. So, it's extremly rare. > Y> > > Y> > I inserted a "KASSERT" into the function (see attached patch) to check this > Y> > behavior, and it raises on every IPv6 forwarded packet to the vlan. The > Y> > problem disapear if i remove hardware tagging. > Y> > > Y> > In the commit 256200, i see that pullups has been removed. May it be related ? > Y> > Y> I think I introduced the header parsing code to meet controller > Y> requirement in em(4) and Jack borrowed that code in the past but it > Y> seems it was removed in r256200. It seems igb_tx_ctx_setup() > Y> assumes it can access ethernet/IP/TCP/UDP headers in the first mbuf > Y> of the chain. > Y> This looks wrong to me. > > Can you please restore the important code in head ASAP? Although crashes happen > only when the mbuf is last in a page and page isn't mapped, we read thrash from > next allocation on almost every packet. > It seems other Intel ethernet drivers except em(4) have similar issues. I didn't check recent Intel controllers/drivers for long time so I don't know details on hardware requirements of offloading. Since Jack is very responsive and has hardwares to verify, he would be more appropriate person to handle these issues. From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 04:15:35 2014 Return-Path: Delivered-To: current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C69EDBD8 for ; Tue, 14 Jan 2014 04:15:35 +0000 (UTC) Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A46441A39 for ; Tue, 14 Jan 2014 04:15:35 +0000 (UTC) Received: from h2.funkthat.com (localhost [127.0.0.1]) by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id s0E4FYFV040669 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 13 Jan 2014 20:15:34 -0800 (PST) (envelope-from jmg@h2.funkthat.com) Received: (from jmg@localhost) by h2.funkthat.com (8.14.3/8.14.3/Submit) id s0E4FYiD040668 for current@FreeBSD.org; Mon, 13 Jan 2014 20:15:34 -0800 (PST) (envelope-from jmg) Date: Mon, 13 Jan 2014 20:15:34 -0800 From: John-Mark Gurney To: current@FreeBSD.org Subject: error message from pkg on HEAD Message-ID: <20140114041534.GJ2982@funkthat.com> Mail-Followup-To: current@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i X-Operating-System: FreeBSD 7.2-RELEASE i386 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (h2.funkthat.com [127.0.0.1]); Mon, 13 Jan 2014 20:15:35 -0800 (PST) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 04:15:35 -0000 So, now when I run pkg I get the following: pkg: Ignoring bad configuration entry in /usr/local/etc/pkg/repos/FreeBSD.conf: "URL: http://pkg.freebsd.org/${ABI}/latest" pkg: Ignoring bad configuration entry in /usr/local/etc/pkg/repos/FreeBSD.conf: true pkg: Ignoring bad configuration entry in /usr/local/etc/pkg/repos/FreeBSD.conf: "SRV" pkg does seem to work so I'm not sure what I need to do. I think I was told to add these lines to the file, though I'm not sure, so I don't want to delete them. Thanks for help in letting me know what the solution is. # pkg -v 1.2.4_1 # uname -a FreeBSD carbon.funkthat.com 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r260082M: Wed Jan 1 12:08:41 PST 2014 jmg@carbon.funkthat.com:/usr/obj/usr/src/sys/lockprof amd64 # cat /usr/local/etc/pkg/repos/FreeBSD.conf FreeBSD: URL: http://pkg.freebsd.org/${ABI}/latest ENABLED: YES MIRROR_TYPE: SRV -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 04:22:47 2014 Return-Path: Delivered-To: current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B765FA1; Tue, 14 Jan 2014 04:22:47 +0000 (UTC) Received: from mail0.glenbarber.us (mail0.glenbarber.us [IPv6:2607:fc50:1:2300:1001:1001:1001:face]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5F77C1ADD; Tue, 14 Jan 2014 04:22:47 +0000 (UTC) Received: from glenbarber.us (c-71-224-221-174.hsd1.nj.comcast.net [71.224.221.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by mail0.glenbarber.us (Postfix) with ESMTPSA id 713BBFF18; Tue, 14 Jan 2014 04:22:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us 713BBFF18 Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Mon, 13 Jan 2014 23:22:43 -0500 From: Glen Barber To: John-Mark Gurney Subject: Re: error message from pkg on HEAD Message-ID: <20140114042243.GW1742@glenbarber.us> References: <20140114041534.GJ2982@funkthat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="nbjgUHX6eyHhY7pW" Content-Disposition: inline In-Reply-To: <20140114041534.GJ2982@funkthat.com> X-Operating-System: FreeBSD 11.0-CURRENT amd64 User-Agent: Mutt/1.5.22 (2013-10-16) Cc: current@FreeBSD.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 04:22:47 -0000 --nbjgUHX6eyHhY7pW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 13, 2014 at 08:15:34PM -0800, John-Mark Gurney wrote: > So, now when I run pkg I get the following: > pkg: Ignoring bad configuration entry in /usr/local/etc/pkg/repos/FreeBSD= =2Econf: "URL: http://pkg.freebsd.org/${ABI}/latest" > pkg: Ignoring bad configuration entry in /usr/local/etc/pkg/repos/FreeBSD= =2Econf: true > pkg: Ignoring bad configuration entry in /usr/local/etc/pkg/repos/FreeBSD= =2Econf: "SRV" >=20 > pkg does seem to work so I'm not sure what I need to do. I think I was > told to add these lines to the file, though I'm not sure, so I don't want > to delete them. >=20 > Thanks for help in letting me know what the solution is. >=20 > # pkg -v > 1.2.4_1 > # uname -a > FreeBSD carbon.funkthat.com 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r260082M= : Wed Jan 1 12:08:41 PST 2014 jmg@carbon.funkthat.com:/usr/obj/usr/src= /sys/lockprof amd64 > # cat /usr/local/etc/pkg/repos/FreeBSD.conf=20 > FreeBSD: > URL: http://pkg.freebsd.org/${ABI}/latest > ENABLED: YES > MIRROR_TYPE: SRV >=20 The file format is incorrect. FreeBSD: { url: "http://pkg.freebsd.org/${ABI}/latest", enabled: yes, mirror_type: "srv" } Glen --nbjgUHX6eyHhY7pW Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJS1LuTAAoJELls3eqvi17QkGoP/3w41VJ5xU4XA3U1TcBpWWJ1 849bHYrzZAxndtRFG028+7ClW4xNEocZNFGFmpQ49fs9Bw3tJ1IoQgOQHSx2Xgdb SamasquYznxIQGiGzAgAle8fQ4f6s9Yi/d8RWt4i6HudatxTPLdsBsP1uBlaPFrV /XvNVMF1/KuK5aEavyw5t+O5DvuV1SuknpQB6RYuUy1vkwVbFVusiYUNv4gCN6XA sb0rv2Jfg+GxWhvLSENHywEFYrCmq+IrXFDFpJ+bTV7XcZAKg/8Y/FzjaSywy26t BZA/0hnxcxU/T4lpiuBK+YFoTeP3E2C+xRcbqBG+FS/gLifcrJCv4IGrJMBun363 rmL5nMoc9uJasp/tQHTypfCkWajwVjPj/uhqm/xz/Ef39KZc1ugtBFPzH+cYcnl7 b4RoNe3dCKy4zxJUT395TjKZi984caeBFO07/AkRGiPs7RCnCLH0fm409BKjSwK+ eeGJI9Mkr4AbZ2cWed62VcG09l/1gFC53HQeRTmObs0woIRfVqkIHA7BOeVfkXNA cyP2DJsCNRFW1uyPe5KbPpyqaSbeqnlGApaYkVwwGAPAMM43FVVl7yJb+mBHvcu4 qDfEBq184ZvulACyJk726vyjVWGEXQto8ACST0mDiVI9yw01EH2IJBwboAeb8Tat Pw/sH7wa283abGQTl9nV =eW3b -----END PGP SIGNATURE----- --nbjgUHX6eyHhY7pW-- From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 04:39:26 2014 Return-Path: Delivered-To: current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A133137E; Tue, 14 Jan 2014 04:39:26 +0000 (UTC) Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 643891CBB; Tue, 14 Jan 2014 04:39:26 +0000 (UTC) Received: from h2.funkthat.com (localhost [127.0.0.1]) by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id s0E4dPOX040980 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 13 Jan 2014 20:39:25 -0800 (PST) (envelope-from jmg@h2.funkthat.com) Received: (from jmg@localhost) by h2.funkthat.com (8.14.3/8.14.3/Submit) id s0E4dPw1040979; Mon, 13 Jan 2014 20:39:25 -0800 (PST) (envelope-from jmg) Date: Mon, 13 Jan 2014 20:39:25 -0800 From: John-Mark Gurney To: Glen Barber Subject: Re: error message from pkg on HEAD Message-ID: <20140114043925.GL2982@funkthat.com> Mail-Followup-To: Glen Barber , current@FreeBSD.org References: <20140114041534.GJ2982@funkthat.com> <20140114042243.GW1742@glenbarber.us> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140114042243.GW1742@glenbarber.us> User-Agent: Mutt/1.4.2.3i X-Operating-System: FreeBSD 7.2-RELEASE i386 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (h2.funkthat.com [127.0.0.1]); Mon, 13 Jan 2014 20:39:25 -0800 (PST) Cc: current@FreeBSD.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 04:39:26 -0000 Glen Barber wrote this message on Mon, Jan 13, 2014 at 23:22 -0500: > On Mon, Jan 13, 2014 at 08:15:34PM -0800, John-Mark Gurney wrote: > > So, now when I run pkg I get the following: > > pkg: Ignoring bad configuration entry in /usr/local/etc/pkg/repos/FreeBSD.conf: "URL: http://pkg.freebsd.org/${ABI}/latest" > > pkg: Ignoring bad configuration entry in /usr/local/etc/pkg/repos/FreeBSD.conf: true > > pkg: Ignoring bad configuration entry in /usr/local/etc/pkg/repos/FreeBSD.conf: "SRV" > > > > pkg does seem to work so I'm not sure what I need to do. I think I was > > told to add these lines to the file, though I'm not sure, so I don't want > > to delete them. > > > > Thanks for help in letting me know what the solution is. > > > > # pkg -v > > 1.2.4_1 > > # uname -a > > FreeBSD carbon.funkthat.com 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r260082M: Wed Jan 1 12:08:41 PST 2014 jmg@carbon.funkthat.com:/usr/obj/usr/src/sys/lockprof amd64 > > # cat /usr/local/etc/pkg/repos/FreeBSD.conf > > FreeBSD: > > URL: http://pkg.freebsd.org/${ABI}/latest > > ENABLED: YES > > MIRROR_TYPE: SRV > > > > The file format is incorrect. > > FreeBSD: { > url: "http://pkg.freebsd.org/${ABI}/latest", > enabled: yes, > mirror_type: "srv" > } For the archives. Glen helped me in IRC, it turns out that this file was no longer necessary. I beileve I was told to add it at one point to make pkg work, but the correct solution was to remove the file... Thanks Glen. -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 05:27:59 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F451BBF for ; Tue, 14 Jan 2014 05:27:59 +0000 (UTC) Received: from frv198.fwdcdn.com (frv198.fwdcdn.com [212.42.77.198]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 290DC1FCF for ; Tue, 14 Jan 2014 05:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=ffe; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:To:Subject:From:Date; bh=P+lESE1Srwe9VJMy6EqhtuqXhzdWq1oFRnxWOhJh9IY=; b=MEJuYZRdtxjj5YQX5i2I2SeCSACqgmskHqHTebgj9xu6tdgHFqQP5uAfiQjnpcEao9gNry1VrQxoAu5TKuKR99/+9v8oqodCZT19PoPLUaKBd2XBqYl1DwioQ+/oTFW21IeSsFntZ2u5rv/MGkVIiHc/Td6bAEDterrbm5XJ49M=; Received: from [10.10.10.45] (helo=frv45.ukr.net) by frv198.fwdcdn.com with smtp ID 1W2wXU-0003By-GA for freebsd-current@freebsd.org; Tue, 14 Jan 2014 07:27:48 +0200 Date: Tue, 14 Jan 2014 07:27:47 +0200 From: Vladimir Sharun Subject: Re[2]: ARC "pressured out", how to control/stabilize ? (reformatted to text/plain) To: Current FreeBSD X-Mailer: mail.ukr.net 5.0 Message-Id: <1389676958.516993176.oq4lbgg7@frv45.ukr.net> In-Reply-To: <52CA9963.1050507@FreeBSD.org> References: <1388839805.123581691.q97ijp8l@frv45.ukr.net> <52C93E4D.1050100@FreeBSD.org> <1389005433.815055146.2dcjke36@frv45.ukr.net> <52CA9963.1050507@FreeBSD.org> MIME-Version: 1.0 Received: from atz@ukr.net by frv45.ukr.net; Tue, 14 Jan 2014 07:27:47 +0200 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: binary Content-Disposition: inline X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 05:27:59 -0000 Dear Andriy and FreeBSD community, > I am not sure if the buffers are leaked somehow or if they are actually in use. > It's one of the very few places where data buffers are allocated without > charging ARC. In all other places it's quite easy to match allocations and > deallocations. But in L2ARC it is not obvious that all buffers get freed or > when that happens. After one week under load I think we figure out the cause: it's L2ARC. Here's the top's header for 7d17h of the runtime: last pid: 46409; load averages: 0.37, 0.62, 0.70 up 7+17:14:01 07:24:10 173 processes: 1 running, 171 sleeping, 1 zombie CPU: 2.0% user, 0.0% nice, 3.5% system, 0.4% interrupt, 94.2% idle Mem: 8714M Active, 14G Inact, 96G Wired, 1929M Cache, 3309M Buf, 3542M Free ARC: 85G Total, 2558M MFU, 77G MRU, 28M Anon, 1446M Header, 4802M Other ARC related tunables: vm.kmem_size="110G" vfs.zfs.arc_max="90G" vfs.zfs.arc_min="42G" For more than 7 days of hard runtime the picture clearly shows: Wired minus ARC = 11..12Gb, ARC grow and shrinks in 80-87Gb range and the system runs just fine. So what shall we do with L2ARC leakage ? From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 07:31:33 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 801288DC; Tue, 14 Jan 2014 07:31:33 +0000 (UTC) Received: from caravan.chchile.org (caravan.chchile.org [178.32.125.136]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4B83B17FB; Tue, 14 Jan 2014 07:31:33 +0000 (UTC) Received: by caravan.chchile.org (Postfix, from userid 1000) id 1E30FBBDE9; Tue, 14 Jan 2014 07:26:21 +0000 (UTC) Date: Tue, 14 Jan 2014 08:26:21 +0100 From: Jeremie Le Hen To: freebsd-current@FreeBSD.org Subject: buildworld fails with "Zero byte read from file, skipping rest of line" Message-ID: <20140114072620.GB83762@caravan.chchile.org> Mail-Followup-To: freebsd-current@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.22 (2013-10-16) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 07:31:33 -0000 Hi, I have a FreeBSD -CURRENT in Virtualbox (running on Linux). I have been unable to buildworld for a while. I suspect this is not a problem with the source because I didn't see any report so far, whereas I've been experiencing this for a month or more. Thus I naturally suspected it was a binary problem, so I've upgraded to the latest snapshot, but the problem still exists. ===> gnu/usr.bin/groff/src/libs/libgroff (all) make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: warning: Zero byte read from file, skipping rest of line. make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: Need an operator make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 4: Need an operator make[6]: Fatal errors encountered -- cannot continue make[6]: stopped in /usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff *** [all] Error code 1 Typscript available here: http://people.freebsd.org/~jlh/typescript.buildworld.txt Any ideas? Cheers, -- Jeremie Le Hen Scientists say the world is made up of Protons, Neutrons and Electrons. They forgot to mention Morons. From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 08:58:28 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45F69724 for ; Tue, 14 Jan 2014 08:58:28 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C2E021E74 for ; Tue, 14 Jan 2014 08:58:26 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.7/8.14.7) with ESMTP id s0E8wInS023876 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 14 Jan 2014 12:58:18 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.7/8.14.7/Submit) id s0E8wIId023875 for freebsd-current@FreeBSD.org; Tue, 14 Jan 2014 12:58:18 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 14 Jan 2014 12:58:18 +0400 From: Gleb Smirnoff To: freebsd-current@FreeBSD.org Subject: Re: buildworld fails with "Zero byte read from file, skipping rest of line" Message-ID: <20140114085818.GQ8472@FreeBSD.org> References: <20140114072620.GB83762@caravan.chchile.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140114072620.GB83762@caravan.chchile.org> User-Agent: Mutt/1.5.22 (2013-10-16) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 08:58:28 -0000 Jeremie, On Tue, Jan 14, 2014 at 08:26:21AM +0100, Jeremie Le Hen wrote: J> Hi, J> J> I have a FreeBSD -CURRENT in Virtualbox (running on Linux). I have been J> unable to buildworld for a while. J> J> I suspect this is not a problem with the source because I didn't see any J> report so far, whereas I've been experiencing this for a month or more. J> Thus I naturally suspected it was a binary problem, so I've upgraded J> to the latest snapshot, but the problem still exists. J> J> ===> gnu/usr.bin/groff/src/libs/libgroff (all) J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: warning: Zero byte read from file, skipping rest of line. J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: Need an operator J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 4: Need an operator J> make[6]: Fatal errors encountered -- cannot continue J> make[6]: stopped in /usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff J> *** [all] Error code 1 J> J> Typscript available here: J> http://people.freebsd.org/~jlh/typescript.buildworld.txt J> J> Any ideas? Can you try to reproduce this with unmapped I/O turned off in boot loader? -- Totus tuus, Glebius. From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 14:47:33 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3F069AC for ; Tue, 14 Jan 2014 14:47:33 +0000 (UTC) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A70971CEB for ; Tue, 14 Jan 2014 14:47:33 +0000 (UTC) Received: from compute2.internal (compute2.nyi.mail.srv.osa [10.202.2.42]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 43D78204F7 for ; Tue, 14 Jan 2014 09:47:27 -0500 (EST) Received: from web3 ([10.202.2.213]) by compute2.internal (MEProxy); Tue, 14 Jan 2014 09:47:27 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=message-id:from:to:mime-version :content-transfer-encoding:content-type:subject:date; s=smtpout; bh=c4XEBpS3VaRGHK2OAW0SiOopQ0U=; b=pAo2/Qgfzf1TilUB8/B9YVH21TDl 8S6LzCOA3aV2k6DI7M5vch5Hu1W5JkvF0x+BLWV4HQoL1/AqrPMwIdByqkP5yM8p NZupTD4cz9JXpjQMFTgDy+KI6xCAO/T4Tm6/mjeVvb6QSqA+9/kWVRrJh660lgYv CFOLc1/O/lG3JBc= Received: by web3.nyi.mail.srv.osa (Postfix, from userid 99) id 1C5631183CC; Tue, 14 Jan 2014 09:47:27 -0500 (EST) Message-Id: <1389710847.2685.70601137.72B5C024@webmail.messagingengine.com> X-Sasl-Enc: gBsa6e1t4gUHU53kRwdrMqehCioPVFochJ16HkNjws2r 1389710847 From: Mark Felder To: freebsd-current@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain X-Mailer: MessagingEngine.com Webmail Interface - ajax-fdd84f42 Subject: mtree acl support Date: Tue, 14 Jan 2014 08:47:27 -0600 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 14:47:33 -0000 I was recently talking to someone about how one would backup / restore ACLs reliably. I didn't see any mention of ACLs in the mtree man page and after a quick google I came upon this old mailing list post: http://lists.freebsd.org/pipermail/freebsd-hackers/2008-April/024173.html patch in list is here: http://heka.cenkes.org/sat/diffs/mtree_acl.diff I've mirrored it here: https://feld.me/freebsd/mtree_acl.diff This old patch appears to still apply cleanly. I hate to see a patch die and be forgotten. From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:00:07 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C6D5DED; Tue, 14 Jan 2014 15:00:07 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1C391DBE; Tue, 14 Jan 2014 15:00:05 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92694623" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:45 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:45 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35Sz-0006J6-7G; Tue, 14 Jan 2014 14:59:45 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 00/20] FreeBSD PVH DomU support Date: Tue, 14 Jan 2014 15:59:22 +0100 Message-ID: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:00:07 -0000 This series is a split of the previous patch "Xen x86 DomU PVH support", with the aim to make the review of the code easier. The series can also be found on my git repo: git://xenbits.xen.org/people/royger/freebsd.git pvh_v10 or http://xenbits.xen.org/gitweb/?p=people/royger/freebsd.git;a=shortlog;h=refs/heads/pvh_v10 PVH mode is basically a PV guest inside an HVM container, and shares a great amount of code with PVHVM. The main difference is the way the guest is started, PVH uses the PV start sequence, jumping directly into the kernel entry point in long mode and with page tables set. The main work of this patch consists in setting the environment as similar as possible to what native FreeBSD expects, and then adding hooks to the PV ops when necessary. This new version of the series (v10) addresses the comments from the previous posted version (v9). Major changes between v9 and v10: * Add a identify routine to xenpv instead of attaching it manually from the Xen nexus. * Remove bus routines from xenpci (devices are now attached to xenpv instead). * Add __printflike modifier to xc_printf. From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:00:11 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED09FEEF; Tue, 14 Jan 2014 15:00:10 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 681AA1DC2; Tue, 14 Jan 2014 15:00:09 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92694666" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:48 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:47 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T1-0006J6-TZ; Tue, 14 Jan 2014 14:59:47 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 05/20] xen: rework xen timer so it can be used early in boot process Date: Tue, 14 Jan 2014 15:59:27 +0100 Message-ID: <1389711582-66908-6-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:00:11 -0000 This should not introduce any functional change, and makes the functions suitable to be called before we have actually mapped the vcpu_info struct on a per-cpu basis. --- sys/dev/xen/timer/timer.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c index 354085b..b2f6bcd 100644 --- a/sys/dev/xen/timer/timer.c +++ b/sys/dev/xen/timer/timer.c @@ -230,22 +230,22 @@ xen_fetch_vcpu_tinfo(struct vcpu_time_info *dst, struct vcpu_time_info *src) /** * \brief Get the current time, in nanoseconds, since the hypervisor booted. * + * \param vcpu vcpu_info structure to fetch the time from. + * * \note This function returns the current CPU's idea of this value, unless * it happens to be less than another CPU's previously determined value. */ static uint64_t -xen_fetch_vcpu_time(void) +xen_fetch_vcpu_time(struct vcpu_info *vcpu) { struct vcpu_time_info dst; struct vcpu_time_info *src; uint32_t pre_version; uint64_t now; volatile uint64_t last; - struct vcpu_info *vcpu = DPCPU_GET(vcpu_info); src = &vcpu->time; - critical_enter(); do { pre_version = xen_fetch_vcpu_tinfo(&dst, src); barrier(); @@ -266,16 +266,19 @@ xen_fetch_vcpu_time(void) } } while (!atomic_cmpset_64(&xen_timer_last_time, last, now)); - critical_exit(); - return (now); } static uint32_t xentimer_get_timecount(struct timecounter *tc) { + uint32_t xen_time; - return ((uint32_t)xen_fetch_vcpu_time() & UINT_MAX); + critical_enter(); + xen_time = (uint32_t)xen_fetch_vcpu_time(DPCPU_GET(vcpu_info)) & UINT_MAX; + critical_exit(); + + return (xen_time); } /** @@ -305,7 +308,12 @@ xen_fetch_wallclock(struct timespec *ts) static void xen_fetch_uptime(struct timespec *ts) { - uint64_t uptime = xen_fetch_vcpu_time(); + uint64_t uptime; + + critical_enter(); + uptime = xen_fetch_vcpu_time(DPCPU_GET(vcpu_info)); + critical_exit(); + ts->tv_sec = uptime / NSEC_IN_SEC; ts->tv_nsec = uptime % NSEC_IN_SEC; } @@ -354,7 +362,7 @@ xentimer_intr(void *arg) struct xentimer_softc *sc = (struct xentimer_softc *)arg; struct xentimer_pcpu_data *pcpu = DPCPU_PTR(xentimer_pcpu); - pcpu->last_processed = xen_fetch_vcpu_time(); + pcpu->last_processed = xen_fetch_vcpu_time(DPCPU_GET(vcpu_info)); if (pcpu->timer != 0 && sc->et.et_active) sc->et.et_event_cb(&sc->et, sc->et.et_arg); @@ -415,7 +423,10 @@ xentimer_et_start(struct eventtimer *et, do { if (++i == 60) panic("can't schedule timer"); - next_time = xen_fetch_vcpu_time() + first_in_ns; + critical_enter(); + next_time = xen_fetch_vcpu_time(DPCPU_GET(vcpu_info)) + + first_in_ns; + critical_exit(); error = xentimer_vcpu_start_timer(cpu, next_time); } while (error == -ETIME); -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:00:09 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3136FE4F; Tue, 14 Jan 2014 15:00:09 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C0EC1DC0; Tue, 14 Jan 2014 15:00:07 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92694644" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:46 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:45 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35Sz-0006J6-OP; Tue, 14 Jan 2014 14:59:45 +0000 From: Roger Pau Monne To: , , , , , , Subject: =?UTF-8?q?=5BPATCH=20v10=2001/20=5D=20xen=3A=20add=20PV/PVH=20kernel=20entry=20point?= Date: Tue, 14 Jan 2014 15:59:23 +0100 Message-ID: <1389711582-66908-2-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:00:09 -0000 Add the PV/PVH entry point and the low level functions for PVH initialization. --- sys/amd64/amd64/locore.S | 1 + sys/amd64/amd64/xen-locore.S | 83 +++++++++++++++++++++++++++++ sys/amd64/include/asmacros.h | 26 +++++++++ sys/conf/files.amd64 | 2 + sys/i386/xen/xen_machdep.c | 2 + sys/x86/xen/hvm.c | 1 + sys/x86/xen/pv.c | 119 ++++++++++++++++++++++++++++++++++++++++++ sys/xen/xen-os.h | 4 ++ 8 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 sys/amd64/amd64/xen-locore.S create mode 100644 sys/x86/xen/pv.c diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 55cda3a..4acef97 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -84,5 +84,6 @@ NON_GPROF_ENTRY(btext) .bss ALIGN_DATA /* just to be sure */ + .globl bootstack .space 0x1000 /* space for bootstack - temporary stack */ bootstack: diff --git a/sys/amd64/amd64/xen-locore.S b/sys/amd64/amd64/xen-locore.S new file mode 100644 index 0000000..84287c4 --- /dev/null +++ b/sys/amd64/amd64/xen-locore.S @@ -0,0 +1,83 @@ +/*- + * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2013 Roger Pau Monne + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +#include +#include +#include + +#include +#define __ASSEMBLY__ +#include + +#include "assym.s" + +.section __xen_guest + ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz, "FreeBSD") + ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz, "HEAD") + ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz, "xen-3.0") + ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, .quad, KERNBASE) + ELFNOTE(Xen, XEN_ELFNOTE_PADDR_OFFSET, .quad, KERNBASE) /* Xen honours elf->p_paddr; compensate for this */ + ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .quad, xen_start) + ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .quad, hypercall_page) + ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, .quad, HYPERVISOR_VIRT_START) + ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz, "writable_descriptor_tables|auto_translated_physmap|supervisor_mode_kernel|hvm_callback_vector") + ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz, "yes") + ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, .long, PG_V, PG_V) + ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz, "generic") + ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 0) + ELFNOTE(Xen, XEN_ELFNOTE_BSD_SYMTAB, .asciz, "yes") + + .text +.p2align PAGE_SHIFT, 0x90 /* Hypercall_page needs to be PAGE aligned */ + +NON_GPROF_ENTRY(hypercall_page) + .skip 0x1000, 0x90 /* Fill with "nop"s */ + +NON_GPROF_ENTRY(xen_start) + /* Don't trust what the loader gives for rflags. */ + pushq $PSL_KERNEL + popfq + + /* Parameters for the xen init function */ + movq %rsi, %rdi /* shared_info (arg 1) */ + movq %rsp, %rsi /* xenstack (arg 2) */ + + /* Use our own stack */ + movq $bootstack,%rsp + xorl %ebp, %ebp + + /* u_int64_t hammer_time_xen(start_info_t *si, u_int64_t xenstack); */ + call hammer_time_xen + movq %rax, %rsp /* set up kstack for mi_startup() */ + call mi_startup /* autoconfiguration, mountroot etc */ + + /* NOTREACHED */ +0: hlt + jmp 0b diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h index 1fb592a..ce8dce4 100644 --- a/sys/amd64/include/asmacros.h +++ b/sys/amd64/include/asmacros.h @@ -201,4 +201,30 @@ #endif /* LOCORE */ +#ifdef __STDC__ +#define ELFNOTE(name, type, desctype, descdata...) \ +.pushsection .note.name ; \ + .align 4 ; \ + .long 2f - 1f /* namesz */ ; \ + .long 4f - 3f /* descsz */ ; \ + .long type ; \ +1:.asciz #name ; \ +2:.align 4 ; \ +3:desctype descdata ; \ +4:.align 4 ; \ +.popsection +#else /* !__STDC__, i.e. -traditional */ +#define ELFNOTE(name, type, desctype, descdata) \ +.pushsection .note.name ; \ + .align 4 ; \ + .long 2f - 1f /* namesz */ ; \ + .long 4f - 3f /* descsz */ ; \ + .long type ; \ +1:.asciz "name" ; \ +2:.align 4 ; \ +3:desctype descdata ; \ +4:.align 4 ; \ +.popsection +#endif /* __STDC__ */ + #endif /* !_MACHINE_ASMACROS_H_ */ diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index d1bdcd9..16029d8 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -119,6 +119,7 @@ amd64/amd64/in_cksum.c optional inet | inet6 amd64/amd64/initcpu.c standard amd64/amd64/io.c optional io amd64/amd64/locore.S standard no-obj +amd64/amd64/xen-locore.S optional xenhvm amd64/amd64/machdep.c standard amd64/amd64/mem.c optional mem amd64/amd64/minidump_machdep.c standard @@ -566,3 +567,4 @@ x86/x86/nexus.c standard x86/x86/tsc.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xen | xenhvm +x86/xen/pv.c optional xenhvm diff --git a/sys/i386/xen/xen_machdep.c b/sys/i386/xen/xen_machdep.c index 7049be6..fd575ee 100644 --- a/sys/i386/xen/xen_machdep.c +++ b/sys/i386/xen/xen_machdep.c @@ -89,6 +89,7 @@ IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt), IDTVEC(ofl), int xendebug_flags; start_info_t *xen_start_info; +start_info_t *HYPERVISOR_start_info; shared_info_t *HYPERVISOR_shared_info; xen_pfn_t *xen_machine_phys = machine_to_phys_mapping; xen_pfn_t *xen_phys_machine; @@ -927,6 +928,7 @@ initvalues(start_info_t *startinfo) HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments_notify); #endif xen_start_info = startinfo; + HYPERVISOR_start_info = startinfo; xen_phys_machine = (xen_pfn_t *)startinfo->mfn_list; IdlePTD = (pd_entry_t *)((uint8_t *)startinfo->pt_base + PAGE_SIZE); diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 72811dc..b397721 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -159,6 +159,7 @@ DPCPU_DEFINE(xen_intr_handle_t, ipi_handle[nitems(xen_ipis)]); /** Hypercall table accessed via HYPERVISOR_*_op() methods. */ char *hypercall_stubs; shared_info_t *HYPERVISOR_shared_info; +start_info_t *HYPERVISOR_start_info; #ifdef SMP /*---------------------------- XEN PV IPI Handlers ---------------------------*/ diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c new file mode 100644 index 0000000..5571ecf --- /dev/null +++ b/sys/x86/xen/pv.c @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2004 Christian Limpach. + * Copyright (c) 2004-2006,2008 Kip Macy + * Copyright (c) 2013 Roger Pau Monné + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +/* Native initial function */ +extern u_int64_t hammer_time(u_int64_t, u_int64_t); +/* Xen initial function */ +extern u_int64_t hammer_time_xen(start_info_t *, u_int64_t); + +/* + * First function called by the Xen PVH boot sequence. + * + * Set some Xen global variables and prepare the environment so it is + * as similar as possible to what native FreeBSD init function expects. + */ +u_int64_t +hammer_time_xen(start_info_t *si, u_int64_t xenstack) +{ + u_int64_t physfree; + u_int64_t *PT4 = (u_int64_t *)xenstack; + u_int64_t *PT3 = (u_int64_t *)(xenstack + PAGE_SIZE); + u_int64_t *PT2 = (u_int64_t *)(xenstack + 2 * PAGE_SIZE); + int i; + + if ((si == NULL) || (xenstack == 0)) { + HYPERVISOR_shutdown(SHUTDOWN_crash); + } + + /* We use 3 pages of xen stack for the boot pagetables */ + physfree = xenstack + 3 * PAGE_SIZE - KERNBASE; + + /* Setup Xen global variables */ + HYPERVISOR_start_info = si; + HYPERVISOR_shared_info = + (shared_info_t *)(si->shared_info + KERNBASE); + + /* + * Setup some misc global variables for Xen devices + * + * XXX: devices that need this specific variables should + * be rewritten to fetch this info by themselves from the + * start_info page. + */ + xen_store = (struct xenstore_domain_interface *) + (ptoa(si->store_mfn) + KERNBASE); + + xen_domain_type = XEN_PV_DOMAIN; + vm_guest = VM_GUEST_XEN; + + /* + * Use the stack Xen gives us to build the page tables + * as native FreeBSD expects to find them (created + * by the boot trampoline). + */ + for (i = 0; i < 512; i++) { + /* Each slot of the level 4 pages points to the same level 3 page */ + PT4[i] = ((u_int64_t)&PT3[0]) - KERNBASE; + PT4[i] |= PG_V | PG_RW | PG_U; + + /* Each slot of the level 3 pages points to the same level 2 page */ + PT3[i] = ((u_int64_t)&PT2[0]) - KERNBASE; + PT3[i] |= PG_V | PG_RW | PG_U; + + /* The level 2 page slots are mapped with 2MB pages for 1GB. */ + PT2[i] = i * (2 * 1024 * 1024); + PT2[i] |= PG_V | PG_RW | PG_PS | PG_U; + } + load_cr3(((u_int64_t)&PT4[0]) - KERNBASE); + + /* Now we can jump into the native init function */ + return (hammer_time(0, physfree)); +} diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index 87644e9..c7474d8 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -51,6 +51,10 @@ void force_evtchn_callback(void); extern shared_info_t *HYPERVISOR_shared_info; +extern start_info_t *HYPERVISOR_start_info; + +/* XXX: we need to get rid of this and use HYPERVISOR_start_info directly */ +extern struct xenstore_domain_interface *xen_store; enum xen_domain_type { XEN_NATIVE, /* running on bare hardware */ -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:00:11 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 50BA3EF3; Tue, 14 Jan 2014 15:00:11 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8D0B61DC3; Tue, 14 Jan 2014 15:00:09 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92694686" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:49 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:48 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T2-0006J6-V2; Tue, 14 Jan 2014 14:59:49 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 07/20] xen: implement hook to fetch e820 memory map Date: Tue, 14 Jan 2014 15:59:29 +0100 Message-ID: <1389711582-66908-8-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA1 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:00:11 -0000 --- sys/amd64/amd64/machdep.c | 50 ++++++++++++++++++++++++++---------------- sys/amd64/include/pc/bios.h | 2 + sys/amd64/include/sysarch.h | 1 + sys/x86/xen/pv.c | 25 +++++++++++++++++++++ 4 files changed, 59 insertions(+), 19 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index b8d6dc2..64df89a 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -169,11 +169,15 @@ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); /* Preload data parse function */ static caddr_t native_parse_preload_data(u_int64_t); +/* Native function to fetch and parse the e820 map */ +static void native_parse_memmap(caddr_t, vm_paddr_t *, int *); + /* Default init_ops implementation. */ struct init_ops init_ops = { .parse_preload_data = native_parse_preload_data, .early_delay_init = i8254_init, .early_delay = i8254_delay, + .parse_memmap = native_parse_memmap, }; /* @@ -1403,21 +1407,12 @@ add_physmap_entry(uint64_t base, uint64_t length, vm_paddr_t *physmap, return (1); } -static void -add_smap_entries(struct bios_smap *smapbase, vm_paddr_t *physmap, - int *physmap_idx) +void +bios_add_smap_entries(struct bios_smap *smapbase, u_int32_t smapsize, + vm_paddr_t *physmap, int *physmap_idx) { struct bios_smap *smap, *smapend; - u_int32_t smapsize; - /* - * Memory map from INT 15:E820. - * - * subr_module.c says: - * "Consumer may safely assume that size value precedes data." - * ie: an int32_t immediately precedes smap. - */ - smapsize = *((u_int32_t *)smapbase - 1); smapend = (struct bios_smap *)((uintptr_t)smapbase + smapsize); for (smap = smapbase; smap < smapend; smap++) { @@ -1434,6 +1429,29 @@ add_smap_entries(struct bios_smap *smapbase, vm_paddr_t *physmap, } } +static void +native_parse_memmap(caddr_t kmdp, vm_paddr_t *physmap, int *physmap_idx) +{ + struct bios_smap *smap; + u_int32_t size; + + /* + * Memory map from INT 15:E820. + * + * subr_module.c says: + * "Consumer may safely assume that size value precedes data." + * ie: an int32_t immediately precedes smap. + */ + + smap = (struct bios_smap *)preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_SMAP); + if (smap == NULL) + panic("No BIOS smap info from loader!"); + size = *((u_int32_t *)smap - 1); + + bios_add_smap_entries(smap, size, physmap, physmap_idx); +} + /* * Populate the (physmap) array with base/bound pairs describing the * available physical memory in the system, then test this memory and @@ -1451,19 +1469,13 @@ getmemsize(caddr_t kmdp, u_int64_t first) vm_paddr_t pa, physmap[PHYSMAP_SIZE]; u_long physmem_start, physmem_tunable, memtest; pt_entry_t *pte; - struct bios_smap *smapbase; quad_t dcons_addr, dcons_size; bzero(physmap, sizeof(physmap)); basemem = 0; physmap_idx = 0; - smapbase = (struct bios_smap *)preload_search_info(kmdp, - MODINFO_METADATA | MODINFOMD_SMAP); - if (smapbase == NULL) - panic("No BIOS smap info from loader!"); - - add_smap_entries(smapbase, physmap, &physmap_idx); + init_ops.parse_memmap(kmdp, physmap, &physmap_idx); /* * Find the 'base memory' segment for SMP diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h index e7d568e..95ef703 100644 --- a/sys/amd64/include/pc/bios.h +++ b/sys/amd64/include/pc/bios.h @@ -106,6 +106,8 @@ struct bios_oem { int bios_oem_strings(struct bios_oem *oem, u_char *buffer, size_t maxlen); uint32_t bios_sigsearch(uint32_t start, u_char *sig, int siglen, int paralen, int sigofs); +void bios_add_smap_entries(struct bios_smap *smapbase, u_int32_t smapsize, + vm_paddr_t *physmap, int *physmap_idx); #endif #endif /* _MACHINE_PC_BIOS_H_ */ diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h index 60fa635..084223e 100644 --- a/sys/amd64/include/sysarch.h +++ b/sys/amd64/include/sysarch.h @@ -15,6 +15,7 @@ struct init_ops { caddr_t (*parse_preload_data)(u_int64_t); void (*early_delay_init)(void); void (*early_delay)(int); + void (*parse_memmap)(caddr_t, vm_paddr_t *, int *); }; extern struct init_ops init_ops; diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 0ec4b54..d11bc1a 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -57,8 +58,11 @@ extern u_int64_t hammer_time(u_int64_t, u_int64_t); /* Xen initial function */ extern u_int64_t hammer_time_xen(start_info_t *, u_int64_t); +#define MAX_E820_ENTRIES 128 + /*--------------------------- Forward Declarations ---------------------------*/ static caddr_t xen_pv_parse_preload_data(u_int64_t); +static void xen_pv_parse_memmap(caddr_t, vm_paddr_t *, int *); static void xen_pv_set_init_ops(void); @@ -68,6 +72,7 @@ struct init_ops xen_init_ops = { .parse_preload_data = xen_pv_parse_preload_data, .early_delay_init = xen_delay_init, .early_delay = xen_delay, + .parse_memmap = xen_pv_parse_memmap, }; static struct @@ -88,6 +93,8 @@ static struct {NULL, 0} }; +static struct bios_smap xen_smap[MAX_E820_ENTRIES]; + /*-------------------------------- Xen PV init -------------------------------*/ /* * First function called by the Xen PVH boot sequence. @@ -201,6 +208,24 @@ xen_pv_parse_preload_data(u_int64_t modulep) } static void +xen_pv_parse_memmap(caddr_t kmdp, vm_paddr_t *physmap, int *physmap_idx) +{ + struct xen_memory_map memmap; + u_int32_t size; + int rc; + + /* Fetch the E820 map from Xen */ + memmap.nr_entries = MAX_E820_ENTRIES; + set_xen_guest_handle(memmap.buffer, xen_smap); + rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap); + if (rc) + panic("unable to fetch Xen E820 memory map"); + size = memmap.nr_entries * sizeof(xen_smap[0]); + + bios_add_smap_entries(xen_smap, size, physmap, physmap_idx); +} + +static void xen_pv_set_init_ops(void) { /* Init ops for Xen PV */ -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:00:11 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E6CDEF7; Tue, 14 Jan 2014 15:00:11 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AF9831DC4; Tue, 14 Jan 2014 15:00:09 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92694676" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:49 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:48 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T2-0006J6-Dt; Tue, 14 Jan 2014 14:59:48 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 06/20] xen: implement an early timer for Xen PVH Date: Tue, 14 Jan 2014 15:59:28 +0100 Message-ID: <1389711582-66908-7-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:00:11 -0000 When running as a PVH guest, there's no emulated i8254, so we need to use the Xen PV timer as the early source for DELAY. This change allows for different implementations of the early DELAY function and implements a Xen variant for it. --- sys/amd64/amd64/machdep.c | 6 ++- sys/amd64/include/clock.h | 5 ++ sys/amd64/include/sysarch.h | 2 + sys/conf/files.amd64 | 1 + sys/conf/files.i386 | 1 + sys/dev/xen/timer/timer.c | 33 +++++++++++++ sys/i386/include/clock.h | 5 ++ sys/x86/isa/clock.c | 53 +-------------------- sys/x86/x86/delay.c | 112 +++++++++++++++++++++++++++++++++++++++++++ sys/x86/xen/pv.c | 3 + 10 files changed, 167 insertions(+), 54 deletions(-) create mode 100644 sys/x86/x86/delay.c diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 343f9b8..b8d6dc2 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -172,6 +172,8 @@ static caddr_t native_parse_preload_data(u_int64_t); /* Default init_ops implementation. */ struct init_ops init_ops = { .parse_preload_data = native_parse_preload_data, + .early_delay_init = i8254_init, + .early_delay = i8254_delay, }; /* @@ -1822,10 +1824,10 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) lidt(&r_idt); /* - * Initialize the i8254 before the console so that console + * Initialize the early delay before the console so that console * initialization can use DELAY(). */ - i8254_init(); + init_ops.early_delay_init(); /* * Initialize the console before we print anything out. diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h index d7f7d82..ac8818f 100644 --- a/sys/amd64/include/clock.h +++ b/sys/amd64/include/clock.h @@ -25,6 +25,11 @@ extern int smp_tsc; #endif void i8254_init(void); +void i8254_delay(int); +#ifdef XENHVM +void xen_delay_init(void); +void xen_delay(int); +#endif /* * Driver to clock driver interface. diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h index 58ac8cd..60fa635 100644 --- a/sys/amd64/include/sysarch.h +++ b/sys/amd64/include/sysarch.h @@ -13,6 +13,8 @@ */ struct init_ops { caddr_t (*parse_preload_data)(u_int64_t); + void (*early_delay_init)(void); + void (*early_delay)(int); }; extern struct init_ops init_ops; diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 16029d8..109a796 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -565,6 +565,7 @@ x86/x86/mptable_pci.c optional mptable pci x86/x86/msi.c optional pci x86/x86/nexus.c standard x86/x86/tsc.c standard +x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xen | xenhvm x86/xen/pv.c optional xenhvm diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index eb8697c..790296d 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -600,5 +600,6 @@ x86/x86/mptable_pci.c optional apic native pci x86/x86/msi.c optional apic pci x86/x86/nexus.c standard x86/x86/tsc.c standard +x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xen | xenhvm diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c index b2f6bcd..96372ab 100644 --- a/sys/dev/xen/timer/timer.c +++ b/sys/dev/xen/timer/timer.c @@ -59,6 +59,9 @@ __FBSDID("$FreeBSD$"); #include #include +/* For the declaration of clock_lock */ +#include + #include "clock_if.h" static devclass_t xentimer_devclass; @@ -584,6 +587,36 @@ xentimer_suspend(device_t dev) return (0); } +/* + * Xen delay early init + */ +void xen_delay_init(void) +{ + /* Init the clock lock */ + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE); +} +/* + * Xen PV DELAY function + * + * When running on PVH mode we don't have an emulated i8524, so + * make use of the Xen time info in order to code a simple DELAY + * function that can be used during early boot. + */ +void xen_delay(int n) +{ + uint64_t end_ns; + uint64_t current; + + end_ns = xen_fetch_vcpu_time(&HYPERVISOR_shared_info->vcpu_info[0]); + end_ns += n * NSEC_IN_USEC; + + for (;;) { + current = xen_fetch_vcpu_time(&HYPERVISOR_shared_info->vcpu_info[0]); + if (current >= end_ns) + break; + } +} + static device_method_t xentimer_methods[] = { DEVMETHOD(device_identify, xentimer_identify), DEVMETHOD(device_probe, xentimer_probe), diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index d980ec7..b831445 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -22,6 +22,11 @@ extern int tsc_is_invariant; extern int tsc_perf_stat; void i8254_init(void); +void i8254_delay(int); +#ifdef XENHVM +void xen_delay_init(void); +void xen_delay(int); +#endif /* * Driver to clock driver interface. diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c index a12e175..a5aed1c 100644 --- a/sys/x86/isa/clock.c +++ b/sys/x86/isa/clock.c @@ -247,61 +247,13 @@ getit(void) return ((high << 8) | low); } -#ifndef DELAYDEBUG -static u_int -get_tsc(__unused struct timecounter *tc) -{ - - return (rdtsc32()); -} - -static __inline int -delay_tc(int n) -{ - struct timecounter *tc; - timecounter_get_t *func; - uint64_t end, freq, now; - u_int last, mask, u; - - tc = timecounter; - freq = atomic_load_acq_64(&tsc_freq); - if (tsc_is_invariant && freq != 0) { - func = get_tsc; - mask = ~0u; - } else { - if (tc->tc_quality <= 0) - return (0); - func = tc->tc_get_timecount; - mask = tc->tc_counter_mask; - freq = tc->tc_frequency; - } - now = 0; - end = freq * n / 1000000; - if (func == get_tsc) - sched_pin(); - last = func(tc) & mask; - do { - cpu_spinwait(); - u = func(tc) & mask; - if (u < last) - now += mask - last + u + 1; - else - now += u - last; - last = u; - } while (now < end); - if (func == get_tsc) - sched_unpin(); - return (1); -} -#endif - /* * Wait "n" microseconds. * Relies on timer 1 counting down from (i8254_freq / hz) * Note: timer had better have been programmed before this is first used! */ void -DELAY(int n) +i8254_delay(int n) { int delta, prev_tick, tick, ticks_left; #ifdef DELAYDEBUG @@ -317,9 +269,6 @@ DELAY(int n) } if (state == 1) printf("DELAY(%d)...", n); -#else - if (delay_tc(n)) - return; #endif /* * Read the counter first, so that the rest of the setup overhead is diff --git a/sys/x86/x86/delay.c b/sys/x86/x86/delay.c new file mode 100644 index 0000000..d13c727 --- /dev/null +++ b/sys/x86/x86/delay.c @@ -0,0 +1,112 @@ +/*- + * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 2010 Alexander Motin + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * William Jolitz and Don Ahn. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 + */ + +#include +__FBSDID("$FreeBSD$"); + +/* Generic x86 routines to handle delay */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +static u_int +get_tsc(__unused struct timecounter *tc) +{ + + return (rdtsc32()); +} + +static int +delay_tc(int n) +{ + struct timecounter *tc; + timecounter_get_t *func; + uint64_t end, freq, now; + u_int last, mask, u; + + tc = timecounter; + freq = atomic_load_acq_64(&tsc_freq); + if (tsc_is_invariant && freq != 0) { + func = get_tsc; + mask = ~0u; + } else { + if (tc->tc_quality <= 0) + return (0); + func = tc->tc_get_timecount; + mask = tc->tc_counter_mask; + freq = tc->tc_frequency; + } + now = 0; + end = freq * n / 1000000; + if (func == get_tsc) + sched_pin(); + last = func(tc) & mask; + do { + cpu_spinwait(); + u = func(tc) & mask; + if (u < last) + now += mask - last + u + 1; + else + now += u - last; + last = u; + } while (now < end); + if (func == get_tsc) + sched_unpin(); + return (1); +} + +#ifndef XEN +void +DELAY(int n) +{ + + if (delay_tc(n)) + return; + +#ifdef __amd64__ + init_ops.early_delay(n); +#else + i8254_delay(n); +#endif +} +#endif diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 908b50b..0ec4b54 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -65,6 +66,8 @@ static void xen_pv_set_init_ops(void); /* Xen init_ops implementation. */ struct init_ops xen_init_ops = { .parse_preload_data = xen_pv_parse_preload_data, + .early_delay_init = xen_delay_init, + .early_delay = xen_delay, }; static struct -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:00:09 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4EAFEE74; Tue, 14 Jan 2014 15:00:09 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BFFBC1DC1; Tue, 14 Jan 2014 15:00:07 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92694647" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:47 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:46 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T0-0006J6-BW; Tue, 14 Jan 2014 14:59:46 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 02/20] xen: add macro to detect if running as Dom0 Date: Tue, 14 Jan 2014 15:59:24 +0100 Message-ID: <1389711582-66908-3-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:00:09 -0000 --- sys/xen/xen-os.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index c7474d8..e8a5a99 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -82,6 +82,13 @@ xen_hvm_domain(void) return (xen_domain_type == XEN_HVM_DOMAIN); } +static inline int +xen_initial_domain(void) +{ + return (xen_domain() && HYPERVISOR_start_info && + HYPERVISOR_start_info->flags & SIF_INITDOMAIN); +} + #ifndef xen_mb #define xen_mb() mb() #endif -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:00:13 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C6957FF7; Tue, 14 Jan 2014 15:00:13 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5B8E51DC6; Tue, 14 Jan 2014 15:00:11 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92694698" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:50 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:49 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T3-0006J6-Fw; Tue, 14 Jan 2014 14:59:49 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 08/20] xen: use the same hypercall mechanism for XEN and XENHVM Date: Tue, 14 Jan 2014 15:59:30 +0100 Message-ID: <1389711582-66908-9-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:00:13 -0000 --- sys/amd64/include/xen/hypercall.h | 7 ------- sys/i386/i386/locore.s | 9 +++++++++ sys/i386/include/xen/hypercall.h | 8 -------- sys/x86/xen/hvm.c | 24 ++++++++++-------------- 4 files changed, 19 insertions(+), 29 deletions(-) diff --git a/sys/amd64/include/xen/hypercall.h b/sys/amd64/include/xen/hypercall.h index a1b2a5c..499fb4d 100644 --- a/sys/amd64/include/xen/hypercall.h +++ b/sys/amd64/include/xen/hypercall.h @@ -51,15 +51,8 @@ #define CONFIG_XEN_COMPAT 0x030002 #define __must_check -#ifdef XEN #define HYPERCALL_STR(name) \ "call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)" -#else -#define HYPERCALL_STR(name) \ - "mov $("STR(__HYPERVISOR_##name)" * 32),%%eax; "\ - "add hypercall_stubs(%%rip),%%rax; " \ - "call *%%rax" -#endif #define _hypercall0(type, name) \ ({ \ diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index 68cb430..bd136b1 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -898,3 +898,12 @@ done_pde: #endif ret + +#ifdef XENHVM +/* Xen Hypercall page */ + .text +.p2align PAGE_SHIFT, 0x90 /* Hypercall_page needs to be PAGE aligned */ + +NON_GPROF_ENTRY(hypercall_page) + .skip 0x1000, 0x90 /* Fill with "nop"s */ +#endif diff --git a/sys/i386/include/xen/hypercall.h b/sys/i386/include/xen/hypercall.h index edc13f4..16b5ee2 100644 --- a/sys/i386/include/xen/hypercall.h +++ b/sys/i386/include/xen/hypercall.h @@ -39,16 +39,8 @@ #define ENOXENSYS 38 #define CONFIG_XEN_COMPAT 0x030002 - -#if defined(XEN) #define HYPERCALL_STR(name) \ "call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)" -#else -#define HYPERCALL_STR(name) \ - "mov hypercall_stubs,%%eax; " \ - "add $("STR(__HYPERVISOR_##name)" * 32),%%eax; " \ - "call *%%eax" -#endif #define _hypercall0(type, name) \ ({ \ diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index b397721..9a0411e 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -157,7 +157,7 @@ DPCPU_DEFINE(xen_intr_handle_t, ipi_handle[nitems(xen_ipis)]); /*------------------ Hypervisor Access Shared Memory Regions -----------------*/ /** Hypercall table accessed via HYPERVISOR_*_op() methods. */ -char *hypercall_stubs; +extern char *hypercall_page; shared_info_t *HYPERVISOR_shared_info; start_info_t *HYPERVISOR_start_info; @@ -559,7 +559,7 @@ xen_hvm_cpuid_base(void) * Allocate and fill in the hypcall page. */ static int -xen_hvm_init_hypercall_stubs(void) +xen_hvm_init_hypercall_stubs(enum xen_hvm_init_type init_type) { uint32_t base, regs[4]; int i; @@ -568,7 +568,7 @@ xen_hvm_init_hypercall_stubs(void) if (base == 0) return (ENXIO); - if (hypercall_stubs == NULL) { + if (init_type == XEN_HVM_INIT_COLD) { do_cpuid(base + 1, regs); printf("XEN: Hypervisor version %d.%d detected.\n", regs[0] >> 16, regs[0] & 0xffff); @@ -578,18 +578,9 @@ xen_hvm_init_hypercall_stubs(void) * Find the hypercall pages. */ do_cpuid(base + 2, regs); - - if (hypercall_stubs == NULL) { - size_t call_region_size; - - call_region_size = regs[0] * PAGE_SIZE; - hypercall_stubs = malloc(call_region_size, M_XENHVM, M_NOWAIT); - if (hypercall_stubs == NULL) - panic("Unable to allocate Xen hypercall region"); - } for (i = 0; i < regs[0]; i++) - wrmsr(regs[1], vtophys(hypercall_stubs + i * PAGE_SIZE) + i); + wrmsr(regs[1], vtophys(&hypercall_page + i * PAGE_SIZE) + i); return (0); } @@ -692,7 +683,12 @@ xen_hvm_init(enum xen_hvm_init_type init_type) if (init_type == XEN_HVM_INIT_CANCELLED_SUSPEND) return; - error = xen_hvm_init_hypercall_stubs(); + if (xen_pv_domain()) { + /* hypercall page is already set in the PV case */ + error = 0; + } else { + error = xen_hvm_init_hypercall_stubs(init_type); + } switch (init_type) { case XEN_HVM_INIT_COLD: -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:01:49 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33EF86EC; Tue, 14 Jan 2014 15:01:49 +0000 (UTC) Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AD0D41E71; Tue, 14 Jan 2014 15:01:47 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="90575064" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:50 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:49 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T4-0006J6-0S; Tue, 14 Jan 2014 14:59:50 +0000 From: Roger Pau Monne To: , , , , , , Subject: =?UTF-8?q?=5BPATCH=20v10=2009/20=5D=20xen=3A=20add=20a=20apic=5Fenumerator=20for=20PVH?= Date: Tue, 14 Jan 2014 15:59:31 +0100 Message-ID: <1389711582-66908-10-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:01:49 -0000 --- sys/conf/files.amd64 | 1 + sys/x86/xen/pvcpu_enum.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 0 deletions(-) create mode 100644 sys/x86/xen/pvcpu_enum.c diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 109a796..a3491da 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -569,3 +569,4 @@ x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xen | xenhvm x86/xen/pv.c optional xenhvm +x86/xen/pvcpu_enum.c optional xenhvm diff --git a/sys/x86/xen/pvcpu_enum.c b/sys/x86/xen/pvcpu_enum.c new file mode 100644 index 0000000..0384886 --- /dev/null +++ b/sys/x86/xen/pvcpu_enum.c @@ -0,0 +1,136 @@ +/*- + * Copyright (c) 2003 John Baldwin + * Copyright (c) 2013 Roger Pau Monné + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include +#include + +#include + +static int xenpv_probe(void); +static int xenpv_probe_cpus(void); +static int xenpv_setup_local(void); +static int xenpv_setup_io(void); + +static struct apic_enumerator xenpv_enumerator = { + "Xen PV", + xenpv_probe, + xenpv_probe_cpus, + xenpv_setup_local, + xenpv_setup_io +}; + +/* + * This enumerator will only be registered on PVH + */ +static int +xenpv_probe(void) +{ + return (-100); +} + +/* + * Test each possible vCPU in order to find the number of vCPUs + */ +static int +xenpv_probe_cpus(void) +{ +#ifdef SMP + int i, ret; + + for (i = 0; i < MAXCPU; i++) { + ret = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL); + if (ret >= 0) + cpu_add((i * 2), (i == 0)); + } +#endif + return (0); +} + +/* + * Initialize the vCPU id of the BSP + */ +static int +xenpv_setup_local(void) +{ + PCPU_SET(vcpu_id, 0); + return (0); +} + +/* + * On PVH guests there's no IO APIC + */ +static int +xenpv_setup_io(void) +{ + return (0); +} + +static void +xenpv_register(void *dummy __unused) +{ + if (xen_pv_domain()) { + apic_register_enumerator(&xenpv_enumerator); + } +} +SYSINIT(xenpv_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, xenpv_register, NULL); + +/* + * Setup per-CPU vCPU IDs + */ +static void +xenpv_set_ids(void *dummy) +{ + struct pcpu *pc; + int i; + + CPU_FOREACH(i) { + pc = pcpu_find(i); + pc->pc_vcpu_id = i; + } +} +SYSINIT(xenpv_set_ids, SI_SUB_CPU, SI_ORDER_MIDDLE, xenpv_set_ids, NULL); -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:01:57 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D16DB81D; Tue, 14 Jan 2014 15:01:57 +0000 (UTC) Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 763451E7B; Tue, 14 Jan 2014 15:01:56 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="90575051" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:48 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:47 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T1-0006J6-Ck; Tue, 14 Jan 2014 14:59:47 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 04/20] amd64: introduce hook for custom preload metadata parsers Date: Tue, 14 Jan 2014 15:59:26 +0100 Message-ID: <1389711582-66908-5-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA1 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:01:57 -0000 --- sys/amd64/amd64/machdep.c | 41 ++++++++++++++++------ sys/amd64/include/sysarch.h | 12 ++++++ sys/x86/xen/pv.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 11 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index f0d4ea8..343f9b8 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -126,6 +126,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef PERFMON #include #endif @@ -165,6 +166,14 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp, char *xfpustate, size_t xfpustate_len); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); +/* Preload data parse function */ +static caddr_t native_parse_preload_data(u_int64_t); + +/* Default init_ops implementation. */ +struct init_ops init_ops = { + .parse_preload_data = native_parse_preload_data, +}; + /* * The file "conf/ldscript.amd64" defines the symbol "kernphys". Its value is * the physical address at which the kernel is loaded. @@ -1685,6 +1694,26 @@ do_next: msgbufp = (struct msgbuf *)PHYS_TO_DMAP(phys_avail[pa_indx]); } +static caddr_t +native_parse_preload_data(u_int64_t modulep) +{ + caddr_t kmdp; + + preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); + preload_bootstrap_relocate(KERNBASE); + kmdp = preload_search_by_type("elf kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf64 kernel"); + boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); + kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *) + KERNBASE; +#ifdef DDB + ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t); + ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t); +#endif + + return (kmdp); +} + u_int64_t hammer_time(u_int64_t modulep, u_int64_t physfree) { @@ -1709,17 +1738,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) */ proc_linkup0(&proc0, &thread0); - preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); - preload_bootstrap_relocate(KERNBASE); - kmdp = preload_search_by_type("elf kernel"); - if (kmdp == NULL) - kmdp = preload_search_by_type("elf64 kernel"); - boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); - kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *) + KERNBASE; -#ifdef DDB - ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t); - ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t); -#endif + kmdp = init_ops.parse_preload_data(modulep); /* Init basic tunables, hz etc */ init_param1(); diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h index cd380d4..58ac8cd 100644 --- a/sys/amd64/include/sysarch.h +++ b/sys/amd64/include/sysarch.h @@ -4,3 +4,15 @@ /* $FreeBSD$ */ #include + +/* + * Struct containing pointers to init functions whose + * implementation is run time selectable. Selection can be made, + * for example, based on detection of a BIOS variant or + * hypervisor environment. + */ +struct init_ops { + caddr_t (*parse_preload_data)(u_int64_t); +}; + +extern struct init_ops init_ops; diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index db3b7a3..908b50b 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -46,6 +46,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include @@ -54,6 +56,36 @@ extern u_int64_t hammer_time(u_int64_t, u_int64_t); /* Xen initial function */ extern u_int64_t hammer_time_xen(start_info_t *, u_int64_t); +/*--------------------------- Forward Declarations ---------------------------*/ +static caddr_t xen_pv_parse_preload_data(u_int64_t); + +static void xen_pv_set_init_ops(void); + +/*-------------------------------- Global Data -------------------------------*/ +/* Xen init_ops implementation. */ +struct init_ops xen_init_ops = { + .parse_preload_data = xen_pv_parse_preload_data, +}; + +static struct +{ + const char *ev; + int mask; +} howto_names[] = { + {"boot_askname", RB_ASKNAME}, + {"boot_single", RB_SINGLE}, + {"boot_nosync", RB_NOSYNC}, + {"boot_halt", RB_ASKNAME}, + {"boot_serial", RB_SERIAL}, + {"boot_cdrom", RB_CDROM}, + {"boot_gdb", RB_GDB}, + {"boot_gdb_pause", RB_RESERVED1}, + {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {NULL, 0} +}; + +/*-------------------------------- Xen PV init -------------------------------*/ /* * First function called by the Xen PVH boot sequence. * @@ -118,6 +150,56 @@ hammer_time_xen(start_info_t *si, u_int64_t xenstack) } load_cr3(((u_int64_t)&PT4[0]) - KERNBASE); + /* Set the hooks for early functions that diverge from bare metal */ + xen_pv_set_init_ops(); + /* Now we can jump into the native init function */ return (hammer_time(0, physfree)); } + +/*-------------------------------- PV specific -------------------------------*/ +/* + * Functions to convert the "extra" parameters passed by Xen + * into FreeBSD boot options (from the i386 Xen port). + */ +static char * +xen_setbootenv(char *cmd_line) +{ + char *cmd_line_next; + + /* Skip leading spaces */ + for (; *cmd_line == ' '; cmd_line++); + + for (cmd_line_next = cmd_line; strsep(&cmd_line_next, ",") != NULL;); + return (cmd_line); +} + +static int +xen_boothowto(char *envp) +{ + int i, howto = 0; + + /* get equivalents from the environment */ + for (i = 0; howto_names[i].ev != NULL; i++) + if (getenv(howto_names[i].ev) != NULL) + howto |= howto_names[i].mask; + return (howto); +} + +static caddr_t +xen_pv_parse_preload_data(u_int64_t modulep) +{ + /* Parse the extra boot information given by Xen */ + if (HYPERVISOR_start_info->cmd_line) + kern_envp = xen_setbootenv(HYPERVISOR_start_info->cmd_line); + boothowto |= xen_boothowto(kern_envp); + + return (NULL); +} + +static void +xen_pv_set_init_ops(void) +{ + /* Init ops for Xen PV */ + init_ops = xen_init_ops; +} -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:01:51 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 78930797; Tue, 14 Jan 2014 15:01:51 +0000 (UTC) Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A4DAD1E75; Tue, 14 Jan 2014 15:01:49 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="90575047" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jan 2014 14:59:47 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 09:59:46 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T0-0006J6-SE; Tue, 14 Jan 2014 14:59:46 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 03/20] xen: add and enable Xen console for PVH guests Date: Tue, 14 Jan 2014 15:59:25 +0100 Message-ID: <1389711582-66908-4-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA1 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:01:51 -0000 This adds and enables the console used on XEN kernels. --- sys/conf/files | 4 +- sys/dev/xen/console/console.c | 37 +++++++++++++++++++++++++++++------ sys/dev/xen/console/xencons_ring.c | 15 +++++++++---- sys/i386/include/xen/xen-os.h | 1 - sys/i386/xen/xen_machdep.c | 17 ---------------- sys/x86/xen/pv.c | 4 +++ sys/xen/xen-os.h | 4 +++ 7 files changed, 50 insertions(+), 32 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 33fc75d..bddf021 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2493,8 +2493,8 @@ dev/xe/if_xe_pccard.c optional xe pccard dev/xen/balloon/balloon.c optional xen | xenhvm dev/xen/blkfront/blkfront.c optional xen | xenhvm dev/xen/blkback/blkback.c optional xen | xenhvm -dev/xen/console/console.c optional xen -dev/xen/console/xencons_ring.c optional xen +dev/xen/console/console.c optional xen | xenhvm +dev/xen/console/xencons_ring.c optional xen | xenhvm dev/xen/control/control.c optional xen | xenhvm dev/xen/netback/netback.c optional xen | xenhvm dev/xen/netfront/netfront.c optional xen | xenhvm diff --git a/sys/dev/xen/console/console.c b/sys/dev/xen/console/console.c index 23eaee2..899dffc 100644 --- a/sys/dev/xen/console/console.c +++ b/sys/dev/xen/console/console.c @@ -69,11 +69,14 @@ struct mtx cn_mtx; static char wbuf[WBUF_SIZE]; static char rbuf[RBUF_SIZE]; static int rc, rp; -static unsigned int cnsl_evt_reg; +unsigned int cnsl_evt_reg; static unsigned int wc, wp; /* write_cons, write_prod */ xen_intr_handle_t xen_intr_handle; device_t xencons_dev; +/* Virtual address of the shared console page */ +char *console_page; + #ifdef KDB static int xc_altbrk; #endif @@ -110,9 +113,26 @@ static struct ttydevsw xc_ttydevsw = { .tsw_outwakeup = xcoutwakeup, }; +/*----------------------------- Debug function -------------------------------*/ +#define XC_PRINTF_BUFSIZE 1024 +void +xc_printf(const char *fmt, ...) +{ + static char buf[XC_PRINTF_BUFSIZE]; + __va_list ap; + + va_start(ap, fmt); + vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); + HYPERVISOR_console_write(buf, strlen(buf)); +} + static void xc_cnprobe(struct consdev *cp) { + if (!xen_pv_domain()) + return; + cp->cn_pri = CN_REMOTE; sprintf(cp->cn_name, "%s0", driver_name); } @@ -175,7 +195,7 @@ static void xc_cnputc(struct consdev *dev, int c) { - if (xen_start_info->flags & SIF_INITDOMAIN) + if (xen_initial_domain()) xc_cnputc_dom0(dev, c); else xc_cnputc_domu(dev, c); @@ -206,8 +226,7 @@ xcons_putc(int c) xcons_force_flush(); #endif } - if (cnsl_evt_reg) - __xencons_tx_flush(); + __xencons_tx_flush(); /* inform start path that we're pretty full */ return ((wp - wc) >= WBUF_SIZE - 100) ? TRUE : FALSE; @@ -217,6 +236,10 @@ static void xc_identify(driver_t *driver, device_t parent) { device_t child; + + if (!xen_pv_domain()) + return; + child = BUS_ADD_CHILD(parent, 0, driver_name, 0); device_set_driver(child, driver); device_set_desc(child, "Xen Console"); @@ -245,7 +268,7 @@ xc_attach(device_t dev) cnsl_evt_reg = 1; callout_reset(&xc_callout, XC_POLLTIME, xc_timeout, xccons); - if (xen_start_info->flags & SIF_INITDOMAIN) { + if (xen_initial_domain()) { error = xen_intr_bind_virq(dev, VIRQ_CONSOLE, 0, NULL, xencons_priv_interrupt, NULL, INTR_TYPE_TTY, &xen_intr_handle); @@ -309,7 +332,7 @@ __xencons_tx_flush(void) sz = wp - wc; if (sz > (WBUF_SIZE - WBUF_MASK(wc))) sz = WBUF_SIZE - WBUF_MASK(wc); - if (xen_start_info->flags & SIF_INITDOMAIN) { + if (xen_initial_domain()) { HYPERVISOR_console_io(CONSOLEIO_write, sz, &wbuf[WBUF_MASK(wc)]); wc += sz; } else { @@ -424,7 +447,7 @@ xcons_force_flush(void) { int sz; - if (xen_start_info->flags & SIF_INITDOMAIN) + if (xen_initial_domain()) return; /* Spin until console data is flushed through to the domain controller. */ diff --git a/sys/dev/xen/console/xencons_ring.c b/sys/dev/xen/console/xencons_ring.c index 3701551..d826363 100644 --- a/sys/dev/xen/console/xencons_ring.c +++ b/sys/dev/xen/console/xencons_ring.c @@ -32,9 +32,9 @@ __FBSDID("$FreeBSD$"); #define console_evtchn console.domU.evtchn xen_intr_handle_t console_handle; -extern char *console_page; extern struct mtx cn_mtx; extern device_t xencons_dev; +extern int cnsl_evt_reg; static inline struct xencons_interface * xencons_interface(void) @@ -60,6 +60,8 @@ xencons_ring_send(const char *data, unsigned len) struct xencons_interface *intf; XENCONS_RING_IDX cons, prod; int sent; + struct evtchn_send send = { .port = + HYPERVISOR_start_info->console_evtchn }; intf = xencons_interface(); cons = intf->out_cons; @@ -76,7 +78,10 @@ xencons_ring_send(const char *data, unsigned len) wmb(); intf->out_prod = prod; - xen_intr_signal(console_handle); + if (cnsl_evt_reg) + xen_intr_signal(console_handle); + else + HYPERVISOR_event_channel_op(EVTCHNOP_send, &send); return sent; @@ -125,11 +130,11 @@ xencons_ring_init(void) { int err; - if (!xen_start_info->console_evtchn) + if (!HYPERVISOR_start_info->console_evtchn) return 0; err = xen_intr_bind_local_port(xencons_dev, - xen_start_info->console_evtchn, NULL, xencons_handle_input, NULL, + HYPERVISOR_start_info->console_evtchn, NULL, xencons_handle_input, NULL, INTR_TYPE_MISC | INTR_MPSAFE, &console_handle); if (err) { return err; @@ -145,7 +150,7 @@ void xencons_suspend(void) { - if (!xen_start_info->console_evtchn) + if (!HYPERVISOR_start_info->console_evtchn) return; xen_intr_unbind(&console_handle); diff --git a/sys/i386/include/xen/xen-os.h b/sys/i386/include/xen/xen-os.h index a8fba61..3d1ef04 100644 --- a/sys/i386/include/xen/xen-os.h +++ b/sys/i386/include/xen/xen-os.h @@ -45,7 +45,6 @@ static inline void rep_nop(void) #define cpu_relax() rep_nop() #ifndef XENHVM -void xc_printf(const char *fmt, ...); #ifdef SMP extern int gdtset; diff --git a/sys/i386/xen/xen_machdep.c b/sys/i386/xen/xen_machdep.c index fd575ee..09c01f1 100644 --- a/sys/i386/xen/xen_machdep.c +++ b/sys/i386/xen/xen_machdep.c @@ -186,21 +186,6 @@ xen_boothowto(char *envp) return howto; } -#define XC_PRINTF_BUFSIZE 1024 -void -xc_printf(const char *fmt, ...) -{ - __va_list ap; - int retval; - static char buf[XC_PRINTF_BUFSIZE]; - - va_start(ap, fmt); - retval = vsnprintf(buf, XC_PRINTF_BUFSIZE - 1, fmt, ap); - va_end(ap); - buf[retval] = 0; - (void)HYPERVISOR_console_write(buf, retval); -} - #define XPQUEUE_SIZE 128 @@ -745,8 +730,6 @@ void initvalues(start_info_t *startinfo); struct xenstore_domain_interface; extern struct xenstore_domain_interface *xen_store; -char *console_page; - void * bootmem_alloc(unsigned int size) { diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 5571ecf..db3b7a3 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -70,9 +70,12 @@ hammer_time_xen(start_info_t *si, u_int64_t xenstack) int i; if ((si == NULL) || (xenstack == 0)) { + xc_printf("ERROR: invalid start_info or xen stack, halting\n"); HYPERVISOR_shutdown(SHUTDOWN_crash); } + xc_printf("FreeBSD PVH running on %s\n", si->magic); + /* We use 3 pages of xen stack for the boot pagetables */ physfree = xenstack + 3 * PAGE_SIZE - KERNBASE; @@ -90,6 +93,7 @@ hammer_time_xen(start_info_t *si, u_int64_t xenstack) */ xen_store = (struct xenstore_domain_interface *) (ptoa(si->store_mfn) + KERNBASE); + console_page = (char *)(ptoa(si->console.domU.mfn) + KERNBASE); xen_domain_type = XEN_PV_DOMAIN; vm_guest = VM_GUEST_XEN; diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index e8a5a99..b1aa0a9 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -55,6 +55,7 @@ extern start_info_t *HYPERVISOR_start_info; /* XXX: we need to get rid of this and use HYPERVISOR_start_info directly */ extern struct xenstore_domain_interface *xen_store; +extern char *console_page; enum xen_domain_type { XEN_NATIVE, /* running on bare hardware */ @@ -89,6 +90,9 @@ xen_initial_domain(void) HYPERVISOR_start_info->flags & SIF_INITDOMAIN); } +/* Debug function, prints directly to hypervisor console */ +void xc_printf(const char *, ...) __printflike(1, 2); + #ifndef xen_mb #define xen_mb() mb() #endif -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:03:52 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 02D03A9A; Tue, 14 Jan 2014 15:03:52 +0000 (UTC) Received: from denrei.darkbsd.org (denrei.darkbsd.org [91.121.179.66]) by mx1.freebsd.org (Postfix) with ESMTP id A6D741EA4; Tue, 14 Jan 2014 15:03:51 +0000 (UTC) Received: from denrei.darkbsd.org (localhost [127.0.0.1]) by denrei.darkbsd.org (Postfix) with ESMTP id 45DA67ED; Tue, 14 Jan 2014 16:03:49 +0100 (CET) X-Virus-Scanned: amavisd-new at darkbsd.org Received: from denrei.darkbsd.org ([127.0.0.1]) by denrei.darkbsd.org (denrei.darkbsd.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id r3xsKZzBWfBb; Tue, 14 Jan 2014 16:03:47 +0100 (CET) Received: from fusen (lns-bzn-49f-62-147-170-46.adsl.proxad.net [62.147.170.46]) (Authenticated sender: c.prevotaux@rural-networks.com) by denrei.darkbsd.org (Postfix) with ESMTPSA id 0E8957EC; Tue, 14 Jan 2014 16:03:47 +0100 (CET) Date: Tue, 14 Jan 2014 16:03:46 +0100 From: Christophe Prevotaux To: freebsd-stable@freebsd.org, freebsd-current@freebsd.org Subject: Shared IRQ on ATOM based Soekris net6501 board Message-ID: <20140114160346.2c34db92@fusen> Organization: Rural Networks X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.17; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:03:52 -0000 I have found out that when I use 2 AR9580 mini PCIe board some irq (namely in that case irq18 is shared over 3 devices) I wonder why it is done like this and if this could be something to fix ? Kernel is 30/12/2014 CURRENT ( FreeBSD/amd64) with : options mptable vmstat -i interrupt total rate irq4: uart0 1006 0 irq17: ath0 12857761 2078 irq18: ath1++ 11204038 1811 cpu0:timer 5775445 933 irq256: ahci0 3761 0 irq257: em0:rx 0 43769 7 irq258: em0:tx 0 6667 1 irq259: em0:link 2 0 irq260: em1:rx 0 6157 0 irq261: em1:tx 0 46 0 irq262: em1:link 2 0 irq263: em2:rx 0 21929 3 irq264: em2:tx 0 17803 2 irq265: em2:link 4 0 irq266: em3:rx 0 12326978 1992 irq267: em3:tx 0 13653018 2207 irq268: em3:link 11 0 cpu1:timer 5734729 927 Total 61653126 9966 ACPI BIOS Error (bug): A valid RSDP was not found (20130823/tbxfroot-223) Copyright (c) 1992-2013 The FreeBSD Project. Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved. FreeBSD is a registered trademark of The FreeBSD Foundation. FreeBSD 11.0-CURRENT #1: Wed Jan 8 20:42:57 EST 2014 root@ap01:/usr/obj/usr/src/sys/NET6501 amd64 FreeBSD clang version 3.3 (tags/RELEASE_33/final 183502) 20130610 CPU: Genuine Intel(R) CPU @ 600MHz (600.01-MHz K8-class CPU) Origin = "GenuineIntel" Id = 0x20661 Family = 0x6 Model = 0x26 Stepping = 1 Features=0xbfe9fbff Features2=0x40e3bd AMD Features=0x20100800 AMD Features2=0x1 TSC: P-state invariant, performance statistics real memory = 536739840 (511 MB) avail memory = 496316416 (473 MB) MPTable: Event timer "LAPIC" quality 400 FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs FreeBSD/SMP: 1 package(s) x 1 core(s) x 2 HTT threads cpu0 (BSP): APIC ID: 0 cpu1 (AP/HT): APIC ID: 1 ioapic0: Assuming intbase of 0 ioapic0 irqs 0-23 on motherboard random: initialized kbd0 at kbdmux0 module_register_init: MOD_LOAD (vesa, 0xffffffff80ab3c10, 0) error 19 ACPI BIOS Error (bug): A valid RSDP was not found (20130823/tbxfroot-223) ACPI: Table initialisation failed: AE_NOT_FOUND ACPI: Try disabling either ACPI or apic support. pcib0: pcibus 0 on motherboard pci0: on pcib0 pcib1: irq 16 at device 23.0 on pci0 pci1: on pcib1 pcib2: irq 16 at device 0.0 on pci1 pci2: on pcib2 pci2: at device 0.0 (no driver attached) pci2: at device 0.1 (no driver attached) pci2: at device 0.2 (no driver attached) ohci0: mem 0xa0000b00-0xa0000bff irq 19 at device 2.0 on pci2 usbus0 on ohci0 ohci1: mem 0xa0000c00-0xa0000cff irq 19 at device 2.1 on pci2 usbus1 on ohci1 ohci2: mem 0xa0000d00-0xa0000dff irq 19 at device 2.2 on pci2 usbus2 on ohci2 ehci0: mem 0xa0000e00-0xa0000eff irq 19 at device 2.3 on pci2 usbus3: EHCI version 1.0 usbus3 on ehci0 pci2: at device 2.4 (no driver attached) sdhci_pci0: mem 0xa0004000-0xa00041ff irq 18 at device 4.0 on pci2 sdhci_pci0: 1 slot(s) allocated sdhci_pci1: mem 0xa0004200-0xa00043ff irq 18 at device 4.1 on pci2 sdhci_pci1: 1 slot(s) allocated ahci0: port 0x1020-0x103f mem 0xa0004400-0xa00047ff irq 17 at device 6.0 on pci2 ahci0: AHCI v1.10 with 2 3Gbps ports, Port Multiplier supported ahcich0: at channel 0 on ahci0 ahcich1: at channel 1 on ahci0 ohci3: mem 0xa0004800-0xa00048ff irq 16 at device 8.0 on pci2 usbus4 on ohci3 ohci4: mem 0xa0004900-0xa00049ff irq 16 at device 8.1 on pci2 usbus5 on ohci4 ohci5: mem 0xa0004a00-0xa0004aff irq 16 at device 8.2 on pci2 usbus6 on ohci5 ehci1: mem 0xa0004b00-0xa0004bff irq 16 at device 8.3 on pci2 usbus7: EHCI version 1.0 usbus7 on ehci1 pci2: at device 10.0 (no driver attached) uart2: port 0x1040-0x1047 mem 0xa0004d00-0xa0004d0f irq 19 at device 10.1 on pci2 uart3: port 0x1048-0x104f mem 0xa0004d10-0xa0004d1f irq 19 at device 10.2 on pci2 uart4: port 0x1050-0x1057 mem 0xa0004d20-0xa0004d2f irq 19 at device 10.3 on pci2 uart5: port 0x1058-0x105f mem 0xa0004d30-0xa0004d3f irq 19 at device 10.4 on pci2 pci2: at device 12.0 (no driver attached) pci2: at device 12.1 (no driver attached) pci2: at device 12.2 (no driver attached) pci2: at device 12.3 (no driver attached) pci2: at device 12.4 (no driver attached) pcib3: irq 17 at device 24.0 on pci0 pci3: on pcib3 pcib4: at device 0.0 on pci3 pci4: on pcib4 pcib5: at device 2.0 on pci4 pci5: on pcib5 em0: port 0x2000-0x201f mem 0xa1000000-0xa101ffff,0xa1020000-0xa1023fff irq 19 at device 0.0 on pci5 em0: Using MSIX interrupts with 3 vectors em0: Ethernet address: 00:00:24:cf:05:30 pcib6: at device 3.0 on pci4 pci6: on pcib6 em1: port 0x3000-0x301f mem 0xa2000000-0xa201ffff,0xa2020000-0xa2023fff irq 16 at device 0.0 on pci6 em1: Using MSIX interrupts with 3 vectors em1: Ethernet address: 00:00:24:cf:05:31 pcib7: at device 4.0 on pci4 pci7: on pcib7 pcib8: irq 18 at device 25.0 on pci0 pci8: on pcib8 pcib9: at device 0.0 on pci8 pci9: on pcib9 pcib10: at device 2.0 on pci9 pci10: on pcib10 em2: port 0x4000-0x401f mem 0xa3000000-0xa301ffff,0xa3020000-0xa3023fff irq 16 at device 0.0 on pci10 em2: Using MSIX interrupts with 3 vectors em2: Ethernet address: 00:00:24:cf:05:32 pcib11: at device 3.0 on pci9 pci11: on pcib11 em3: port 0x5000-0x501f mem 0xa4000000-0xa401ffff,0xa4020000-0xa4023fff irq 17 at device 0.0 on pci11 em3: Using MSIX interrupts with 3 vectors em3: Ethernet address: 00:00:24:cf:05:33 pcib12: at device 4.0 on pci9 pci12: on pcib12 pcib13: irq 19 at device 26.0 on pci0 pci13: on pcib13 pcib14: mem 0xa5000000-0xa5003fff irq 19 at device 0.0 on pci13 pci14: on pcib14 pcib15: irq 16 at device 1.0 on pci14 pci15: on pcib15 pcib16: irq 17 at device 2.0 on pci14 pci16: on pcib16 ath0: mem 0xa6000000-0xa601ffff irq 17 at device 0.0 on pci16 ar9300_set_stub_functions: setting stub functions ar9300_set_stub_functions: setting stub functions ar9300_attach: calling ar9300_hw_attach ar9300_hw_attach: calling ar9300_eeprom_attach ar9300_flash_map: unimplemented for now Restoring Cal data from DRAM Restoring Cal data from EEPROM ar9300_hw_attach: ar9300_eeprom_attach returned 0 ath0: RX status length: 48 ath0: RX buffer size: 4096 ath0: TX descriptor length: 128 ath0: TX status length: 36 ath0: TX buffers per descriptor: 4 ar9300_freebsd_setup_x_tx_desc: called, 0x0/0, 0x0/0, 0x0/0 ath0: ath_edma_setup_rxfifo: type=0, FIFO depth = 16 entries ath0: ath_edma_setup_rxfifo: type=1, FIFO depth = 128 entries ath0: [HT] enabling HT modes ath0: [HT] enabling short-GI in 20MHz mode ath0: [HT] 1 stream STBC receive enabled ath0: [HT] 1 stream STBC transmit enabled ath0: [HT] 3 RX streams; 3 TX streams ath0: AR9580 mac 448.4 RF5110 phy 3661.5 ath0: 2GHz radio: 0x0000; 5GHz radio: 0x0000 pcib17: irq 18 at device 3.0 on pci14 pci17: on pcib17 ath1: mem 0xa7000000-0xa701ffff irq 18 at device 0.0 on pci17 ar9300_set_stub_functions: setting stub functions ar9300_set_stub_functions: setting stub functions ar9300_attach: calling ar9300_hw_attach ar9300_hw_attach: calling ar9300_eeprom_attach ar9300_flash_map: unimplemented for now Restoring Cal data from DRAM Restoring Cal data from EEPROM ar9300_hw_attach: ar9300_eeprom_attach returned 0 ath1: RX status length: 48 ath1: RX buffer size: 4096 ath1: TX descriptor length: 128 ath1: TX status length: 36 ath1: TX buffers per descriptor: 4 ar9300_freebsd_setup_x_tx_desc: called, 0x0/0, 0x0/0, 0x0/0 ath1: ath_edma_setup_rxfifo: type=0, FIFO depth = 16 entries ath1: ath_edma_setup_rxfifo: type=1, FIFO depth = 128 entries ath1: [HT] enabling HT modes ath1: [HT] enabling short-GI in 20MHz mode ath1: [HT] 1 stream STBC receive enabled ath1: [HT] 1 stream STBC transmit enabled ath1: [HT] 3 RX streams; 3 TX streams ath1: AR9580 mac 448.4 RF5110 phy 1083.4 ath1: 2GHz radio: 0x0000; 5GHz radio: 0x0000 isab0: at device 31.0 on pci0 isa0: on isab0 cpu0 on motherboard est0: on cpu0 est: CPU supports Enhanced Speedstep, but is not recognized. est: cpu_vendor GenuineIntel, msr 60706070600060a device_attach: est0 attach returned 6 p4tcc0: on cpu0 cpu1 on motherboard est1: on cpu1 est: CPU supports Enhanced Speedstep, but is not recognized. est: cpu_vendor GenuineIntel, msr 60706070600060a device_attach: est1 attach returned 6 p4tcc1: on cpu1 atrtc0: at port 0x70 irq 8 on isa0 Event timer "RTC" frequency 32768 Hz quality 0 attimer0: at port 0x40 on isa0 Timecounter "i8254" frequency 1193182 Hz quality 0 Event timer "i8254" frequency 1193182 Hz quality 100 ppc0: cannot reserve I/O port range uart0: <16550 or compatible> at port 0x3f8-0x3ff irq 4 flags 0x10 on isa0 uart0: console (9600,n,8,1) est0: on cpu0 est: CPU supports Enhanced Speedstep, but is not recognized. est: cpu_vendor GenuineIntel, msr 60706070600060a device_attach: est0 attach returned 6 est1: on cpu1 est: CPU supports Enhanced Speedstep, but is not recognized. est: cpu_vendor GenuineIntel, msr 60706070600060a device_attach: est1 attach returned 6 Timecounters tick every 1.000 msec random: unblocking device. usbus0: 12Mbps Full Speed USB v1.0 usbus1: 12Mbps Full Speed USB v1.0 ugen0.1: <0x8086> at usbus0 uhub0: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus0 ugen1.1: <0x8086> at usbus1 uhub1: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus1 usbus2: 12Mbps Full Speed USB v1.0 usbus3: 480Mbps High Speed USB v2.0 ugen2.1: <0x8086> at usbus2 uhub2: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus2 ugen3.1: at usbus3 uhub3: on usbus3 usbus4: 12Mbps Full Speed USB v1.0 uhub0: 1 port with 1 removable, self powered ugen4.1: <0x8086> at usbus4 uhub4: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus4 uhub1: 1 port with 1 removable, self powered usbus5: 12Mbps Full Speed USB v1.0 uhub2: 1 port with 1 removable, self powered ugen5.1: <0x8086> at usbus5 uhub5: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus5 usbus6: 12Mbps Full Speed USB v1.0 usbus7: 480Mbps High Speed USB v2.0 ugen6.1: <0x8086> at usbus6 uhub6: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus6 uhub4: 1 port with 1 removable, self powered ugen7.1: at usbus7 uhub7: on usbus7 ada0 at ahcich0 bus 0 scbus0 target 0 lun 0 uhub5: 1 port with 1 removable, self powered ada0: uhub6: 1 port with 1 removable, self powered ATA-8 SATA 2.x device ada0: Serial Number 02512013500300001076 ada0: 300.000MB/s transfers (SATA 2.x, UDMA6, PIO 8192bytes) ada0: Command Queueing enabled ada0: 28626MB (58626288 512 byte sectors: 16H 63S/T 16383C) ada0: Previously was known as ad4 SMP: AP CPU #1 Launched! Timecounter "TSC" frequency 600012906 Hz quality 1000 Root mount waiting for: usbus7 usbus3 uhub3: 3 ports with 3 removable, self powered uhub7: 3 ports with 3 removable, self powered Trying to mount root from ufs:/dev/ada0p2 [rw]... Setting hostuuid: c649b9a0-786a-11e3-8e56-000024cf0530. Setting hostid: 0xb1ae740b. Entropy harvesting: interrupts ethernet point_to_point swi. Starting file system checks: /dev/ada0p2: FILE SYSTEM CLEAN; SKIPPING CHECKS /dev/ada0p2: clean, 5902320 free (1056 frags, 737658 blocks, 0.0% fragmentation) Mounting local file systems:. Writing entropy file:. Setting hostname: ap01. bridge0: Ethernet address: 02:b1:ae:74:0b:00 Created clone interfaces: bridge0. wlan0: Ethernet address: 04:f0:21:04:5d:7a ath0: stuck beacon; resetting (bmiss count 4) ath0: stuck beacon; resetting (bmiss count 0) Starting hostapd. Configuration file: /etc/hostapd-wlan0.conf Using interface wlan0 with hwaddr 04:f0:21:04:5d:7a and ssid "R2" wlan1: Ethernet address: 04:f0:21:04:5d:65 Starting hostapd. Configuration file: /etc/hostapd-wlan1.conf Using interface wlan1 with hwaddr 04:f0:21:04:5d:65 and ssid "R1" Starting Network: lo0 em0 em1 em2 em3 ath0 ath1 bridge0. lo0: flags=8049 metric 0 mtu 16384 options=600003 inet6 ::1 prefixlen 128 inet6 fe80::1%lo0 prefixlen 64 scopeid 0x7 inet 127.0.0.1 netmask 0xff000000 nd6 options=21 em0: flags=8843 metric 0 mtu 1500 options=4219b ether 00:00:24:cf:05:30 inet6 fe80::200:24ff:fecf:530%em0 prefixlen 64 scopeid 0x1 nd6 options=23 media: Ethernet autoselect (100baseTX ) status: active em1: flags=8943 metric 0 mtu 1500 options=42098 ether 00:00:24:cf:05:31 inet6 fe80::200:24ff:fecf:531%em1 prefixlen 64 scopeid 0x2 nd6 options=29 media: Ethernet autoselect status: no carrier em2: flags=8943 metric 0 mtu 1500 options=42098 ether 00:00:24:cf:05:32 inet6 fe80::200:24ff:fecf:532%em2 prefixlen 64 scopeid 0x3 nd6 options=29 media: Ethernet autoselect (100baseTX ) status: active em3: flags=8943 metric 0 mtu 1500 options=42098 ether 00:00:24:cf:05:33 inet6 fe80::200:24ff:fecf:533%em3 prefixlen 64 scopeid 0x4 nd6 options=29 media: Ethernet autoselect status: no carrier ath0: flags=8843 metric 0 mtu 2290 ether 04:f0:21:04:5d:7a nd6 options=21 media: IEEE 802.11 Wireless Ethernet autoselect mode 11ng status: running ath1: flags=8843 metric 0 mtu 2290 ether 04:f0:21:04:5d:65 nd6 options=21 media: IEEE 802.11 Wireless Ethernet autoselect mode 11ng status: running bridge0: flags=8843 metric 0 mtu 1500 ether 02:b1:ae:74:0b:00 inet 192.168.1.1 netmask 0xffffff00 broadcast 192.168.1.255 nd6 options=9 id 00:00:00:00:00:00 priority 32768 hellotime 2 fwddelay 15 maxage 20 holdcnt 6 proto rstp maxaddr 2000 timeout 1200 root id 00:00:00:00:00:00 priority 32768 ifcost 0 port 0 member: wlan1 flags=143 ifmaxaddr 0 port 10 priority 128 path cost 22222 member: wlan0 flags=143 ifmaxaddr 0 port 9 priority 128 path cost 22222 member: em3 flags=143 ifmaxaddr 0 port 4 priority 128 path cost 2000000 member: em2 flags=143 ifmaxaddr 0 port 3 priority 128 path cost 200000 member: em1 flags=143 ifmaxaddr 0 port 2 priority 128 path cost 2000000 Starting devd. Starting dhclient. DHCPREQUEST on em0 to 255.255.255.255 port 67 DHCPACK from 10.20.30.5 bound to 10.20.30.135 -- renewal in 129600 seconds. Starting pflogd: add net fe80::: gateway ::1 add net ff02::: gateway ::1 add net ::ffff:0.0.0.0: gateway ::1 add net ::0.0.0.0: gateway ::1 Creating and/or trimming log files. Starting syslogd. No core dumps found. ELF ldconfig path: /lib /usr/lib /usr/lib/compat /usr/local/lib 32-bit compatibility ldconfig path: /usr/lib32 Additional ABI support: linux. Starting casperd. Clearing /tmp (X related). Updating motd:. Mounting late file systems:. Starting ntpd. Starting powerd. Performing sanity check on sshd configuration. Starting sshd. Starting sendmail_submit. Starting sendmail_msp_queue. Starting cron. Starting background file system checks in 60 seconds. Tue Jan 14 08:19:31 EST 2014 em3: link state changed to DOWN em3: link state changed to UP em3: link state changed to DOWN em3: link state changed to UP em3: link state changed to DOWN em3: link state changed to UP em3: link state changed to DOWN em3: link state changed to UP Jan 14 08:36:01 ap01 su: eric to root on /dev/pts/0 Jan 14 08:38:30 ap01 su: nighty to root on /dev/pts/3 Jan 14 08:40:06 ap01 login: ROOT LOGIN (root) ON ttyu0 Jan 14 09:29:27 ap01 sshd[2264]: error: PAM: authentication error for nighty from 192.168.8.12 Jan 14 09:29:29 ap01 sshd[2264]: error: PAM: authentication error for nighty from 192.168.8.12 Jan 14 09:29:38 ap01 su: nighty to root on /dev/pts/3 -- ===================================================== Christophe Prevotaux ===================================================== From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:25:25 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4BC3616; Tue, 14 Jan 2014 15:25:25 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 288061089; Tue, 14 Jan 2014 15:25:23 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92709101" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:21 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:21 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T6-0006J6-L4; Tue, 14 Jan 2014 14:59:52 +0000 From: Roger Pau Monne To: , , , , , , Subject: =?UTF-8?q?=5BPATCH=20v10=2014/20=5D=20xen=3A=20introduce=20xenpv=20bus=20and=20a=20dummy=20pvcpu=20device?= Date: Tue, 14 Jan 2014 15:59:36 +0100 Message-ID: <1389711582-66908-15-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-DLP: MIA1 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:25:25 -0000 Since Xen PVH guests doesn't have ACPI, we need to create a dummy bus so top level Xen devices can attach to it (instead of attaching directly to the nexus) and a pvcpu device that will be used to fill the pcpu->pc_device field. --- sys/conf/files.amd64 | 1 + sys/conf/files.i386 | 1 + sys/x86/xen/xenpv.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 0 deletions(-) create mode 100644 sys/x86/xen/xenpv.c diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index a3491da..d7c98cc 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -570,3 +570,4 @@ x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xen | xenhvm x86/xen/pv.c optional xenhvm x86/xen/pvcpu_enum.c optional xenhvm +x86/xen/xenpv.c optional xenhvm diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 790296d..81142e3 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -603,3 +603,4 @@ x86/x86/tsc.c standard x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xen | xenhvm +x86/xen/xenpv.c optional xen | xenhvm diff --git a/sys/x86/xen/xenpv.c b/sys/x86/xen/xenpv.c new file mode 100644 index 0000000..e1282cf --- /dev/null +++ b/sys/x86/xen/xenpv.c @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2013 Roger Pau Monné + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +static devclass_t xenpv_devclass; + +static void +xenpv_identify(driver_t *driver, device_t parent) +{ + if (!xen_domain()) + return; + + /* Make sure there's only one xenpv device. */ + if (devclass_get_device(xenpv_devclass, 0)) + return; + + /* + * Use a high order number so xenpv is attached after + * xenpci on HVM guests. + */ + BUS_ADD_CHILD(parent, 200, "xenpv", 0); +} + +static int +xenpv_probe(device_t dev) +{ + + device_set_desc(dev, "Xen PV bus"); + device_quiet(dev); + return (BUS_PROBE_NOWILDCARD); +} + +static int +xenpv_attach(device_t dev) +{ + device_t child; + + if (xen_hvm_domain()) { + device_t xenpci; + devclass_t dc; + + /* Make sure xenpci has been attached */ + dc = devclass_find("xenpci"); + if (dc == NULL) + panic("unable to find xenpci devclass"); + + xenpci = devclass_get_device(dc, 0); + if (xenpci == NULL) + panic("unable to find xenpci device"); + + if (!device_is_attached(xenpci)) + panic("trying to attach xenpv before xenpci"); + } + + /* + * Let our child drivers identify any child devices that they + * can find. Once that is done attach any devices that we + * found. + */ + bus_generic_probe(dev); + bus_generic_attach(dev); + + if (!devclass_get_device(devclass_find("isa"), 0)) { + child = BUS_ADD_CHILD(dev, 0, "isa", 0); + if (child == NULL) + panic("xenpv_attach isa"); + device_probe_and_attach(child); + } + + return 0; +} + +static device_method_t xenpv_methods[] = { + /* Device interface */ + DEVMETHOD(device_identify, xenpv_identify), + DEVMETHOD(device_probe, xenpv_probe), + DEVMETHOD(device_attach, xenpv_attach), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + + /* Bus interface */ + DEVMETHOD(bus_add_child, bus_generic_add_child), + + DEVMETHOD_END +}; + +static driver_t xenpv_driver = { + "xenpv", + xenpv_methods, + 1, /* no softc */ +}; + +DRIVER_MODULE(xenpv, nexus, xenpv_driver, xenpv_devclass, 0, 0); -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:25:30 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC9D671B; Tue, 14 Jan 2014 15:25:30 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5BC4F108B; Tue, 14 Jan 2014 15:25:29 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92709156" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:28 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:28 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T9-0006J6-Cw; Tue, 14 Jan 2014 14:59:55 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 19/20] xen: changes to gnttab for PVH Date: Tue, 14 Jan 2014 15:59:41 +0100 Message-ID: <1389711582-66908-20-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:25:31 -0000 --- sys/xen/gnttab.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/xen/gnttab.c b/sys/xen/gnttab.c index 03c32b7..6949be5 100644 --- a/sys/xen/gnttab.c +++ b/sys/xen/gnttab.c @@ -25,6 +25,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -607,6 +608,7 @@ gnttab_resume(void) { int error; unsigned int max_nr_gframes, nr_gframes; + void *alloc_mem; nr_gframes = nr_grant_frames; max_nr_gframes = max_nr_grant_frames(); @@ -614,11 +616,25 @@ gnttab_resume(void) return (ENOSYS); if (!resume_frames) { - error = xenpci_alloc_space(PAGE_SIZE * max_nr_gframes, - &resume_frames); - if (error) { - printf("error mapping gnttab share frames\n"); - return (error); + if (xen_pv_domain()) { + /* + * This is a waste of physical memory, + * we should use ballooned pages instead, + * but it will do for now. + */ + alloc_mem = contigmalloc(max_nr_gframes * PAGE_SIZE, + M_DEVBUF, M_NOWAIT, 0, + ULONG_MAX, PAGE_SIZE, 0); + KASSERT((alloc_mem != NULL), + ("unable to alloc memory for gnttab")); + resume_frames = vtophys(alloc_mem); + } else { + error = xenpci_alloc_space(PAGE_SIZE * max_nr_gframes, + &resume_frames); + if (error) { + printf("error mapping gnttab share frames\n"); + return (error); + } } } -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:25:37 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8AAA8842; Tue, 14 Jan 2014 15:25:37 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0ED37109A; Tue, 14 Jan 2014 15:25:35 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92709209" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:35 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:34 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T7-0006J6-6J; Tue, 14 Jan 2014 14:59:53 +0000 From: Roger Pau Monne To: , , , , , , Subject: =?UTF-8?q?=5BPATCH=20v10=2015/20=5D=20xen=3A=20create=20a=20PV=20CPU=20device=20for=20PVH=20guests?= Date: Tue, 14 Jan 2014 15:59:37 +0100 Message-ID: <1389711582-66908-16-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:25:37 -0000 Since there's no ACPI on PVH guests, we need to create a dummy CPU device in order to fill the pcpu->pc_device field. --- sys/conf/files | 1 + sys/dev/xen/pvcpu/pvcpu.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) create mode 100644 sys/dev/xen/pvcpu/pvcpu.c diff --git a/sys/conf/files b/sys/conf/files index bddf021..178d5e2 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2500,6 +2500,7 @@ dev/xen/netback/netback.c optional xen | xenhvm dev/xen/netfront/netfront.c optional xen | xenhvm dev/xen/xenpci/xenpci.c optional xenpci dev/xen/timer/timer.c optional xen | xenhvm +dev/xen/pvcpu/pvcpu.c optional xen | xenhvm dev/xl/if_xl.c optional xl pci dev/xl/xlphy.c optional xl pci fs/deadfs/dead_vnops.c standard diff --git a/sys/dev/xen/pvcpu/pvcpu.c b/sys/dev/xen/pvcpu/pvcpu.c new file mode 100644 index 0000000..7f3697c --- /dev/null +++ b/sys/dev/xen/pvcpu/pvcpu.c @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2013 Roger Pau Monné + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +/* + * Dummy Xen cpu device + * + * Since there's no ACPI on PVH guests, we need to create a dummy + * CPU device in order to fill the pcpu->pc_device field. + */ + +static void +xenpvcpu_identify(driver_t *driver, device_t parent) +{ + device_t child; + int i; + + /* Only attach to PV guests, HVM guests use the ACPI CPU devices */ + if (!xen_pv_domain()) + return; + + CPU_FOREACH(i) { + child = BUS_ADD_CHILD(parent, 0, "pvcpu", i); + if (child == NULL) + panic("xenpvcpu_identify add pvcpu"); + } +} + +static int +xenpvcpu_probe(device_t dev) +{ + + device_set_desc(dev, "Xen PV CPU"); + return (BUS_PROBE_NOWILDCARD); +} + +static int +xenpvcpu_attach(device_t dev) +{ + struct pcpu *pc; + int cpu; + + cpu = device_get_unit(dev); + pc = pcpu_find(cpu); + pc->pc_device = dev; + return (0); +} + +static device_method_t xenpvcpu_methods[] = { + DEVMETHOD(device_identify, xenpvcpu_identify), + DEVMETHOD(device_probe, xenpvcpu_probe), + DEVMETHOD(device_attach, xenpvcpu_attach), + + DEVMETHOD_END +}; + +static driver_t xenpvcpu_driver = { + "pvcpu", + xenpvcpu_methods, + 0, +}; + +devclass_t xenpvcpu_devclass; + +DRIVER_MODULE(xenpvcpu, xenpv, xenpvcpu_driver, xenpvcpu_devclass, 0, 0); +MODULE_DEPEND(xenpvcpu, xenpv, 1, 1, 1); -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:25:49 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A64D4A9A; Tue, 14 Jan 2014 15:25:49 +0000 (UTC) Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A935F10AB; Tue, 14 Jan 2014 15:25:46 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="90590737" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:44 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:39 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T7-0006J6-Ph; Tue, 14 Jan 2014 14:59:53 +0000 From: Roger Pau Monne To: , , , , , , Subject: =?UTF-8?q?=5BPATCH=20v10=2016/20=5D=20xen=3A=20create=20a=20Xen=20nexus=20to=20use=20in=20PV/PVH?= Date: Tue, 14 Jan 2014 15:59:38 +0100 Message-ID: <1389711582-66908-17-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-DLP: MIA1 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:25:49 -0000 Introduce a Xen specific nexus that is going to be in charge for attaching Xen specific devices. --- sys/conf/files.amd64 | 1 + sys/conf/files.i386 | 1 + sys/dev/xen/console/console.c | 2 +- sys/dev/xen/timer/timer.c | 4 +- sys/dev/xen/xenpci/xenpci.c | 64 ++--------------------------------- sys/x86/xen/xen_nexus.c | 76 +++++++++++++++++++++++++++++++++++++++++ sys/xen/xenstore/xenstore.c | 6 +--- 7 files changed, 85 insertions(+), 69 deletions(-) create mode 100644 sys/x86/xen/xen_nexus.c diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index d7c98cc..f378983 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -571,3 +571,4 @@ x86/xen/xen_intr.c optional xen | xenhvm x86/xen/pv.c optional xenhvm x86/xen/pvcpu_enum.c optional xenhvm x86/xen/xenpv.c optional xenhvm +x86/xen/xen_nexus.c optional xenhvm diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 81142e3..02887a33 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -604,3 +604,4 @@ x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xen | xenhvm x86/xen/xenpv.c optional xen | xenhvm +x86/xen/xen_nexus.c optional xen | xenhvm diff --git a/sys/dev/xen/console/console.c b/sys/dev/xen/console/console.c index 899dffc..91538fe 100644 --- a/sys/dev/xen/console/console.c +++ b/sys/dev/xen/console/console.c @@ -462,4 +462,4 @@ xcons_force_flush(void) } } -DRIVER_MODULE(xc, nexus, xc_driver, xc_devclass, 0, 0); +DRIVER_MODULE(xc, xenpv, xc_driver, xc_devclass, 0, 0); diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c index 96372ab..f16f5a5 100644 --- a/sys/dev/xen/timer/timer.c +++ b/sys/dev/xen/timer/timer.c @@ -636,5 +636,5 @@ static driver_t xentimer_driver = { sizeof(struct xentimer_softc), }; -DRIVER_MODULE(xentimer, nexus, xentimer_driver, xentimer_devclass, 0, 0); -MODULE_DEPEND(xentimer, nexus, 1, 1, 1); +DRIVER_MODULE(xentimer, xenpv, xentimer_driver, xentimer_devclass, 0, 0); +MODULE_DEPEND(xentimer, xenpv, 1, 1, 1); diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c index dd2ad92..e334051 100644 --- a/sys/dev/xen/xenpci/xenpci.c +++ b/sys/dev/xen/xenpci/xenpci.c @@ -51,8 +51,6 @@ __FBSDID("$FreeBSD$"); extern void xen_intr_handle_upcall(struct trapframe *trap_frame); -static device_t nexus; - /* * This is used to find our platform device instance. */ @@ -188,36 +186,6 @@ xenpci_alloc_space(size_t sz, vm_paddr_t *pa) } } -static struct resource * -xenpci_alloc_resource(device_t dev, device_t child, int type, int *rid, - u_long start, u_long end, u_long count, u_int flags) -{ - return (BUS_ALLOC_RESOURCE(nexus, child, type, rid, start, - end, count, flags)); -} - - -static int -xenpci_release_resource(device_t dev, device_t child, int type, int rid, - struct resource *r) -{ - return (BUS_RELEASE_RESOURCE(nexus, child, type, rid, r)); -} - -static int -xenpci_activate_resource(device_t dev, device_t child, int type, int rid, - struct resource *r) -{ - return (BUS_ACTIVATE_RESOURCE(nexus, child, type, rid, r)); -} - -static int -xenpci_deactivate_resource(device_t dev, device_t child, int type, - int rid, struct resource *r) -{ - return (BUS_DEACTIVATE_RESOURCE(nexus, child, type, rid, r)); -} - /* * Probe - just check device ID. */ @@ -229,7 +197,7 @@ xenpci_probe(device_t dev) return (ENXIO); device_set_desc(dev, "Xen Platform Device"); - return (bus_generic_probe(dev)); + return (BUS_PROBE_DEFAULT); } /* @@ -239,20 +207,8 @@ static int xenpci_attach(device_t dev) { struct xenpci_softc *scp = device_get_softc(dev); - devclass_t dc; int error; - /* - * Find and record nexus0. Since we are not really on the - * PCI bus, all resource operations are directed to nexus - * instead of through our parent. - */ - if ((dc = devclass_find("nexus")) == 0 - || (nexus = devclass_get_device(dc, 0)) == 0) { - device_printf(dev, "unable to find nexus."); - return (ENOENT); - } - error = xenpci_allocate_resources(dev); if (error) { device_printf(dev, "xenpci_allocate_resources failed(%d).\n", @@ -270,7 +226,7 @@ xenpci_attach(device_t dev) goto errexit; } - return (bus_generic_attach(dev)); + return (0); errexit: /* @@ -309,16 +265,10 @@ xenpci_detach(device_t dev) } static int -xenpci_suspend(device_t dev) -{ - return (bus_generic_suspend(dev)); -} - -static int xenpci_resume(device_t dev) { xen_hvm_set_callback(dev); - return (bus_generic_resume(dev)); + return (0); } static device_method_t xenpci_methods[] = { @@ -326,16 +276,8 @@ static device_method_t xenpci_methods[] = { DEVMETHOD(device_probe, xenpci_probe), DEVMETHOD(device_attach, xenpci_attach), DEVMETHOD(device_detach, xenpci_detach), - DEVMETHOD(device_suspend, xenpci_suspend), DEVMETHOD(device_resume, xenpci_resume), - /* Bus interface */ - DEVMETHOD(bus_add_child, bus_generic_add_child), - DEVMETHOD(bus_alloc_resource, xenpci_alloc_resource), - DEVMETHOD(bus_release_resource, xenpci_release_resource), - DEVMETHOD(bus_activate_resource, xenpci_activate_resource), - DEVMETHOD(bus_deactivate_resource, xenpci_deactivate_resource), - { 0, 0 } }; diff --git a/sys/x86/xen/xen_nexus.c b/sys/x86/xen/xen_nexus.c new file mode 100644 index 0000000..c5b7c43 --- /dev/null +++ b/sys/x86/xen/xen_nexus.c @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2013 Roger Pau Monné + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +/* + * Xen nexus(4) driver. + */ +static int +nexus_xen_probe(device_t dev) +{ + if (!xen_pv_domain()) + return (ENXIO); + + return (BUS_PROBE_DEFAULT); +} + +static int +nexus_xen_attach(device_t dev) +{ + + nexus_init_resources(); + bus_generic_probe(dev); + bus_generic_attach(dev); + + return 0; +} + +static device_method_t nexus_xen_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, nexus_xen_probe), + DEVMETHOD(device_attach, nexus_xen_attach), + + { 0, 0 } +}; + +DEFINE_CLASS_1(nexus, nexus_xen_driver, nexus_xen_methods, 1, nexus_driver); +static devclass_t nexus_devclass; + +DRIVER_MODULE(nexus_xen, root, nexus_xen_driver, nexus_devclass, 0, 0); diff --git a/sys/xen/xenstore/xenstore.c b/sys/xen/xenstore/xenstore.c index d404862..b5cf413 100644 --- a/sys/xen/xenstore/xenstore.c +++ b/sys/xen/xenstore/xenstore.c @@ -1261,11 +1261,7 @@ static device_method_t xenstore_methods[] = { DEFINE_CLASS_0(xenstore, xenstore_driver, xenstore_methods, 0); static devclass_t xenstore_devclass; -#ifdef XENHVM -DRIVER_MODULE(xenstore, xenpci, xenstore_driver, xenstore_devclass, 0, 0); -#else -DRIVER_MODULE(xenstore, nexus, xenstore_driver, xenstore_devclass, 0, 0); -#endif +DRIVER_MODULE(xenstore, xenpv, xenstore_driver, xenstore_devclass, 0, 0); /*------------------------------- Sysctl Data --------------------------------*/ /* XXX Shouldn't the node be somewhere else? */ -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:25:39 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A988A8B2; Tue, 14 Jan 2014 15:25:39 +0000 (UTC) Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C449109C; Tue, 14 Jan 2014 15:25:36 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="90590385" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:19 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:19 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T9-0006J6-Ts; Tue, 14 Jan 2014 14:59:55 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 20/20] isa: allow ISA bus to attach to xenpv device Date: Tue, 14 Jan 2014 15:59:42 +0100 Message-ID: <1389711582-66908-21-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:25:39 -0000 --- sys/x86/isa/isa.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/sys/x86/isa/isa.c b/sys/x86/isa/isa.c index 1a57137..9287ff2 100644 --- a/sys/x86/isa/isa.c +++ b/sys/x86/isa/isa.c @@ -241,3 +241,6 @@ isa_release_resource(device_t bus, device_t child, int type, int rid, * On this platform, isa can also attach to the legacy bus. */ DRIVER_MODULE(isa, legacy, isa_driver, isa_devclass, 0, 0); +#ifdef XENHVM +DRIVER_MODULE(isa, xenpv, isa_driver, isa_devclass, 0, 0); +#endif -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:25:52 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E19EDBBD; Tue, 14 Jan 2014 15:25:52 +0000 (UTC) Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D412710B2; Tue, 14 Jan 2014 15:25:50 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="90590768" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:47 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:45 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T5-0006J6-21; Tue, 14 Jan 2014 14:59:51 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 11/20] xen: changes to hvm code in order to support PVH guests Date: Tue, 14 Jan 2014 15:59:33 +0100 Message-ID: <1389711582-66908-12-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA1 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:25:53 -0000 On PVH we don't need to init the shared info page, or disable emulated devices. Also, make sure PV IPIs are set before starting the APs. --- sys/x86/xen/hvm.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 9a0411e..fb1ed79 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -523,7 +523,7 @@ xen_setup_cpus(void) { int i; - if (!xen_hvm_domain() || !xen_vector_callback_enabled) + if (!xen_vector_callback_enabled) return; #ifdef __amd64__ @@ -712,10 +712,13 @@ xen_hvm_init(enum xen_hvm_init_type init_type) } xen_vector_callback_enabled = 0; - xen_domain_type = XEN_HVM_DOMAIN; - xen_hvm_init_shared_info_page(); xen_hvm_set_callback(NULL); - xen_hvm_disable_emulated_devices(); + + if (!xen_pv_domain()) { + xen_domain_type = XEN_HVM_DOMAIN; + xen_hvm_init_shared_info_page(); + xen_hvm_disable_emulated_devices(); + } } void @@ -746,6 +749,9 @@ xen_set_vcpu_id(void) struct pcpu *pc; int i; + if (!xen_hvm_domain()) + return; + /* Set vcpu_id to acpi_id */ CPU_FOREACH(i) { pc = pcpu_find(i); @@ -789,7 +795,8 @@ xen_hvm_cpu_init(void) SYSINIT(xen_hvm_init, SI_SUB_HYPERVISOR, SI_ORDER_FIRST, xen_hvm_sysinit, NULL); #ifdef SMP -SYSINIT(xen_setup_cpus, SI_SUB_SMP, SI_ORDER_FIRST, xen_setup_cpus, NULL); +/* We need to setup IPIs before APs are started */ +SYSINIT(xen_setup_cpus, SI_SUB_SMP-1, SI_ORDER_FIRST, xen_setup_cpus, NULL); #endif SYSINIT(xen_hvm_cpu_init, SI_SUB_INTR, SI_ORDER_FIRST, xen_hvm_cpu_init, NULL); SYSINIT(xen_set_vcpu_id, SI_SUB_CPU, SI_ORDER_ANY, xen_set_vcpu_id, NULL); -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:25:59 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08856DAD; Tue, 14 Jan 2014 15:25:59 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 63D2A10BA; Tue, 14 Jan 2014 15:25:57 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92709345" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:56 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T8-0006J6-Bu; Tue, 14 Jan 2014 14:59:54 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 17/20] xen: add shutdown hook for PVH Date: Tue, 14 Jan 2014 15:59:39 +0100 Message-ID: <1389711582-66908-18-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA1 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:25:59 -0000 Add the PV shutdown hook to PVH. --- sys/dev/xen/control/control.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index bc0609d..78894ba 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -316,21 +316,6 @@ xctrl_suspend() EVENTHANDLER_INVOKE(power_resume); } -static void -xen_pv_shutdown_final(void *arg, int howto) -{ - /* - * Inform the hypervisor that shutdown is complete. - * This is not necessary in HVM domains since Xen - * emulates ACPI in that mode and FreeBSD's ACPI - * support will request this transition. - */ - if (howto & (RB_HALT | RB_POWEROFF)) - HYPERVISOR_shutdown(SHUTDOWN_poweroff); - else - HYPERVISOR_shutdown(SHUTDOWN_reboot); -} - #else /* HVM mode suspension. */ @@ -440,6 +425,21 @@ xctrl_crash() panic("Xen directed crash"); } +static void +xen_pv_shutdown_final(void *arg, int howto) +{ + /* + * Inform the hypervisor that shutdown is complete. + * This is not necessary in HVM domains since Xen + * emulates ACPI in that mode and FreeBSD's ACPI + * support will request this transition. + */ + if (howto & (RB_HALT | RB_POWEROFF)) + HYPERVISOR_shutdown(SHUTDOWN_poweroff); + else + HYPERVISOR_shutdown(SHUTDOWN_reboot); +} + /*------------------------------ Event Reception -----------------------------*/ static void xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int len) @@ -522,10 +522,9 @@ xctrl_attach(device_t dev) xctrl->xctrl_watch.callback_data = (uintptr_t)xctrl; xs_register_watch(&xctrl->xctrl_watch); -#ifndef XENHVM - EVENTHANDLER_REGISTER(shutdown_final, xen_pv_shutdown_final, NULL, - SHUTDOWN_PRI_LAST); -#endif + if (xen_pv_domain()) + EVENTHANDLER_REGISTER(shutdown_final, xen_pv_shutdown_final, NULL, + SHUTDOWN_PRI_LAST); return (0); } -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:25:44 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7B839BF; Tue, 14 Jan 2014 15:25:44 +0000 (UTC) Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3756510A6; Tue, 14 Jan 2014 15:25:41 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="90590647" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:38 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:36 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T5-0006J6-It; Tue, 14 Jan 2014 14:59:51 +0000 From: Roger Pau Monne To: , , , , , , Subject: =?UTF-8?q?=5BPATCH=20v10=2012/20=5D=20xen=3A=20add=20a=20hook=20to=20perform=20AP=20startup?= Date: Tue, 14 Jan 2014 15:59:34 +0100 Message-ID: <1389711582-66908-13-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-DLP: MIA1 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:25:44 -0000 AP startup on PVH follows the PV method, so we need to add a hook in order to diverge from bare metal. --- sys/amd64/amd64/mp_machdep.c | 14 +++--- sys/amd64/include/cpu.h | 1 + sys/amd64/include/smp.h | 1 + sys/x86/xen/hvm.c | 12 +++++- sys/x86/xen/pv.c | 85 ++++++++++++++++++++++++++++++++++++++++++ sys/xen/pv.h | 32 ++++++++++++++++ 6 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 sys/xen/pv.h diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 4af4f8f..17e957d 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -90,7 +90,7 @@ extern struct pcpu __pcpu[]; /* AP uses this during bootstrap. Do not staticize. */ char *bootSTK; -static int bootAP; +int bootAP; /* Free these after use */ void *bootstacks[MAXCPU]; @@ -124,7 +124,8 @@ static u_long *ipi_hardclock_counts[MAXCPU]; /* Default cpu_ops implementation. */ struct cpu_ops cpu_ops = { - .ipi_vectored = lapic_ipi_vectored + .ipi_vectored = lapic_ipi_vectored, + .start_all_aps = native_start_all_aps, }; extern inthand_t IDTVEC(fast_syscall), IDTVEC(fast_syscall32); @@ -138,7 +139,7 @@ extern int pmap_pcid_enabled; static volatile cpuset_t ipi_nmi_pending; /* used to hold the AP's until we are ready to release them */ -static struct mtx ap_boot_mtx; +struct mtx ap_boot_mtx; /* Set to 1 once we're ready to let the APs out of the pen. */ static volatile int aps_ready = 0; @@ -165,7 +166,6 @@ static int cpu_cores; /* cores per package */ static void assign_cpu_ids(void); static void set_interrupt_apic_ids(void); -static int start_all_aps(void); static int start_ap(int apic_id); static void release_aps(void *dummy); @@ -569,7 +569,7 @@ cpu_mp_start(void) assign_cpu_ids(); /* Start each Application Processor */ - start_all_aps(); + cpu_ops.start_all_aps(); set_interrupt_apic_ids(); } @@ -908,8 +908,8 @@ assign_cpu_ids(void) /* * start each AP in our list */ -static int -start_all_aps(void) +int +native_start_all_aps(void) { vm_offset_t va = boot_address + KERNBASE; u_int64_t *pt4, *pt3, *pt2; diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h index 3c5d5df..98dc3e0 100644 --- a/sys/amd64/include/cpu.h +++ b/sys/amd64/include/cpu.h @@ -64,6 +64,7 @@ struct cpu_ops { void (*cpu_init)(void); void (*cpu_resume)(void); void (*ipi_vectored)(u_int, int); + int (*start_all_aps)(void); }; extern struct cpu_ops cpu_ops; diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h index d1b366b..15bc823 100644 --- a/sys/amd64/include/smp.h +++ b/sys/amd64/include/smp.h @@ -79,6 +79,7 @@ void smp_masked_invlpg_range(cpuset_t mask, struct pmap *pmap, vm_offset_t startva, vm_offset_t endva); void smp_invltlb(struct pmap *pmap); void smp_masked_invltlb(cpuset_t mask, struct pmap *pmap); +int native_start_all_aps(void); #endif /* !LOCORE */ #endif /* SMP */ diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index fb1ed79..49caacf 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -53,6 +53,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef __amd64__ +#include +#endif #include #include @@ -119,7 +122,10 @@ enum xen_domain_type xen_domain_type = XEN_NATIVE; struct cpu_ops xen_hvm_cpu_ops = { .ipi_vectored = lapic_ipi_vectored, .cpu_init = xen_hvm_cpu_init, - .cpu_resume = xen_hvm_cpu_resume + .cpu_resume = xen_hvm_cpu_resume, +#ifdef __amd64__ + .start_all_aps = native_start_all_aps, +#endif }; static MALLOC_DEFINE(M_XENHVM, "xen_hvm", "Xen HVM PV Support"); @@ -698,6 +704,10 @@ xen_hvm_init(enum xen_hvm_init_type init_type) setup_xen_features(); cpu_ops = xen_hvm_cpu_ops; vm_guest = VM_GUEST_XEN; +#ifdef __amd64__ + if (xen_pv_domain()) + cpu_ops.start_all_aps = xen_pv_start_all_aps; +#endif break; case XEN_HVM_INIT_RESUME: if (error != 0) diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index d11bc1a..22fd6a6 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -34,8 +34,11 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include +#include +#include #include #include @@ -49,9 +52,13 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include +#include + +#include /* Native initial function */ extern u_int64_t hammer_time(u_int64_t, u_int64_t); @@ -65,6 +72,15 @@ static caddr_t xen_pv_parse_preload_data(u_int64_t); static void xen_pv_parse_memmap(caddr_t, vm_paddr_t *, int *); static void xen_pv_set_init_ops(void); +/*---------------------------- Extern Declarations ---------------------------*/ +/* Variables used by amd64 mp_machdep to start APs */ +extern struct mtx ap_boot_mtx; +extern void *bootstacks[]; +extern char *doublefault_stack; +extern char *nmi_stack; +extern void *dpcpu; +extern int bootAP; +extern char *bootSTK; /*-------------------------------- Global Data -------------------------------*/ /* Xen init_ops implementation. */ @@ -168,6 +184,75 @@ hammer_time_xen(start_info_t *si, u_int64_t xenstack) } /*-------------------------------- PV specific -------------------------------*/ + +static int +start_xen_ap(int cpu) +{ + struct vcpu_guest_context *ctxt; + int ms, cpus = mp_naps; + + ctxt = malloc(sizeof(*ctxt), M_TEMP, M_NOWAIT | M_ZERO); + if (ctxt == NULL) + panic("unable to allocate memory"); + + ctxt->flags = VGCF_IN_KERNEL; + ctxt->user_regs.rip = (unsigned long) init_secondary; + ctxt->user_regs.rsp = (unsigned long) bootSTK; + + /* Set the AP to use the same page tables */ + ctxt->ctrlreg[3] = KPML4phys; + + if (HYPERVISOR_vcpu_op(VCPUOP_initialise, cpu, ctxt)) + panic("unable to initialize AP#%d\n", cpu); + + free(ctxt, M_TEMP); + + /* Launch the vCPU */ + if (HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL)) + panic("unable to start AP#%d\n", cpu); + + /* Wait up to 5 seconds for it to start. */ + for (ms = 0; ms < 5000; ms++) { + if (mp_naps > cpus) + return (1); /* return SUCCESS */ + DELAY(1000); + } + + return (0); +} + +int +xen_pv_start_all_aps(void) +{ + int cpu; + + mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); + + for (cpu = 1; cpu < mp_ncpus; cpu++) { + + /* allocate and set up an idle stack data page */ + bootstacks[cpu] = (void *)kmem_malloc(kernel_arena, + KSTACK_PAGES * PAGE_SIZE, M_WAITOK | M_ZERO); + doublefault_stack = (char *)kmem_malloc(kernel_arena, + PAGE_SIZE, M_WAITOK | M_ZERO); + nmi_stack = (char *)kmem_malloc(kernel_arena, PAGE_SIZE, + M_WAITOK | M_ZERO); + dpcpu = (void *)kmem_malloc(kernel_arena, DPCPU_SIZE, + M_WAITOK | M_ZERO); + + bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8; + bootAP = cpu; + + /* attempt to start the Application Processor */ + if (!start_xen_ap(cpu)) + panic("AP #%d failed to start!", cpu); + + CPU_SET(cpu, &all_cpus); /* record AP in CPU map */ + } + + return (mp_naps); +} + /* * Functions to convert the "extra" parameters passed by Xen * into FreeBSD boot options (from the i386 Xen port). diff --git a/sys/xen/pv.h b/sys/xen/pv.h new file mode 100644 index 0000000..45b7473 --- /dev/null +++ b/sys/xen/pv.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2013 Roger Pau Monné + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef __XEN_PV_H__ +#define __XEN_PV_H__ + +int xen_pv_start_all_aps(void); + +#endif /* __XEN_PV_H__ */ -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:25:53 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 224F7BC1; Tue, 14 Jan 2014 15:25:53 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9E53910B4; Tue, 14 Jan 2014 15:25:51 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92709294" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:49 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:48 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T6-0006J6-3l; Tue, 14 Jan 2014 14:59:52 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 13/20] xen: introduce flag to disable the local apic Date: Tue, 14 Jan 2014 15:59:35 +0100 Message-ID: <1389711582-66908-14-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:25:53 -0000 PVH guests don't have an emulated lapic. --- sys/amd64/amd64/mp_machdep.c | 10 ++++++---- sys/amd64/include/apicvar.h | 1 + sys/i386/include/apicvar.h | 1 + sys/i386/xen/xen_machdep.c | 2 ++ sys/x86/x86/local_apic.c | 8 +++++--- sys/x86/xen/pv.c | 3 +++ 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 17e957d..cea0306 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -707,7 +707,8 @@ init_secondary(void) wrmsr(MSR_SF_MASK, PSL_NT|PSL_T|PSL_I|PSL_C|PSL_D); /* Disable local APIC just to be sure. */ - lapic_disable(); + if (lapic_valid) + lapic_disable(); /* signal our startup to the BSP. */ mp_naps++; @@ -733,7 +734,7 @@ init_secondary(void) /* A quick check from sanity claus */ cpuid = PCPU_GET(cpuid); - if (PCPU_GET(apic_id) != lapic_id()) { + if (lapic_valid && (PCPU_GET(apic_id) != lapic_id())) { printf("SMP: cpuid = %d\n", cpuid); printf("SMP: actual apic_id = %d\n", lapic_id()); printf("SMP: correct apic_id = %d\n", PCPU_GET(apic_id)); @@ -749,7 +750,8 @@ init_secondary(void) mtx_lock_spin(&ap_boot_mtx); /* Init local apic for irq's */ - lapic_setup(1); + if (lapic_valid) + lapic_setup(1); /* Set memory range attributes for this CPU to match the BSP */ mem_range_AP_init(); @@ -764,7 +766,7 @@ init_secondary(void) if (cpu_logical > 1 && PCPU_GET(apic_id) % cpu_logical != 0) CPU_SET(cpuid, &logical_cpus_mask); - if (bootverbose) + if (lapic_valid && bootverbose) lapic_dump("AP"); if (smp_cpus == mp_ncpus) { diff --git a/sys/amd64/include/apicvar.h b/sys/amd64/include/apicvar.h index e7423a3..c04a238 100644 --- a/sys/amd64/include/apicvar.h +++ b/sys/amd64/include/apicvar.h @@ -169,6 +169,7 @@ inthand_t extern vm_paddr_t lapic_paddr; extern int apic_cpuids[]; +extern bool lapic_valid; u_int apic_alloc_vector(u_int apic_id, u_int irq); u_int apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, diff --git a/sys/i386/include/apicvar.h b/sys/i386/include/apicvar.h index df99ebe..ea8a3c3 100644 --- a/sys/i386/include/apicvar.h +++ b/sys/i386/include/apicvar.h @@ -168,6 +168,7 @@ inthand_t extern vm_paddr_t lapic_paddr; extern int apic_cpuids[]; +extern bool lapic_valid; u_int apic_alloc_vector(u_int apic_id, u_int irq); u_int apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, diff --git a/sys/i386/xen/xen_machdep.c b/sys/i386/xen/xen_machdep.c index 09c01f1..25b9cfc 100644 --- a/sys/i386/xen/xen_machdep.c +++ b/sys/i386/xen/xen_machdep.c @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include @@ -912,6 +913,7 @@ initvalues(start_info_t *startinfo) #endif xen_start_info = startinfo; HYPERVISOR_start_info = startinfo; + lapic_valid = false; xen_phys_machine = (xen_pfn_t *)startinfo->mfn_list; IdlePTD = (pd_entry_t *)((uint8_t *)startinfo->pt_base + PAGE_SIZE); diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 41bd602..fddf1fb 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -156,6 +156,7 @@ extern inthand_t IDTVEC(rsvd); volatile lapic_t *lapic; vm_paddr_t lapic_paddr; +bool lapic_valid = true; static u_long lapic_timer_divisor; static struct eventtimer lapic_et; @@ -1367,9 +1368,10 @@ apic_setup_io(void *dummy __unused) if (retval != 0) printf("%s: Failed to setup I/O APICs: returned %d\n", best_enum->apic_name, retval); -#ifdef XEN - return; -#endif + + if (!lapic_valid) + return; + /* * Finish setting up the local APIC on the BSP once we know how to * properly program the LINT pins. diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 22fd6a6..6ea1e2a 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -315,4 +316,6 @@ xen_pv_set_init_ops(void) { /* Init ops for Xen PV */ init_ops = xen_init_ops; + /* Disable lapic */ + lapic_valid = false; } -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:26:01 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70CB7EFE; Tue, 14 Jan 2014 15:26:01 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CE88710C1; Tue, 14 Jan 2014 15:25:59 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92709361" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 15:25:59 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:25:58 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T4-0006J6-HA; Tue, 14 Jan 2014 14:59:50 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 10/20] xen: add hook for AP bootstrap memory reservation Date: Tue, 14 Jan 2014 15:59:32 +0100 Message-ID: <1389711582-66908-11-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:26:01 -0000 This hook will only be implemented for bare metal, Xen doesn't require any bootstrap code since APs are started in long mode with paging enabled. --- sys/amd64/amd64/machdep.c | 6 +++++- sys/amd64/include/sysarch.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 64df89a..3a2db30 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -178,6 +178,9 @@ struct init_ops init_ops = { .early_delay_init = i8254_init, .early_delay = i8254_delay, .parse_memmap = native_parse_memmap, +#ifdef SMP + .mp_bootaddress = mp_bootaddress, +#endif }; /* @@ -1492,7 +1495,8 @@ getmemsize(caddr_t kmdp, u_int64_t first) #ifdef SMP /* make hole for AP bootstrap code */ - physmap[1] = mp_bootaddress(physmap[1] / 1024); + if (init_ops.mp_bootaddress) + physmap[1] = init_ops.mp_bootaddress(physmap[1] / 1024); #endif /* diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h index 084223e..7696064 100644 --- a/sys/amd64/include/sysarch.h +++ b/sys/amd64/include/sysarch.h @@ -16,6 +16,7 @@ struct init_ops { void (*early_delay_init)(void); void (*early_delay)(int); void (*parse_memmap)(caddr_t, vm_paddr_t *, int *); + u_int (*mp_bootaddress)(u_int); }; extern struct init_ops init_ops; -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:26:05 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 56AA3F0D; Tue, 14 Jan 2014 15:26:05 +0000 (UTC) Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB74210C6; Tue, 14 Jan 2014 15:26:03 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="90590893" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jan 2014 15:26:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 10:26:00 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W35T8-0006J6-SQ; Tue, 14 Jan 2014 14:59:54 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH v10 18/20] xen: xenstore changes to support PVH Date: Tue, 14 Jan 2014 15:59:40 +0100 Message-ID: <1389711582-66908-19-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA1 Cc: Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:26:05 -0000 --- sys/xen/xenstore/xenstore.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/xen/xenstore/xenstore.c b/sys/xen/xenstore/xenstore.c index b5cf413..7fa08cc 100644 --- a/sys/xen/xenstore/xenstore.c +++ b/sys/xen/xenstore/xenstore.c @@ -229,13 +229,11 @@ struct xs_softc { */ struct sx xenwatch_mutex; -#ifdef XENHVM /** * The HVM guest pseudo-physical frame number. This is Xen's mapping * of the true machine frame number into our "physical address space". */ unsigned long gpfn; -#endif /** * The event channel for communicating with the @@ -1147,13 +1145,15 @@ xs_attach(device_t dev) /* Initialize the interface to xenstore. */ struct proc *p; -#ifdef XENHVM - xs.evtchn = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN); - xs.gpfn = hvm_get_parameter(HVM_PARAM_STORE_PFN); - xen_store = pmap_mapdev(xs.gpfn * PAGE_SIZE, PAGE_SIZE); -#else - xs.evtchn = xen_start_info->store_evtchn; -#endif + if (xen_hvm_domain()) { + xs.evtchn = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN); + xs.gpfn = hvm_get_parameter(HVM_PARAM_STORE_PFN); + xen_store = pmap_mapdev(xs.gpfn * PAGE_SIZE, PAGE_SIZE); + } else if (xen_pv_domain()) { + xs.evtchn = HYPERVISOR_start_info->store_evtchn; + } else { + panic("Unknown domain type, cannot initialize xenstore\n"); + } TAILQ_INIT(&xs.reply_list); TAILQ_INIT(&xs.watch_events); -- 1.7.7.5 (Apple Git-26) From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 15:47:33 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 07FD698D for ; Tue, 14 Jan 2014 15:47:33 +0000 (UTC) Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8DAE312C2 for ; Tue, 14 Jan 2014 15:47:32 +0000 (UTC) Received: by mail-we0-f175.google.com with SMTP id p61so564013wes.34 for ; Tue, 14 Jan 2014 07:47:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=eZAf2Jsq8X2YtooXl7ODA3aJHw4fEtu9rY90GKEFVoY=; b=GRZZkCqZCCXAbN88F7ArrHFFwq1sN2BdGOcBEOBbGJrjkhl0oZZFeLiUPnzmCMj2Tz CdCAotTLXm45zSvurLRsRBD1hkiIQrFMvDdOrEw/zHoJFxIqTrQds6PaiRPzvkggf5Ch gN9QYW0p6rPxUr65VHfEHkzlrOeR8koUzS9nMF3uMhcPrqD2J77h9junn6YT9Qr64lih R+ap5UiD9Bnb+Ll7OPB301fcTmMSEh1UGONUzMqbj1n/J0VUKUVRPml80krZ1Xc1VH87 4xjZz/D9nrnwY9eaCfVjUuFl3IIfmKN6nFV88+fSCe0FjjOetqKqIV5vkc/I6w5L6FIg 2sLw== X-Gm-Message-State: ALoCoQkwdfJ9o25lbVttzKofZHSt+Pwjbi83GiONaLQof49Ilcmf8cTeS1Pj0WJuzn9J2NQ+yFNB X-Received: by 10.180.8.194 with SMTP id t2mr3606396wia.41.1389714103256; Tue, 14 Jan 2014 07:41:43 -0800 (PST) Received: from [10.80.2.139] ([185.25.64.249]) by mx.google.com with ESMTPSA id f7sm839362wjb.7.2014.01.14.07.41.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Jan 2014 07:41:42 -0800 (PST) Message-ID: <52D55AB4.4010504@linaro.org> Date: Tue, 14 Jan 2014 15:41:40 +0000 From: Julien Grall User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20131104 Icedove/17.0.10 MIME-Version: 1.0 To: Roger Pau Monne Subject: Re: [PATCH v10 14/20] xen: introduce xenpv bus and a dummy pvcpu device References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> <1389711582-66908-15-git-send-email-roger.pau@citrix.com> In-Reply-To: <1389711582-66908-15-git-send-email-roger.pau@citrix.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: xen-devel@lists.xen.org, julien.grall@citrix.com, freebsd-xen@freebsd.org, freebsd-current@freebsd.org, kib@freebsd.org, gibbs@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 15:47:33 -0000 On 01/14/2014 02:59 PM, Roger Pau Monne wrote: > +static int > +xenpv_attach(device_t dev) > +{ > + device_t child; > + > + if (xen_hvm_domain()) { > + device_t xenpci; > + devclass_t dc; > + > + /* Make sure xenpci has been attached */ > + dc = devclass_find("xenpci"); > + if (dc == NULL) > + panic("unable to find xenpci devclass"); > + > + xenpci = devclass_get_device(dc, 0); > + if (xenpci == NULL) > + panic("unable to find xenpci device"); > + > + if (!device_is_attached(xenpci)) > + panic("trying to attach xenpv before xenpci"); > + } Can you use the identify method to add the xenpci device? As I said earlier, I will reuse this code for ARM guest and this device is not used on this architecture. -- Julien Grall From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 16:08:19 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 002E23FD; Tue, 14 Jan 2014 16:08:18 +0000 (UTC) Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 525CF14B2; Tue, 14 Jan 2014 16:08:16 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="90613276" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jan 2014 16:08:13 +0000 Received: from [IPv6:::1] (10.80.16.47) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 11:08:12 -0500 Message-ID: <52D560EB.8040108@citrix.com> Date: Tue, 14 Jan 2014 17:08:11 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Julien Grall Subject: Re: [PATCH v10 14/20] xen: introduce xenpv bus and a dummy pvcpu device References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> <1389711582-66908-15-git-send-email-roger.pau@citrix.com> <52D55AB4.4010504@linaro.org> In-Reply-To: <52D55AB4.4010504@linaro.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-DLP: MIA2 Cc: xen-devel@lists.xen.org, julien.grall@citrix.com, freebsd-xen@freebsd.org, freebsd-current@freebsd.org, kib@freebsd.org, gibbs@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 16:08:19 -0000 On 14/01/14 16:41, Julien Grall wrote: > On 01/14/2014 02:59 PM, Roger Pau Monne wrote: >> +static int >> +xenpv_attach(device_t dev) >> +{ >> + device_t child; >> + >> + if (xen_hvm_domain()) { >> + device_t xenpci; >> + devclass_t dc; >> + >> + /* Make sure xenpci has been attached */ >> + dc = devclass_find("xenpci"); >> + if (dc == NULL) >> + panic("unable to find xenpci devclass"); >> + >> + xenpci = devclass_get_device(dc, 0); >> + if (xenpci == NULL) >> + panic("unable to find xenpci device"); >> + >> + if (!device_is_attached(xenpci)) >> + panic("trying to attach xenpv before xenpci"); >> + } > > Can you use the identify method to add the xenpci device? I don't think so, xenpci is a pci device, it is detected and plugged by the pci bus code. > As I said earlier, I will reuse this code for ARM guest and this device > is not used on this architecture. You could move this chunk of code (the check for xenpci) to a static inline function and make it a noop for ARM. From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 16:20:53 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08221E49; Tue, 14 Jan 2014 16:20:53 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 69C3D15F0; Tue, 14 Jan 2014 16:20:50 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92738398" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 16:20:48 +0000 Received: from [IPv6:::1] (10.80.16.47) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 11:20:47 -0500 Message-ID: <52D563DE.1020207@citrix.com> Date: Tue, 14 Jan 2014 17:20:46 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Julien Grall Subject: Re: [PATCH v10 14/20] xen: introduce xenpv bus and a dummy pvcpu device References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> <1389711582-66908-15-git-send-email-roger.pau@citrix.com> <52D55AB4.4010504@linaro.org> <52D560EB.8040108@citrix.com> <52D5625D.7030702@citrix.com> In-Reply-To: <52D5625D.7030702@citrix.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-DLP: MIA1 Cc: Julien Grall , xen-devel@lists.xen.org, freebsd-xen@freebsd.org, freebsd-current@freebsd.org, kib@freebsd.org, gibbs@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 16:20:53 -0000 On 14/01/14 17:14, Julien Grall wrote: > On 01/14/2014 04:08 PM, Roger Pau Monné wrote: >> On 14/01/14 16:41, Julien Grall wrote: >>> On 01/14/2014 02:59 PM, Roger Pau Monne wrote: >>>> +static int >>>> +xenpv_attach(device_t dev) >>>> +{ >>>> + device_t child; >>>> + >>>> + if (xen_hvm_domain()) { >>>> + device_t xenpci; >>>> + devclass_t dc; >>>> + >>>> + /* Make sure xenpci has been attached */ >>>> + dc = devclass_find("xenpci"); >>>> + if (dc == NULL) >>>> + panic("unable to find xenpci devclass"); >>>> + >>>> + xenpci = devclass_get_device(dc, 0); >>>> + if (xenpci == NULL) >>>> + panic("unable to find xenpci device"); >>>> + >>>> + if (!device_is_attached(xenpci)) >>>> + panic("trying to attach xenpv before xenpci"); >>>> + } >>> >>> Can you use the identify method to add the xenpci device? >> >> I don't think so, xenpci is a pci device, it is detected and plugged by >> the pci bus code. > > Oups, I though you are trying to add the device. In this case, the check > seems pointless. In which case the xenpci couldn't exist? It's just a "belt and suspenders", if we attach the xenpv bus without xenpci being attached first a bunch of things are going to fail, I though it might be best to print a clear error message about what went wrong in order to help debug it. From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 16:14:47 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 295A5A0D; Tue, 14 Jan 2014 16:14:47 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 622831597; Tue, 14 Jan 2014 16:14:44 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,658,1384300800"; d="scan'208";a="92734889" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 14 Jan 2014 16:14:22 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 14 Jan 2014 11:14:21 -0500 Received: from chilopoda.uk.xensource.com ([10.80.2.139]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W36dB-0007ja-Qb; Tue, 14 Jan 2014 16:14:21 +0000 Message-ID: <52D5625D.7030702@citrix.com> Date: Tue, 14 Jan 2014 16:14:21 +0000 From: Julien Grall User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20131104 Icedove/17.0.10 MIME-Version: 1.0 To: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= Subject: Re: [PATCH v10 14/20] xen: introduce xenpv bus and a dummy pvcpu device References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> <1389711582-66908-15-git-send-email-roger.pau@citrix.com> <52D55AB4.4010504@linaro.org> <52D560EB.8040108@citrix.com> In-Reply-To: <52D560EB.8040108@citrix.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-DLP: MIA1 X-Mailman-Approved-At: Tue, 14 Jan 2014 16:25:31 +0000 Cc: Julien Grall , xen-devel@lists.xen.org, freebsd-xen@freebsd.org, freebsd-current@freebsd.org, kib@freebsd.org, gibbs@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 16:14:47 -0000 On 01/14/2014 04:08 PM, Roger Pau Monné wrote: > On 14/01/14 16:41, Julien Grall wrote: >> On 01/14/2014 02:59 PM, Roger Pau Monne wrote: >>> +static int >>> +xenpv_attach(device_t dev) >>> +{ >>> + device_t child; >>> + >>> + if (xen_hvm_domain()) { >>> + device_t xenpci; >>> + devclass_t dc; >>> + >>> + /* Make sure xenpci has been attached */ >>> + dc = devclass_find("xenpci"); >>> + if (dc == NULL) >>> + panic("unable to find xenpci devclass"); >>> + >>> + xenpci = devclass_get_device(dc, 0); >>> + if (xenpci == NULL) >>> + panic("unable to find xenpci device"); >>> + >>> + if (!device_is_attached(xenpci)) >>> + panic("trying to attach xenpv before xenpci"); >>> + } >> >> Can you use the identify method to add the xenpci device? > > I don't think so, xenpci is a pci device, it is detected and plugged by > the pci bus code. Oups, I though you are trying to add the device. In this case, the check seems pointless. In which case the xenpci couldn't exist? -- Julien Grall From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 16:49:27 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57BAEA7D for ; Tue, 14 Jan 2014 16:49:27 +0000 (UTC) Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DAE9D18BC for ; Tue, 14 Jan 2014 16:49:26 +0000 (UTC) Received: by mail-wg0-f53.google.com with SMTP id y10so660450wgg.32 for ; Tue, 14 Jan 2014 08:49:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=IrgsaE+czSp8wPiWmzGaD5r9aoqXBgo1RcPgxl/q6nc=; b=J/fdGB5kQaRdywUL/+RRBurOrkBjdH1U+xa2vPlzRmX+76Y/R6pfdaewTZQ+48AGq3 93gssaoVGhYQyrz01TbR621/gz1JugxH7tkcW/X8jgx7FyX42nbCx7L56aiOHvkvDdCh pNWQrnORZk5Ofxx3TaafGvOL/OAWGbTnQus1RY/LFsGdhh6bMCg8YBZa+Zq7Zu1Og2yK fB9DMl1Mf2cqUymofCf/UKAXB9u54pz21nb4+HxE6WzUqhwinA0V8/vNHf/RxPfO/uIT 2Lfl4YVg1Wlls1WbxCeMVARF3zUbIwSU5HLZplK6+yz9zs4dKfq0JtQWGqlHyP9GFoD0 U7WQ== X-Gm-Message-State: ALoCoQmnrPUmC+kFVrxzPAgzxSq8wp8hyAcjBRjuI+mqm/mHLJUJzSCK0L41vS23tnf78ZJPzQ0O X-Received: by 10.180.80.103 with SMTP id q7mr11155351wix.14.1389718164890; Tue, 14 Jan 2014 08:49:24 -0800 (PST) Received: from [10.80.2.139] ([185.25.64.249]) by mx.google.com with ESMTPSA id hy8sm1003957wjb.2.2014.01.14.08.49.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Jan 2014 08:49:24 -0800 (PST) Message-ID: <52D56A92.4070100@linaro.org> Date: Tue, 14 Jan 2014 16:49:22 +0000 From: Julien Grall User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20131104 Icedove/17.0.10 MIME-Version: 1.0 To: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= Subject: Re: [PATCH v10 14/20] xen: introduce xenpv bus and a dummy pvcpu device References: <1389711582-66908-1-git-send-email-roger.pau@citrix.com> <1389711582-66908-15-git-send-email-roger.pau@citrix.com> <52D55AB4.4010504@linaro.org> <52D560EB.8040108@citrix.com> <52D5625D.7030702@citrix.com> <52D563DE.1020207@citrix.com> In-Reply-To: <52D563DE.1020207@citrix.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: xen-devel@lists.xen.org, Julien Grall , freebsd-xen@freebsd.org, freebsd-current@freebsd.org, kib@freebsd.org, gibbs@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 16:49:27 -0000 On 01/14/2014 04:20 PM, Roger Pau Monné wrote: > On 14/01/14 17:14, Julien Grall wrote: >> On 01/14/2014 04:08 PM, Roger Pau Monné wrote: >>> On 14/01/14 16:41, Julien Grall wrote: >>>> On 01/14/2014 02:59 PM, Roger Pau Monne wrote: >>>>> +static int >>>>> +xenpv_attach(device_t dev) >>>>> +{ >>>>> + device_t child; >>>>> + >>>>> + if (xen_hvm_domain()) { >>>>> + device_t xenpci; >>>>> + devclass_t dc; >>>>> + >>>>> + /* Make sure xenpci has been attached */ >>>>> + dc = devclass_find("xenpci"); >>>>> + if (dc == NULL) >>>>> + panic("unable to find xenpci devclass"); >>>>> + >>>>> + xenpci = devclass_get_device(dc, 0); >>>>> + if (xenpci == NULL) >>>>> + panic("unable to find xenpci device"); >>>>> + >>>>> + if (!device_is_attached(xenpci)) >>>>> + panic("trying to attach xenpv before xenpci"); >>>>> + } >>>> >>>> Can you use the identify method to add the xenpci device? >>> >>> I don't think so, xenpci is a pci device, it is detected and plugged by >>> the pci bus code. >> >> Oups, I though you are trying to add the device. In this case, the check >> seems pointless. In which case the xenpci couldn't exist? > > It's just a "belt and suspenders", if we attach the xenpv bus without > xenpci being attached first a bunch of things are going to fail, I > though it might be best to print a clear error message about what went > wrong in order to help debug it. I only see one place which could failed, and we are already protected. It's when we are trying to allocate space from grant-table via xenpci_alloc_space. I think this error should be enough to understand the problem. At the same time, it's the same things with xenstore. If grant-table initialization has failed, an error message is just printed and FreeBSD will likely failed later when it will try to initialized the PV disk. -- Julien Grall From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 16:52:15 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44A1BBD8; Tue, 14 Jan 2014 16:52:15 +0000 (UTC) Received: from mail-ve0-x22f.google.com (mail-ve0-x22f.google.com [IPv6:2607:f8b0:400c:c01::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E21C61935; Tue, 14 Jan 2014 16:52:14 +0000 (UTC) Received: by mail-ve0-f175.google.com with SMTP id jx11so6101553veb.34 for ; Tue, 14 Jan 2014 08:52:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to:content-type; bh=KBs7bWaAqUWOZlmuoT21Z3+faaNVMcLFtBtZ78uQGIM=; b=oTFKarD/G37bnQoq82O9K6B0ao+sjWTLnayvlSOChqKyTgNKxLdZgAmBRvrq0mKnvV qLbR4lwU6X6+pRNG1mUcvddMINxbWaWnHUbWHnqctHp7LZ5kAKFIFvlTVkloaGjRMsqx /jzS1P5BpqXcsgJHgWmczHgd7k0geD35P53Gm5YEMT0ismB6fo2qC2nP7DQXFs6W9yCd nNrueeDwjY+T9rwr4XthQz0+itkvhCTt4hr2BgWfw89rqJgLG8WGamd32KbLe4cwUX+y eNlBeXLaXaJvcM/EItzY2NLjWn2yODAiCCdkLPfB4H/MAkE79y852RjDVaDUCeqVHe54 kQ3Q== X-Received: by 10.58.50.71 with SMTP id a7mr1454414veo.32.1389718334010; Tue, 14 Jan 2014 08:52:14 -0800 (PST) MIME-Version: 1.0 Sender: cochard@gmail.com Received: by 10.58.171.1 with HTTP; Tue, 14 Jan 2014 08:51:53 -0800 (PST) From: =?ISO-8859-1?Q?Olivier_Cochard=2DLabb=E9?= Date: Tue, 14 Jan 2014 17:51:53 +0100 X-Google-Sender-Auth: 3yFAflFsZkWGLAU5MqjkvrVhjnk Message-ID: Subject: Regression on 10-RC5 with a multicast routing daemon To: "freebsd-current@freebsd.org" , "freebsd-net@freebsd.org" Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 16:52:15 -0000 Hi all, I'm trying to port a PIM sparse-mode daemon ( https://github.com/troglobit/pimd/) and I've meet a problem: This daemon compile and run fine on FreeBSD 9.2 but on 10-RC5 this daemon can't understand received multicast packets (received from other PIM neighbors) and display this kind of error message in debug mode "warning - Received packet from 10.0.12.2 shorter (28 bytes) than hdr+data length (20+28)". How to troubleshoot this problem ? My current work of this port can be tested with theses commands: cd /usr/ports fetch -o ports.pimd.shar " https://sourceforge.net/p/bsdrp/code/HEAD/tree/trunk/BSDRP/patches/ports.pimd.shar?format=raw " sh ./ports.pimd.shar cd net/pimd make install From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 18:09:59 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 220DD196; Tue, 14 Jan 2014 18:09:59 +0000 (UTC) Received: from mail-oa0-x235.google.com (mail-oa0-x235.google.com [IPv6:2607:f8b0:4003:c02::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CF5E91FBB; Tue, 14 Jan 2014 18:09:58 +0000 (UTC) Received: by mail-oa0-f53.google.com with SMTP id i7so1156357oag.40 for ; Tue, 14 Jan 2014 10:09:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=2ERvCzx46d6MqGObAW/4QnV8zGdxFwavTtFZ93gxyn0=; b=i0vm7S06+QbwnS3OcjX3mX9ZdWrB3y1d7Q0Ykmlza731tkytwJNpLujCbfJx+SKIDN vo/V97PsAlr0NIT4xiqUn9kqTbMjjLt7sxADbbh5B4HnjbX3eDzUURqrzxvz3WjpJPxd gucH6mPLN/+w4KwR7eMyEaAy52eNtW2hC4KbgOyutOpZxfxpeS1FyoNshJCKn6LIJ6Di TsxCJqdCCtVuZZBzHuavPLhNjtkkInkdTmbmnjfn9DkUEYe6qjln2HnpU5xegcrJigDw B9nBgku3YUz27cPBw0Zwbv7UuY3uqaIUbBOTWr/SeZrFA2/tIfWAZqXvCI4Y7wTQ9j94 05IA== MIME-Version: 1.0 X-Received: by 10.60.46.162 with SMTP id w2mr2321316oem.48.1389722997161; Tue, 14 Jan 2014 10:09:57 -0800 (PST) Received: by 10.76.132.9 with HTTP; Tue, 14 Jan 2014 10:09:57 -0800 (PST) In-Reply-To: <20140114042243.GW1742@glenbarber.us> References: <20140114041534.GJ2982@funkthat.com> <20140114042243.GW1742@glenbarber.us> Date: Tue, 14 Jan 2014 10:09:57 -0800 Message-ID: Subject: Re: error message from pkg on HEAD From: Freddie Cash To: Glen Barber Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: John-Mark Gurney , current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 18:09:59 -0000 On Mon, Jan 13, 2014 at 8:22 PM, Glen Barber wrote: > On Mon, Jan 13, 2014 at 08:15:34PM -0800, John-Mark Gurney wrote: > > So, now when I run pkg I get the following: > > pkg: Ignoring bad configuration entry in > /usr/local/etc/pkg/repos/FreeBSD.conf: "URL: > http://pkg.freebsd.org/${ABI}/latest" > > pkg: Ignoring bad configuration entry in > /usr/local/etc/pkg/repos/FreeBSD.conf: true > > pkg: Ignoring bad configuration entry in > /usr/local/etc/pkg/repos/FreeBSD.conf: "SRV" > > > > pkg does seem to work so I'm not sure what I need to do. I think I was > > told to add these lines to the file, though I'm not sure, so I don't wa= nt > > to delete them. > > > > Thanks for help in letting me know what the solution is. > > > > # pkg -v > > 1.2.4_1 > > # uname -a > > FreeBSD carbon.funkthat.com 11.0-CURRENT FreeBSD 11.0-CURRENT #4 > r260082M: Wed Jan 1 12:08:41 PST 2014 jmg@carbon.funkthat.com:/usr/o= bj/usr/src/sys/lockprof > amd64 > > # cat /usr/local/etc/pkg/repos/FreeBSD.conf > > FreeBSD: > > URL: http://pkg.freebsd.org/${ABI}/latest > > ENABLED: YES > > MIRROR_TYPE: SRV > > > > The file format is incorrect. > > FreeBSD: { > url: "http://pkg.freebsd.org/${ABI}/latest", > enabled: yes, > mirror_type: "srv" > } > > Shouldn't the URL start with "pkg+http://"?=E2=80=8B=E2=80=8B --=20 Freddie Cash fjwcash@gmail.com From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 18:10:41 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2CC6B30A; Tue, 14 Jan 2014 18:10:41 +0000 (UTC) Received: from mail-ob0-x22d.google.com (mail-ob0-x22d.google.com [IPv6:2607:f8b0:4003:c01::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E01FE1FE9; Tue, 14 Jan 2014 18:10:40 +0000 (UTC) Received: by mail-ob0-f173.google.com with SMTP id vb8so422019obc.4 for ; Tue, 14 Jan 2014 10:10:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:content-type; bh=SKBNtEhwmPH505xLuVnAU8lk7nzsCwaLftM+ETNY62I=; b=mowysmmbmGFUCQfTqrNtyhoEexi/qIJUhhrXkRfP7PMvxYDod+sQaY8irogLFdMQ8t GgI16UyyNVv7+4DmhlvfNtWIr23VLZJFB7ahwcl4yehSu+zg22BNJsSAlyvYlsvViq09 43phTf/OTOCAPuhWzT6G89leh5K7QzfOw7abmXWK3/yd2TPdGy5YjhhAN/5g2Lo0amlT 3FySB3AXBaYnm5gPjhNOf9LLJ2IjaqXo1aFZtoR7XkqHDzS60N/x4vOwsGmd349Eovpk 6E4qHp3PNKmePpNdOL4S6QT8tA8zqXLw+kN86NX4yyK00FGJVvA09ldXNf/v3STY3G1J RKSA== MIME-Version: 1.0 X-Received: by 10.60.33.7 with SMTP id n7mr2273087oei.25.1389723040200; Tue, 14 Jan 2014 10:10:40 -0800 (PST) Sender: pali.gabor@gmail.com Received: by 10.182.22.44 with HTTP; Tue, 14 Jan 2014 10:10:40 -0800 (PST) Date: Tue, 14 Jan 2014 19:10:40 +0100 X-Google-Sender-Auth: YLDWeFOGBBOwewGZsVu2mK46zp8 Message-ID: Subject: Final Call for FreeBSD 2013Q4 (October-December) Status Reports From: Gabor Pali To: hackers@freebsd.org, current@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 18:10:41 -0000 Dear FreeBSD Community, Please note that the submission date for the October to December Quarterly Status Reports is, January 14th, 2014, today. Please consult my earlier message for the details: On Sat, Dec 14, 2013 at 2:05 PM, Gabor Pali wrote: > Dear FreeBSD Community, > > Please note that the next submission date for the October to December > Quarterly Status Reports is January 14th, 2014, about a month away. > > They do not have to be very long -- basically they may be about > anything that lets people know what is going on around the FreeBSD > Project. Submission of reports is not restricted to committers: > Anyone who is doing anything interesting and FreeBSD-related can (and > therefore encouraged to) write one! > > The preferred and easiest submission method is to use the XML > generator [1] with the result emailed as an attachment to us, that is, > monthly@FreeBSD.org [2]. There is also an XML template [3] which can > be filled out manually and attached if preferred. For the expected > content and style, please study our guidelines on how to write a good > status reports [4]. > > To enable compilation and publication of the Q4 report as soon as > possible for the January 14th deadline, please be prompt with any > report submissions you may have. > > We are looking forward to all of your 2013Q4 reports! > > Thanks, > Gabor > > > [1] http://www.freebsd.org/cgi/monthly.cgi > [2] mailto:monthly@freebsd.org > [3] http://www.freebsd.org/news/status/report-sample.xml > [4] http://www.freebsd.org/news/status/howto.html From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 20:15:58 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD92FEEC; Tue, 14 Jan 2014 20:15:58 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B25D710B4; Tue, 14 Jan 2014 20:15:58 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id A52AFB946; Tue, 14 Jan 2014 15:15:57 -0500 (EST) From: John Baldwin To: freebsd-stable@freebsd.org Subject: Re: Shared IRQ on ATOM based Soekris net6501 board Date: Tue, 14 Jan 2014 11:09:18 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; ) References: <20140114160346.2c34db92@fusen> In-Reply-To: <20140114160346.2c34db92@fusen> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201401141109.18137.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 14 Jan 2014 15:15:57 -0500 (EST) Cc: Christophe Prevotaux , freebsd-current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 20:15:58 -0000 On Tuesday, January 14, 2014 10:03:46 am Christophe Prevotaux wrote: > > I have found out that when I use 2 AR9580 mini PCIe board > some irq (namely in that case irq18 is shared over 3 devices) > > I wonder why it is done like this and if this could be something to fix ? You can't fix it. This is how the interrupts are connected on your motherboard. It's true that in PCI-e there are no longer physical interrupt lines, but the connections may still be hardcoded in silicon. The only chance you might possibly have is to use ACPI (which doesn't work on your board) as if the PCI interrupts are hooked up to an interrupt router prior to the I/O APIC you might be able to shuffle things. A far better idea would be to use a board that supports MSI interrupts (and/or fix the driver to use MSI if it is not doing so already). -- John Baldwin From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 20:30:41 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF150244 for ; Tue, 14 Jan 2014 20:30:41 +0000 (UTC) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 3808315D8 for ; Tue, 14 Jan 2014 20:30:40 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id WAA28205; Tue, 14 Jan 2014 22:30:38 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1W3AdB-000BMp-W3; Tue, 14 Jan 2014 22:30:38 +0200 Message-ID: <52D59E36.9040405@FreeBSD.org> Date: Tue, 14 Jan 2014 22:29:42 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Vladimir Sharun , Current FreeBSD Subject: Re: ARC "pressured out", how to control/stabilize ? (reformatted to text/plain) References: <1388839805.123581691.q97ijp8l@frv45.ukr.net> <52C93E4D.1050100@FreeBSD.org> <1389005433.815055146.2dcjke36@frv45.ukr.net> <52CA9963.1050507@FreeBSD.org> <1389676958.516993176.oq4lbgg7@frv45.ukr.net> In-Reply-To: <1389676958.516993176.oq4lbgg7@frv45.ukr.net> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 20:30:41 -0000 on 14/01/2014 07:27 Vladimir Sharun said the following: > Dear Andriy and FreeBSD community, > >> I am not sure if the buffers are leaked somehow or if they are actually in use. >> It's one of the very few places where data buffers are allocated without >> charging ARC. In all other places it's quite easy to match allocations and >> deallocations. But in L2ARC it is not obvious that all buffers get freed or >> when that happens. > > After one week under load I think we figure out the cause: it's L2ARC. > Here's the top's header for 7d17h of the runtime: > > last pid: 46409; load averages: 0.37, 0.62, 0.70 up 7+17:14:01 07:24:10 > 173 processes: 1 running, 171 sleeping, 1 zombie > CPU: 2.0% user, 0.0% nice, 3.5% system, 0.4% interrupt, 94.2% idle > Mem: 8714M Active, 14G Inact, 96G Wired, 1929M Cache, 3309M Buf, 3542M Free > ARC: 85G Total, 2558M MFU, 77G MRU, 28M Anon, 1446M Header, 4802M Other > > ARC related tunables: > > vm.kmem_size="110G" > vfs.zfs.arc_max="90G" > vfs.zfs.arc_min="42G" > > For more than 7 days of hard runtime the picture clearly shows: > Wired minus ARC = 11..12Gb, ARC grow and shrinks in 80-87Gb range and the > system runs just fine. > > So what shall we do with L2ARC leakage ? Could you please try this patch http://cr.illumos.org/~webrev/skiselkov/3995/illumos-gate.patch ? -- Andriy Gapon From owner-freebsd-current@FreeBSD.ORG Tue Jan 14 22:23:24 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1EC4B720; Tue, 14 Jan 2014 22:23:24 +0000 (UTC) Received: from mail-pa0-x234.google.com (mail-pa0-x234.google.com [IPv6:2607:f8b0:400e:c03::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D7692108D; Tue, 14 Jan 2014 22:23:23 +0000 (UTC) Received: by mail-pa0-f52.google.com with SMTP id kx10so247698pab.39 for ; Tue, 14 Jan 2014 14:23:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=mH+8yRLXWyme7BC42zMj585ggFzjL73LNhkgWkDXfVg=; b=NItIYLDv48Qt0azW/CdVu0CJntdQZas5hyr2YnAuXPqcR+BLMkq8CU6R5cS/PVRHjK rrGXH7DJVXq1sM1FZPgGb2BzAr5yn8T6LLtigoGBr1nBxh1P1WXBYDJ12NuJ/HhvZs5o zFBtWiV+rxTRz4G9C6c/uqz+9oZSX8A5IhfmQh/ZI906oMWPXKyohx6EKilnTJ7ETAWT OdjVk9iO44MdChBTnfJ6FI/FjPalMnJc7FsJvhE/bD3waWudbQvG9QchsUpC6R1UNda/ ZXkQFg3OWIp40whpsoZgEb1n0/3SxMiEAgIqJmHOhscMKI4+FFEQWjzohuezkS4/xZdO x3OQ== X-Received: by 10.68.133.163 with SMTP id pd3mr4507564pbb.166.1389738203357; Tue, 14 Jan 2014 14:23:23 -0800 (PST) MIME-Version: 1.0 Received: by 10.70.129.171 with HTTP; Tue, 14 Jan 2014 14:22:43 -0800 (PST) In-Reply-To: <20140113021018.GA3500@michelle.cdnetworks.com> References: <48005124.ny58tnLn4d@pc-alex> <20140110012114.GA3103@michelle.cdnetworks.com> <20140110103529.GE73147@FreeBSD.org> <20140113021018.GA3500@michelle.cdnetworks.com> From: Eric Joyner Date: Tue, 14 Jan 2014 14:22:43 -0800 Message-ID: Subject: Re: FreeBSD 10-RC4: Got crash in igb driver To: pyunyh@gmail.com Content-Type: multipart/mixed; boundary=001a1134b612f2665504eff5a3dc X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: damien.deville@netasq.com, freebsd-current@freebsd.org, fabien.thomas@netasq.com, Alexandre Martins , Gleb Smirnoff , Jack F Vogel X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 22:23:24 -0000 --001a1134b612f2665504eff5a3dc Content-Type: text/plain; charset=UTF-8 All, I work with Jack on FreeBSD network drivers, and we have a patch that we think might fix this problem. It re-implements the header pull-up code that was in the driver pre-2.4.0, but with IPv6 support. Alexandre, could you apply this patch to the igb version in HEAD and try it out on your network? We can't replicate your setup here. If it solves your problem, then the next step would be to port the patch to the ixgbe driver since, as Yonghyeon noted, it looks like that driver will encounter the same problem. We could then modify em to add IPv6 offload support as well. Thanks, --- - Eric Joyner On Fri, Jan 10, 2014 at 02:35:29PM +0400, Gleb Smirnoff wrote: > Yonghyeon, > > On Fri, Jan 10, 2014 at 10:21:14AM +0900, Yonghyeon PYUN wrote: > Y> > I experience some troubles with the igb device driver on FreeBSD 10-RC4. > Y> > > Y> > The kernel make a pagefault in the igb_tx_ctx_setup function when accessing to > Y> > a IPv6 header. > Y> > > Y> > The network configuration is the following: > Y> > - box acting as an IPv6 router > Y> > - one interface with an IPv6 (igb0) > Y> > - another interface with a vlan, and IPv6 on it (vlan0 on igb1) > Y> > > Y> > Vlan Hardware tagging is set on both interfaces. > Y> > > Y> > The packet that cause the crash come from igb0 and go to vlan0. > Y> > > Y> > After investigation, i see that the mbuf is split in two. The first one carry > Y> > the ethernet header, the second, the IPv6 header and data payload. > Y> > > Y> > The split is due to the "m_copy" done in ip6_forward, that make the mbuf not > Y> > writable and the "M_PREPEND" in ether_output that insert the new mbuf before > Y> > the original one. > Y> > > Y> > The kernel crashes only if the newly allocated mbuf is at the end of a memory > Y> > page, and no page is available after this one. So, it's extremly rare. > Y> > > Y> > I inserted a "KASSERT" into the function (see attached patch) to check this > Y> > behavior, and it raises on every IPv6 forwarded packet to the vlan. The > Y> > problem disapear if i remove hardware tagging. > Y> > > Y> > In the commit 256200, i see that pullups has been removed. May it be related ? > Y> > Y> I think I introduced the header parsing code to meet controller > Y> requirement in em(4) and Jack borrowed that code in the past but it > Y> seems it was removed in r256200. It seems igb_tx_ctx_setup() > Y> assumes it can access ethernet/IP/TCP/UDP headers in the first mbuf > Y> of the chain. > Y> This looks wrong to me. > > Can you please restore the important code in head ASAP? Although crashes happen > only when the mbuf is last in a page and page isn't mapped, we read thrash from > next allocation on almost every packet. > It seems other Intel ethernet drivers except em(4) have similar issues. I didn't check recent Intel controllers/drivers for long time so I don't know details on hardware requirements of offloading. Since Jack is very responsive and has hardwares to verify, he would be more appropriate person to handle these issues. _______________________________________________ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" --001a1134b612f2665504eff5a3dc Content-Type: application/octet-stream; name="fix.patch" Content-Disposition: attachment; filename="fix.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hqfq2abb0 ZGlmZiAtTmF1ciBoZWFkL2lmX2lnYi5jIHBhdGNoL2lmX2lnYi5jCi0tLSBoZWFkL2lmX2lnYi5j CTIwMTQtMDEtMTQgMTQ6MDg6MDQuMDAwMDAwMDAwIC0wODAwCisrKyBwYXRjaC9pZl9pZ2IuYwky MDE0LTAxLTE0IDE0OjA3OjAxLjAwMDAwMDAwMCAtMDgwMApAQCAtMSw2ICsxLDYgQEAKIC8qKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioKIAotICBDb3B5cmlnaHQgKGMpIDIwMDEtMjAxMywgSW50ZWwgQ29y cG9yYXRpb24gCisgIENvcHlyaWdodCAoYykgMjAwMS0yMDE0LCBJbnRlbCBDb3Jwb3JhdGlvbiAK ICAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAgCiAgIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dCAKQEAgLTI0NCw5ICsyNDQs MTEgQEAKIHN0YXRpYyBib29sCWlnYl9yeGVvZihzdHJ1Y3QgaWdiX3F1ZXVlICosIGludCwgaW50 ICopOwogc3RhdGljIHZvaWQJaWdiX3J4X2NoZWNrc3VtKHUzMiwgc3RydWN0IG1idWYgKiwgdTMy KTsKIHN0YXRpYyBpbnQJaWdiX3R4X2N0eF9zZXR1cChzdHJ1Y3QgdHhfcmluZyAqLAotCQkgICAg c3RydWN0IG1idWYgKiwgdTMyICosIHUzMiAqKTsKKwkJICAgIHN0cnVjdCBtYnVmICosIHUzMiAq LCB1MzIgKiwgc3RydWN0IGlnYl9wa3RfaW5mbyAqKTsKIHN0YXRpYyBpbnQJaWdiX3Rzb19zZXR1 cChzdHJ1Y3QgdHhfcmluZyAqLAotCQkgICAgc3RydWN0IG1idWYgKiwgdTMyICosIHUzMiAqKTsK KwkJICAgIHN0cnVjdCBtYnVmICosIHUzMiAqLCB1MzIgKiwgc3RydWN0IGlnYl9wa3RfaW5mbyAq KTsKK3N0YXRpYyBpbnQJaWdiX3B1bGx1cF9oZWFkZXJzKHN0cnVjdCBtYnVmICoqLCB1MzIsCisJ CSAgICBzdHJ1Y3QgaWdiX3BrdF9pbmZvICopOwogc3RhdGljIHZvaWQJaWdiX3NldF9wcm9taXNj KHN0cnVjdCBhZGFwdGVyICopOwogc3RhdGljIHZvaWQJaWdiX2Rpc2FibGVfcHJvbWlzYyhzdHJ1 Y3QgYWRhcHRlciAqKTsKIHN0YXRpYyB2b2lkCWlnYl9zZXRfbXVsdGkoc3RydWN0IGFkYXB0ZXIg Kik7CkBAIC0yOTAsNiArMjkyLDcgQEAKIHN0YXRpYyBpbnQJaWdiX3N5c2N0bF9kbWFjKFNZU0NU TF9IQU5ETEVSX0FSR1MpOwogc3RhdGljIGludAlpZ2Jfc3lzY3RsX2VlZShTWVNDVExfSEFORExF Ul9BUkdTKTsKIAorCiAjaWZkZWYgREVWSUNFX1BPTExJTkcKIHN0YXRpYyBwb2xsX2hhbmRsZXJf dCBpZ2JfcG9sbDsKICNlbmRpZiAvKiBQT0xMSU5HICovCkBAIC0xODQzLDkgKzE4NDYsMTEgQEAK IAlidXNfZG1hX3NlZ21lbnRfdCBzZWdzW0lHQl9NQVhfU0NBVFRFUl07CiAJYnVzX2RtYW1hcF90 CW1hcDsKIAlzdHJ1Y3QgaWdiX3R4X2J1ZiAqdHhidWY7CisJc3RydWN0IGlnYl9wa3RfaW5mbwlw a3Q7CiAJdW5pb24gZTEwMDBfYWR2X3R4X2Rlc2MgKnR4ZCA9IE5VTEw7CiAKIAltX2hlYWQgPSAq bV9oZWFkcDsKKwliemVybygmcGt0LCBzaXplb2Yoc3RydWN0IGlnYl9wa3RfaW5mbykpOwogCiAJ LyogQmFzaWMgZGVzY3JpcHRvciBkZWZpbmVzICovCiAgICAgICAgIGNtZF90eXBlX2xlbiA9IChF MTAwMF9BRFZUWERfRFRZUF9EQVRBIHwKQEAgLTE4NjMsNiArMTg2OCwxNCBAQAogCXR4YnVmID0g JnR4ci0+dHhfYnVmZmVyc1tmaXJzdF07CiAJbWFwID0gdHhidWYtPm1hcDsKIAorCS8qIFB1bGx1 cCBoZWFkZXJzIGlmIG9mZmxvYWQgaGFzIGJlZW4gcmVxdWVzdGVkICovCisJaWYgKG1faGVhZC0+ bV9wa3RoZHIuY3N1bV9mbGFncyAmIENTVU1fT0ZGTE9BRCkgeworCQllcnJvciA9IGlnYl9wdWxs dXBfaGVhZGVycyhtX2hlYWRwLAorCQkgICAgbV9oZWFkLT5tX3BrdGhkci5jc3VtX2ZsYWdzLCAm cGt0KTsKKwkJaWYgKGVycm9yKQorCQkJcmV0dXJuIChlcnJvcik7CisJfQorCiAJLyoKIAkgKiBN YXAgdGhlIHBhY2tldCBmb3IgRE1BLgogCSAqLwpAQCAtMTkwNiwxOCArMTkxOSwxOCBAQAogCQli dXNfZG1hbWFwX3VubG9hZCh0eHItPnR4dGFnLCBtYXApOwogCQlyZXR1cm4gKEVOT0JVRlMpOwog CX0KLQltX2hlYWQgPSAqbV9oZWFkcDsKIAogCS8qCiAJKiogU2V0IHVwIHRoZSBhcHByb3ByaWF0 ZSBvZmZsb2FkIGNvbnRleHQKIAkqKiB0aGlzIHdpbGwgY29uc3VtZSB0aGUgZmlyc3QgZGVzY3Jp cHRvcgogCSovCi0JZXJyb3IgPSBpZ2JfdHhfY3R4X3NldHVwKHR4ciwgbV9oZWFkLCAmY21kX3R5 cGVfbGVuLCAmb2xpbmZvX3N0YXR1cyk7CisJZXJyb3IgPSBpZ2JfdHhfY3R4X3NldHVwKHR4ciwg bV9oZWFkLCAmY21kX3R5cGVfbGVuLCAmb2xpbmZvX3N0YXR1cywgJnBrdCk7CiAJaWYgKF9fcHJl ZGljdF9mYWxzZShlcnJvcikpIHsKIAkJbV9mcmVlbSgqbV9oZWFkcCk7CiAJCSptX2hlYWRwID0g TlVMTDsKIAkJcmV0dXJuIChlcnJvcik7CiAJfQorCW1faGVhZCA9ICptX2hlYWRwOwogCiAJLyog ODI1NzUgbmVlZHMgdGhlIHF1ZXVlIGluZGV4IGFkZGVkICovCiAJaWYgKGFkYXB0ZXItPmh3Lm1h Yy50eXBlID09IGUxMDAwXzgyNTc1KQpAQCAtMzcwMSw2MCArMzcxNCwzOSBAQAogICoqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKiovCiBzdGF0aWMgaW50CiBpZ2JfdHNvX3NldHVwKHN0cnVjdCB0eF9yaW5nICp0eHIsIHN0 cnVjdCBtYnVmICptcCwKLSAgICB1MzIgKmNtZF90eXBlX2xlbiwgdTMyICpvbGluZm9fc3RhdHVz KQorICAgIHUzMiAqY21kX3R5cGVfbGVuLCB1MzIgKm9saW5mb19zdGF0dXMsIHN0cnVjdCBpZ2Jf cGt0X2luZm8gKnBrdCkKIHsKIAlzdHJ1Y3QgYWRhcHRlciAqYWRhcHRlciA9IHR4ci0+YWRhcHRl cjsKIAlzdHJ1Y3QgZTEwMDBfYWR2X3R4X2NvbnRleHRfZGVzYyAqVFhEOwogCXUzMiB2bGFuX21h Y2lwX2xlbnMgPSAwLCB0eXBlX3R1Y21kX21saGwgPSAwOwogCXUzMiBtc3NfbDRsZW5faWR4ID0g MCwgcGF5bGVuOwotCXUxNiB2dGFnID0gMCwgZWhfdHlwZTsKLQlpbnQgY3R4ZCwgZWhkcmxlbiwg aXBfaGxlbiwgdGNwX2hsZW47Ci0Jc3RydWN0IGV0aGVyX3ZsYW5faGVhZGVyICplaDsKKwl1MTYg dnRhZyA9IDA7CisJaW50IGN0eGQsIHRjcF9obGVuOwogI2lmZGVmIElORVQ2CiAJc3RydWN0IGlw Nl9oZHIgKmlwNjsKICNlbmRpZgogI2lmZGVmIElORVQKIAlzdHJ1Y3QgaXAgKmlwOwogI2VuZGlm Ci0Jc3RydWN0IHRjcGhkciAqdGg7Ci0KLQotCS8qCi0JICogRGV0ZXJtaW5lIHdoZXJlIGZyYW1l IHBheWxvYWQgc3RhcnRzLgotCSAqIEp1bXAgb3ZlciB2bGFuIGhlYWRlcnMgaWYgYWxyZWFkeSBw cmVzZW50Ci0JICovCi0JZWggPSBtdG9kKG1wLCBzdHJ1Y3QgZXRoZXJfdmxhbl9oZWFkZXIgKik7 Ci0JaWYgKGVoLT5ldmxfZW5jYXBfcHJvdG8gPT0gaHRvbnMoRVRIRVJUWVBFX1ZMQU4pKSB7Ci0J CWVoZHJsZW4gPSBFVEhFUl9IRFJfTEVOICsgRVRIRVJfVkxBTl9FTkNBUF9MRU47Ci0JCWVoX3R5 cGUgPSBlaC0+ZXZsX3Byb3RvOwotCX0gZWxzZSB7Ci0JCWVoZHJsZW4gPSBFVEhFUl9IRFJfTEVO OwotCQllaF90eXBlID0gZWgtPmV2bF9lbmNhcF9wcm90bzsKLQl9CiAKLQlzd2l0Y2ggKG50b2hz KGVoX3R5cGUpKSB7CisJc3dpdGNoIChwa3QtPmV0eXBlKSB7CiAjaWZkZWYgSU5FVDYKIAljYXNl IEVUSEVSVFlQRV9JUFY2OgotCQlpcDYgPSAoc3RydWN0IGlwNl9oZHIgKikobXAtPm1fZGF0YSAr IGVoZHJsZW4pOworCQlpcDYgPSBwa3QtPmlwNjsKIAkJLyogWFhYLUJaIEZvciBub3cgd2UgZG8g bm90IHByZXRlbmQgdG8gc3VwcG9ydCBleHQuIGhkcnMuICovCiAJCWlmIChpcDYtPmlwNl9ueHQg IT0gSVBQUk9UT19UQ1ApCiAJCQlyZXR1cm4gKEVOWElPKTsKLQkJaXBfaGxlbiA9IHNpemVvZihz dHJ1Y3QgaXA2X2hkcik7Ci0JCWlwNiA9IChzdHJ1Y3QgaXA2X2hkciAqKShtcC0+bV9kYXRhICsg ZWhkcmxlbik7Ci0JCXRoID0gKHN0cnVjdCB0Y3BoZHIgKikoKGNhZGRyX3QpaXA2ICsgaXBfaGxl bik7Ci0JCXRoLT50aF9zdW0gPSBpbjZfY2tzdW1fcHNldWRvKGlwNiwgMCwgSVBQUk9UT19UQ1As IDApOworCQlwa3QtPnRoLT50aF9zdW0gPSBpbjZfY2tzdW1fcHNldWRvKGlwNiwgMCwgSVBQUk9U T19UQ1AsIDApOwogCQl0eXBlX3R1Y21kX21saGwgfD0gRTEwMDBfQURWVFhEX1RVQ01EX0lQVjY7 CiAJCWJyZWFrOwogI2VuZGlmCiAjaWZkZWYgSU5FVAogCWNhc2UgRVRIRVJUWVBFX0lQOgotCQlp cCA9IChzdHJ1Y3QgaXAgKikobXAtPm1fZGF0YSArIGVoZHJsZW4pOworCQlpcCA9IHBrdC0+aXA7 CiAJCWlmIChpcC0+aXBfcCAhPSBJUFBST1RPX1RDUCkKIAkJCXJldHVybiAoRU5YSU8pOwogCQlp cC0+aXBfc3VtID0gMDsKLQkJaXBfaGxlbiA9IGlwLT5pcF9obCA8PCAyOwotCQl0aCA9IChzdHJ1 Y3QgdGNwaGRyICopKChjYWRkcl90KWlwICsgaXBfaGxlbik7Ci0JCXRoLT50aF9zdW0gPSBpbl9w c2V1ZG8oaXAtPmlwX3NyYy5zX2FkZHIsCisJCXBrdC0+dGgtPnRoX3N1bSA9IGluX3BzZXVkbyhp cC0+aXBfc3JjLnNfYWRkciwKIAkJICAgIGlwLT5pcF9kc3Quc19hZGRyLCBodG9ucyhJUFBST1RP X1RDUCkpOwogCQl0eXBlX3R1Y21kX21saGwgfD0gRTEwMDBfQURWVFhEX1RVQ01EX0lQVjQ7CiAJ CS8qIFRlbGwgdHJhbnNtaXQgZGVzYyB0byBhbHNvIGRvIElQdjQgY2hlY2tzdW0uICovCkBAIC0z NzYzLDE3ICszNzU1LDE3IEBACiAjZW5kaWYKIAlkZWZhdWx0OgogCQlwYW5pYygiJXM6IENTVU1f VFNPIGJ1dCBubyBzdXBwb3J0ZWQgSVAgdmVyc2lvbiAoMHglMDR4KSIsCi0JCSAgICBfX2Z1bmNf XywgbnRvaHMoZWhfdHlwZSkpOworCQkgICAgX19mdW5jX18sIHBrdC0+ZXR5cGUpOwogCQlicmVh azsKIAl9CiAKIAljdHhkID0gdHhyLT5uZXh0X2F2YWlsX2Rlc2M7CiAJVFhEID0gKHN0cnVjdCBl MTAwMF9hZHZfdHhfY29udGV4dF9kZXNjICopICZ0eHItPnR4X2Jhc2VbY3R4ZF07CiAKLQl0Y3Bf aGxlbiA9IHRoLT50aF9vZmYgPDwgMjsKKwl0Y3BfaGxlbiA9IHBrdC0+dGgtPnRoX29mZiA8PCAy OwogCiAJLyogVGhpcyBpcyB1c2VkIGluIHRoZSB0cmFuc21pdCBkZXNjIGluIGVuY2FwICovCi0J cGF5bGVuID0gbXAtPm1fcGt0aGRyLmxlbiAtIGVoZHJsZW4gLSBpcF9obGVuIC0gdGNwX2hsZW47 CisJcGF5bGVuID0gbXAtPm1fcGt0aGRyLmxlbiAtIHBrdC0+ZWhkcmxlbiAtIHBrdC0+aXBfaGxl biAtIHRjcF9obGVuOwogCiAJLyogVkxBTiBNQUNMRU4gSVBMRU4gKi8KIAlpZiAobXAtPm1fZmxh Z3MgJiBNX1ZMQU5UQUcpIHsKQEAgLTM3ODEsOCArMzc3Myw4IEBACiAgICAgICAgICAgICAgICAg dmxhbl9tYWNpcF9sZW5zIHw9ICh2dGFnIDw8IEUxMDAwX0FEVlRYRF9WTEFOX1NISUZUKTsKIAl9 CiAKLQl2bGFuX21hY2lwX2xlbnMgfD0gZWhkcmxlbiA8PCBFMTAwMF9BRFZUWERfTUFDTEVOX1NI SUZUOwotCXZsYW5fbWFjaXBfbGVucyB8PSBpcF9obGVuOworCXZsYW5fbWFjaXBfbGVucyB8PSBw a3QtPmVoZHJsZW4gPDwgRTEwMDBfQURWVFhEX01BQ0xFTl9TSElGVDsKKwl2bGFuX21hY2lwX2xl bnMgfD0gcGt0LT5pcF9obGVuOwogCVRYRC0+dmxhbl9tYWNpcF9sZW5zID0gaHRvbGUzMih2bGFu X21hY2lwX2xlbnMpOwogCiAJLyogQURWIERUWVBFIFRVQ01EICovCkBAIC0zODIwLDE2ICszODEy LDEzIEBACiAKIHN0YXRpYyBpbnQKIGlnYl90eF9jdHhfc2V0dXAoc3RydWN0IHR4X3JpbmcgKnR4 ciwgc3RydWN0IG1idWYgKm1wLAotICAgIHUzMiAqY21kX3R5cGVfbGVuLCB1MzIgKm9saW5mb19z dGF0dXMpCisgICAgdTMyICpjbWRfdHlwZV9sZW4sIHUzMiAqb2xpbmZvX3N0YXR1cywgc3RydWN0 IGlnYl9wa3RfaW5mbyAqcGt0KQogewogCXN0cnVjdCBlMTAwMF9hZHZfdHhfY29udGV4dF9kZXNj ICpUWEQ7CiAJc3RydWN0IGFkYXB0ZXIgKmFkYXB0ZXIgPSB0eHItPmFkYXB0ZXI7Ci0Jc3RydWN0 IGV0aGVyX3ZsYW5faGVhZGVyICplaDsKIAlzdHJ1Y3QgaXAgKmlwOwogCXN0cnVjdCBpcDZfaGRy ICppcDY7CiAJdTMyIHZsYW5fbWFjaXBfbGVucyA9IDAsIHR5cGVfdHVjbWRfbWxobCA9IDAsIG1z c19sNGxlbl9pZHggPSAwOwotCWludAllaGRybGVuLCBpcF9obGVuID0gMDsKLQl1MTYJZXR5cGU7 CiAJdTgJaXBwcm90byA9IDA7CiAJaW50CW9mZmxvYWQgPSBUUlVFOwogCWludAljdHhkID0gdHhy LT5uZXh0X2F2YWlsX2Rlc2M7CkBAIC0zODM3LDcgKzM4MjYsNyBAQAogCiAJLyogRmlyc3QgY2hl Y2sgaWYgVFNPIGlzIHRvIGJlIHVzZWQgKi8KIAlpZiAobXAtPm1fcGt0aGRyLmNzdW1fZmxhZ3Mg JiBDU1VNX1RTTykKLQkJcmV0dXJuIChpZ2JfdHNvX3NldHVwKHR4ciwgbXAsIGNtZF90eXBlX2xl biwgb2xpbmZvX3N0YXR1cykpOworCQlyZXR1cm4gKGlnYl90c29fc2V0dXAodHhyLCBtcCwgY21k X3R5cGVfbGVuLCBvbGluZm9fc3RhdHVzLCBwa3QpKTsKIAogCWlmICgobXAtPm1fcGt0aGRyLmNz dW1fZmxhZ3MgJiBDU1VNX09GRkxPQUQpID09IDApCiAJCW9mZmxvYWQgPSBGQUxTRTsKQEAgLTM4 NTksMzMgKzM4NDgsMTcgQEAKIAl9IGVsc2UgaWYgKG9mZmxvYWQgPT0gRkFMU0UpIC8qIC4uLiBu byBvZmZsb2FkIHRvIGRvICovCiAJCXJldHVybiAoMCk7CiAKLQkvKgotCSAqIERldGVybWluZSB3 aGVyZSBmcmFtZSBwYXlsb2FkIHN0YXJ0cy4KLQkgKiBKdW1wIG92ZXIgdmxhbiBoZWFkZXJzIGlm IGFscmVhZHkgcHJlc2VudCwKLQkgKiBoZWxwZnVsIGZvciBRaW5RIHRvby4KLQkgKi8KLQllaCA9 IG10b2QobXAsIHN0cnVjdCBldGhlcl92bGFuX2hlYWRlciAqKTsKLQlpZiAoZWgtPmV2bF9lbmNh cF9wcm90byA9PSBodG9ucyhFVEhFUlRZUEVfVkxBTikpIHsKLQkJZXR5cGUgPSBudG9ocyhlaC0+ ZXZsX3Byb3RvKTsKLQkJZWhkcmxlbiA9IEVUSEVSX0hEUl9MRU4gKyBFVEhFUl9WTEFOX0VOQ0FQ X0xFTjsKLQl9IGVsc2UgewotCQlldHlwZSA9IG50b2hzKGVoLT5ldmxfZW5jYXBfcHJvdG8pOwot CQllaGRybGVuID0gRVRIRVJfSERSX0xFTjsKLQl9Ci0KIAkvKiBTZXQgdGhlIGV0aGVyIGhlYWRl ciBsZW5ndGggKi8KLQl2bGFuX21hY2lwX2xlbnMgfD0gZWhkcmxlbiA8PCBFMTAwMF9BRFZUWERf TUFDTEVOX1NISUZUOworCXZsYW5fbWFjaXBfbGVucyB8PSBwa3QtPmVoZHJsZW4gPDwgRTEwMDBf QURWVFhEX01BQ0xFTl9TSElGVDsKIAotCXN3aXRjaCAoZXR5cGUpIHsKKwlzd2l0Y2ggKHBrdC0+ ZXR5cGUpIHsKIAkJY2FzZSBFVEhFUlRZUEVfSVA6Ci0JCQlpcCA9IChzdHJ1Y3QgaXAgKikobXAt Pm1fZGF0YSArIGVoZHJsZW4pOwotCQkJaXBfaGxlbiA9IGlwLT5pcF9obCA8PCAyOworCQkJaXAg PSBwa3QtPmlwOwogCQkJaXBwcm90byA9IGlwLT5pcF9wOwogCQkJdHlwZV90dWNtZF9tbGhsIHw9 IEUxMDAwX0FEVlRYRF9UVUNNRF9JUFY0OwogCQkJYnJlYWs7CiAJCWNhc2UgRVRIRVJUWVBFX0lQ VjY6Ci0JCQlpcDYgPSAoc3RydWN0IGlwNl9oZHIgKikobXAtPm1fZGF0YSArIGVoZHJsZW4pOwot CQkJaXBfaGxlbiA9IHNpemVvZihzdHJ1Y3QgaXA2X2hkcik7CisJCQlpcDYgPSBwa3QtPmlwNjsK IAkJCS8qIFhYWC1CWiB0aGlzIHdpbGwgZ28gYmFkbHkgaW4gY2FzZSBvZiBleHQgaGRycy4gKi8K IAkJCWlwcHJvdG8gPSBpcDYtPmlwNl9ueHQ7CiAJCQl0eXBlX3R1Y21kX21saGwgfD0gRTEwMDBf QURWVFhEX1RVQ01EX0lQVjY7CkBAIC0zODk1LDcgKzM4NjgsNyBAQAogCQkJYnJlYWs7CiAJfQog Ci0Jdmxhbl9tYWNpcF9sZW5zIHw9IGlwX2hsZW47CisJdmxhbl9tYWNpcF9sZW5zIHw9IHBrdC0+ aXBfaGxlbjsKIAl0eXBlX3R1Y21kX21saGwgfD0gRTEwMDBfQURWVFhEX0RDTURfREVYVCB8IEUx MDAwX0FEVlRYRF9EVFlQX0NUWFQ7CiAKIAlzd2l0Y2ggKGlwcHJvdG8pIHsKQEAgLTM5NDEsNiAr MzkxNCwxNjcgQEAKICAgICAgICAgcmV0dXJuICgwKTsKIH0KIAorLyoKKyAqIEludGVsIHJlY29t bWVuZHMgZW50aXJlIElQL1RDUCBoZWFkZXIgbGVuZ3RoIHJlc2lkZSBpbiBhIHNpbmdsZQorICog YnVmZmVyLiBJZiBtdWx0aXBsZSBkZXNjcmlwdG9ycyBhcmUgdXNlZCB0byBkZXNjcmliZSB0aGUg SVAgYW5kCisgKiBUQ1AgaGVhZGVyLCBlYWNoIGRlc2NyaXB0b3Igc2hvdWxkIGRlc2NyaWJlIG9u ZSBvciBtb3JlCisgKiBjb21wbGV0ZSBoZWFkZXJzOyBkZXNjcmlwdG9ycyByZWZlcmVuY2luZyBv bmx5IHBhcnRzIG9mIGhlYWRlcnMKKyAqIGFyZSBub3Qgc3VwcG9ydGVkLiBJZiBhbGwgbGF5ZXIg aGVhZGVycyBhcmUgbm90IGNvYWxlc2NlZCBpbnRvCisgKiBhIHNpbmdsZSBidWZmZXIsIGVhY2gg YnVmZmVyIHNob3VsZCBub3QgY3Jvc3MgYSA0S0IgYm91bmRhcnksCisgKiBvciBiZSBsYXJnZXIg dGhhbiB0aGUgbWF4aW11bSByZWFkIHJlcXVlc3Qgc2l6ZS4KKyAqCisgKiBDb250cm9sbGVyIGFs c28gcmVxdWlyZXMgbW9kaWZpbmcgSVAvVENQIGhlYWRlciB0byBtYWtlIFRTTyB3b3JrCisgKiBz byB3ZSBmaXJzdGx5IGdldCBhIHdyaXRhYmxlIG1idWYgY2hhaW4gdGhlbiBjb2FsZXNjZSBldGhl cm5ldC8KKyAqIElQL1RDUCBoZWFkZXIgaW50byBhIHNpbmdsZSBidWZmZXIgdG8gbWVldCB0aGUg cmVxdWlyZW1lbnQgb2YKKyAqIGNvbnRyb2xsZXIuIFRoaXMgYWxzbyBzaW1wbGlmaWVzIElQL1RD UC9VRFAgY2hlY2tzdW0gb2ZmbG9hZGluZworICogd2hpY2ggYWxzbyBoYXMgc2ltaWxpYXIgcmVz dHJpY3Rpb25zLgorICovCitzdGF0aWMgaW50CitpZ2JfcHVsbHVwX2hlYWRlcnMoc3RydWN0IG1i dWYgKiptX2hlYWRwLCB1MzIgY3N1bV9mbGFncywgc3RydWN0IGlnYl9wa3RfaW5mbyAqcGt0KQor eworCXN0cnVjdCBtYnVmIAkJKm1faGVhZCA9ICptX2hlYWRwOworCXN0cnVjdCBldGhlcl92bGFu X2hlYWRlciAqZWg7CisJdTE2IGV0eXBlOworCXUzMiBlaGRybGVuLCBpcF9obGVuLCBkb190c28s IHBvZmY7CisjaWZkZWYgSU5FVAorCXN0cnVjdCBpcAkJKmlwOworI2VuZGlmCisjaWZkZWYgSU5F VDYKKwlzdHJ1Y3QgaXA2X2hkcgkJKmlwNjsKKyNlbmRpZgorCXN0cnVjdCB0Y3BoZHIJCSp0aDsK KworCWRvX3RzbyA9ICgoY3N1bV9mbGFncyAmIENTVU1fVFNPKSAhPSAwKTsKKwliemVybyhwa3Qs IHNpemVvZihzdHJ1Y3QgaWdiX3BrdF9pbmZvKSk7CisKKwkvKgorCSAqIERldGVybWluZSB3aGVy ZSBmcmFtZSBwYXlsb2FkIHN0YXJ0cy4KKwkgKiBKdW1wIG92ZXIgdmxhbiBoZWFkZXJzIGlmIGFs cmVhZHkgcHJlc2VudCwKKwkgKiBoZWxwZnVsIGZvciBRaW5RIHRvby4KKwkgKi8KKwllaCA9IG10 b2QobV9oZWFkLCBzdHJ1Y3QgZXRoZXJfdmxhbl9oZWFkZXIgKik7CisJaWYgKGVoLT5ldmxfZW5j YXBfcHJvdG8gPT0gaHRvbnMoRVRIRVJUWVBFX1ZMQU4pKSB7CisJCWV0eXBlID0gbnRvaHMoZWgt PmV2bF9wcm90byk7CisJCWVoZHJsZW4gPSBFVEhFUl9IRFJfTEVOICsgRVRIRVJfVkxBTl9FTkNB UF9MRU47CisJfSBlbHNlIHsKKwkJZXR5cGUgPSBudG9ocyhlaC0+ZXZsX2VuY2FwX3Byb3RvKTsK KwkJZWhkcmxlbiA9IEVUSEVSX0hEUl9MRU47CisJfQorCQorCS8qIG1ha2UgbWJ1ZiBjaGFpbiB3 cml0YWJsZSAqLworCWlmIChtX2hlYWQtPm1fbmV4dCAhPSBOVUxMKSB7CisJCWlmIChNX1dSSVRB QkxFKCptX2hlYWRwKSA9PSAwKSB7CisJCQltX2hlYWQgPSBtX2R1cCgqbV9oZWFkcCwgTV9OT1dB SVQpOworCQkJbV9mcmVlbSgqbV9oZWFkcCk7CisJCQlpZiAobV9oZWFkID09IE5VTEwpIHsKKwkJ CQkqbV9oZWFkcCA9IE5VTEw7CisJCQkJcmV0dXJuIChFTk9CVUZTKTsKKwkJCX0KKwkJCSptX2hl YWRwID0gbV9oZWFkOworCQl9CisJfQorCisJLyogcHVsbCB1cCBldGhlcm5ldCBoZWFkZXIsIGFj Y291bnRzIGZvciB2bGFuIHRhZyAqLworCW1faGVhZCA9IG1fcHVsbHVwKG1faGVhZCwgZWhkcmxl bik7CisJaWYgKG1faGVhZCA9PSBOVUxMKSB7CisJCSptX2hlYWRwID0gTlVMTDsKKwkJcmV0dXJu IChFTk9CVUZTKTsKKwl9CisKKwkvKiBwdWxsIHVwIGlwIGFuZCBnZXQgcG9pbnRlcnMgKi8KKwlz d2l0Y2ggKGV0eXBlKSB7CisjaWZkZWYgSU5FVAorCQljYXNlIEVUSEVSVFlQRV9JUDoKKwkJCW1f aGVhZCA9IG1fcHVsbHVwKG1faGVhZCwgZWhkcmxlbiArIHNpemVvZihzdHJ1Y3QgaXApKTsKKwkJ CWlwID0gKHN0cnVjdCBpcCAqKShtdG9kKG1faGVhZCwgY2hhciAqKSArIGVoZHJsZW4pOworCQkJ aXBfaGxlbiA9IGlwLT5pcF9obCA8PCAyOworCQkJcG9mZiA9IGVoZHJsZW4gKyBpcF9obGVuOwor CQkJYnJlYWs7CisjZW5kaWYKKyNpZmRlZiBJTkVUNgorCQljYXNlIEVUSEVSVFlQRV9JUFY2Ogor CQkJbV9oZWFkID0gbV9wdWxsdXAobV9oZWFkLCBlaGRybGVuICsgc2l6ZW9mKHN0cnVjdCBpcDZf aGRyKSk7CisJCQlpcDYgPSAoc3RydWN0IGlwNl9oZHIgKikobXRvZChtX2hlYWQsIGNoYXIgKikg KyBlaGRybGVuKTsKKwkJCWlwX2hsZW4gPSBzaXplb2Yoc3RydWN0IGlwNl9oZHIpOworCQkJcG9m ZiA9IGVoZHJsZW4gKyBpcF9obGVuOworCQkJYnJlYWs7CisjZW5kaWYKKwkJZGVmYXVsdDoKKwkJ CWJyZWFrOworCX0KKworCWlmIChtX2hlYWQgPT0gTlVMTCkgeworCQkqbV9oZWFkcCA9IE5VTEw7 CisJCXJldHVybiAoRU5PQlVGUyk7CisJfQorCisJaWYgKGRvX3RzbykgeworCQkvKiBwdWxsIHVw IFRDUCBoZWFkZXIgKi8KKwkJbV9oZWFkID0gbV9wdWxsdXAobV9oZWFkLCBwb2ZmICsgc2l6ZW9m KHN0cnVjdCB0Y3BoZHIpKTsKKwkJaWYgKG1faGVhZCA9PSBOVUxMKSB7CisJCQkqbV9oZWFkcCA9 IE5VTEw7CisJCQlyZXR1cm4gKEVOT0JVRlMpOworCQl9CisJCXRoID0gKHN0cnVjdCB0Y3BoZHIg KikobXRvZChtX2hlYWQsIGNoYXIgKikgKyBwb2ZmKTsKKwkJLyoKKwkJICogVFNPIHdvcmthcm91 bmQ6CisJCSAqICAgcHVsbCA0IG1vcmUgYnl0ZXMgb2YgZGF0YSBpbnRvIGl0LgorCQkgKi8KKwkJ bV9oZWFkID0gbV9wdWxsdXAobV9oZWFkLCBwb2ZmICsgKHRoLT50aF9vZmYgPDwgMikgKyA0KTsK KwkJaWYgKG1faGVhZCA9PSBOVUxMKSB7CisJCQkqbV9oZWFkcCA9IE5VTEw7CisJCQlyZXR1cm4g KEVOT0JVRlMpOworCQl9CisJCXBrdC0+dGggPSAoc3RydWN0IHRjcGhkciAqKShtdG9kKG1faGVh ZCwgY2hhciAqKSArIHBvZmYpOworCX0gZWxzZSBpZiAoY3N1bV9mbGFncyAmIENTVU1fVENQKSB7 CisJCW1faGVhZCA9IG1fcHVsbHVwKG1faGVhZCwgcG9mZiArIHNpemVvZihzdHJ1Y3QgdGNwaGRy KSk7CisJCWlmIChtX2hlYWQgPT0gTlVMTCkgeworCQkJKm1faGVhZHAgPSBOVUxMOworCQkJcmV0 dXJuIChFTk9CVUZTKTsKKwkJfQorCQl0aCA9IChzdHJ1Y3QgdGNwaGRyICopKG10b2QobV9oZWFk LCBjaGFyICopICsgcG9mZik7CisJCW1faGVhZCA9IG1fcHVsbHVwKG1faGVhZCwgcG9mZiArICh0 aC0+dGhfb2ZmIDw8IDIpKTsKKwkJaWYgKG1faGVhZCA9PSBOVUxMKSB7CisJCQkqbV9oZWFkcCA9 IE5VTEw7CisJCQlyZXR1cm4gKEVOT0JVRlMpOworCQl9CisJCXBrdC0+dGggPSAoc3RydWN0IHRj cGhkciAqKShtdG9kKG1faGVhZCwgY2hhciAqKSArIHBvZmYpOworCX0gZWxzZSBpZiAoY3N1bV9m bGFncyAmIENTVU1fVURQKSB7CisJCW1faGVhZCA9IG1fcHVsbHVwKG1faGVhZCwgcG9mZiArIHNp emVvZihzdHJ1Y3QgdWRwaGRyKSk7CisJCWlmIChtX2hlYWQgPT0gTlVMTCkgeworCQkJKm1faGVh ZHAgPSBOVUxMOworCQkJcmV0dXJuIChFTk9CVUZTKTsKKwkJfQorCX0KKworCS8qIGZpbmFsIGNh cHR1cmUgb2YgaXAgcG9pbnRlciAqLworCXN3aXRjaCAoZXR5cGUpIHsKKyNpZmRlZiBJTkVUCisJ CWNhc2UgRVRIRVJUWVBFX0lQOgorCQkJcGt0LT5pcCA9IChzdHJ1Y3QgaXAgKikobXRvZChtX2hl YWQsIGNoYXIgKikgKyBlaGRybGVuKTsKKwkJCXBrdC0+aXA2ID0gTlVMTDsKKwkJCWJyZWFrOwor I2VuZGlmCisjaWZkZWYgSU5FVDYKKwkJY2FzZSBFVEhFUlRZUEVfSVBWNjoKKwkJCXBrdC0+aXA2 ID0gKHN0cnVjdCBpcDZfaGRyICopKG10b2QobV9oZWFkLCBjaGFyICopICsgZWhkcmxlbik7CisJ CQlwa3QtPmlwID0gTlVMTDsKKwkJCWJyZWFrOworI2VuZGlmCisJCWRlZmF1bHQ6CisJCQlicmVh azsKKwl9CisJKm1faGVhZHAgPSBtX2hlYWQ7CisKKwkvKiByZXR1cm4gdGhlc2UgY2FsY3VsYXRl ZCBwb2ludGVycy92YWx1ZXMgZm9yIHJlLXVzZSAqLworCXBrdC0+ZWhkcmxlbiA9IGVoZHJsZW47 CisJcGt0LT5ldHlwZSA9IGV0eXBlOworCXBrdC0+aXBfaGxlbiA9IGlwX2hsZW47CisKKwlyZXR1 cm4gKDApOworfQorCisKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAgKgogICogIEV4YW1pbmUgZWFjaCB0eF9i dWZmZXIgaW4gdGhlIHVzZWQgcXVldWUuIElmIHRoZSBoYXJkd2FyZSBpcyBkb25lCmRpZmYgLU5h dXIgaGVhZC9pZl9pZ2IuaCBwYXRjaC9pZl9pZ2IuaAotLS0gaGVhZC9pZl9pZ2IuaAkyMDE0LTAx LTE0IDE0OjA4OjA0LjAwMDAwMDAwMCAtMDgwMAorKysgcGF0Y2gvaWZfaWdiLmgJMjAxNC0wMS0x NCAxNDowNzowMS4wMDAwMDAwMDAgLTA4MDAKQEAgLTEsNiArMSw2IEBACiAvKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqCiAKLSAgQ29weXJpZ2h0IChjKSAyMDAxLTIwMTMsIEludGVsIENvcnBvcmF0aW9u IAorICBDb3B5cmlnaHQgKGMpIDIwMDEtMjAxNCwgSW50ZWwgQ29ycG9yYXRpb24gCiAgIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAgIAogICBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQgCkBAIC0yMzcsOSArMjM3LDkgQEAKIAog LyogT2ZmbG9hZCBiaXRzIGluIG1idWYgZmxhZyAqLwogI2lmIF9fRnJlZUJTRF92ZXJzaW9uID49 IDgwMDAwMAotI2RlZmluZSBDU1VNX09GRkxPQUQJCShDU1VNX0lQfENTVU1fVENQfENTVU1fVURQ fENTVU1fU0NUUCkKKyNkZWZpbmUgQ1NVTV9PRkZMT0FECQkoQ1NVTV9JUHxDU1VNX1RDUHxDU1VN X1VEUHxDU1VNX1RTT3xDU1VNX1NDVFApCiAjZWxzZQotI2RlZmluZSBDU1VNX09GRkxPQUQJCShD U1VNX0lQfENTVU1fVENQfENTVU1fVURQKQorI2RlZmluZSBDU1VNX09GRkxPQUQJCShDU1VNX0lQ fENTVU1fVENQfENTVU1fVURQfENTVU1fVFNPKQogI2VuZGlmCiAKIC8qIERlZmluZSB0aGUgc3Rh cnRpbmcgSW50ZXJydXB0IHJhdGUgcGVyIFF1ZXVlICovCkBAIC01MTMsNiArNTEzLDE1IEBACiAJ YnVzX2RtYW1hcF90CXBtYXA7CS8qIGJ1c19kbWEgbWFwIGZvciBwYWNrZXQgKi8KIH07CiAKK3N0 cnVjdCBpZ2JfcGt0X2luZm8geworCXUxNgkJZXR5cGU7CisJdTMyCQllaGRybGVuOworCXUzMgkJ aXBfaGxlbjsKKwlzdHJ1Y3QgaXAJKmlwOworCXN0cnVjdCBpcDZfaGRyCSppcDY7CisJc3RydWN0 IHRjcGhkcgkqdGg7Cit9OworCiAvKgogKiogRmluZCB0aGUgbnVtYmVyIG9mIHVucmVmcmVzaGVk IFJYIGRlc2NyaXB0b3JzCiAqLwo= --001a1134b612f2665504eff5a3dc-- From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 07:20:15 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C741D3C; Wed, 15 Jan 2014 07:20:15 +0000 (UTC) Received: from naweprlhax07o.nmci.navy.mil (naweprlhax07o.nmci.navy.mil [138.163.129.84]) by mx1.freebsd.org (Postfix) with ESMTP id EE1FC1202; Wed, 15 Jan 2014 07:20:14 +0000 (UTC) Received: from naweprlheg02v.nadsuswe.nads.navy.mil (gate2-hawaii.nmci.navy.mil [138.163.128.42]) by naweprlhax07o.nmci.navy.mil (Symantec Mail Security) with SMTP id 4C.9C.18817.DA636D25; Tue, 14 Jan 2014 21:20:13 -1000 (HST) X-AuditID: 8aa38153-b7f686d000004981-ce-52d636ad9dfd Authentication-Results: UKEL19PA05_EEMSG_MP2.csd.disa.mil; dkim=neutral (message not signed) header.i=none Received-SPF: None identity=pra; client-ip=8.8.178.116; receiver=UKEL19PA05_EEMSG_MP2.csd.disa.mil; envelope-from="owner-freebsd-stable@freebsd.org"; x-sender="owner-freebsd-stable@freebsd.org"; x-conformance=sidf_compatible Received-SPF: Pass identity=mailfrom; client-ip=8.8.178.116; receiver=UKEL19PA05_EEMSG_MP2.csd.disa.mil; envelope-from="owner-freebsd-stable@freebsd.org"; x-sender="owner-freebsd-stable@freebsd.org"; x-conformance=sidf_compatible; x-record-type="v=spf1" Received-SPF: None identity=helo; client-ip=8.8.178.116; receiver=UKEL19PA05_EEMSG_MP2.csd.disa.mil; envelope-from="owner-freebsd-stable@freebsd.org"; x-sender="postmaster@mx2.freebsd.org"; x-conformance=sidf_compatible X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtwCABlD1VIICLJ0nGdsb2JhbABagmpZtVSFCoFiFg4BAQEBAQYNCQkUKIInAgQBATcMCAIXBgEOAwECBgIrDQEHCAgDAQsYAQkLIgcCBQQBBBgEh2QCAQnEHBcWjiABAWgBhCQEjjmHFIJQgTGUE2x9Bxc Delivered-To: freebsd-stable@freebsd.org X-Virus-Scanned: amavisd-new at darkbsd.org Date: Tue, 14 Jan 2014 16:03:46 +0100 From: Christophe Prevotaux To: freebsd-stable@freebsd.org, freebsd-current@freebsd.org Subject: Shared IRQ on ATOM based Soekris net6501 board Message-ID: <20140114160346.2c34db92@fusen> Organization: Rural Networks X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.17; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: owner-freebsd-stable@freebsd.org Sender: owner-freebsd-stable@freebsd.org X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLIsWRmVeSWpSXmKPExsXStbhBS3et2bUgg7XX9S3mvPnAZHG4WciB yWPGp/ksAYxRXDYpqTmZZalF+nYJXBmLz4UX7JvBWNG/ZwFbA2N7TRcjJ4eEgInE/u5HbBC2 mMSFe+uBbC4OIYEnjBJzH95ihilacqeJBcRmFMiSOP9kCliDkMAbRok/PewQDT1MElf7D7FC OM8ZJd6+aWWC6FaWWLfxHzuEvYNRYu/vYBCbRUBDYvq9t4wQcW2JfYvbmSDiqhLvd5wBq2cT sJa4O20CWI0IkP1j7h1WEFtYwFzizP6LYHFeoN7ryxeAXcQvICPRt2k51F47ifc7PwHN4QCq EZT4u0MYIqwu8f3tJ6hzJCUmfNgOVi4gICAxb8lOMJtHwE9i/qf3LBB2H6PE0Q5nCNtJ4tKi l+wQtp7EvTk/WSFsZ4nNU7pZQH7nEehmlDhz6RxYgllAR2LB7k9sELa8xPa3c8Ahygp086xX vUwTGFVmIZw3C0nHLCQdCxiZVzEq5yWWpxYU5WQkVhiY6+UlphSXFpenghlAoqxSLzczZxMj OFE0Bu9gvL3F6hCjAAejEg9vS9LVICHWxLLiytxDjBIczEoivCza14KEeFMSK6tSi/Lji0pz UosPMUpzsCiJ8zrGrg8SEkhPLEnNTk0tSC2CyTJxcEo1MAr7Z6Ts729leyJw9O+alxXqbg7H 1GKLE8smf51ylSvPQfJQ/fPS3U293c0N1e4nXKNWL03dbfBY+ndV7rf7F1f5XtzumpCwWrb3 6OLkj2l7v4Zf0T9TsdX+R8+puT3n/p0pnc6410Vq/cdODXfJ3G3V7H+OSk6NiFup+viD551T Pu1xPDdPTFViKc5INNRiLipOBACNpMK7EAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA11TfVAUdRjmt7fs7R1sLofCy4WahymTKeQ0g2lhEzOO1Ywg/kHZGK2yckfH gfeBQNAoDh0hytmXBibIMZEOKZzFR5DmCaM4RIV3gMyFqZTycV0eSSIftXu7KPTPzvN7n/d5 nvc3729JiaJXpiTZbCOr1zFaFSHHeyAkYrV7qzMx+rJz1bquOhvxMtpcUdwmSUDb5S+msFpN FquPin1HrrZ2JWWeP4ayS1sriX3InFeMZCTQz0O1qwAXcAj8PHCWKEZyUkF/iIHl81rEE4hO g58GPyF4rKBHEUyVSIWmEgycpXZ/4XAHgXu0EBOsIuBM/YxUwE0Ivp/cJqjz4Ztz47ggKMCg 70CpmFePwHqp3KfA6Ug4OuBGAnEEg5r9dZhw+BJBueU7iXAoR2D/4KYYsgrOW81i1xUED4f/ EGf0IDj5w3FCMH4aPE2dPgVBb4BfP7P4LriQww++cPnzOJiOgc4Lv/jqFOfaW1Pp0y6gw+Gw rUa8Xix4mr2cD8n1BMF0U7BQXgn/uL3iQGFg+avR107TNJyobvbhQHoLVHg9uIAPI2gvirOg yLLHTmUcI6GfhcoWLyHgpdDoPi6pRJLTKELH7GUz9Vo1kx29do2OSTGYDHtZH+A+WTlr0jVa G+KeRbF1/6tNqLthvR3RJFIFUvcxR6LCn8ky5KTb0QskplpEbUxwJiqe2JmRkqNmDOpkvUnL GlRLqJhRrjP0UZlLyNTs0mSYDMkmvdaOgJSoFlKn4zktlcLk5LL6DEFqR0+SuCqUittxNlFB pzJG9l2WzWT1s+xGklQBdZAPDdKzqWz2bo3WOEurllF/87nKucz/ozFSZkcxZCCXb/PlGzKZ dIMmVbRYTKXwFiGz1fnyqyie7P7aO4UUuC5DxypDqSP8KDTfrTbpHk2ifIr6lrcJm0PMd+J/ O5K0GbvRYmUwhfz8/BSB3D3TNUZxEJG/hYLIIamCkGOsjo5Q+mKHkQtx+wimqvjwQI3O+Hj+ cCqLD14kFueHrq3mdPT1aLjXoIK+i20IulomEUy4P8Wg5W4PBl+duYPBRyPjGLg8kxhMNrZJ 4PpIhwQKJ8Yl4PDYcRj8/RIO/55w4FB7t9afe5MHCDjmLCdgwNNEwDXzDAEdrSVSuFJ0VAq/ 9dRJYez2LSmcmxoiwXVvlISxAi8JDvO0DAp/nJGB41S/HFyl1gCYuNEaAANXOwOGuf1g3H7y bzj4/RgZ49z9LNncze9HrM6/oHIfeq3/2urwsdBcp9nc135QVhWKVkSt3JV3cesbSZv27Jlu T1s/+PpLO9PfHsp7sH06vkr9sS5uU1Dk7trK4vLlo2WXL6Q1RBTd36boiH04Ysl/P3dBQuGh t5pNIcn6GG+Y0dr/XrRxS6dt2ambFct3tG3QLk2KWrGu9OQhv1d6/3wzpP52doAKN6iZ556R 6A3Mf5ZljGpqBQAA X-OriginalArrivalTime: 14 Jan 2014 15:04:13.0998 (UTC) FILETIME=[E3389CE0:01CF1139] X-BeenThere: freebsd-current@freebsd.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 07:20:15 -0000 I have found out that when I use 2 AR9580 mini PCIe board some irq (namely in that case irq18 is shared over 3 devices) I wonder why it is done like this and if this could be something to fix ? Kernel is 30/12/2014 CURRENT ( FreeBSD/amd64) with : options mptable vmstat -i interrupt total rate irq4: uart0 1006 0 irq17: ath0 12857761 2078 irq18: ath1++ 11204038 1811 cpu0:timer 5775445 933 irq256: ahci0 3761 0 irq257: em0:rx 0 43769 7 irq258: em0:tx 0 6667 1 irq259: em0:link 2 0 irq260: em1:rx 0 6157 0 irq261: em1:tx 0 46 0 irq262: em1:link 2 0 irq263: em2:rx 0 21929 3 irq264: em2:tx 0 17803 2 irq265: em2:link 4 0 irq266: em3:rx 0 12326978 1992 irq267: em3:tx 0 13653018 2207 irq268: em3:link 11 0 cpu1:timer 5734729 927 Total 61653126 9966 ACPI BIOS Error (bug): A valid RSDP was not found (20130823/tbxfroot-223) Copyright (c) 1992-2013 The FreeBSD Project. Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved. FreeBSD is a registered trademark of The FreeBSD Foundation. FreeBSD 11.0-CURRENT #1: Wed Jan 8 20:42:57 EST 2014 root@ap01:/usr/obj/usr/src/sys/NET6501 amd64 FreeBSD clang version 3.3 (tags/RELEASE_33/final 183502) 20130610 CPU: Genuine Intel(R) CPU @ 600MHz (600.01-MHz K8-class CPU) Origin = "GenuineIntel" Id = 0x20661 Family = 0x6 Model = 0x26 Stepping = 1 Features=0xbfe9fbff Features2=0x40e3bd AMD Features=0x20100800 AMD Features2=0x1 TSC: P-state invariant, performance statistics real memory = 536739840 (511 MB) avail memory = 496316416 (473 MB) MPTable: Event timer "LAPIC" quality 400 FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs FreeBSD/SMP: 1 package(s) x 1 core(s) x 2 HTT threads cpu0 (BSP): APIC ID: 0 cpu1 (AP/HT): APIC ID: 1 ioapic0: Assuming intbase of 0 ioapic0 irqs 0-23 on motherboard random: initialized kbd0 at kbdmux0 module_register_init: MOD_LOAD (vesa, 0xffffffff80ab3c10, 0) error 19 ACPI BIOS Error (bug): A valid RSDP was not found (20130823/tbxfroot-223) ACPI: Table initialisation failed: AE_NOT_FOUND ACPI: Try disabling either ACPI or apic support. pcib0: pcibus 0 on motherboard pci0: on pcib0 pcib1: irq 16 at device 23.0 on pci0 pci1: on pcib1 pcib2: irq 16 at device 0.0 on pci1 pci2: on pcib2 pci2: at device 0.0 (no driver attached) pci2: at device 0.1 (no driver attached) pci2: at device 0.2 (no driver attached) ohci0: mem 0xa0000b00-0xa0000bff irq 19 at device 2.0 on pci2 usbus0 on ohci0 ohci1: mem 0xa0000c00-0xa0000cff irq 19 at device 2.1 on pci2 usbus1 on ohci1 ohci2: mem 0xa0000d00-0xa0000dff irq 19 at device 2.2 on pci2 usbus2 on ohci2 ehci0: mem 0xa0000e00-0xa0000eff irq 19 at device 2.3 on pci2 usbus3: EHCI version 1.0 usbus3 on ehci0 pci2: at device 2.4 (no driver attached) sdhci_pci0: mem 0xa0004000-0xa00041ff irq 18 at device 4.0 on pci2 sdhci_pci0: 1 slot(s) allocated sdhci_pci1: mem 0xa0004200-0xa00043ff irq 18 at device 4.1 on pci2 sdhci_pci1: 1 slot(s) allocated ahci0: port 0x1020-0x103f mem 0xa0004400-0xa00047ff irq 17 at device 6.0 on pci2 ahci0: AHCI v1.10 with 2 3Gbps ports, Port Multiplier supported ahcich0: at channel 0 on ahci0 ahcich1: at channel 1 on ahci0 ohci3: mem 0xa0004800-0xa00048ff irq 16 at device 8.0 on pci2 usbus4 on ohci3 ohci4: mem 0xa0004900-0xa00049ff irq 16 at device 8.1 on pci2 usbus5 on ohci4 ohci5: mem 0xa0004a00-0xa0004aff irq 16 at device 8.2 on pci2 usbus6 on ohci5 ehci1: mem 0xa0004b00-0xa0004bff irq 16 at device 8.3 on pci2 usbus7: EHCI version 1.0 usbus7 on ehci1 pci2: at device 10.0 (no driver attached) uart2: port 0x1040-0x1047 mem 0xa0004d00-0xa0004d0f irq 19 at device 10.1 on pci2 uart3: port 0x1048-0x104f mem 0xa0004d10-0xa0004d1f irq 19 at device 10.2 on pci2 uart4: port 0x1050-0x1057 mem 0xa0004d20-0xa0004d2f irq 19 at device 10.3 on pci2 uart5: port 0x1058-0x105f mem 0xa0004d30-0xa0004d3f irq 19 at device 10.4 on pci2 pci2: at device 12.0 (no driver attached) pci2: at device 12.1 (no driver attached) pci2: at device 12.2 (no driver attached) pci2: at device 12.3 (no driver attached) pci2: at device 12.4 (no driver attached) pcib3: irq 17 at device 24.0 on pci0 pci3: on pcib3 pcib4: at device 0.0 on pci3 pci4: on pcib4 pcib5: at device 2.0 on pci4 pci5: on pcib5 em0: port 0x2000-0x201f mem 0xa1000000-0xa101ffff,0xa1020000-0xa1023fff irq 19 at device 0.0 on pci5 em0: Using MSIX interrupts with 3 vectors em0: Ethernet address: 00:00:24:cf:05:30 pcib6: at device 3.0 on pci4 pci6: on pcib6 em1: port 0x3000-0x301f mem 0xa2000000-0xa201ffff,0xa2020000-0xa2023fff irq 16 at device 0.0 on pci6 em1: Using MSIX interrupts with 3 vectors em1: Ethernet address: 00:00:24:cf:05:31 pcib7: at device 4.0 on pci4 pci7: on pcib7 pcib8: irq 18 at device 25.0 on pci0 pci8: on pcib8 pcib9: at device 0.0 on pci8 pci9: on pcib9 pcib10: at device 2.0 on pci9 pci10: on pcib10 em2: port 0x4000-0x401f mem 0xa3000000-0xa301ffff,0xa3020000-0xa3023fff irq 16 at device 0.0 on pci10 em2: Using MSIX interrupts with 3 vectors em2: Ethernet address: 00:00:24:cf:05:32 pcib11: at device 3.0 on pci9 pci11: on pcib11 em3: port 0x5000-0x501f mem 0xa4000000-0xa401ffff,0xa4020000-0xa4023fff irq 17 at device 0.0 on pci11 em3: Using MSIX interrupts with 3 vectors em3: Ethernet address: 00:00:24:cf:05:33 pcib12: at device 4.0 on pci9 pci12: on pcib12 pcib13: irq 19 at device 26.0 on pci0 pci13: on pcib13 pcib14: mem 0xa5000000-0xa5003fff irq 19 at device 0.0 on pci13 pci14: on pcib14 pcib15: irq 16 at device 1.0 on pci14 pci15: on pcib15 pcib16: irq 17 at device 2.0 on pci14 pci16: on pcib16 ath0: mem 0xa6000000-0xa601ffff irq 17 at device 0.0 on pci16 ar9300_set_stub_functions: setting stub functions ar9300_set_stub_functions: setting stub functions ar9300_attach: calling ar9300_hw_attach ar9300_hw_attach: calling ar9300_eeprom_attach ar9300_flash_map: unimplemented for now Restoring Cal data from DRAM Restoring Cal data from EEPROM ar9300_hw_attach: ar9300_eeprom_attach returned 0 ath0: RX status length: 48 ath0: RX buffer size: 4096 ath0: TX descriptor length: 128 ath0: TX status length: 36 ath0: TX buffers per descriptor: 4 ar9300_freebsd_setup_x_tx_desc: called, 0x0/0, 0x0/0, 0x0/0 ath0: ath_edma_setup_rxfifo: type=0, FIFO depth = 16 entries ath0: ath_edma_setup_rxfifo: type=1, FIFO depth = 128 entries ath0: [HT] enabling HT modes ath0: [HT] enabling short-GI in 20MHz mode ath0: [HT] 1 stream STBC receive enabled ath0: [HT] 1 stream STBC transmit enabled ath0: [HT] 3 RX streams; 3 TX streams ath0: AR9580 mac 448.4 RF5110 phy 3661.5 ath0: 2GHz radio: 0x0000; 5GHz radio: 0x0000 pcib17: irq 18 at device 3.0 on pci14 pci17: on pcib17 ath1: mem 0xa7000000-0xa701ffff irq 18 at device 0.0 on pci17 ar9300_set_stub_functions: setting stub functions ar9300_set_stub_functions: setting stub functions ar9300_attach: calling ar9300_hw_attach ar9300_hw_attach: calling ar9300_eeprom_attach ar9300_flash_map: unimplemented for now Restoring Cal data from DRAM Restoring Cal data from EEPROM ar9300_hw_attach: ar9300_eeprom_attach returned 0 ath1: RX status length: 48 ath1: RX buffer size: 4096 ath1: TX descriptor length: 128 ath1: TX status length: 36 ath1: TX buffers per descriptor: 4 ar9300_freebsd_setup_x_tx_desc: called, 0x0/0, 0x0/0, 0x0/0 ath1: ath_edma_setup_rxfifo: type=0, FIFO depth = 16 entries ath1: ath_edma_setup_rxfifo: type=1, FIFO depth = 128 entries ath1: [HT] enabling HT modes ath1: [HT] enabling short-GI in 20MHz mode ath1: [HT] 1 stream STBC receive enabled ath1: [HT] 1 stream STBC transmit enabled ath1: [HT] 3 RX streams; 3 TX streams ath1: AR9580 mac 448.4 RF5110 phy 1083.4 ath1: 2GHz radio: 0x0000; 5GHz radio: 0x0000 isab0: at device 31.0 on pci0 isa0: on isab0 cpu0 on motherboard est0: on cpu0 est: CPU supports Enhanced Speedstep, but is not recognized. est: cpu_vendor GenuineIntel, msr 60706070600060a device_attach: est0 attach returned 6 p4tcc0: on cpu0 cpu1 on motherboard est1: on cpu1 est: CPU supports Enhanced Speedstep, but is not recognized. est: cpu_vendor GenuineIntel, msr 60706070600060a device_attach: est1 attach returned 6 p4tcc1: on cpu1 atrtc0: at port 0x70 irq 8 on isa0 Event timer "RTC" frequency 32768 Hz quality 0 attimer0: at port 0x40 on isa0 Timecounter "i8254" frequency 1193182 Hz quality 0 Event timer "i8254" frequency 1193182 Hz quality 100 ppc0: cannot reserve I/O port range uart0: <16550 or compatible> at port 0x3f8-0x3ff irq 4 flags 0x10 on isa0 uart0: console (9600,n,8,1) est0: on cpu0 est: CPU supports Enhanced Speedstep, but is not recognized. est: cpu_vendor GenuineIntel, msr 60706070600060a device_attach: est0 attach returned 6 est1: on cpu1 est: CPU supports Enhanced Speedstep, but is not recognized. est: cpu_vendor GenuineIntel, msr 60706070600060a device_attach: est1 attach returned 6 Timecounters tick every 1.000 msec random: unblocking device. usbus0: 12Mbps Full Speed USB v1.0 usbus1: 12Mbps Full Speed USB v1.0 ugen0.1: <0x8086> at usbus0 uhub0: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus0 ugen1.1: <0x8086> at usbus1 uhub1: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus1 usbus2: 12Mbps Full Speed USB v1.0 usbus3: 480Mbps High Speed USB v2.0 ugen2.1: <0x8086> at usbus2 uhub2: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus2 ugen3.1: at usbus3 uhub3: on usbus3 usbus4: 12Mbps Full Speed USB v1.0 uhub0: 1 port with 1 removable, self powered ugen4.1: <0x8086> at usbus4 uhub4: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus4 uhub1: 1 port with 1 removable, self powered usbus5: 12Mbps Full Speed USB v1.0 uhub2: 1 port with 1 removable, self powered ugen5.1: <0x8086> at usbus5 uhub5: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus5 usbus6: 12Mbps Full Speed USB v1.0 usbus7: 480Mbps High Speed USB v2.0 ugen6.1: <0x8086> at usbus6 uhub6: <0x8086 OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus6 uhub4: 1 port with 1 removable, self powered ugen7.1: at usbus7 uhub7: on usbus7 ada0 at ahcich0 bus 0 scbus0 target 0 lun 0 uhub5: 1 port with 1 removable, self powered ada0: uhub6: 1 port with 1 removable, self powered ATA-8 SATA 2.x device ada0: Serial Number 02512013500300001076 ada0: 300.000MB/s transfers (SATA 2.x, UDMA6, PIO 8192bytes) ada0: Command Queueing enabled ada0: 28626MB (58626288 512 byte sectors: 16H 63S/T 16383C) ada0: Previously was known as ad4 SMP: AP CPU #1 Launched! Timecounter "TSC" frequency 600012906 Hz quality 1000 Root mount waiting for: usbus7 usbus3 uhub3: 3 ports with 3 removable, self powered uhub7: 3 ports with 3 removable, self powered Trying to mount root from ufs:/dev/ada0p2 [rw]... Setting hostuuid: c649b9a0-786a-11e3-8e56-000024cf0530. Setting hostid: 0xb1ae740b. Entropy harvesting: interrupts ethernet point_to_point swi. Starting file system checks: /dev/ada0p2: FILE SYSTEM CLEAN; SKIPPING CHECKS /dev/ada0p2: clean, 5902320 free (1056 frags, 737658 blocks, 0.0% fragmentation) Mounting local file systems:. Writing entropy file:. Setting hostname: ap01. bridge0: Ethernet address: 02:b1:ae:74:0b:00 Created clone interfaces: bridge0. wlan0: Ethernet address: 04:f0:21:04:5d:7a ath0: stuck beacon; resetting (bmiss count 4) ath0: stuck beacon; resetting (bmiss count 0) Starting hostapd. Configuration file: /etc/hostapd-wlan0.conf Using interface wlan0 with hwaddr 04:f0:21:04:5d:7a and ssid "R2" wlan1: Ethernet address: 04:f0:21:04:5d:65 Starting hostapd. Configuration file: /etc/hostapd-wlan1.conf Using interface wlan1 with hwaddr 04:f0:21:04:5d:65 and ssid "R1" Starting Network: lo0 em0 em1 em2 em3 ath0 ath1 bridge0. lo0: flags=8049 metric 0 mtu 16384 options=600003 inet6 ::1 prefixlen 128 inet6 fe80::1%lo0 prefixlen 64 scopeid 0x7 inet 127.0.0.1 netmask 0xff000000 nd6 options=21 em0: flags=8843 metric 0 mtu 1500 options=4219b ether 00:00:24:cf:05:30 inet6 fe80::200:24ff:fecf:530%em0 prefixlen 64 scopeid 0x1 nd6 options=23 media: Ethernet autoselect (100baseTX ) status: active em1: flags=8943 metric 0 mtu 1500 options=42098 ether 00:00:24:cf:05:31 inet6 fe80::200:24ff:fecf:531%em1 prefixlen 64 scopeid 0x2 nd6 options=29 media: Ethernet autoselect status: no carrier em2: flags=8943 metric 0 mtu 1500 options=42098 ether 00:00:24:cf:05:32 inet6 fe80::200:24ff:fecf:532%em2 prefixlen 64 scopeid 0x3 nd6 options=29 media: Ethernet autoselect (100baseTX ) status: active em3: flags=8943 metric 0 mtu 1500 options=42098 ether 00:00:24:cf:05:33 inet6 fe80::200:24ff:fecf:533%em3 prefixlen 64 scopeid 0x4 nd6 options=29 media: Ethernet autoselect status: no carrier ath0: flags=8843 metric 0 mtu 2290 ether 04:f0:21:04:5d:7a nd6 options=21 media: IEEE 802.11 Wireless Ethernet autoselect mode 11ng status: running ath1: flags=8843 metric 0 mtu 2290 ether 04:f0:21:04:5d:65 nd6 options=21 media: IEEE 802.11 Wireless Ethernet autoselect mode 11ng status: running bridge0: flags=8843 metric 0 mtu 1500 ether 02:b1:ae:74:0b:00 inet 192.168.1.1 netmask 0xffffff00 broadcast 192.168.1.255 nd6 options=9 id 00:00:00:00:00:00 priority 32768 hellotime 2 fwddelay 15 maxage 20 holdcnt 6 proto rstp maxaddr 2000 timeout 1200 root id 00:00:00:00:00:00 priority 32768 ifcost 0 port 0 member: wlan1 flags=143 ifmaxaddr 0 port 10 priority 128 path cost 22222 member: wlan0 flags=143 ifmaxaddr 0 port 9 priority 128 path cost 22222 member: em3 flags=143 ifmaxaddr 0 port 4 priority 128 path cost 2000000 member: em2 flags=143 ifmaxaddr 0 port 3 priority 128 path cost 200000 member: em1 flags=143 ifmaxaddr 0 port 2 priority 128 path cost 2000000 Starting devd. Starting dhclient. DHCPREQUEST on em0 to 255.255.255.255 port 67 DHCPACK from 10.20.30.5 bound to 10.20.30.135 -- renewal in 129600 seconds. Starting pflogd: add net fe80::: gateway ::1 add net ff02::: gateway ::1 add net ::ffff:0.0.0.0: gateway ::1 add net ::0.0.0.0: gateway ::1 Creating and/or trimming log files. Starting syslogd. No core dumps found. ELF ldconfig path: /lib /usr/lib /usr/lib/compat /usr/local/lib 32-bit compatibility ldconfig path: /usr/lib32 Additional ABI support: linux. Starting casperd. Clearing /tmp (X related). Updating motd:. Mounting late file systems:. Starting ntpd. Starting powerd. Performing sanity check on sshd configuration. Starting sshd. Starting sendmail_submit. Starting sendmail_msp_queue. Starting cron. Starting background file system checks in 60 seconds. Tue Jan 14 08:19:31 EST 2014 em3: link state changed to DOWN em3: link state changed to UP em3: link state changed to DOWN em3: link state changed to UP em3: link state changed to DOWN em3: link state changed to UP em3: link state changed to DOWN em3: link state changed to UP Jan 14 08:36:01 ap01 su: eric to root on /dev/pts/0 Jan 14 08:38:30 ap01 su: nighty to root on /dev/pts/3 Jan 14 08:40:06 ap01 login: ROOT LOGIN (root) ON ttyu0 Jan 14 09:29:27 ap01 sshd[2264]: error: PAM: authentication error for nighty from 192.168.8.12 Jan 14 09:29:29 ap01 sshd[2264]: error: PAM: authentication error for nighty from 192.168.8.12 Jan 14 09:29:38 ap01 su: nighty to root on /dev/pts/3 -- ===================================================== Christophe Prevotaux ===================================================== _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 07:41:00 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F01AF63C; Wed, 15 Jan 2014 07:41:00 +0000 (UTC) Received: from caravan.chchile.org (caravan.chchile.org [178.32.125.136]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B9A001433; Wed, 15 Jan 2014 07:41:00 +0000 (UTC) Received: by caravan.chchile.org (Postfix, from userid 1000) id 579E9BA6BE; Wed, 15 Jan 2014 07:40:53 +0000 (UTC) Date: Wed, 15 Jan 2014 08:40:53 +0100 From: Jeremie Le Hen To: Gleb Smirnoff Subject: Re: buildworld fails with "Zero byte read from file, skipping rest of line" Message-ID: <20140115074053.GD83762@caravan.chchile.org> Mail-Followup-To: Gleb Smirnoff , freebsd-current@FreeBSD.org References: <20140114072620.GB83762@caravan.chchile.org> <20140114085818.GQ8472@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140114085818.GQ8472@FreeBSD.org> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: freebsd-current@FreeBSD.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 07:41:01 -0000 On Tue, Jan 14, 2014 at 12:58:18PM +0400, Gleb Smirnoff wrote: > Jeremie, > > On Tue, Jan 14, 2014 at 08:26:21AM +0100, Jeremie Le Hen wrote: > J> Hi, > J> > J> I have a FreeBSD -CURRENT in Virtualbox (running on Linux). I have been > J> unable to buildworld for a while. > J> > J> I suspect this is not a problem with the source because I didn't see any > J> report so far, whereas I've been experiencing this for a month or more. > J> Thus I naturally suspected it was a binary problem, so I've upgraded > J> to the latest snapshot, but the problem still exists. > J> > J> ===> gnu/usr.bin/groff/src/libs/libgroff (all) > J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: warning: Zero byte read from file, skipping rest of line. > J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: Need an operator > J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 4: Need an operator > J> make[6]: Fatal errors encountered -- cannot continue > J> make[6]: stopped in /usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff > J> *** [all] Error code 1 > J> > J> Typscript available here: > J> http://people.freebsd.org/~jlh/typescript.buildworld.txt > J> > J> Any ideas? > > Can you try to reproduce this with unmapped I/O turned off in boot loader? I've never heard of that. Can you please point me to the right code/doc? Thanks? -- Jeremie Le Hen Scientists say the world is made up of Protons, Neutrons and Electrons. They forgot to mention Morons. From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 08:40:40 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A361DE4E for ; Wed, 15 Jan 2014 08:40:40 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2C33F18E4 for ; Wed, 15 Jan 2014 08:40:39 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.7/8.14.7) with ESMTP id s0F8eZNS031200 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 15 Jan 2014 12:40:35 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.7/8.14.7/Submit) id s0F8eZ8F031199 for freebsd-current@FreeBSD.org; Wed, 15 Jan 2014 12:40:35 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Wed, 15 Jan 2014 12:40:35 +0400 From: Gleb Smirnoff To: freebsd-current@FreeBSD.org Subject: Re: buildworld fails with "Zero byte read from file, skipping rest of line" Message-ID: <20140115084035.GC26504@glebius.int.ru> References: <20140114072620.GB83762@caravan.chchile.org> <20140114085818.GQ8472@FreeBSD.org> <20140115074053.GD83762@caravan.chchile.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140115074053.GD83762@caravan.chchile.org> User-Agent: Mutt/1.5.22 (2013-10-16) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 08:40:40 -0000 Jeremie, On Wed, Jan 15, 2014 at 08:40:53AM +0100, Jeremie Le Hen wrote: J> > J> ===> gnu/usr.bin/groff/src/libs/libgroff (all) J> > J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: warning: Zero byte read from file, skipping rest of line. J> > J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: Need an operator J> > J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 4: Need an operator J> > J> make[6]: Fatal errors encountered -- cannot continue J> > J> make[6]: stopped in /usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff J> > J> *** [all] Error code 1 J> > J> J> > J> Typscript available here: J> > J> http://people.freebsd.org/~jlh/typescript.buildworld.txt J> > J> J> > J> Any ideas? J> > J> > Can you try to reproduce this with unmapped I/O turned off in boot loader? J> J> I've never heard of that. Can you please point me to the right J> code/doc? In loader prompt: OK set vfs.unmapped_buf_allowed=0 OK boot -- Totus tuus, Glebius. From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 09:35:27 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C8734B2; Wed, 15 Jan 2014 09:35:27 +0000 (UTC) Received: from work.netasq.com (gwlille.netasq.com [91.212.116.1]) by mx1.freebsd.org (Postfix) with ESMTP id 3A7E91E13; Wed, 15 Jan 2014 09:35:25 +0000 (UTC) Received: from work.netasq.com (localhost [127.0.0.1]) by work.netasq.com (Postfix) with ESMTP id CEB352705246; Wed, 15 Jan 2014 10:35:17 +0100 (CET) Received: from pc-alex.localnet (unknown [10.2.0.1]) by work.netasq.com (Postfix) with ESMTP id 670C9270512A; Wed, 15 Jan 2014 10:35:17 +0100 (CET) From: Alexandre Martins To: Eric Joyner Subject: Re: FreeBSD 10-RC4: Got crash in igb driver Date: Wed, 15 Jan 2014 10:34 +0100 Message-ID: <2055921.6VO2ozmCaJ@pc-alex> Organization: NETASQ User-Agent: KMail/4.10.5 (FreeBSD/9.2-RELEASE-p2; KDE/4.10.5; amd64; ; ) In-Reply-To: References: <48005124.ny58tnLn4d@pc-alex> <20140113021018.GA3500@michelle.cdnetworks.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3445562.qoCPSgfVDr"; micalg="sha1"; protocol="application/pkcs7-signature" Cc: pyunyh@gmail.com, damien.deville@netasq.com, freebsd-current@freebsd.org, fabien.thomas@netasq.com, Gleb Smirnoff , Jack F Vogel X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 09:35:27 -0000 --nextPart3445562.qoCPSgfVDr Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1" I have some compillation issues : ../../../dev/e1000/if_igb.c: In function 'igb_mq_start_locked': ../../../dev/e1000/if_igb.c:3936: warning: 'poff' may be used uninitial= ized in=20 this function ../../../dev/e1000/if_igb.c:3936: note: 'poff' was declared here ../../../dev/e1000/if_igb.c:3936: warning: 'ip_hlen' may be used uninit= ialized=20 in this function ../../../dev/e1000/if_igb.c:3936: note: 'ip_hlen' was declared here But this fix the crash. However, I have now a copy made of all ipv6 forwarded packet in=20 igb_pullup_headers. It will be nice to m_free the copy of the packet made in ip6_forward be= fore=20 calling nd6_output function. It will put back the packet writable and a= void=20 (in most cases) the copy. I have no time this week to check performance of this new driver versio= n. I'll=20 try to make that Monday. Thank you for this fix Le mardi 14 janvier 2014 14:22:43 Eric Joyner a =E9crit : > All, >=20 > I work with Jack on FreeBSD network drivers, and we have a patch that= we > think might fix this problem. It re-implements the header pull-up cod= e that > was in the driver pre-2.4.0, but with IPv6 support. Alexandre, could = you > apply this patch to the igb version in HEAD and try it out on your ne= twork? > We can't replicate your setup here. >=20 > If it solves your problem, then the next step would be to port the pa= tch to > the ixgbe driver since, as Yonghyeon noted, it looks like that driver= will > encounter the same problem. We could then modify em to add IPv6 offlo= ad > support as well. >=20 > Thanks, >=20 > --- > - Eric Joyner >=20 > On Fri, Jan 10, 2014 at 02:35:29PM +0400, Gleb Smirnoff wrote: > > Yonghyeon, > >=20 > > On Fri, Jan 10, 2014 at 10:21:14AM +0900, Yonghyeon PYUN wrote: > > Y> > I experience some troubles with the igb device driver on FreeB= SD >=20 > 10-RC4. >=20 > > Y> > > > Y> > The kernel make a pagefault in the igb_tx_ctx_setup function w= hen >=20 > accessing to >=20 > > Y> > a IPv6 header. > > Y> > > > Y> > The network configuration is the following: > > Y> > - box acting as an IPv6 router > > Y> > - one interface with an IPv6 (igb0) > > Y> > - another interface with a vlan, and IPv6 on it (vlan0 on igb= 1) > > Y> > > > Y> > Vlan Hardware tagging is set on both interfaces. > > Y> > > > Y> > The packet that cause the crash come from igb0 and go to vlan0= . > > Y> > > > Y> > After investigation, i see that the mbuf is split in two. The = first >=20 > one carry >=20 > > Y> > the ethernet header, the second, the IPv6 header and data payl= oad. > > Y> > > > Y> > The split is due to the "m_copy" done in ip6_forward, that mak= e the >=20 > mbuf not >=20 > > Y> > writable and the "M_PREPEND" in ether_output that insert the n= ew >=20 > mbuf before >=20 > > Y> > the original one. > > Y> > > > Y> > The kernel crashes only if the newly allocated mbuf is at the = end of >=20 > a memory >=20 > > Y> > page, and no page is available after this one. So, it's extrem= ly >=20 > rare. >=20 > > Y> > > > Y> > I inserted a "KASSERT" into the function (see attached patch) = to >=20 > check this >=20 > > Y> > behavior, and it raises on every IPv6 forwarded packet to the = vlan. >=20 > The >=20 > > Y> > problem disapear if i remove hardware tagging. > > Y> > > > Y> > In the commit 256200, i see that pullups has been removed. May= it be >=20 > related ? >=20 > > Y> > > Y> I think I introduced the header parsing code to meet controller > > Y> requirement in em(4) and Jack borrowed that code in the past but= it > > Y> seems it was removed in r256200. It seems igb_tx_ctx_setup() > > Y> assumes it can access ethernet/IP/TCP/UDP headers in the first m= buf > > Y> of the chain. > > Y> This looks wrong to me. > >=20 > > Can you please restore the important code in head ASAP? Although cr= ashes >=20 > happen >=20 > > only when the mbuf is last in a page and page isn't mapped, we read= >=20 > thrash from >=20 > > next allocation on almost every packet. >=20 > It seems other Intel ethernet drivers except em(4) have similar > issues. I didn't check recent Intel controllers/drivers for long > time so I don't know details on hardware requirements of > offloading. > Since Jack is very responsive and has hardwares to verify, he would > be more appropriate person to handle these issues. > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd= .org" --=20 Alexandre Martins NETASQ -- We secure IT --nextPart3445562.qoCPSgfVDr Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Disposition: attachment; filename="smime.p7s" Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIErzCCBKsw ggOToAMCAQICCnDGsUgWa/KQbDQwDQYJKoZIhvcNAQEFBQAwgZExCzAJBgNVBAYTAkZSMQ0wCwYD VQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQnQXNjcTEuMCwGA1UEChMlTkVUQVNRIC0g U2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UECxMeTkVUQVNRIENlcnRpZmljYXRp b24gQXV0aG9yaXR5MB4XDTEzMDIxNTE1NDk1N1oXDTE0MDIxNTE1NDk1N1owgdoxCzAJBgNVBAYT AkZSMQ0wCwYDVQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQnQXNjcTEuMCwGA1UEChMl TkVUQVNRIC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UECxMeTkVUQVNRIENl cnRpZmljYXRpb24gQXV0aG9yaXR5MRowGAYDVQQDExFBbGV4YW5kcmUgTUFSVElOUzErMCkGCSqG SIb3DQEJARYcYWxleGFuZHJlLm1hcnRpbnNAbmV0YXNxLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD ggEPADCCAQoCggEBAL4/gp0+01ma1Hi1C9Zw7TY8nZPJTmB3HG5eX1e062tMm+0CrNcDwfMwmF8w g47zuFzkzTYy/d6/waoHbbCLsj1AM2kRQcWfuqglpgnSu7FdnIAE0dSAOS9Ni0uWDsFhRr3UUHq5 qnDzQXOrPXRMzMz1W8nqiyqXYfykrDrq0sjzaIj20BYA/6AlDSWs+XKid1EM3wOe40Kyl+1HWLsA MuY9CpQdAkQh4rJb6Sbgx57DXJ3INCSWjzZWYK0KAE0JF8XhP5zLGcvHI5Atm7gN8WiMZ+DFRM2z HIOlZ6zhp1VHSSbs+c64UJtGgt+cq7QvuyaIoqBP6rDHsLMPbjNR0w8CAwEAAaOBuTCBtjAdBgNV HQ4EFgQUyiEDfxLvYJqY+A8btt9sZFYPejYwHwYDVR0jBBgwFoAUJyrrHdlE2joXc2oJICDJJaj5 f7IwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCA+gwJwYDVR0RBCAwHoEcYWxleGFuZHJlLm1hcnRp bnNAbmV0YXNxLmNvbTARBglghkgBhvhCAQEEBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwQGCCsG AQUFBwMCMA0GCSqGSIb3DQEBBQUAA4IBAQCaSZdSJKRujYP6KnfKcyYYlNNqRdIyQm16o4BIIeGG qxQGxAO/dzcQziNVQcE+G8RHTcuivayhOX/NRhIlYxyvTN+wWAbC5NQuul4eQzGrz4OxWfrfpm9S DnDbLfHf1qdjyvFkTM8Wgq21/oExphasFHdOxi/txN4099Be/BZpV8Fpqa0dKEirG2Wa3KfEn85A WaKnNs/k3x95gr/eeTt1NdlT7OqVYqnUdUlRmQVNvEi29wIQbfYi2WeZIGlpNh0PBthWdBaXzMKU U/pfjIzZhyP8E4ghUKz4uvmpA901Qj9LEhSYqOKWALRNOk/dCcNd0LV8S54te/vsFkDTHWvlMYIC UjCCAk4CAQEwgaAwgZExCzAJBgNVBAYTAkZSMQ0wCwYDVQQIEwROb3JkMRowGAYDVQQHExFWaWxs ZW5ldXZlIGQnQXNjcTEuMCwGA1UEChMlTkVUQVNRIC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rp dml0eTEnMCUGA1UECxMeTkVUQVNRIENlcnRpZmljYXRpb24gQXV0aG9yaXR5AgpwxrFIFmvykGw0 MAkGBSsOAwIaBQCggYcwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcN MTQwMTE1MDkzNDAwWjAjBgkqhkiG9w0BCQQxFgQUheBUec8907G+ENYlrnH3xeyvLFUwKAYJKoZI hvcNAQkPMRswGTALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDQYJKoZIhvcNAQEBBQAEggEADeaz rdSbmdtHNaN4LsIxDDU3Jl0RL4SpEeH+MbuoYWggy1uPmn/t3PL5OEIrIq02/cxlXugXmQCRVJbU vX5+XMfGoI2eToEs1jIy78XmFfgJvBJSr+52ONtnUfrujhA+wr/JoTYeDeCz7kmJnY1u+0c+igjO a9NnfW+Vx2TEAW5ej0IJipFRJXbZrPAzuin/3arI+7QRaeegcPKXfShPZDZtwRz6q6xEuK8yjI4R d2ZsKbS7HmiwdP81tsci4quFuLc7OQclcLJ9otuDUoM4G054vDHO89ylKEMBU59SUsFEf6xj9Qnu 4UlrAjTc4LpMPMnOB896by2OzXwCmFEmigAAAAAAAA== --nextPart3445562.qoCPSgfVDr-- From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 10:47:02 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E59F080C; Wed, 15 Jan 2014 10:47:02 +0000 (UTC) Received: from hell.ukr.net (hell.ukr.net [212.42.67.68]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A305713CF; Wed, 15 Jan 2014 10:47:02 +0000 (UTC) Received: from satan by hell.ukr.net with local ID 1W3Ni9-000PnP-4E ; Wed, 15 Jan 2014 12:28:37 +0200 Date: Wed, 15 Jan 2014 12:28:37 +0200 From: Vitalij Satanivskij To: Andriy Gapon Subject: Re: ARC "pressured out", how to control/stabilize ? (reformatted to text/plain) Message-ID: <20140115102837.GA98983@hell.ukr.net> References: <1388839805.123581691.q97ijp8l@frv45.ukr.net> <52C93E4D.1050100@FreeBSD.org> <1389005433.815055146.2dcjke36@frv45.ukr.net> <52CA9963.1050507@FreeBSD.org> <1389676958.516993176.oq4lbgg7@frv45.ukr.net> <52D59E36.9040405@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <52D59E36.9040405@FreeBSD.org> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: Vladimir Sharun , Current FreeBSD X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 10:47:03 -0000 Dear Andriy and FreeBSD community, Andriy Gapon wrote: AG> on 14/01/2014 07:27 Vladimir Sharun said the following: AG> > Dear Andriy and FreeBSD community, AG> > AG> >> I am not sure if the buffers are leaked somehow or if they are actually in use. AG> >> It's one of the very few places where data buffers are allocated without AG> >> charging ARC. In all other places it's quite easy to match allocations and AG> >> deallocations. But in L2ARC it is not obvious that all buffers get freed or AG> >> when that happens. AG> > AG> > After one week under load I think we figure out the cause: it's L2ARC. AG> > Here's the top's header for 7d17h of the runtime: AG> > AG> > last pid: 46409; load averages: 0.37, 0.62, 0.70 up 7+17:14:01 07:24:10 AG> > 173 processes: 1 running, 171 sleeping, 1 zombie AG> > CPU: 2.0% user, 0.0% nice, 3.5% system, 0.4% interrupt, 94.2% idle AG> > Mem: 8714M Active, 14G Inact, 96G Wired, 1929M Cache, 3309M Buf, 3542M Free AG> > ARC: 85G Total, 2558M MFU, 77G MRU, 28M Anon, 1446M Header, 4802M Other AG> > AG> > ARC related tunables: AG> > AG> > vm.kmem_size="110G" AG> > vfs.zfs.arc_max="90G" AG> > vfs.zfs.arc_min="42G" AG> > AG> > For more than 7 days of hard runtime the picture clearly shows: AG> > Wired minus ARC = 11..12Gb, ARC grow and shrinks in 80-87Gb range and the AG> > system runs just fine. AG> > AG> > So what shall we do with L2ARC leakage ? AG> AG> AG> Could you please try this patch AG> http://cr.illumos.org/~webrev/skiselkov/3995/illumos-gate.patch ? AG> While applying path to curent version of arc.c (r260622) I'm found next truble with compilation olaris/uts/common/fs/zfs/arc.c -o arc.o /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c:4628:18: error: use of undeclared identifier 'abl2' trim_map_free(abl2->b_dev->l2ad_vdev, abl2->b_daddr, ^ 1 error generated. *** Error code 1 the code is - if (zio->io_error != 0) { /* * Error - drop L2ARC entry. */ list_remove(buflist, ab); ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize); ab->b_l2hdr = NULL; trim_map_free(abl2->b_dev->l2ad_vdev, abl2->b_daddr, ab->b_size, 0); kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t)); ARCSTAT_INCR(arcstat_l2_size, -ab->b_size); } Looks like it's part is freebsd specific changes. Can somebody help with this part of code ? From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 11:16:08 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59ECCCE2 for ; Wed, 15 Jan 2014 11:16:08 +0000 (UTC) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 87CB9167E for ; Wed, 15 Jan 2014 11:16:07 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id NAA13035; Wed, 15 Jan 2014 13:15:58 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1W3ORy-000FEV-H2; Wed, 15 Jan 2014 13:15:58 +0200 Message-ID: <52D66DB6.7030807@FreeBSD.org> Date: Wed, 15 Jan 2014 13:15:02 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Vitalij Satanivskij Subject: Re: ARC "pressured out", how to control/stabilize ? (reformatted to text/plain) References: <1388839805.123581691.q97ijp8l@frv45.ukr.net> <52C93E4D.1050100@FreeBSD.org> <1389005433.815055146.2dcjke36@frv45.ukr.net> <52CA9963.1050507@FreeBSD.org> <1389676958.516993176.oq4lbgg7@frv45.ukr.net> <52D59E36.9040405@FreeBSD.org> <20140115102837.GA98983@hell.ukr.net> In-Reply-To: <20140115102837.GA98983@hell.ukr.net> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Vladimir Sharun , Current FreeBSD X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 11:16:08 -0000 on 15/01/2014 12:28 Vitalij Satanivskij said the following: > Dear Andriy and FreeBSD community, > > Andriy Gapon wrote: > AG> on 14/01/2014 07:27 Vladimir Sharun said the following: > AG> > Dear Andriy and FreeBSD community, > AG> > > AG> >> I am not sure if the buffers are leaked somehow or if they are actually in use. > AG> >> It's one of the very few places where data buffers are allocated without > AG> >> charging ARC. In all other places it's quite easy to match allocations and > AG> >> deallocations. But in L2ARC it is not obvious that all buffers get freed or > AG> >> when that happens. > AG> > > AG> > After one week under load I think we figure out the cause: it's L2ARC. > AG> > Here's the top's header for 7d17h of the runtime: > AG> > > AG> > last pid: 46409; load averages: 0.37, 0.62, 0.70 up 7+17:14:01 07:24:10 > AG> > 173 processes: 1 running, 171 sleeping, 1 zombie > AG> > CPU: 2.0% user, 0.0% nice, 3.5% system, 0.4% interrupt, 94.2% idle > AG> > Mem: 8714M Active, 14G Inact, 96G Wired, 1929M Cache, 3309M Buf, 3542M Free > AG> > ARC: 85G Total, 2558M MFU, 77G MRU, 28M Anon, 1446M Header, 4802M Other > AG> > > AG> > ARC related tunables: > AG> > > AG> > vm.kmem_size="110G" > AG> > vfs.zfs.arc_max="90G" > AG> > vfs.zfs.arc_min="42G" > AG> > > AG> > For more than 7 days of hard runtime the picture clearly shows: > AG> > Wired minus ARC = 11..12Gb, ARC grow and shrinks in 80-87Gb range and the > AG> > system runs just fine. > AG> > > AG> > So what shall we do with L2ARC leakage ? > AG> > AG> > AG> Could you please try this patch > AG> http://cr.illumos.org/~webrev/skiselkov/3995/illumos-gate.patch ? > AG> > > While applying path to curent version of arc.c (r260622) I'm found next truble with compilation > > olaris/uts/common/fs/zfs/arc.c -o arc.o > /usr/src/cddl/lib/libzpool/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c:4628:18: error: use of > undeclared identifier 'abl2' > trim_map_free(abl2->b_dev->l2ad_vdev, abl2->b_daddr, > ^ > 1 error generated. > *** Error code 1 > > > the code is - > > if (zio->io_error != 0) { > /* > * Error - drop L2ARC entry. > */ > list_remove(buflist, ab); > ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize); > ab->b_l2hdr = NULL; > trim_map_free(abl2->b_dev->l2ad_vdev, abl2->b_daddr, > ab->b_size, 0); > kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t)); > ARCSTAT_INCR(arcstat_l2_size, -ab->b_size); > } > > > Looks like it's part is freebsd specific changes. > Can somebody help with this part of code ? > The first hunk of the patch is renaming of abl2 to l2hdr. -- Andriy Gapon From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 11:24:27 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A884148; Wed, 15 Jan 2014 11:24:27 +0000 (UTC) Received: from hell.ukr.net (hell.ukr.net [212.42.67.68]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EB2C9173B; Wed, 15 Jan 2014 11:24:26 +0000 (UTC) Received: from satan by hell.ukr.net with local ID 1W3Oa8-0000Qk-9L ; Wed, 15 Jan 2014 13:24:24 +0200 Date: Wed, 15 Jan 2014 13:24:24 +0200 From: Vitalij Satanivskij To: Andriy Gapon Subject: Re: ARC "pressured out", how to control/stabilize ? (reformatted to text/plain) Message-ID: <20140115112424.GA1489@hell.ukr.net> References: <1388839805.123581691.q97ijp8l@frv45.ukr.net> <52C93E4D.1050100@FreeBSD.org> <1389005433.815055146.2dcjke36@frv45.ukr.net> <52CA9963.1050507@FreeBSD.org> <1389676958.516993176.oq4lbgg7@frv45.ukr.net> <52D59E36.9040405@FreeBSD.org> <20140115102837.GA98983@hell.ukr.net> <52D66DB6.7030807@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <52D66DB6.7030807@FreeBSD.org> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: Vitalij Satanivskij , Current FreeBSD , Vladimir Sharun X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 11:24:27 -0000 Dear Andriy and FreeBSD community, AG> AG> The first hunk of the patch is renaming of abl2 to l2hdr. AG> So it.s ok just change trim_map_free(abl2->b_dev->l2ad_vdev, abl2->b_daddr, ab->b_size, 0); to trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr, ab->b_size, 0); ? Ok. Thank you. I will try this patch From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 11:34:36 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86C79687; Wed, 15 Jan 2014 11:34:36 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1E28A189A; Wed, 15 Jan 2014 11:34:35 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.7/8.14.7) with ESMTP id s0FBYUKe032160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 15 Jan 2014 15:34:30 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.7/8.14.7/Submit) id s0FBYU44032159; Wed, 15 Jan 2014 15:34:30 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Wed, 15 Jan 2014 15:34:30 +0400 From: Gleb Smirnoff To: Olivier =?iso-8859-1?Q?Cochard-Labb=E9?= Subject: Re: Regression on 10-RC5 with a multicast routing daemon Message-ID: <20140115113430.GK26504@FreeBSD.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.22 (2013-10-16) Cc: "freebsd-net@freebsd.org" , "freebsd-current@freebsd.org" , andre@FreeBSD.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 11:34:36 -0000 Olivier, On Tue, Jan 14, 2014 at 05:51:53PM +0100, Olivier Cochard-Labbé wrote: O> I'm trying to port a PIM sparse-mode daemon ( O> https://github.com/troglobit/pimd/) and I've meet a problem: O> This daemon compile and run fine on FreeBSD 9.2 but on 10-RC5 this daemon O> can't understand received multicast packets (received from other PIM O> neighbors) and display this kind of error message in debug mode "warning - O> Received packet from 10.0.12.2 shorter (28 bytes) than hdr+data length O> (20+28)". O> How to troubleshoot this problem ? O> O> My current work of this port can be tested with theses commands: O> O> cd /usr/ports O> fetch -o ports.pimd.shar " O> https://sourceforge.net/p/bsdrp/code/HEAD/tree/trunk/BSDRP/patches/ports.pimd.shar?format=raw O> " O> sh ./ports.pimd.shar O> cd net/pimd O> make install TL;DR version: you need not subtract iphdrlen in 10.0. Code in igmp.c:accept_igmp() should be smth like: iphdrlen = ip->ip_hl << 2; #ifdef RAW_INPUT_IS_RAW /* Linux */ ipdatalen = ntohs(ip->ip_len) - iphdrlen; #else #if __FreeBSD_version >= 1000000 ipdatalen = ip->ip_len - iphdrlen; #else ipdatalen = ip->ip_len; #endif #endif You can also look into quagga sources, file ospfd/ospf_packet.c, for more examples of workarounds for this API mess. Long story is the following. Historical behaviour of BSD raw sockets were the following: * packet is modified - packets' ip_len and ip_off are converted to host byte order - packets' ip_len is reduced by the actual size of IP header This is an artefact from the fact that the kernel stack modified every packet at the very beginning of its processing, and worked with it in this form. It just didn't bother to convert it before passing to raw socket, so raw socket wasn't truly _raw_. This is actually a bug. Later, most non-BSD operating systems defined the following API for raw sockets: * packet is passed unmodified btw, I find this much better behavior. Later, right before 9.0-RELEASE, in r226105 (merged to stable/9 as r226299) Andre has changed behaviour to: * packet is modified - packets' ip_len and ip_off are converted to host byte order This appeared a huge disaster to a number of ports, thus it was backed out in r227423 in stable/9. However this remained in head. We decided that all ports should be fixed during two years up to 10.0-RELEASE. Later on, there is a trend for BSD systems to convert their IP stacks to stop modifying byte order internally in kernel. But the compatibility for the raw sockets remained. This is what I did in FreeBSD in r241913 and in r241923. Right now, looking behind, it seems to me that we should have convert raw sockets to be truly raw, like in Linux, right in the 10-release cycle. The API mess should be reduced. According to comments in quagga, DragonFly has the following behavior: * packet is modified - packets' ip_len is reduced by the actual size of IP header Damn, what a mess. I'd like to go towards absolutely unmodified packets for the 11-release cycle. -- Totus tuus, Glebius. From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 11:36:55 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B21B59B4; Wed, 15 Jan 2014 11:36:55 +0000 (UTC) Received: from caravan.chchile.org (caravan.chchile.org [178.32.125.136]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 79A6518CA; Wed, 15 Jan 2014 11:36:55 +0000 (UTC) Received: by caravan.chchile.org (Postfix, from userid 1000) id 8AFA0BAA12; Wed, 15 Jan 2014 11:36:53 +0000 (UTC) Date: Wed, 15 Jan 2014 12:36:53 +0100 From: Jeremie Le Hen To: Gleb Smirnoff Subject: Re: buildworld fails with "Zero byte read from file, skipping rest of line" Message-ID: <20140115113653.GE83762@caravan.chchile.org> Mail-Followup-To: Gleb Smirnoff , freebsd-current@FreeBSD.org References: <20140114072620.GB83762@caravan.chchile.org> <20140114085818.GQ8472@FreeBSD.org> <20140115074053.GD83762@caravan.chchile.org> <20140115084035.GC26504@glebius.int.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140115084035.GC26504@glebius.int.ru> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: freebsd-current@FreeBSD.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 11:36:55 -0000 On Wed, Jan 15, 2014 at 12:40:35PM +0400, Gleb Smirnoff wrote: > Jeremie, > > On Wed, Jan 15, 2014 at 08:40:53AM +0100, Jeremie Le Hen wrote: > J> > J> ===> gnu/usr.bin/groff/src/libs/libgroff (all) > J> > J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: warning: Zero byte read from file, skipping rest of line. > J> > J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 3: Need an operator > J> > J> make[6]: "/usr/obj/usr/src.svn/tmp/usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff/.depend" line 4: Need an operator > J> > J> make[6]: Fatal errors encountered -- cannot continue > J> > J> make[6]: stopped in /usr/src.svn/gnu/usr.bin/groff/src/libs/libgroff > J> > J> *** [all] Error code 1 > J> > J> > J> > J> Typscript available here: > J> > J> http://people.freebsd.org/~jlh/typescript.buildworld.txt > J> > J> > J> > J> Any ideas? > J> > > J> > Can you try to reproduce this with unmapped I/O turned off in boot loader? > J> > J> I've never heard of that. Can you please point me to the right > J> code/doc? > > In loader prompt: > > OK set vfs.unmapped_buf_allowed=0 > OK boot No, unfortunately I still have the same problem without unmapped bufs. -- Jeremie Le Hen Scientists say the world is made up of Protons, Neutrons and Electrons. They forgot to mention Morons. From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 12:43:06 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC2B35A1 for ; Wed, 15 Jan 2014 12:43:06 +0000 (UTC) Received: from smtp.dlink.ua (smtp.dlink.ua [193.138.187.146]) by mx1.freebsd.org (Postfix) with ESMTP id AB760106F for ; Wed, 15 Jan 2014 12:43:06 +0000 (UTC) Received: from terran (unknown [192.168.99.1]) (Authenticated sender: ray) by smtp.dlink.ua (Postfix) with ESMTPA id 34446C493D for ; Wed, 15 Jan 2014 14:43:05 +0200 (EET) Date: Wed, 15 Jan 2014 14:45:24 +0200 From: Aleksandr Rybalko To: current@freebsd.org Subject: [CFT] xboxfb with vt(9) (a.k.a. newcons) Message-Id: <20140115144524.ede04bd0cb57ebc1dfad131a@freebsd.org> X-Mailer: Sylpheed 3.2.0 (GTK+ 2.24.6; amd64-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 12:43:07 -0000 Hello friends! I've just committed update to xboxfb driver for vt(9). But I have no HW to test on. So if anybody have HW and time/wish to test it, please help me. What you need to do that: 1. Update sources to latest HEAD; 2. In XBOX kernel config file replace that devices: -device xboxfb -device sc -device fb with those: +device vt_xboxfb +device vt +device fbd 3. rebuild/reinstall your kernel. Thanks a lot! WBW -- Aleksandr Rybalko From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 15:17:58 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3A2ED29; Wed, 15 Jan 2014 15:17:58 +0000 (UTC) Received: from mail-qe0-x22b.google.com (mail-qe0-x22b.google.com [IPv6:2607:f8b0:400d:c02::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4B1E91D3F; Wed, 15 Jan 2014 15:17:58 +0000 (UTC) Received: by mail-qe0-f43.google.com with SMTP id nc12so1153824qeb.2 for ; Wed, 15 Jan 2014 07:17:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=QWzA6AKiPdB5DWSaFp1YNfgle6/QvAjZqE3mJKQkxko=; b=Yeh7RqYfpna+tYNWti3fesb+V8RpacSCpTolWzXjfeJoYlm5zdWB7n648mgmF9cu66 Rpw9qgp6HSWIG2fecG1uh2yZ3m5wwBgGh7+dRZhMtxEFcl3ROVV8esS1witv+q9lBb17 trQrQp3PVIi0tjgUrPcgvvGBmlefyavloP6CZ+VfjR1UCDRygFUMtF99S/VP8YCa9Z5I yK5iVf3U2QRinsvYEHWt4oB9JDyQci3G+xRwX4XNPBUE6w+M6CKfylIPh5gUlReG7v6H mP09hEsRgTzyGHV+TS/Khtxmi0Yt194i1pEzHv29R0pvNN2ccUuySm7jdGQlOFazeEnz 1KaA== MIME-Version: 1.0 X-Received: by 10.224.16.72 with SMTP id n8mr5594616qaa.76.1389799077429; Wed, 15 Jan 2014 07:17:57 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.224.52.8 with HTTP; Wed, 15 Jan 2014 07:17:57 -0800 (PST) In-Reply-To: <20140115113430.GK26504@FreeBSD.org> References: <20140115113430.GK26504@FreeBSD.org> Date: Wed, 15 Jan 2014 07:17:57 -0800 X-Google-Sender-Auth: bi58kQq144rVyX9EmM3He0r-6Ig Message-ID: Subject: Re: Regression on 10-RC5 with a multicast routing daemon From: Adrian Chadd To: Gleb Smirnoff Content-Type: text/plain; charset=ISO-8859-1 Cc: =?ISO-8859-1?Q?Olivier_Cochard=2DLabb=E9?= , "freebsd-net@freebsd.org" , "freebsd-current@freebsd.org" , Andre Oppermann X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 15:17:58 -0000 On 15 January 2014 03:34, Gleb Smirnoff wrote: [snip] > Damn, what a mess. I'd like to go towards absolutely unmodified packets > for the 11-release cycle. Well, now's the time to _start_ this. :-) Not 6 months before 11.0 :P -a From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 23:35:43 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F276BD0E; Wed, 15 Jan 2014 23:35:42 +0000 (UTC) Received: from mail-we0-x22e.google.com (mail-we0-x22e.google.com [IPv6:2a00:1450:400c:c03::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6AB8412EF; Wed, 15 Jan 2014 23:35:42 +0000 (UTC) Received: by mail-we0-f174.google.com with SMTP id x55so2444967wes.5 for ; Wed, 15 Jan 2014 15:35:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:references:from:date:message-id:subject:to :content-type; bh=m94THr38HchR0PhItM3N2hU0vPDutTAR5g/MIvM0e/4=; b=Cq/12bVhN48ECH7JzreBDYChiTIy+cxSlr2lsAG+XNKh2ntvvl7aQl+8H7vLQ1mIe0 OpV5gEI1VkN24t7pCQudf5XMqs18X5MnNJGBsvRNQAexEcv3Rl/I2Nb0EG+YJdHBeuQU yCb40koCcc7PcFzyYPOgduLohOLhsnr2dOle5cEvg95aecjj08NMTIPk0ACSMdqs5uDL RXJRgvOvX1njrOzUjFkE+3P/GG0PnDNawu9Lc/i5SKJTdkNQsvYbwUsaQNJZkOG0h7RW EqZs71ELUE+mgHdP1xgFLgEPHDJlEWdyB99BeSPOBlYqxJSJCsK0Tr2MDgPy9KFjQZHr uq8g== X-Received: by 10.180.93.196 with SMTP id cw4mr4933160wib.39.1389828940058; Wed, 15 Jan 2014 15:35:40 -0800 (PST) MIME-Version: 1.0 References: <20140115144524.ede04bd0cb57ebc1dfad131a@freebsd.org> From: Ed Schouten Date: Wed, 15 Jan 2014 23:35:39 +0000 Message-ID: <4981005459307976130@gmail297201516> Subject: [CFT] xboxfb with vt(9) (a.k.a. newcons) To: ray@freebsd.org, current@freebsd.org X-Mailman-Approved-At: Wed, 15 Jan 2014 23:40:18 +0000 Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 23:35:43 -0000 Hello there, On Wed Jan 15 2014 at 1:43:56 PM, Aleksandr Rybalko wrote: > I've just committed update to xboxfb driver for vt(9). But I have no HW > to test on. So if anybody have HW and time/wish to test it, please help > me. As I also mentioned to you privately, I think it might actually be wiser to just drop Xbox support entirely. The Xbox support was a funny thing back then, but I suspect it has actually outlived its usefulness. The original Xbox only has a 733 MHz Celeron CPU, 64 MB of RAM and a 10 GB harddisk. I don't think there are that many people left who want to run FreeBSD 11 on it. Thoughts? Ed From owner-freebsd-current@FreeBSD.ORG Wed Jan 15 23:47:41 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70CD5604 for ; Wed, 15 Jan 2014 23:47:41 +0000 (UTC) Received: from smtp.dlink.ua (smtp.dlink.ua [193.138.187.146]) by mx1.freebsd.org (Postfix) with ESMTP id 2A8C513C9 for ; Wed, 15 Jan 2014 23:47:41 +0000 (UTC) Received: from rnote.ddteam.net (219-126-135-95.pool.ukrtel.net [95.135.126.219]) (Authenticated sender: ray) by smtp.dlink.ua (Postfix) with ESMTPSA id 8C67AC4955; Thu, 16 Jan 2014 01:47:39 +0200 (EET) Date: Thu, 16 Jan 2014 01:47:36 +0200 From: Aleksandr Rybalko To: Ed Schouten Subject: Re: [CFT] xboxfb with vt(9) (a.k.a. newcons) Message-Id: <20140116014736.29f9fe41.ray@freebsd.org> In-Reply-To: <4981005459307976130@gmail297201516> References: <20140115144524.ede04bd0cb57ebc1dfad131a@freebsd.org> <4981005459307976130@gmail297201516> Organization: FreeBSD.ORG X-Mailer: Sylpheed 3.1.2 (GTK+ 2.24.5; amd64-portbld-freebsd9.0) X-Operating-System: FreeBSD Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 23:47:41 -0000 On Wed, 15 Jan 2014 23:35:39 +0000 Ed Schouten wrote: > Hello there, > > On Wed Jan 15 2014 at 1:43:56 PM, Aleksandr Rybalko > wrote: > > > I've just committed update to xboxfb driver for vt(9). But I have > > no HW to test on. So if anybody have HW and time/wish to test it, > > please help me. > > > As I also mentioned to you privately, I think it might actually be > wiser to just drop Xbox support entirely. The Xbox support was a > funny thing back then, but I suspect it has actually outlived its > usefulness. > > The original Xbox only has a 733 MHz Celeron CPU, 64 MB of RAM and a > 10 GB harddisk. I don't think there are that many people left who > want to run FreeBSD 11 on it. > > Thoughts? > > Ed Hi folks! Ed, Raspberry-Pi has more RAM, almost same CPU clock and no HDD at all and people use it :) Since it already in HEAD I would prefer to left it here for some time. So other will be able to use it as example. But even for that better to know if it works, to not waste time of users or hackers who will try to use it. :) Thanks! WBW -- Aleksandr Rybalko From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 05:13:49 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6CD4487F for ; Thu, 16 Jan 2014 05:13:49 +0000 (UTC) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F7BC1D25 for ; Thu, 16 Jan 2014 05:13:49 +0000 (UTC) Received: by mail-pa0-f43.google.com with SMTP id rd3so2161165pab.30 for ; Wed, 15 Jan 2014 21:13:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=BsgE2tblbiotx6JK5H/oAftocexLAbPxqXGCeRtWEVo=; b=JQUMK1DhJyINEoBSt6JDCZAqXnXpl/Bc1PtQJCNgtUCC10csbgW+ndfm2f4uMBU9GY k7FxulbfqNpW1qJ4yARlJxucHgCebK2n1v1If6kFGVajenZidnTjIT6iGYMbx7YRQ9R4 3WAG3OhuabvVuJ6uu0GrRrS/cBNkWUCnZvMBE76KNtT5nW8liqex5o1k43QitOX/kzLK qe7DMK59t5R/OsrQdQOQbqLQfUfUzJLa5zxQsLs8pcdc0nHLykw57EaxLIB3O0cFf/Gf DOvqYddYywWIsX4Lq+xrz4UnpoOqV3xMssawI9+zWTqkNSX/cBC0H7ATDx8uMw6ZGZBs Qn8A== X-Gm-Message-State: ALoCoQn95YX6IQEvls8CVFJ2DPc/sakxE6VC1MIrWTG6ycksittcc6BDvmE7FTPgy5flXJZhympe X-Received: by 10.66.156.137 with SMTP id we9mr7648417pab.30.1389849222486; Wed, 15 Jan 2014 21:13:42 -0800 (PST) Received: from [192.168.1.2] (c-24-6-182-22.hsd1.ca.comcast.net. [24.6.182.22]) by mx.google.com with ESMTPSA id bz4sm12011132pbb.12.2014.01.15.21.13.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 21:13:41 -0800 (PST) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: mtree acl support From: Tim Kientzle In-Reply-To: <93FD368C-21D1-4A5F-986A-859D83AFB5BF@kientzle.com> Date: Wed, 15 Jan 2014 21:13:39 -0800 Content-Transfer-Encoding: quoted-printable Message-Id: <0D61C030-E1A3-4056-A6F1-00AF39F2ED0B@kientzle.com> References: <1389710847.2685.70601137.72B5C024@webmail.messagingengine.com> <93FD368C-21D1-4A5F-986A-859D83AFB5BF@kientzle.com> To: Mark Felder X-Mailer: Apple Mail (2.1827) Cc: FreeBSD current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 05:13:49 -0000 On Jan 15, 2014, at 9:11 PM, Tim Kientzle wrote: >=20 > On Jan 14, 2014, at 6:47 AM, Mark Felder wrote: >=20 >> I was recently talking to someone about how one would backup / = restore >> ACLs reliably. I didn't see any mention of ACLs in the mtree man page >> and after a quick google I came upon this old mailing list post: >>=20 >> = http://lists.freebsd.org/pipermail/freebsd-hackers/2008-April/024173.html >>=20 >> patch in list is here: = http://heka.cenkes.org/sat/diffs/mtree_acl.diff >> I've mirrored it here: https://feld.me/freebsd/mtree_acl.diff >>=20 >> This old patch appears to still apply cleanly. I hate to see a patch = die >> and be forgotten. >=20 > One problem that =91tar=92 has addressed (inspired by Joerg = Schilling=92s > work on star) is to permit ACLs to be restored even if the user = database > is out of date. >=20 > This is done by including a fourth field in each ACE with the > numeric user ID. >=20 > I suspect you want to do the same for mtree. I thought > I remembered acl_to_text having an option to use > an extended text format, so it might be a trivial change. Also, comparing ACLs using strcmp() seems a little odd to me. Tim From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 05:17:51 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16E06AD2 for ; Thu, 16 Jan 2014 05:17:51 +0000 (UTC) Received: from mail-pb0-f47.google.com (mail-pb0-f47.google.com [209.85.160.47]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DD9831D53 for ; Thu, 16 Jan 2014 05:17:50 +0000 (UTC) Received: by mail-pb0-f47.google.com with SMTP id um1so2149687pbc.6 for ; Wed, 15 Jan 2014 21:17:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=v/3Ubd7aDkQzPMXOATHbc+11ARHy+4XAudtwcSLux8M=; b=W3p/BYq7bqgeQZEQkkXa0In5thfT21L5itI8Tjxtn3BySC4nfCEoIuOchF4xi2Rm4s 2CbHI1WZioJBh3zZfylCBP4cN42Z05UXQ3IelGu/vFRsnoONI5VzldlH93T1QsogT8NP F6cRLMzIiHjqZlWt3ana8Fld3XYiHtsG3sj2/qeTz5AkKrRmO7yO/cx59wS124YJozdm ru+NqdjfETnos/Oxls/mUleVgahTRuuYt1ztcQT8BqZ7xK6H3WMMGLgHzBtxZ7Zl6RYg /ggsjpqGxNyaOZtgQ6yB1AnSP0YQ37LxZr2a92V8eqUbWFVog7luKgDbrH8RQ7KM8baj Ubbg== X-Gm-Message-State: ALoCoQk1/MhtQFVzTE4ssUgwNaGKi+ZzUGYVwHa0TWbcOJaewy5tMZH0xGLLZlRFaYh1UjK4OmuC X-Received: by 10.67.3.68 with SMTP id bu4mr7499766pad.144.1389849105365; Wed, 15 Jan 2014 21:11:45 -0800 (PST) Received: from [192.168.1.2] (c-24-6-182-22.hsd1.ca.comcast.net. [24.6.182.22]) by mx.google.com with ESMTPSA id j3sm11962901pbh.38.2014.01.15.21.11.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 21:11:43 -0800 (PST) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: mtree acl support From: Tim Kientzle In-Reply-To: <1389710847.2685.70601137.72B5C024@webmail.messagingengine.com> Date: Wed, 15 Jan 2014 21:11:36 -0800 Content-Transfer-Encoding: quoted-printable Message-Id: <93FD368C-21D1-4A5F-986A-859D83AFB5BF@kientzle.com> References: <1389710847.2685.70601137.72B5C024@webmail.messagingengine.com> To: Mark Felder X-Mailer: Apple Mail (2.1827) Cc: FreeBSD current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 05:17:51 -0000 On Jan 14, 2014, at 6:47 AM, Mark Felder wrote: > I was recently talking to someone about how one would backup / restore > ACLs reliably. I didn't see any mention of ACLs in the mtree man page > and after a quick google I came upon this old mailing list post: >=20 > = http://lists.freebsd.org/pipermail/freebsd-hackers/2008-April/024173.html >=20 > patch in list is here: http://heka.cenkes.org/sat/diffs/mtree_acl.diff > I've mirrored it here: https://feld.me/freebsd/mtree_acl.diff >=20 > This old patch appears to still apply cleanly. I hate to see a patch = die > and be forgotten. One problem that =91tar=92 has addressed (inspired by Joerg Schilling=92s work on star) is to permit ACLs to be restored even if the user database is out of date. This is done by including a fourth field in each ACE with the numeric user ID. I suspect you want to do the same for mtree. I thought I remembered acl_to_text having an option to use an extended text format, so it might be a trivial change. Tim From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 09:58:49 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CAC4F9A0 for ; Thu, 16 Jan 2014 09:58:49 +0000 (UTC) Received: from nm15-vm9.access.bullet.mail.gq1.yahoo.com (nm15-vm9.access.bullet.mail.gq1.yahoo.com [216.39.63.253]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6FE56141A for ; Thu, 16 Jan 2014 09:58:49 +0000 (UTC) Received: from [216.39.60.167] by nm15.access.bullet.mail.gq1.yahoo.com with NNFMP; 16 Jan 2014 09:52:49 -0000 Received: from [67.195.23.144] by tm3.access.bullet.mail.gq1.yahoo.com with NNFMP; 16 Jan 2014 09:52:49 -0000 Received: from [127.0.0.1] by smtp116.sbc.mail.gq1.yahoo.com with NNFMP; 16 Jan 2014 09:52:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bellsouth.net; s=s1024; t=1389865969; bh=s+j5cZyVXfwrKSaytv1XvrVeVdMoGk46riL09wXAyBY=; h=X-Yahoo-Newman-Id:Message-ID:Date:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:X-Rocket-Received:From:To:CC:Subject; b=VV+4W+87ftVPckdgLtOa4YlB6WuCk2jdX3C5KrVLdEUvd/2CyXUkimeMNzs2j3Gz3zml7WSa1Du3E8JXVWgc2C47LMKkzYNYU+1B699seF0e5VIfc3xj6vhxd8YpblokugiL3fvBDDDWKvof8voXtIuwjBQJFSf7oBd0NZ1oRFo= X-Yahoo-Newman-Id: 502069.75720.bm@smtp116.sbc.mail.gq1.yahoo.com Message-ID: <502069.75720.bm@smtp116.sbc.mail.gq1.yahoo.com> Date: Thu, 16 Jan 2014 09:52:49 +0000 (UTC) X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: NVthaaoVM1nc1Uj5guSDe73J2dbWRagtSmCa7uiBObzaFsI PDvTduc_rIL69Ld4.I9wVO_TeBFkzTu12FqbnPmisC_ezUKi8hMpZc0a6tOX Uk125JAcoFwuMduOHxZysuUD5H_34esLvIVvXl0FGnJbUAidh1_1YywL1muC C0G9wHolykKTYhNcvQpWoixgWpN7C78Tzus.tpRt4VxZ9BDOeelleXN1D_tG 8i9LFL16nwJJCMyFVOz5pZ8JfalNr4P6ZntJIzOoBLmzFwR7ACPXr7T8cdta fGRcXR_Xsv7oTXwXtS5Zx4d.ZdD1MtQaDMe_6tg6rNm6CGa3oslwusKAQcRL Ko_nPPlQniiEsCtdzK_cs2R5wUN9jUZESTXeP1SrRwSRmZseEcpjKLn2vK1G WzhMefq_EnOKUA4IdJ0a4X35UJiBmgsSo2592B9CZSoss2eHxzXWvkP8P_VP e0ga0rDeiOm.PrxhkUSgwkKvWv69sly4BlXHzjXJ1aKe3d5gcocEsFXrLkmw foMsp7sSd5Tdb8y3txs6ECVNYEJZkVa_mB.UCvR95TE_PzBB8EqzCzHVPl9S abwHJ55PBJFvmLmfHjxLEiRCN X-Yahoo-SMTP: Kz_aW1.swBBYof3zAD7.RWzXz9ZAQVDMml1VADsbgPT4Kq79LC0- X-Rocket-Received: from localhost (mueller6724@96.28.178.143 with plain [67.195.15.66]) by smtp116.sbc.mail.gq1.yahoo.com with SMTP; 16 Jan 2014 09:52:49 +0000 UTC From: "Thomas Mueller" To: freebsd-current@freebsd.org Subject: Re: FreeBSD 10-RC4: Got crash in igb driver Cc: Jack F Vogel , Eric Joyner X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 09:58:49 -0000 > I work with Jack on FreeBSD network drivers, and we have a patch that we > think might fix this problem. It re-implements the header pull-up code that > was in the driver pre-2.4.0, but with IPv6 support. Alexandre, could you > apply this patch to the igb version in HEAD and try it out on your network? > We can't replicate your setup here. > If it solves your problem, then the next step would be to port the patch to > the ixgbe driver since, as Yonghyeon noted, it looks like that driver will > encounter the same problem. We could then modify em to add IPv6 offload > support as well. > Thanks, - Eric Joyner Can I get in on network drivers, two in particular where I have the hardware involved? Drivers in my case are re, which fails on my motherboard, and athn, not currently present in FreeBSD. I would have NetBSD src tree to compare with, and NetBSD re driver works on my motherboard. Tom From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 14:07:26 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A980EC9F for ; Thu, 16 Jan 2014 14:07:26 +0000 (UTC) Received: from sender1.zohomail.com (sender1.zohomail.com [72.5.230.95]) by mx1.freebsd.org (Postfix) with ESMTP id 8CAD01FDD for ; Thu, 16 Jan 2014 14:07:26 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=subject:from:to:content-type:date:message-id:mime-version; b=RCQIHM2LOtfnvDBJL2ssEnFzQHSxISMm+FldVcpSGkARv37w8tkmMViS68PQnsLlUAvSq9wngVFP Ov8OOzx5K/UYm5hpYf4ZV5qAlPBhCdeyUT/RNdPNSLEVF0JJK0iA Received: from [10.1.2.6] (46.229.54.117 [46.229.54.117]) by mx.zohomail.com with SMTPS id 1389881245658201.38327527907916; Thu, 16 Jan 2014 06:07:25 -0800 (PST) Subject: mouse pointer has gone. From: clutton To: FreeBSD Current Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-Q3/sm+ugyVc78x5gSqoE" Date: Thu, 16 Jan 2014 16:07:21 +0200 Message-ID: <1389881241.2088.68.camel@eva02.mbsd> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port X-Zoho-Virus-Status: 1 X-ZohoMail: Ss SS_10 UW UB UW UB SGR3_1_26113_59 X-ZohoMail-Owner: <1389881241.2088.68.camel@eva02.mbsd>+zmo_0_ X-ZohoMail-Sender: 46.229.54.117 X-ZohoMailClient: External X-Mailman-Approved-At: Thu, 16 Jan 2014 16:32:54 +0000 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 14:07:26 -0000 --=-Q3/sm+ugyVc78x5gSqoE Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Using X, I have a frozen mouse pointer. Mouse works fine from syscons but not from X. Booting from kernel.old resolves the problem. Here is my X log with current kernel. 158:[ 34.043] (=3D=3D) NVIDIA(0): Silken mouse enabled 208:[ 34.232] (II) config/hal: Adding input device PS/2 Mouse 209:[ 34.232] (II) LoadModule: "mouse" 210:[ 34.233] (II) Loading /usr/local/lib/xorg/modules/input/mouse_drv.so 211:[ 34.236] (II) Module mouse: vendor=3D"X.Org Foundation" 215:[ 34.237] (II) Using input driver 'mouse' for 'PS/2 Mouse' 216:[ 34.237] (**) PS/2 Mouse: always reports core events 218:[ 34.237] (=3D=3D) PS/2 Mouse: Protocol: "Auto" 219:[ 34.237] (**) PS/2 Mouse: always reports core events 222:[ 34.238] (EE) PS/2 Mouse: cannot open input device 223:[ 34.238] (EE) PreInit returned 2 for "PS/2 Mouse" 224:[ 34.238] (II) UnloadModule: "mouse" And with kernel.old 158:[ 30.743] (=3D=3D) NVIDIA(0): Silken mouse enabled 208:[ 30.941] (II) config/hal: Adding input device PS/2 Mouse 209:[ 30.941] (II) LoadModule: "mouse" 210:[ 30.942] (II) Loading /usr/local/lib/xorg/modules/input/mouse_drv.so 211:[ 30.945] (II) Module mouse: vendor=3D"X.Org Foundation" 215:[ 30.946] (II) Using input driver 'mouse' for 'PS/2 Mouse' 216:[ 30.946] (**) PS/2 Mouse: always reports core events 217:[ 30.946] (**) Option "Device" "/dev/sysmouse" 218:[ 30.946] (=3D=3D) PS/2 Mouse: Protocol: "Auto" 219:[ 30.946] (**) PS/2 Mouse: always reports core events 220:[ 30.947] (=3D=3D) PS/2 Mouse: Emulate3Buttons, Emulate3Timeout: 50 221:[ 30.947] (**) PS/2 Mouse: ZAxisMapping: buttons 4 and 5 222:[ 30.947] (**) PS/2 Mouse: Buttons: 5 224:[ 30.947] (II) XINPUT: Adding extended input device "PS/2 Mouse" (type: MOUSE, id 7) 225:[ 30.948] (**) PS/2 Mouse: (accel) keeping acceleration scheme 1 226:[ 30.948] (**) PS/2 Mouse: (accel) acceleration profile 0 227:[ 30.948] (**) PS/2 Mouse: (accel) acceleration factor: 2.000 228:[ 30.948] (**) PS/2 Mouse: (accel) acceleration threshold: 4 229:[ 30.948] (II) PS/2 Mouse: SetupAuto: hw.iftype is 4, hw.model is 0 230:[ 30.948] (II) PS/2 Mouse: SetupAuto: protocol is SysMouse --=-Q3/sm+ugyVc78x5gSqoE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAABAgAGBQJS1+eZAAoJECNkWbjnbjuibpEP+wZSUC3kyE5NkAPVwG2uXV7z BK8aDxO8O0DkY3Bs0JPOFW3jM8DX9RSqFxNckFM8/93D2EKR8SmILcJjmyA1ZjO5 pLGWHDa8n3qF5Gi0rgLUssT4LO7VxUBwwLRV+u6znSgEJ8QNSJETlHj1hjjaEXoa ZBFkZlqosCzqfqE3GXvHLOAbBowSLgKr10a68k9/eLRQjHhwgEVxP92jbvL6GGKJ HFmAqbnynBJ/hyXoLiTHPWeUz0iebgh77euqY9fXT5K1whnHkFc7UiE9GZoa5NBL /D14tD9IDIS1oIG9GMxVTDRc/7zXFLhn6fb1JK6uaraktaYgz9+/3GM/5yTJmx29 UuwN8d8372Pvi3VuJ05A2gtHzRkUZ/Go4x6GP1YgDw9AyiTzQXOFZld2Log0Tsug lZ/rqia3AYxXDecSBVfthkrgSkB4e7keS8SqAIxVkEdhV2ySuW08EIzDZJ9dzHH/ r7qC9jujF2F1YVq+GNlXa+vpS9I0ZVo8cp2WW5GaCykCbDu3sY2sZJkuvOIZFewT CZPjUj+Dsj4hEK7oiiHvPOhs2OKTuG+0b446Rbrd1MI85NynddVGyR/kCx+FFt36 hKtHr46TK34H6Vm44B7mfwAOwOXwfLtuP6/ezdAk9kzEoexCbNVPmfyuxu1tNEAq vAH4VEaFLsS9LQ8itFwZ =APmC -----END PGP SIGNATURE----- --=-Q3/sm+ugyVc78x5gSqoE-- From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 16:50:32 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16CEF168 for ; Thu, 16 Jan 2014 16:50:32 +0000 (UTC) Received: from amailer.gwdg.de (amailer.gwdg.de [134.76.10.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CBFFF1F58 for ; Thu, 16 Jan 2014 16:50:31 +0000 (UTC) Received: from p57bcca53.dip0.t-ipconnect.de ([87.188.202.83] helo=krabat.raven.hur) by mailer.gwdg.de with esmtpsa (TLSv1:DHE-RSA-CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1W3q96-0001EZ-P4; Thu, 16 Jan 2014 17:50:21 +0100 Message-ID: <52D80DC8.7010202@gwdg.de> Date: Thu, 16 Jan 2014 17:50:16 +0100 From: Rainer Hurling User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: clutton , FreeBSD Current Subject: Re: mouse pointer has gone. References: <1389881241.2088.68.camel@eva02.mbsd> In-Reply-To: <1389881241.2088.68.camel@eva02.mbsd> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Authenticated: Id:rhurlin X-Spam-Level: - X-Virus-Scanned: (clean) by exiscan+sophie X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 16:50:32 -0000 Am 16.01.2014 15:07, schrieb clutton: > Using X, I have a frozen mouse pointer. > Mouse works fine from syscons but not from X. Booting from kernel.old > resolves the problem. > > Here is my X log with current kernel. > > 158:[ 34.043] (==) NVIDIA(0): Silken mouse enabled > 208:[ 34.232] (II) config/hal: Adding input device PS/2 Mouse > 209:[ 34.232] (II) LoadModule: "mouse" > 210:[ 34.233] (II) > Loading /usr/local/lib/xorg/modules/input/mouse_drv.so > 211:[ 34.236] (II) Module mouse: vendor="X.Org Foundation" > 215:[ 34.237] (II) Using input driver 'mouse' for 'PS/2 Mouse' > 216:[ 34.237] (**) PS/2 Mouse: always reports core events > 218:[ 34.237] (==) PS/2 Mouse: Protocol: "Auto" > 219:[ 34.237] (**) PS/2 Mouse: always reports core events > 222:[ 34.238] (EE) PS/2 Mouse: cannot open input device > 223:[ 34.238] (EE) PreInit returned 2 for "PS/2 Mouse" > 224:[ 34.238] (II) UnloadModule: "mouse" > > > And with kernel.old > > 158:[ 30.743] (==) NVIDIA(0): Silken mouse enabled > 208:[ 30.941] (II) config/hal: Adding input device PS/2 Mouse > 209:[ 30.941] (II) LoadModule: "mouse" > 210:[ 30.942] (II) > Loading /usr/local/lib/xorg/modules/input/mouse_drv.so > 211:[ 30.945] (II) Module mouse: vendor="X.Org Foundation" > 215:[ 30.946] (II) Using input driver 'mouse' for 'PS/2 Mouse' > 216:[ 30.946] (**) PS/2 Mouse: always reports core events > 217:[ 30.946] (**) Option "Device" "/dev/sysmouse" > 218:[ 30.946] (==) PS/2 Mouse: Protocol: "Auto" > 219:[ 30.946] (**) PS/2 Mouse: always reports core events > 220:[ 30.947] (==) PS/2 Mouse: Emulate3Buttons, Emulate3Timeout: 50 > 221:[ 30.947] (**) PS/2 Mouse: ZAxisMapping: buttons 4 and 5 > 222:[ 30.947] (**) PS/2 Mouse: Buttons: 5 > 224:[ 30.947] (II) XINPUT: Adding extended input device "PS/2 > Mouse" (type: MOUSE, id 7) > 225:[ 30.948] (**) PS/2 Mouse: (accel) keeping acceleration scheme 1 > 226:[ 30.948] (**) PS/2 Mouse: (accel) acceleration profile 0 > 227:[ 30.948] (**) PS/2 Mouse: (accel) acceleration factor: 2.000 > 228:[ 30.948] (**) PS/2 Mouse: (accel) acceleration threshold: 4 > 229:[ 30.948] (II) PS/2 Mouse: SetupAuto: hw.iftype is 4, hw.model is > 0 > 230:[ 30.948] (II) PS/2 Mouse: SetupAuto: protocol is SysMouse > For me, it helped to rebuild devel/dbus and sysutils/hal and restart that services again. HTH, Rainer From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 17:21:55 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E71A5F82 for ; Thu, 16 Jan 2014 17:21:55 +0000 (UTC) Received: from mail-pd0-x22d.google.com (mail-pd0-x22d.google.com [IPv6:2607:f8b0:400e:c02::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB3881278 for ; Thu, 16 Jan 2014 17:21:55 +0000 (UTC) Received: by mail-pd0-f173.google.com with SMTP id p10so2873710pdj.4 for ; Thu, 16 Jan 2014 09:21:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=S6DJLkTBBdZGiQtlreeRqvRfO1a0CBAW62mJX2EHs6I=; b=Wd9ZztQAaQroXTFl6F3o/z2JKcLxutC6iZ2NUrsaVfKFix2IsAJljd2YXX1yo+QYrR Scg605OYCJBIZwza8YUN69s9U+eZWGFXSao4SIKPAOrnVowqO3CUCimHyWg6aJZ8i8g2 exzSXdlnCTc+SNEmeIrPi6N9JDUZ/f7GdYeyHBKuQdzAycvt6pnP8WJcHeYFXHCmTN/t uyM8B6ku0F/kK3pqwesk/V87MN+EmWFp947KND0BlSa8MznZv9btyNVatq1JzWOW6ZFU i7rr99kFNXLThC8xyxDueOYoTO2DzvMORVRN1xldeOp/BxZLqeghQMRzOZxiExD+4+4M i40g== MIME-Version: 1.0 X-Received: by 10.66.224.109 with SMTP id rb13mr11315092pac.78.1389892915320; Thu, 16 Jan 2014 09:21:55 -0800 (PST) Sender: kob6558@gmail.com Received: by 10.67.30.1 with HTTP; Thu, 16 Jan 2014 09:21:55 -0800 (PST) In-Reply-To: <52D80DC8.7010202@gwdg.de> References: <1389881241.2088.68.camel@eva02.mbsd> <52D80DC8.7010202@gwdg.de> Date: Thu, 16 Jan 2014 09:21:55 -0800 X-Google-Sender-Auth: g8m083dg5HLkCSAkhB_SQn5GL5Y Message-ID: Subject: Re: mouse pointer has gone. From: Kevin Oberman To: Rainer Hurling Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: clutton , FreeBSD Current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 17:21:56 -0000 On Thu, Jan 16, 2014 at 8:50 AM, Rainer Hurling wrote: > Am 16.01.2014 15:07, schrieb clutton: > > Using X, I have a frozen mouse pointer. > > Mouse works fine from syscons but not from X. Booting from kernel.old > > resolves the problem. > > > > Here is my X log with current kernel. > > > > 158:[ 34.043] (==) NVIDIA(0): Silken mouse enabled > > 208:[ 34.232] (II) config/hal: Adding input device PS/2 Mouse > > 209:[ 34.232] (II) LoadModule: "mouse" > > 210:[ 34.233] (II) > > Loading /usr/local/lib/xorg/modules/input/mouse_drv.so > > 211:[ 34.236] (II) Module mouse: vendor="X.Org Foundation" > > 215:[ 34.237] (II) Using input driver 'mouse' for 'PS/2 Mouse' > > 216:[ 34.237] (**) PS/2 Mouse: always reports core events > > 218:[ 34.237] (==) PS/2 Mouse: Protocol: "Auto" > > 219:[ 34.237] (**) PS/2 Mouse: always reports core events > > 222:[ 34.238] (EE) PS/2 Mouse: cannot open input device > > 223:[ 34.238] (EE) PreInit returned 2 for "PS/2 Mouse" > > 224:[ 34.238] (II) UnloadModule: "mouse" > > > > > > And with kernel.old > > > > 158:[ 30.743] (==) NVIDIA(0): Silken mouse enabled > > 208:[ 30.941] (II) config/hal: Adding input device PS/2 Mouse > > 209:[ 30.941] (II) LoadModule: "mouse" > > 210:[ 30.942] (II) > > Loading /usr/local/lib/xorg/modules/input/mouse_drv.so > > 211:[ 30.945] (II) Module mouse: vendor="X.Org Foundation" > > 215:[ 30.946] (II) Using input driver 'mouse' for 'PS/2 Mouse' > > 216:[ 30.946] (**) PS/2 Mouse: always reports core events > > 217:[ 30.946] (**) Option "Device" "/dev/sysmouse" > > 218:[ 30.946] (==) PS/2 Mouse: Protocol: "Auto" > > 219:[ 30.946] (**) PS/2 Mouse: always reports core events > > 220:[ 30.947] (==) PS/2 Mouse: Emulate3Buttons, Emulate3Timeout: 50 > > 221:[ 30.947] (**) PS/2 Mouse: ZAxisMapping: buttons 4 and 5 > > 222:[ 30.947] (**) PS/2 Mouse: Buttons: 5 > > 224:[ 30.947] (II) XINPUT: Adding extended input device "PS/2 > > Mouse" (type: MOUSE, id 7) > > 225:[ 30.948] (**) PS/2 Mouse: (accel) keeping acceleration scheme 1 > > 226:[ 30.948] (**) PS/2 Mouse: (accel) acceleration profile 0 > > 227:[ 30.948] (**) PS/2 Mouse: (accel) acceleration factor: 2.000 > > 228:[ 30.948] (**) PS/2 Mouse: (accel) acceleration threshold: 4 > > 229:[ 30.948] (II) PS/2 Mouse: SetupAuto: hw.iftype is 4, hw.model is > > 0 > > 230:[ 30.948] (II) PS/2 Mouse: SetupAuto: protocol is SysMouse > > > > For me, it helped to rebuild devel/dbus and sysutils/hal and restart > that services again. > > HTH, > Rainer > sysutils/hal needs rebuilding due to a change in the kernel ABI. It is NOT the only port affected by the change and rebuilding all ports is recommended, but to get the pointer to work only requires a re-built hald. devel/dbus has no problems. I can tell you that you need to also rebuild sysutils/tmux, if you use it. I'll admit to being lazy and have not rebuilt all ports to this point. Only the two ports mentioned have caused any problems, so far. -- R. Kevin Oberman, Network Engineer, Retired E-mail: rkoberman@gmail.com From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 17:06:43 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25F03880 for ; Thu, 16 Jan 2014 17:06:43 +0000 (UTC) Received: from sender1.zohomail.com (sender1.zohomail.com [72.5.230.95]) by mx1.freebsd.org (Postfix) with ESMTP id F0768110F for ; Thu, 16 Jan 2014 17:06:42 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=subject:from:to:in-reply-to:references:content-type:date:message-id:mime-version; b=WmuMfZBkf1GQfzDoK1NzD7yTu6wdXYmlASqtiGcOgQhUfd7xkXHsDBX+p/c376+sz74kQPBEZJAk kMI8HRv2hFng/BDSUg4GIRWrqD/LyTqtUlkYBivC8/3EsR4RaWI2 Received: from [192.168.11.5] (213.111.120.236 [213.111.120.236]) by mx.zohomail.com with SMTPS id 1389892000903556.3211937171195; Thu, 16 Jan 2014 09:06:40 -0800 (PST) Subject: Re: mouse pointer has gone. From: clutton To: freebsd-current@freebsd.org In-Reply-To: <52D80DC8.7010202@gwdg.de> References: <1389881241.2088.68.camel@eva02.mbsd> <52D80DC8.7010202@gwdg.de> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-gzW/uWt6NVQXcCMf1lps" Date: Thu, 16 Jan 2014 19:06:35 +0200 Message-ID: <1389891995.1869.1.camel@eva02.mbsd> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port X-Zoho-Virus-Status: 1 X-ZohoMail: Ss SS_10 UW UB UW UB SGR3_1_26113_337 X-ZohoMail-Owner: <1389891995.1869.1.camel@eva02.mbsd>+zmo_0_ X-ZohoMail-Sender: 213.111.120.236 X-ZohoMailClient: External X-Mailman-Approved-At: Thu, 16 Jan 2014 19:04:14 +0000 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 17:06:43 -0000 --=-gzW/uWt6NVQXcCMf1lps Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2014-01-16 at 17:50 +0100, Rainer Hurling wrote: > Am 16.01.2014 15:07, schrieb clutton: > > Using X, I have a frozen mouse pointer. > > Mouse works fine from syscons but not from X. Booting from kernel.old > > resolves the problem. > >=20 > > Here is my X log with current kernel. > >=20 > > 158:[ 34.043] (=3D=3D) NVIDIA(0): Silken mouse enabled > > 208:[ 34.232] (II) config/hal: Adding input device PS/2 Mouse > > 209:[ 34.232] (II) LoadModule: "mouse" > > 210:[ 34.233] (II) > > Loading /usr/local/lib/xorg/modules/input/mouse_drv.so > > 211:[ 34.236] (II) Module mouse: vendor=3D"X.Org Foundation" > > 215:[ 34.237] (II) Using input driver 'mouse' for 'PS/2 Mouse' > > 216:[ 34.237] (**) PS/2 Mouse: always reports core events > > 218:[ 34.237] (=3D=3D) PS/2 Mouse: Protocol: "Auto" > > 219:[ 34.237] (**) PS/2 Mouse: always reports core events > > 222:[ 34.238] (EE) PS/2 Mouse: cannot open input device > > 223:[ 34.238] (EE) PreInit returned 2 for "PS/2 Mouse" > > 224:[ 34.238] (II) UnloadModule: "mouse" > >=20 > >=20 > > And with kernel.old > >=20 > > 158:[ 30.743] (=3D=3D) NVIDIA(0): Silken mouse enabled > > 208:[ 30.941] (II) config/hal: Adding input device PS/2 Mouse > > 209:[ 30.941] (II) LoadModule: "mouse" > > 210:[ 30.942] (II) > > Loading /usr/local/lib/xorg/modules/input/mouse_drv.so > > 211:[ 30.945] (II) Module mouse: vendor=3D"X.Org Foundation" > > 215:[ 30.946] (II) Using input driver 'mouse' for 'PS/2 Mouse' > > 216:[ 30.946] (**) PS/2 Mouse: always reports core events > > 217:[ 30.946] (**) Option "Device" "/dev/sysmouse" > > 218:[ 30.946] (=3D=3D) PS/2 Mouse: Protocol: "Auto" > > 219:[ 30.946] (**) PS/2 Mouse: always reports core events > > 220:[ 30.947] (=3D=3D) PS/2 Mouse: Emulate3Buttons, Emulate3Timeout:= 50 > > 221:[ 30.947] (**) PS/2 Mouse: ZAxisMapping: buttons 4 and 5 > > 222:[ 30.947] (**) PS/2 Mouse: Buttons: 5 > > 224:[ 30.947] (II) XINPUT: Adding extended input device "PS/2 > > Mouse" (type: MOUSE, id 7) > > 225:[ 30.948] (**) PS/2 Mouse: (accel) keeping acceleration scheme 1 > > 226:[ 30.948] (**) PS/2 Mouse: (accel) acceleration profile 0 > > 227:[ 30.948] (**) PS/2 Mouse: (accel) acceleration factor: 2.000 > > 228:[ 30.948] (**) PS/2 Mouse: (accel) acceleration threshold: 4 > > 229:[ 30.948] (II) PS/2 Mouse: SetupAuto: hw.iftype is 4, hw.model i= s > > 0 > > 230:[ 30.948] (II) PS/2 Mouse: SetupAuto: protocol is SysMouse > >=20 >=20 > For me, it helped to rebuild devel/dbus and sysutils/hal and restart > that services again. >=20 > HTH, > Rainer Thanks, I rebuild hald, but I hadn't tried rebuilding dbus. --=-gzW/uWt6NVQXcCMf1lps Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAABAgAGBQJS2BGbAAoJECNkWbjnbjuiQikP/08Nhb7Hw7t5eSqgZz27b3a2 o1cDCP1dJHIg8YEDsiw21zSPN22M787Ltl6esbutWvml1+IdvfOxaEhT1BjgJD7L aKqyxOTHbXRCqUolHXYK+rqFHCjP7F4x5aewyrR4Eigl5xAG+Xd7DghpI+ZT/e/x 3yoK4G1t6DNNGe733abtJAcQ5uJDG0LXF71MKoOrKEPJ7AbwwF4aA2HxGgnS8sKe swF5KQAtob6JzmVUBRWkwRex+AYoCfBLGULd6auMuF8FOiOQ4znSu9KDS8lb2XhU uJtHWo3ZLFjv/U0Ub1bEIpGPTAe5oiCnigETKvDbIsxWVSgw64YuHI6Jze77+1Wm 0SLlBG/x4iBensnylMEYq/FzeBUtNjxEF9KQNYXObJogY2VLR/D6c6ABvROe2N0C etmrNsA1E6vRyGbBlfZJmgEfG2c0J+tPC7+ziJnUk1wzHCeGJJFZf2hbSW/H4i6P +IlhwO8BEiFJo/1Uh+6pisR4OQMhMR8HIqRx73s/gFD8VJwnjPufPRvR4i1ozpRC H+FwIvbrp7CzUkcCxdj4zIiduIdTfukihAYlUN9/0MYPjZAkYkcspvsCWRY6mxlB XEVMx6qRP4YL45gT4qywU688HIi4OEDzvGdNw1zchu0w2DRmien/6jRMr/aQf2ny HZ65pC5fjyi1bsCr1TvO =K4OP -----END PGP SIGNATURE----- --=-gzW/uWt6NVQXcCMf1lps-- From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 19:20:36 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB6F3D0B; Thu, 16 Jan 2014 19:20:36 +0000 (UTC) Received: from mail-ee0-x22f.google.com (mail-ee0-x22f.google.com [IPv6:2a00:1450:4013:c00::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 16D7E1FD4; Thu, 16 Jan 2014 19:20:35 +0000 (UTC) Received: by mail-ee0-f47.google.com with SMTP id d49so954904eek.20 for ; Thu, 16 Jan 2014 11:20:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=xLl5N6UhL200xOK0rsgBRrWmjzWMp7bxLxCHxGFgxCU=; b=lEuLrqfSeMrMWicCtIlPBlztCFlsoA2gHxbrCdGxzyssNchGvQcNGaqXHDDJXUnXxu 4uEEmYfk+ImL7dTc+H/IT8+kpcILoiw+21LjVDEdWBUTdZhs0ZO48bUhkzEIhaFG1bk/ snO582YGaco8UFRtkAVMMHD2JKzdjLSATycIxqAe4BfGmP9P5M02ff8oA//QPVGlg0m8 txZbjsl1sB6DtUJeys/ZF9x9taeIoBvO/1umnRwdK739TigrMfmp91eM0e2BkjFmjeWi a2xH78fjbGg8uOguxdPqaHFM+ow13kECe4b3YgO+8z/1Ub9Mkd6UL1tJVe12mNwUgOhX 6iFQ== X-Received: by 10.14.0.201 with SMTP id 49mr14553001eeb.38.1389900034210; Thu, 16 Jan 2014 11:20:34 -0800 (PST) Received: from [192.168.1.101] (45.81.datacomsa.pl. [195.34.81.45]) by mx.google.com with ESMTPSA id z46sm20658835een.1.2014.01.16.11.20.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 11:20:33 -0800 (PST) Sender: =?UTF-8?Q?Edward_Tomasz_Napiera=C5=82a?= Subject: Re: mtree acl support Mime-Version: 1.0 (Apple Message framework v1283) Content-Type: text/plain; charset=windows-1250 From: =?iso-8859-2?Q?Edward_Tomasz_Napiera=B3a?= In-Reply-To: <93FD368C-21D1-4A5F-986A-859D83AFB5BF@kientzle.com> Date: Thu, 16 Jan 2014 20:20:31 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: References: <1389710847.2685.70601137.72B5C024@webmail.messagingengine.com> <93FD368C-21D1-4A5F-986A-859D83AFB5BF@kientzle.com> To: Tim Kientzle X-Mailer: Apple Mail (2.1283) Cc: FreeBSD current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 19:20:36 -0000 Wiadomo=9C=E6 napisana przez Tim Kientzle w dniu 16 sty 2014, o godz. = 06:11: > On Jan 14, 2014, at 6:47 AM, Mark Felder wrote: >=20 >> I was recently talking to someone about how one would backup / = restore >> ACLs reliably. I didn't see any mention of ACLs in the mtree man page >> and after a quick google I came upon this old mailing list post: >>=20 >> = http://lists.freebsd.org/pipermail/freebsd-hackers/2008-April/024173.html >>=20 >> patch in list is here: = http://heka.cenkes.org/sat/diffs/mtree_acl.diff >> I've mirrored it here: https://feld.me/freebsd/mtree_acl.diff >>=20 >> This old patch appears to still apply cleanly. I hate to see a patch = die >> and be forgotten. >=20 > One problem that =91tar=92 has addressed (inspired by Joerg = Schilling=92s > work on star) is to permit ACLs to be restored even if the user = database > is out of date. >=20 > This is done by including a fourth field in each ACE with the > numeric user ID. >=20 > I suspect you want to do the same for mtree. I thought > I remembered acl_to_text having an option to use > an extended text format, so it might be a trivial change. It's ACL_TEXT_APPEND_ID, used with acl_to_text_np(3). The other side, acl_from_text(3), already does the right thing when appended IDs are = present in the textual form. --=20 If you cut off my head, what would I say? Me and my head, or me and my = body? From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 20:36:21 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8779EB49 for ; Thu, 16 Jan 2014 20:36:21 +0000 (UTC) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 571411657 for ; Thu, 16 Jan 2014 20:36:21 +0000 (UTC) Received: from compute6.internal (compute6.nyi.mail.srv.osa [10.202.2.46]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 3B51C20DBE; Thu, 16 Jan 2014 15:36:16 -0500 (EST) Received: from web3 ([10.202.2.213]) by compute6.internal (MEProxy); Thu, 16 Jan 2014 15:36:17 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=message-id:from:to:cc:mime-version :content-transfer-encoding:content-type:in-reply-to:references :subject:date; s=smtpout; bh=mrzdSjUT5GmUFnas5chIOxY3hL8=; b=Ask q8EgJsf6j4B188ZOtckvuzIfy6uDsKjXuHFNB0+53UjoPWxU+9K0IV5g4PIswyB0 sX0aZ4zaWs2zbXW0BIscycJ9o+E8HEAe+YiuAjRFInIOJAFQAks/aHiMEV5HQ3+7 GCnz3DIqrQdB6dHvjvmWfnJd7X2+xgHCKw78dnSM= Received: by web3.nyi.mail.srv.osa (Postfix, from userid 99) id 4FEEE101B8C; Thu, 16 Jan 2014 15:36:16 -0500 (EST) Message-Id: <1389904576.2313.71707745.52B4D2D1@webmail.messagingengine.com> X-Sasl-Enc: zBmlPIrNJDMCrGLEy9oaE0IGvuPxk62Bu3tlCVj8ILEg 1389904576 From: Mark Felder To: Tim Kientzle MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-fdd84f42 In-Reply-To: <93FD368C-21D1-4A5F-986A-859D83AFB5BF@kientzle.com> References: <1389710847.2685.70601137.72B5C024@webmail.messagingengine.com> <93FD368C-21D1-4A5F-986A-859D83AFB5BF@kientzle.com> Subject: Re: mtree acl support Date: Thu, 16 Jan 2014 14:36:16 -0600 Cc: FreeBSD current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 20:36:21 -0000 On Wed, Jan 15, 2014, at 23:11, Tim Kientzle wrote: >=20 > On Jan 14, 2014, at 6:47 AM, Mark Felder wrote: >=20 > > I was recently talking to someone about how one would backup / restore > > ACLs reliably. I didn't see any mention of ACLs in the mtree man page > > and after a quick google I came upon this old mailing list post: > >=20 > > http://lists.freebsd.org/pipermail/freebsd-hackers/2008-April/024173.ht= ml > >=20 > > patch in list is here: http://heka.cenkes.org/sat/diffs/mtree_acl.diff > > I've mirrored it here: https://feld.me/freebsd/mtree_acl.diff > >=20 > > This old patch appears to still apply cleanly. I hate to see a patch die > > and be forgotten. >=20 > One problem that =E2=80=98tar=E2=80=99 has addressed (inspired by Joerg S= chilling=E2=80=99s > work on star) is to permit ACLs to be restored even if the user database > is out of date. >=20 > This is done by including a fourth field in each ACE with the > numeric user ID. >=20 > I suspect you want to do the same for mtree. I thought > I remembered acl_to_text having an option to use > an extended text format, so it might be a trivial change. >=20 As long as it's not default. One of the most convenient ways to change a user's UID (or multiple users!) is to do an mtree backup, change UID/GID, and then re-apply mtree backup. Every file that the user(s) previously owned will be automatically changed to the new UID/GID for you :-) From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 22:09:21 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DABB4D4; Thu, 16 Jan 2014 22:09:21 +0000 (UTC) Received: from mail-ea0-x231.google.com (mail-ea0-x231.google.com [IPv6:2a00:1450:4013:c01::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BE2561E85; Thu, 16 Jan 2014 22:09:20 +0000 (UTC) Received: by mail-ea0-f177.google.com with SMTP id n15so1431463ead.8 for ; Thu, 16 Jan 2014 14:09:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=UcVaXzUfwAZHET3s7QWi+qGR0jwztBNkaALveG+Tq+w=; b=o4kLd30hT/Epo9vEdf9cNGeXb+y06FKwwuQRVNKkF6wKTjt8Gm0c4IyfsjtQzjT1xV IC/2E4wY1afE6z6wi2PP05VaUxVHq0zxGYvi87WgYI7DMWyza9sYVm86qHRzIKyU3c0I EG5PBOs8iQR5CKPWv75m2u9VY9JKJHP2T5161Oq5WeV2UdpansDbljz0d98ChHxQgFb8 eCF8r0f9AcUivJPq5Nk6XJjfWHY/+6+UAVBwmyuWmJXLHVM8lwh9k6IydXjOgrrUHv3C uHeAOKKm/jRmEPGBR72DdcOeKTkq6GiHcXtV7ireZbyY5efUUdE721T0MD+V7v8u26HB hgmQ== X-Received: by 10.15.24.72 with SMTP id i48mr14607588eeu.74.1389910159069; Thu, 16 Jan 2014 14:09:19 -0800 (PST) Received: from [192.168.1.101] (45.81.datacomsa.pl. [195.34.81.45]) by mx.google.com with ESMTPSA id z49sm8857601eeo.10.2014.01.16.14.09.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 14:09:18 -0800 (PST) Sender: =?UTF-8?Q?Edward_Tomasz_Napiera=C5=82a?= Subject: Re: mtree acl support Mime-Version: 1.0 (Apple Message framework v1283) Content-Type: text/plain; charset=windows-1250 From: =?iso-8859-2?Q?Edward_Tomasz_Napiera=B3a?= In-Reply-To: <1389904576.2313.71707745.52B4D2D1@webmail.messagingengine.com> Date: Thu, 16 Jan 2014 23:09:16 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: <3607BA99-E4C9-4A0B-9BF1-7081DD79700B@FreeBSD.org> References: <1389710847.2685.70601137.72B5C024@webmail.messagingengine.com> <93FD368C-21D1-4A5F-986A-859D83AFB5BF@kientzle.com> <1389904576.2313.71707745.52B4D2D1@webmail.messagingengine.com> To: Mark Felder X-Mailer: Apple Mail (2.1283) Cc: FreeBSD current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 22:09:21 -0000 Wiadomo=9C=E6 napisana przez Mark Felder w dniu 16 sty 2014, o godz. = 21:36: > On Wed, Jan 15, 2014, at 23:11, Tim Kientzle wrote: >>=20 >> On Jan 14, 2014, at 6:47 AM, Mark Felder wrote: >>=20 >>> I was recently talking to someone about how one would backup / = restore >>> ACLs reliably. I didn't see any mention of ACLs in the mtree man = page >>> and after a quick google I came upon this old mailing list post: >>>=20 >>> = http://lists.freebsd.org/pipermail/freebsd-hackers/2008-April/024173.html >>>=20 >>> patch in list is here: = http://heka.cenkes.org/sat/diffs/mtree_acl.diff >>> I've mirrored it here: https://feld.me/freebsd/mtree_acl.diff >>>=20 >>> This old patch appears to still apply cleanly. I hate to see a patch = die >>> and be forgotten. >>=20 >> One problem that =91tar=92 has addressed (inspired by Joerg = Schilling=92s >> work on star) is to permit ACLs to be restored even if the user = database >> is out of date. >>=20 >> This is done by including a fourth field in each ACE with the >> numeric user ID. >>=20 >> I suspect you want to do the same for mtree. I thought >> I remembered acl_to_text having an option to use >> an extended text format, so it might be a trivial change. >>=20 >=20 > As long as it's not default. One of the most convenient ways to change = a > user's UID (or multiple users!) is to do an mtree backup, change > UID/GID, and then re-apply mtree backup. Every file that the user(s) > previously owned will be automatically changed to the new UID/GID for > you :-) I don't think the functionality above would interfere with that in any = way. The owner entries ("user:" for POSIX, "owner@" for NFSv4 ACLs) are = stored in a different way, and they never have the appended ID. (Besides, why not just "find ./ -user XXX -print0 | xargs -0 chown = YYY"?) --=20 If you cut off my head, what would I say? Me and my head, or me and my = body? From owner-freebsd-current@FreeBSD.ORG Thu Jan 16 23:16:45 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F5164A3 for ; Thu, 16 Jan 2014 23:16:45 +0000 (UTC) Received: from onelab2.iet.unipi.it (onelab2.iet.unipi.it [131.114.59.238]) by mx1.freebsd.org (Postfix) with ESMTP id 121A71352 for ; Thu, 16 Jan 2014 23:16:43 +0000 (UTC) Received: by onelab2.iet.unipi.it (Postfix, from userid 275) id 6B7AF7300A; Fri, 17 Jan 2014 00:19:02 +0100 (CET) Date: Fri, 17 Jan 2014 00:19:02 +0100 From: Luigi Rizzo To: current@freebsd.org Subject: picking a new AF_* number for NETLINK ? Message-ID: <20140116231902.GA51955@onelab2.iet.unipi.it> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 23:16:45 -0000 In porting the kernel openvswitch code to FreeBSD we have implemented netlink sockets, so we need to pick a number to use for AF_NETLINK/PF_NETLINK in the messages. Obviously we'd like ovs to be loadable as a module on existing kernels, so i wonder if there are any restrictions on what we can use -- specifically, whether we should make sure that AF_NETLINK < AF_MAX or that is irrelevant. cheers luigi From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 04:37:18 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0117BD6 for ; Fri, 17 Jan 2014 04:37:18 +0000 (UTC) Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C5D581B7D for ; Fri, 17 Jan 2014 04:37:17 +0000 (UTC) Received: by mail-pd0-f175.google.com with SMTP id r10so3506611pdi.20 for ; Thu, 16 Jan 2014 20:37:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=1VCmjuWSYyF2lvaeU/W6q3T4Wa4/S0AuKdPhs17jq8o=; b=aoakCdD3S03UDkzPbDq39nELmdTKkgIRepdLa4ni9J3smS08mKe4wFWvOtckeGeVZv frymqskPg6oRDJHiDSP6GH0CXfNhsfX4OZ1aSBKRhP5+275P6OObbWZM/pGoldVeqMJS A5SbfH+EtpE/hgevSAabPT9Jfm40dGmS3xd698hStJXOvgUm+HPRJ7VAJ4byayeJdJoa ulWhoTX1ZS66GPWnCo4eyT+hdFoOfb0SGUyXvVOuFFgpaWr56RgsL1k4iTMzm5S1fRXj 5Bh0fDAvGsUC7UFDpI+bHGO0xciamdqgCThX486S46k2QZYdN32yPQkRxNWzrTe351ra 9j0g== X-Gm-Message-State: ALoCoQnL8D5uttWEJmihyuW57AOkoImo5Mq98ji+X4apQm05bK3DYl224/vbDhby4Awrezz+Pbke X-Received: by 10.69.26.228 with SMTP id jb4mr14192959pbd.83.1389933437088; Thu, 16 Jan 2014 20:37:17 -0800 (PST) Received: from [192.168.1.2] (c-24-6-182-22.hsd1.ca.comcast.net. [24.6.182.22]) by mx.google.com with ESMTPSA id om6sm19059586pbc.43.2014.01.16.20.37.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 20:37:16 -0800 (PST) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: mtree acl support From: Tim Kientzle In-Reply-To: <1389904576.2313.71707745.52B4D2D1@webmail.messagingengine.com> Date: Thu, 16 Jan 2014 20:37:13 -0800 Content-Transfer-Encoding: quoted-printable Message-Id: References: <1389710847.2685.70601137.72B5C024@webmail.messagingengine.com> <93FD368C-21D1-4A5F-986A-859D83AFB5BF@kientzle.com> <1389904576.2313.71707745.52B4D2D1@webmail.messagingengine.com> To: Mark Felder X-Mailer: Apple Mail (2.1827) Cc: FreeBSD current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 04:37:18 -0000 On Jan 16, 2014, at 12:36 PM, Mark Felder wrote: > On Wed, Jan 15, 2014, at 23:11, Tim Kientzle wrote: >>=20 >> On Jan 14, 2014, at 6:47 AM, Mark Felder wrote: >>=20 >>> I was recently talking to someone about how one would backup / = restore >>> ACLs reliably. I didn't see any mention of ACLs in the mtree man = page >>> and after a quick google I came upon this old mailing list post: >>>=20 >>> = http://lists.freebsd.org/pipermail/freebsd-hackers/2008-April/024173.html >>>=20 >>> patch in list is here: = http://heka.cenkes.org/sat/diffs/mtree_acl.diff >>> I've mirrored it here: https://feld.me/freebsd/mtree_acl.diff >>>=20 >>> This old patch appears to still apply cleanly. I hate to see a patch = die >>> and be forgotten. >>=20 >> One problem that =91tar=92 has addressed (inspired by Joerg = Schilling=92s >> work on star) is to permit ACLs to be restored even if the user = database >> is out of date. >>=20 >> This is done by including a fourth field in each ACE with the >> numeric user ID. >>=20 >> I suspect you want to do the same for mtree. I thought >> I remembered acl_to_text having an option to use >> an extended text format, so it might be a trivial change. >>=20 >=20 > As long as it's not default. One of the most convenient ways to change = a > user's UID (or multiple users!) is to do an mtree backup, change > UID/GID, and then re-apply mtree backup. Every file that the user(s) > previously owned will be automatically changed to the new UID/GID for > you :-) The extended format stores both name and numeric ID. It tries to restore by name first (looking up as necessary), then falls = back on ID if that fails. So this does correctly handle your case. This also lets you restore trees when user lookups are unavailable. For = example, user lookups may be broken because of permission problems that = you=92re trying to fix with mtree. ;-) Tim From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 07:47:32 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 685AAD17 for ; Fri, 17 Jan 2014 07:47:32 +0000 (UTC) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DBD9D17C6 for ; Fri, 17 Jan 2014 07:47:31 +0000 (UTC) Received: by mail-la0-f53.google.com with SMTP id e16so3281669lan.26 for ; Thu, 16 Jan 2014 23:47:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=ixW1mHYGOSoWEgU7fPGCezZ0tX8H8y7IO2ysomFPpjI=; b=lUGNaDuhGROBZtO5LHgHsi/BQZtx5zZLysp1ISODMy7tderdNgkbtClBJxZvktXxoi Xq3hW5Oc07AMAAXBHzt428ee8yQxK23+NZfz1ygoTh2jRgx/lXwI/c+CYHi9KKlGjarU DsF1ISLovklC6+R+1h7L6VbHguT0vSUaxYAepPo2pBm5qPqn1wF6h+OsZYMbeOTsHF0w gr/0NCwPKwZRkM2b8Tj8n7twI4hlIJ96XwDXJPBaTOngYlYfQmV8fTjOouWRA4QUSrjC VZYpsZKj5S3+4S6lU67T2xTTr5n9UMwhXxMDmWhYI6fYepLyhV+4qMkuD5zIVnlz6s3i g46w== X-Gm-Message-State: ALoCoQnzd+l6TrXcGK8BUMP8MjySRYi8uN3KZAcC4n4r0GE28+ZOf+4Yt3L7JrBMaW83CQrS8iTV X-Received: by 10.112.64.227 with SMTP id r3mr251441lbs.24.1389944843610; Thu, 16 Jan 2014 23:47:23 -0800 (PST) Received: from [192.168.1.2] ([89.169.173.68]) by mx.google.com with ESMTPSA id gi5sm2746914lbc.4.2014.01.16.23.47.22 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 23:47:23 -0800 (PST) Message-ID: <52D8E00A.6060907@freebsd.org> Date: Fri, 17 Jan 2014 11:47:22 +0400 From: Andrey Chernov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Alexander , current@FreeBSD.org Subject: Re: SCHED_ULE bug (was Re: cpuminer mines only on one core regardless of "--threads" option) References: <399751389704518@web9j.yandex.ru> <52D541E7.3040305@gmail.com> <5101389708996@web13m.yandex.ru> <52D55B24.8080102@freebsd.org> <113571389724340@web5g.yandex.ru> <37721389856823@web8h.yandex.ru> In-Reply-To: <37721389856823@web8h.yandex.ru> X-Enigmail-Version: 1.7a1pre Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit Cc: "stable@freebsd.org" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 07:47:32 -0000 On 16.01.2014 11:20, Alexander wrote: > > > 14.01.2014, 22:32, "Alexander" : >> 14.01.2014, 20:14, "Subbsd" : >> >>> On Tue, Jan 14, 2014 at 7:43 PM, Andrey Chernov wrote: >>>> On 14.01.2014 17:01, Alexander wrote: >>>>> on Freebsd 9.2 x64 on 5 different PCs I installed net-p2p/cpuminer >>>>> from ports and by "pkg install" - result is the same - minerd mines >>>>> only on one core regardless of "--threads" option. >>>> ... >>>>> # top -P >>>>> CPU 0: 0.0% user, 0.0% nice, 0.0% system, 0.0% interrupt, 100% idle >>>>> CPU 1: 0.0% user, 0.0% nice, 0.0% system, 0.0% interrupt, 100% idle >>>>> CPU 2: 0.0% user, 0.0% nice, 0.0% system, 0.0% interrupt, 100% idle >>>>> CPU 3: 0.0% user, 100% nice, 0.0% system, 0.0% interrupt, 0.0% idle >>>> This is SCHED_ULE bug, I see _all_ processes (not minerd only in >>>> particular) stuck to the last CPU too (top's 'C' column is equal to the >>>> last CPU and never changes), latest -stable i386. It disappears for me >>>> switching to SCHED_4BSD. >>>> >> >> reboot didn't help (try on 3 different PCs) > ... > minerd was started from cron after reboot immediately and broke SMP, so when I disable minerd from cron and reboot - SMP works fine. > I think Andrey Chernov said here the reason http://www.freebsd.org/cgi/query-pr.cgi?pr=kern/163585#reply3 > So this bug is alive - on 9.1 and 9.2 x64 releases. > I didn't try SCHED_4BSD yet, cause don't wont to use not-generic kernel because of mining only, but for interest I'll try it on one machine on this weekends. I just try it on latest x64 -current, result is exact the same: the bug exist with SCHED_ULE and not with SCHED_4BSD. Something is very wrong in SCHED_ULE+cpuset_setaffinity chain. From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 13:06:18 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D761C53 for ; Fri, 17 Jan 2014 13:06:18 +0000 (UTC) Received: from mail-we0-x22c.google.com (mail-we0-x22c.google.com [IPv6:2a00:1450:400c:c03::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E4D9A110E for ; Fri, 17 Jan 2014 13:06:17 +0000 (UTC) Received: by mail-we0-f172.google.com with SMTP id q58so4547731wes.31 for ; Fri, 17 Jan 2014 05:06:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=4dkmxOwhX27MTFooeFLwwgf8QfvI890x7UMQX5pvRS8=; b=aYvyFAUtsPb9tIYwFx88ihnPzkwCkUhHjS/TncjMWTNKUbluTeG4x3/y1bnM9XC4yC ByWaJcrvdny8YjKrUvnaZuTtpcVtKaCW8pWS93DMZE2ekEINoRmyC3nMrkTNCUWsVy+G IaPC0JxNgAOchdXv/jDQKyViczkO43IEmLX1vj70CWee6Fd02Y7uqUTiDWbDlno72B/R yY5DBDeS3rmxxQx+XbOkSAHVz2a6jvXGepCbTGxV+7YqTZWR48EiW8FLL6J18UZPNlNN KUDyyUreZHZyGbq1q65O9xKotpNzuitCXhSkdt/e/IcVhQ2Bmui9Bzi3tGzKNbF+ZDVw KYPg== X-Received: by 10.180.37.193 with SMTP id a1mr2334707wik.52.1389963976379; Fri, 17 Jan 2014 05:06:16 -0800 (PST) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id 12sm5620576wjm.10.2014.01.17.05.06.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 17 Jan 2014 05:06:15 -0800 (PST) Sender: Baptiste Daroussin Date: Fri, 17 Jan 2014 14:06:13 +0100 From: Baptiste Daroussin To: Luigi Rizzo Subject: Re: picking a new AF_* number for NETLINK ? Message-ID: <20140117130613.GA3760@ithaqua.etoilebsd.net> References: <20140116231902.GA51955@onelab2.iet.unipi.it> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OgqxwSJOaUobr8KG" Content-Disposition: inline In-Reply-To: <20140116231902.GA51955@onelab2.iet.unipi.it> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 13:06:18 -0000 --OgqxwSJOaUobr8KG Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 17, 2014 at 12:19:02AM +0100, Luigi Rizzo wrote: > In porting the kernel openvswitch code to FreeBSD we > have implemented netlink sockets, so we need to pick a > number to use for AF_NETLINK/PF_NETLINK in the messages. >=20 > Obviously we'd like ovs to be loadable as a module on existing > kernels, so i wonder if there are any restrictions on what we > can use -- specifically, whether we should make sure that >=20 > AF_NETLINK < AF_MAX=20 >=20 > or that is irrelevant. I asked this question a couple of month ago to Alfred (who did the reservat= ion stuff) exactly for AF_NETLINK which I planned to implement here is his answ= er: | You want to take 38. |=20 | The next person should take 40. |=20 | All odds until 133 are allocated for vendors and should not be used by Fr= eeBSD | code. regards, Bapt --OgqxwSJOaUobr8KG Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (FreeBSD) iEYEARECAAYFAlLZKsUACgkQ8kTtMUmk6EwecQCfQ4imO1QF7wuMETtOOonLx1dz jWQAoI+gVbs4+xIOE6XMCJR1eAGirwPS =/e/W -----END PGP SIGNATURE----- --OgqxwSJOaUobr8KG-- From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 13:11:07 2014 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9209DE6E for ; Fri, 17 Jan 2014 13:11:07 +0000 (UTC) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id C6F6711FA for ; Fri, 17 Jan 2014 13:11:06 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id PAA27883 for ; Fri, 17 Jan 2014 15:11:04 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1W49CS-000OWx-6X for freebsd-current@FreeBSD.org; Fri, 17 Jan 2014 15:11:04 +0200 Message-ID: <52D92BB0.2060109@FreeBSD.org> Date: Fri, 17 Jan 2014 15:10:08 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: FreeBSD Current Subject: binary-only modules with SDT X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=X-VIET-VPS Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 13:11:07 -0000 Does anybody know if there are any third-party binary-only modules that use SDT? -- Andriy Gapon From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 15:39:50 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 50F3AC45 for ; Fri, 17 Jan 2014 15:39:50 +0000 (UTC) Received: from smtp.dlink.ua (smtp.dlink.ua [193.138.187.146]) by mx1.freebsd.org (Postfix) with ESMTP id 8D3C81EE3 for ; Fri, 17 Jan 2014 15:39:49 +0000 (UTC) Received: from terran (unknown [192.168.99.1]) (Authenticated sender: ray) by smtp.dlink.ua (Postfix) with ESMTPA id C8771C4950 for ; Fri, 17 Jan 2014 17:39:41 +0200 (EET) Date: Fri, 17 Jan 2014 17:42:07 +0200 From: Aleksandr Rybalko To: current@freebsd.org Subject: [CFT] updated ofwfb driver vt(9) Message-Id: <20140117174207.88bedb221f2ac942c607dbf1@freebsd.org> X-Mailer: Sylpheed 3.2.0 (GTK+ 2.24.6; amd64-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart=_Fri__17_Jan_2014_17_42_07_+0200_naE5YrvJnuCVT7_H" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 15:39:50 -0000 This is a multi-part message in MIME format. --Multipart=_Fri__17_Jan_2014_17_42_07_+0200_naE5YrvJnuCVT7_H Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Hello hackers! I did updated version of vt's ofwfb driver, but have no HW to test. It will be very nice if someone try it on ppc/sparc device. Instructions on how to enable vt(9) (newcons) can be found here: https://wiki.freebsd.org/Newcons Patch to HEAD in attachment. (hope it will not be stripped) xf86-video-scfb expected to work too :) Many-many thanks! WBW -- Aleksandr Rybalko --Multipart=_Fri__17_Jan_2014_17_42_07_+0200_naE5YrvJnuCVT7_H Content-Type: text/x-diff; name="ofwfb.update.patch" Content-Disposition: attachment; filename="ofwfb.update.patch" Content-Transfer-Encoding: 7bit Index: ofwfb.c =================================================================== --- ofwfb.c (revision 260753) +++ ofwfb.c (working copy) @@ -30,8 +30,10 @@ #include #include #include +#include #include +#include #include #include @@ -47,25 +49,19 @@ #include struct ofwfb_softc { + struct fb_info info; + + /* Own variables. */ phandle_t sc_node; - - intptr_t sc_addr; - int sc_depth; - int sc_stride; - - bus_space_tag_t sc_memt; - - uint32_t sc_colormap[16]; + bus_space_tag_t sc_memt; }; static vd_init_t ofwfb_init; -static vd_blank_t ofwfb_blank; -static vd_bitbltchr_t ofwfb_bitbltchr; static const struct vt_driver vt_ofwfb_driver = { .vd_init = ofwfb_init, - .vd_blank = ofwfb_blank, - .vd_bitbltchr = ofwfb_bitbltchr, + .vd_blank = vt_fb_blank, + .vd_bitbltchr = vt_fb_bitbltchr, .vd_priority = VD_PRIORITY_GENERIC+1, }; @@ -75,86 +71,8 @@ /* XXX: hardcoded max size */ static void -ofwfb_blank(struct vt_device *vd, term_color_t color) +ofwfb_initialize(struct ofwfb_softc *sc) { - struct ofwfb_softc *sc = vd->vd_softc; - u_int ofs; - uint32_t c; - - switch (sc->sc_depth) { - case 8: - for (ofs = 0; ofs < sc->sc_stride*vd->vd_height; ofs++) - *(uint8_t *)(sc->sc_addr + ofs) = color; - break; - case 32: - c = sc->sc_colormap[color]; - for (ofs = 0; ofs < sc->sc_stride*vd->vd_height; ofs++) - *(uint32_t *)(sc->sc_addr + 4*ofs) = c; - break; - default: - /* panic? */ - break; - } -} - -static void -ofwfb_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask, - int bpl, vt_axis_t top, vt_axis_t left, unsigned int width, - unsigned int height, term_color_t fg, term_color_t bg) -{ - struct ofwfb_softc *sc = vd->vd_softc; - u_long line; - uint32_t fgc, bgc; - int c; - uint8_t b, m; - - fgc = sc->sc_colormap[fg]; - bgc = sc->sc_colormap[bg]; - b = m = 0; - - /* Don't try to put off screen pixels */ - if (((left + width) > vd->vd_width) || ((top + height) > - vd->vd_height)) - return; - - line = (sc->sc_stride * top) + left * sc->sc_depth/8; - for (; height > 0; height--) { - for (c = 0; c < width; c++) { - if (c % 8 == 0) - b = *src++; - else - b <<= 1; - if (mask != NULL) { - if (c % 8 == 0) - m = *mask++; - else - m <<= 1; - /* Skip pixel write, if mask has no bit set. */ - if ((m & 0x80) == 0) - continue; - } - switch(sc->sc_depth) { - case 8: - *(uint8_t *)(sc->sc_addr + line + c) = - b & 0x80 ? fg : bg; - break; - case 32: - *(uint32_t *)(sc->sc_addr + line + 4*c) = - (b & 0x80) ? fgc : bgc; - break; - default: - /* panic? */ - break; - } - } - line += sc->sc_stride; - } -} - -static void -ofwfb_initialize(struct vt_device *vd) -{ - struct ofwfb_softc *sc = vd->vd_softc; char name[64]; ihandle_t ih; int i; @@ -170,16 +88,16 @@ * Set up the color map */ - switch (sc->sc_depth) { + switch (sc->info.fb_bpp) { case 8: - vt_generate_vga_palette(sc->sc_colormap, COLOR_FORMAT_RGB, 255, + vt_generate_vga_palette(sc->info.fb_cmap, COLOR_FORMAT_RGB, 255, 0, 255, 8, 255, 16); for (i = 0; i < 16; i++) { OF_call_method("color!", ih, 4, 1, - (cell_t)((sc->sc_colormap[i] >> 16) & 0xff), - (cell_t)((sc->sc_colormap[i] >> 8) & 0xff), - (cell_t)((sc->sc_colormap[i] >> 0) & 0xff), + (cell_t)((sc->info.fb_cmap[i] >> 16) & 0xff), + (cell_t)((sc->info.fb_cmap[i] >> 8) & 0xff), + (cell_t)((sc->info.fb_cmap[i] >> 0) & 0xff), (cell_t)i, &retval); } break; @@ -192,24 +110,22 @@ * endianness slightly different. Figure out the host-view * endianness of the frame buffer. */ - oldpix = bus_space_read_4(sc->sc_memt, sc->sc_addr, 0); - bus_space_write_4(sc->sc_memt, sc->sc_addr, 0, 0xff000000); - if (*(uint8_t *)(sc->sc_addr) == 0xff) - vt_generate_vga_palette(sc->sc_colormap, + oldpix = bus_space_read_4(sc->sc_memt, sc->info.fb_vbase, 0); + bus_space_write_4(sc->sc_memt, sc->info.fb_vbase, 0, 0xff000000); + if (*(uint8_t *)(sc->info.fb_vbase) == 0xff) + vt_generate_vga_palette(sc->info.fb_cmap, COLOR_FORMAT_RGB, 255, 16, 255, 8, 255, 0); else - vt_generate_vga_palette(sc->sc_colormap, + vt_generate_vga_palette(sc->info.fb_cmap, COLOR_FORMAT_RGB, 255, 0, 255, 8, 255, 16); - bus_space_write_4(sc->sc_memt, sc->sc_addr, 0, oldpix); + bus_space_write_4(sc->sc_memt, sc->info.fb_vbase, 0, oldpix); break; default: - panic("Unknown color space depth %d", sc->sc_depth); + panic("Unknown color space depth %d", sc->info.fb_bpp); break; } - /* Clear the screen. */ - ofwfb_blank(vd, TC_BLACK); } static int @@ -252,7 +168,7 @@ if (OF_getproplen(node, "height") != sizeof(height) || OF_getproplen(node, "width") != sizeof(width) || OF_getproplen(node, "depth") != sizeof(depth) || - OF_getproplen(node, "linebytes") != sizeof(sc->sc_stride)) + OF_getproplen(node, "linebytes") != sizeof(sc->info.fb_stride)) return (CN_DEAD); /* Only support 8 and 32-bit framebuffers */ @@ -259,14 +175,15 @@ OF_getprop(node, "depth", &depth, sizeof(depth)); if (depth != 8 && depth != 32) return (CN_DEAD); - sc->sc_depth = depth; + sc->info.fb_bpp = depth; + sc->info.fb_depth = (depth == 32) ? 24 : 8; OF_getprop(node, "height", &height, sizeof(height)); OF_getprop(node, "width", &width, sizeof(width)); - OF_getprop(node, "linebytes", &sc->sc_stride, sizeof(sc->sc_stride)); + OF_getprop(node, "linebytes", &sc->info.fb_stride, sizeof(sc->info.fb_stride)); - vd->vd_height = height; - vd->vd_width = width; + sc->info.fb_height = height; + sc->info.fb_width = width; /* * Get the PCI addresses of the adapter, if present. The node may be the @@ -294,12 +211,14 @@ #if defined(__powerpc__) sc->sc_memt = &bs_be_tag; - bus_space_map(sc->sc_memt, fb_phys, height * sc->sc_stride, - BUS_SPACE_MAP_PREFETCHABLE, &sc->sc_addr); + bus_space_map(sc->sc_memt, fb_phys, height * sc->info.fb_stride, + BUS_SPACE_MAP_PREFETCHABLE, &sc->info.fb_vbase); + sc->info.fb_pbase = fb_phys; #elif defined(__sparc64__) OF_decode_addr(node, 0, &space, &phys); sc->sc_memt = &ofwfb_memt[0]; - sc->sc_addr = sparc64_fake_bustag(space, fb_phys, sc->sc_memt); + sc->info.fb_vbase = sparc64_fake_bustag(space, fb_phys, sc->sc_memt); + sc->info.fb_pbase = fb_phys; #else #error Unsupported platform! #endif @@ -314,7 +233,7 @@ fb_phys = n_pciaddrs; for (i = 0; i < n_pciaddrs; i++) { /* If it is too small, not the framebuffer */ - if (pciaddrs[i].size_lo < sc->sc_stride*height) + if (pciaddrs[i].size_lo < sc->info.fb_stride*height) continue; /* If it is not memory, it isn't either */ if (!(pciaddrs[i].phys_hi & @@ -333,16 +252,23 @@ return (CN_DEAD); #if defined(__powerpc__) - OF_decode_addr(node, fb_phys, &sc->sc_memt, &sc->sc_addr); + OF_decode_addr(node, fb_phys, &sc->sc_memt, &sc->info.fb_vbase); + sc->info.fb_pbase = fb_phys; #elif defined(__sparc64__) OF_decode_addr(node, fb_phys, &space, &phys); sc->sc_memt = &ofwfb_memt[0]; - sc->sc_addr = sparc64_fake_bustag(space, phys, sc->sc_memt); + sc->info.fb_vbase = sparc64_fake_bustag(space, phys, sc->sc_memt); + sc->info.fb_pbase = fb_phys; #endif } - ofwfb_initialize(vd); + ofwfb_initialize(sc); + /* Initialize fb_info. */ + sc->info.fb_size = height * width * depth / 4; + + fb_probe(&sc->info); + vt_fb_init(vd); + return (CN_INTERNAL); } - --Multipart=_Fri__17_Jan_2014_17_42_07_+0200_naE5YrvJnuCVT7_H-- From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 16:01:28 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F6368E4 for ; Fri, 17 Jan 2014 16:01:28 +0000 (UTC) Received: from mail.ipfw.ru (mail.ipfw.ru [IPv6:2a01:4f8:120:6141::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 63BA01112 for ; Fri, 17 Jan 2014 16:01:28 +0000 (UTC) Received: from [2a02:6b8:0:401:222:4dff:fe50:cd2f] (helo=ptichko.yndx.net) by mail.ipfw.ru with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.76 (FreeBSD)) (envelope-from ) id 1W481T-000K1S-BJ; Fri, 17 Jan 2014 15:55:39 +0400 Message-ID: <52D95305.6020909@FreeBSD.org> Date: Fri, 17 Jan 2014 19:57:57 +0400 From: "Alexander V. Chernikov" User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Luigi Rizzo , current@freebsd.org Subject: Re: picking a new AF_* number for NETLINK ? References: <20140116231902.GA51955@onelab2.iet.unipi.it> In-Reply-To: <20140116231902.GA51955@onelab2.iet.unipi.it> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 16:01:28 -0000 On 17.01.2014 03:19, Luigi Rizzo wrote: > In porting the kernel openvswitch code to FreeBSD we > have implemented netlink sockets, so we need to pick a Wow, great! How deep you're planning to go with netlink support? E.g. sockets with NETLINK_GENERIC OVS-related CMDs, or NETLINK_ROUTE (and other families like FW) as well? > number to use for AF_NETLINK/PF_NETLINK in the messages. > > Obviously we'd like ovs to be loadable as a module on existing > kernels, so i wonder if there are any restrictions on what we > can use -- specifically, whether we should make sure that > > AF_NETLINK < AF_MAX > > or that is irrelevant. > > cheers > luigi > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 16:10:55 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7AB52C2C; Fri, 17 Jan 2014 16:10:55 +0000 (UTC) Received: from mail-lb0-x22a.google.com (mail-lb0-x22a.google.com [IPv6:2a00:1450:4010:c04::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C4EE311DE; Fri, 17 Jan 2014 16:10:54 +0000 (UTC) Received: by mail-lb0-f170.google.com with SMTP id u14so3171785lbd.1 for ; Fri, 17 Jan 2014 08:10:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=j1K7/t6rf/QexbM53/lJHbvIpKdvEPKtzosvLQOhNog=; b=D+kH3A8ScSa8Oipf8VbMKlVdQ8IwsFtBxAUhnFoIiMsDINt4cPvXfj9ZD0hC9dO6H5 tlJOAoaw8arH6UsGhMLJExSfvzl51ZzML9dY7mNWD1vvN4iQlJRoNnAx6LHCEdXchIY6 dF//uzENa8M/Iu94GUvhtFM3nRCOy8izmUUUNoN+O4TQIKUIa4e43qidgo5tTYhEsITO WTLevns0RFF4QY9wOX42GOV1DslnOKUVy9WCnoEgr7k3VlyRXhdu/4t+3FuEArnDs41V Kdd5GLjB+yqjv1Crztuch+PW8IcELwE8a5eNq/plWCpqGQSJeJLYPNoakkYbYpu5hx9W vbmw== MIME-Version: 1.0 X-Received: by 10.152.180.35 with SMTP id dl3mr637508lac.66.1389975052739; Fri, 17 Jan 2014 08:10:52 -0800 (PST) Sender: rizzo.unipi@gmail.com Received: by 10.114.175.180 with HTTP; Fri, 17 Jan 2014 08:10:52 -0800 (PST) In-Reply-To: <52D95305.6020909@FreeBSD.org> References: <20140116231902.GA51955@onelab2.iet.unipi.it> <52D95305.6020909@FreeBSD.org> Date: Fri, 17 Jan 2014 08:10:52 -0800 X-Google-Sender-Auth: 4qynfCVqhWPlTk7kh92bg4D7EHc Message-ID: Subject: Re: picking a new AF_* number for NETLINK ? From: Luigi Rizzo To: "Alexander V. Chernikov" Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: FreeBSD Current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 16:10:55 -0000 On Fri, Jan 17, 2014 at 7:57 AM, Alexander V. Chernikov < melifaro@freebsd.org> wrote: > On 17.01.2014 03:19, Luigi Rizzo wrote: > >> In porting the kernel openvswitch code to FreeBSD we >> have implemented netlink sockets, so we need to pick a >> > Wow, great! > How deep you're planning to go with netlink support? > > E.g. sockets with NETLINK_GENERIC OVS-related CMDs, or NETLINK_ROUTE (and > other families like FW) as well? > for the time being we focus on the ovs-related commands. Our initial prototype overloaded PF_ROUTE: if the first message on a socket carried a PF_NETLINK identifier then all subsequent i/o is routed to the netlink routines. However this required small changes to route.c so now we are going to do the real thing (using a PF_NETLINK domain). cheers luigi From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 20:15:37 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BDC71A9; Fri, 17 Jan 2014 20:15:37 +0000 (UTC) Received: from onelab2.iet.unipi.it (onelab2.iet.unipi.it [131.114.59.238]) by mx1.freebsd.org (Postfix) with ESMTP id 3D8D8168C; Fri, 17 Jan 2014 20:15:37 +0000 (UTC) Received: by onelab2.iet.unipi.it (Postfix, from userid 275) id 6669D7300A; Fri, 17 Jan 2014 21:18:02 +0100 (CET) Date: Fri, 17 Jan 2014 21:18:02 +0100 From: Luigi Rizzo To: pfg@freebsd.org, current@freebsd.org Subject: svn 260311 breaks gcc builds on releng9 ? Message-ID: <20140117201802.GB62555@onelab2.iet.unipi.it> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 20:15:37 -0000 Hi, I am seeing an odd problem which seems to be triggered by svn260311 I have two machines running snapshots of stable/9 from last fall (one 255898 sep.26, the other 258126 nov.14). All is amd64 Build a recent head (260311 and newer) with gcc fails on the sep.26 machine: ... 19:51:22 ===> gnu/usr.bin/cc/cc1plus (all) PROG CC /media/bsd10/usr/home/luigi/FreeBSD/head/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/main.c ... PROG CC /media/bsd10/usr/home/luigi/FreeBSD/head/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/cp/except.c parser.o: In function `cp_parser_objc_tentative_protocol_refs_opt': parser.c:(.text+0x14665): undefined reference to `cp_objc_protocol_id_list' *** [cc1plus-dummy] Error code 1 1 error but works on the newer one. svn 260310 builds on both. I am a bit unclear on what is going on because the missing symbol (cp_objc_protocol_id_list) only appears in the source file parser.c and in a ChangeLog.apple file, so maybe it is generated and the actual failure is at some earlier stage. Hope this helps tracking the problem. thanks luigi From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 20:53:02 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63AF8D4C for ; Fri, 17 Jan 2014 20:53:02 +0000 (UTC) Received: from nm3-vm0.bullet.mail.bf1.yahoo.com (nm3-vm0.bullet.mail.bf1.yahoo.com [98.139.212.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EBBC41952 for ; Fri, 17 Jan 2014 20:53:01 +0000 (UTC) Received: from [66.196.81.170] by nm3.bullet.mail.bf1.yahoo.com with NNFMP; 17 Jan 2014 20:50:14 -0000 Received: from [98.139.211.195] by tm16.bullet.mail.bf1.yahoo.com with NNFMP; 17 Jan 2014 20:50:14 -0000 Received: from [127.0.0.1] by smtp204.mail.bf1.yahoo.com with NNFMP; 17 Jan 2014 20:50:14 -0000 X-Yahoo-Newman-Id: 265402.38391.bm@smtp204.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 0A8OxLYVM1ldSLBhAx65nH7an9Lr2LCif0yN57tt4O4xA.M iiYzFCa3qTwzLEhi.qOqpl0QRfluGbMuJ9dPja_xZzqdQYXc2z.Jvr7pR5Yg ZAkj18DgIpqzlm70uo1hWm3elokbrAEn7izbQkYU4J7p6H8_tCP2vUrnTBu2 i9fbjhu.YEOYqWpk.t4o.Y_tl7.lgv8jK9ctWuMJwn1vz66TYja6wzsIhnNg k9Tw3bHnMbpE5S4CFxRZjBfhjhy6JvZjgBoOt.Vg3urOCqFrR2SlvwtAQawB srNhpVwX4f9IMUE2foLNQmRzUJkZIZClNDW03Wsz.2FO.PodyeIZS711Kzty aPsZve7VFHHjFrZIID_xnk.3vCPFFihHJ.2QY_NRTYlz_6SQoc1znZeMUbgP 9dq71RrXwFfawuN_hS842SYisnNw4OKqPIS_BA4Q7TCORqBg3fhnDjv52DFf SixVkqpIqGg2yE0X5CjZSFUSjYUMlPqKdEHgx7Yguz4ZWtnFBS827OGFxrQc B3rxaSGd.5LNJOb7XzmQzX4PnauX0ptD29L97G60lBixljeHwH8b8eL8- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf X-Rocket-Received: from [192.168.0.102] (pfg@190.157.126.109 with plain [63.250.193.228]) by smtp204.mail.bf1.yahoo.com with SMTP; 17 Jan 2014 12:50:14 -0800 PST Message-ID: <52D99783.9020909@FreeBSD.org> Date: Fri, 17 Jan 2014 15:50:11 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Luigi Rizzo , current@freebsd.org Subject: Re: svn 260311 breaks gcc builds on releng9 ? References: <20140117201802.GB62555@onelab2.iet.unipi.it> In-Reply-To: <20140117201802.GB62555@onelab2.iet.unipi.it> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 20:53:02 -0000 Hello Luigi; On 17.01.2014 15:18, Luigi Rizzo wrote: > Hi, > I am seeing an odd problem which seems to be triggered by svn260311 > > I have two machines running snapshots of stable/9 from last fall > (one 255898 sep.26, the other 258126 nov.14). All is amd64 > > Build a recent head (260311 and newer) with gcc fails on the sep.26 machine: > > ... > 19:51:22 ===> gnu/usr.bin/cc/cc1plus (all) > PROG CC /media/bsd10/usr/home/luigi/FreeBSD/head/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/main.c > ... > PROG CC /media/bsd10/usr/home/luigi/FreeBSD/head/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/cp/except.c > parser.o: In function `cp_parser_objc_tentative_protocol_refs_opt': > parser.c:(.text+0x14665): undefined reference to `cp_objc_protocol_id_list' > *** [cc1plus-dummy] Error code 1 > 1 error > > but works on the newer one. > > svn 260310 builds on both. > > I am a bit unclear on what is going on because the missing symbol > (cp_objc_protocol_id_list) only appears in the source file parser.c > and in a ChangeLog.apple file, so maybe it is generated and > the actual failure is at some earlier stage. Thanks for the report. Of course gcc can also have bugs but it would look like you may not be doing a clean build or that some how object code from two different builds got mixed up. JIC, the cp_obj_protocol_id_list stuff is obviously objc stuff that we don't need at all and that crept in along with other changes from Apple so I will remove it to see if it helps somehow. Pedro. From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 20:56:56 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65675E72; Fri, 17 Jan 2014 20:56:56 +0000 (UTC) Received: from freebsd-current.sentex.ca (freebsd-current.sentex.ca [64.7.128.98]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 29C3C1972; Fri, 17 Jan 2014 20:56:55 +0000 (UTC) Received: from freebsd-current.sentex.ca (localhost [127.0.0.1]) by freebsd-current.sentex.ca (8.14.5/8.14.5) with ESMTP id s0HKunpL021236; Fri, 17 Jan 2014 15:56:49 -0500 (EST) (envelope-from tinderbox@freebsd.org) Received: (from tinderbox@localhost) by freebsd-current.sentex.ca (8.14.5/8.14.5/Submit) id s0HKunDg021234; Fri, 17 Jan 2014 20:56:49 GMT (envelope-from tinderbox@freebsd.org) Date: Fri, 17 Jan 2014 20:56:49 GMT Message-Id: <201401172056.s0HKunDg021234@freebsd-current.sentex.ca> X-Authentication-Warning: freebsd-current.sentex.ca: tinderbox set sender to FreeBSD Tinderbox using -f Sender: FreeBSD Tinderbox From: FreeBSD Tinderbox To: FreeBSD Tinderbox , , Subject: [head tinderbox] failure on i386/pc98 Precedence: bulk X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 20:56:56 -0000 TB --- 2014-01-17 19:57:58 - tinderbox 2.20 running on freebsd-current.sentex.ca TB --- 2014-01-17 19:57:58 - FreeBSD freebsd-current.sentex.ca 8.3-PRERELEASE FreeBSD 8.3-PRERELEASE #0: Mon Mar 26 13:54:12 EDT 2012 des@freebsd-current.sentex.ca:/usr/obj/usr/src/sys/GENERIC amd64 TB --- 2014-01-17 19:57:58 - starting HEAD tinderbox run for i386/pc98 TB --- 2014-01-17 19:57:58 - cleaning the object tree TB --- 2014-01-17 19:57:58 - /usr/local/bin/svn stat /src TB --- 2014-01-17 19:58:15 - At svn revision 260825 TB --- 2014-01-17 19:58:16 - building world TB --- 2014-01-17 19:58:16 - CROSS_BUILD_TESTING=YES TB --- 2014-01-17 19:58:16 - MAKEOBJDIRPREFIX=/obj TB --- 2014-01-17 19:58:16 - PATH=/usr/bin:/usr/sbin:/bin:/sbin TB --- 2014-01-17 19:58:16 - SRCCONF=/dev/null TB --- 2014-01-17 19:58:16 - TARGET=pc98 TB --- 2014-01-17 19:58:16 - TARGET_ARCH=i386 TB --- 2014-01-17 19:58:16 - TZ=UTC TB --- 2014-01-17 19:58:16 - __MAKE_CONF=/dev/null TB --- 2014-01-17 19:58:16 - cd /src TB --- 2014-01-17 19:58:16 - /usr/bin/make -B buildworld >>> Building an up-to-date make(1) >>> World build started on Fri Jan 17 19:58:24 UTC 2014 >>> Rebuilding the temporary build tree >>> stage 1.1: legacy release compatibility shims >>> stage 1.2: bootstrap tools >>> stage 2.1: cleaning up the object tree >>> stage 2.2: rebuilding the object tree >>> stage 2.3: build tools >>> stage 3: cross tools [...] c++ -O2 -pipe -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/include -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/tools/clang/include -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/lib/CodeGen/SelectionDAG -I. -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/../../lib/clang/include -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -fno-strict-aliasing -DLLVM_DEFAULT_TARGET_TRIPLE=\"i386-unknown-freebsd11.0\" -DLLVM_HOST_TRIPLE=\"x86_64-unknown-freebsd11.0\" -DDEFAULT_SYSROOT=\"/obj/pc98.i386/src/tmp\" -I/obj/pc98.i386/src/tmp/legacy/usr/include -fno-exceptions -fno-rtti -c /src/lib/clang/libllvmselectiondag/../../../contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGVLIW.cpp -o ScheduleDAGVLIW.o c++ -O2 -pipe -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/include -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/tools/clang/include -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/lib/CodeGen/SelectionDAG -I. -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/../../lib/clang/include -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -fno-strict-aliasing -DLLVM_DEFAULT_TARGET_TRIPLE=\"i386-unknown-freebsd11.0\" -DLLVM_HOST_TRIPLE=\"x86_64-unknown-freebsd11.0\" -DDEFAULT_SYSROOT=\"/obj/pc98.i386/src/tmp\" -I/obj/pc98.i386/src/tmp/legacy/usr/include -fno-exceptions -fno-rtti -c /src/lib/clang/libllvmselectiondag/../../../contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp -o SelectionDAG.o c++ -O2 -pipe -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/include -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/tools/clang/include -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/lib/CodeGen/SelectionDAG -I. -I/src/lib/clang/libllvmselectiondag/../../../contrib/llvm/../../lib/clang/include -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -fno-strict-aliasing -DLLVM_DEFAULT_TARGET_TRIPLE=\"i386-unknown-freebsd11.0\" -DLLVM_HOST_TRIPLE=\"x86_64-unknown-freebsd11.0\" -DDEFAULT_SYSROOT=\"/obj/pc98.i386/src/tmp\" -I/obj/pc98.i386/src/tmp/legacy/usr/include -fno-exceptions -fno-rtti -c /src/lib/clang/libllvmselectiondag/../../../contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp -o SelectionDAGBuilder.o /src/lib/clang/libllvmselectiondag/../../../contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp: In member function 'std::pair llvm::TargetLowering::LowerCallTo(llvm::TargetLowering::CallLoweringInfo&) const': /src/lib/clang/libllvmselectiondag/../../../contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp:6397: internal compiler error: in var_ann, at tree-flow-inline.h:128 Please submit a full bug report, with preprocessed source if appropriate. See for instructions. *** Error code 1 Stop. bmake[3]: stopped in /src/lib/clang/libllvmselectiondag *** Error code 1 Stop. bmake[2]: stopped in /src/lib/clang *** Error code 1 Stop. bmake[1]: stopped in /src *** Error code 1 Stop. bmake: stopped in /src *** Error code 1 Stop in /src. TB --- 2014-01-17 20:56:49 - WARNING: /usr/bin/make returned exit code 1 TB --- 2014-01-17 20:56:49 - ERROR: failed to build world TB --- 2014-01-17 20:56:49 - 3033.79 user 342.02 system 3530.47 real http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-i386-pc98.full From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 21:07:55 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4AE253C8; Fri, 17 Jan 2014 21:07:55 +0000 (UTC) Received: from mail-lb0-x229.google.com (mail-lb0-x229.google.com [IPv6:2a00:1450:4010:c04::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 863331A5F; Fri, 17 Jan 2014 21:07:54 +0000 (UTC) Received: by mail-lb0-f169.google.com with SMTP id q8so3382639lbi.14 for ; Fri, 17 Jan 2014 13:07:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=iUSosXfjMz63PNh3A+NsFppqjViNNVu2eBD4NVJPOGE=; b=ingdXUSHKB4HXXqvAHD7TRRl3HgWAF/J2ETr0/8zdRMlh4MXKiYceVmv5fYhxyitiP Z64OpLWA0k99zvntxx/qWj9eMRjig2wbX/gnNVS+CkdUVG67BY/U+rogcqc4xUe23qag rOLRsmrNTQoO9fuGVrqFQBL6HNCbklNdSCBvTwu3vVGsX55wTV3uX4fsxgXH6T8nuBUP WIizeV+SxAElpnSMDC+vnaCXuIpHUF/9yl4A4BC5bBqAExgEPGkZZjooP2OVyfroQ4B4 bPI0rXUrHzim0KPrUMSxdDmgthdmLhgy86lEQW4ub6Hk1h5Id/gbsCOweR5ETenSB4JT ZVvg== MIME-Version: 1.0 X-Received: by 10.112.133.3 with SMTP id oy3mr379883lbb.63.1389992872573; Fri, 17 Jan 2014 13:07:52 -0800 (PST) Sender: rizzo.unipi@gmail.com Received: by 10.114.175.180 with HTTP; Fri, 17 Jan 2014 13:07:52 -0800 (PST) In-Reply-To: <52D99783.9020909@FreeBSD.org> References: <20140117201802.GB62555@onelab2.iet.unipi.it> <52D99783.9020909@FreeBSD.org> Date: Fri, 17 Jan 2014 13:07:52 -0800 X-Google-Sender-Auth: isQffSSEd1En6kBlT9vOyJ_Yg8k Message-ID: Subject: Re: svn 260311 breaks gcc builds on releng9 ? From: Luigi Rizzo To: Pedro Giffuni Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: FreeBSD Current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 21:07:55 -0000 On Fri, Jan 17, 2014 at 12:50 PM, Pedro Giffuni wrote: > Hello Luigi; > > > On 17.01.2014 15:18, Luigi Rizzo wrote: > >> Hi, >> I am seeing an odd problem which seems to be triggered by svn260311 >> >> I have two machines running snapshots of stable/9 from last fall >> (one 255898 sep.26, the other 258126 nov.14). All is amd64 >> >> Build a recent head (260311 and newer) with gcc fails on the sep.26 >> machine: >> >> ... >> 19:51:22 ===> gnu/usr.bin/cc/cc1plus (all) >> PROG CC /media/bsd10/usr/home/luigi/ >> FreeBSD/head/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/main.c >> ... >> PROG CC /media/bsd10/usr/home/luigi/ >> FreeBSD/head/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/cp/except.c >> parser.o: In function `cp_parser_objc_tentative_ >> protocol_refs_opt': >> parser.c:(.text+0x14665): undefined reference to >> `cp_objc_protocol_id_list' >> *** [cc1plus-dummy] Error code 1 >> 1 error >> >> but works on the newer one. >> >> svn 260310 builds on both. >> >> I am a bit unclear on what is going on because the missing symbol >> (cp_objc_protocol_id_list) only appears in the source file parser.c >> and in a ChangeLog.apple file, so maybe it is generated and >> the actual failure is at some earlier stage. >> > Thanks for the report. > > Of course gcc can also have bugs but it would look like you may not be > doing a clean build or that some how object code from two different builds > got mixed up. > i thought so too, but i am building in a completely new dir and i retried some 10 times rm -rf on the output dir, resyncing the repo and checking diffs, etc. Also it is very suspicious that going back to 260310 makes the problem disappear, and 260311 brings it back in. Anyways, it is very confusing indeed. > JIC, the cp_obj_protocol_id_list stuff is obviously objc stuff that we > don't need at all and that crept in along with other changes from Apple so > I will remove it to see if it helps somehow. > ok thanks. let me know if you want me to test a patch before committing, since I have a way to reproduce the error (i am not upgrading the offending system on purpose). cheers luigi From owner-freebsd-current@FreeBSD.ORG Fri Jan 17 21:26:42 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4FF8ADB9 for ; Fri, 17 Jan 2014 21:26:42 +0000 (UTC) Received: from nm28.bullet.mail.bf1.yahoo.com (nm28.bullet.mail.bf1.yahoo.com [98.139.212.187]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F29081D28 for ; Fri, 17 Jan 2014 21:26:41 +0000 (UTC) Received: from [66.196.81.172] by nm28.bullet.mail.bf1.yahoo.com with NNFMP; 17 Jan 2014 21:26:34 -0000 Received: from [98.139.211.201] by tm18.bullet.mail.bf1.yahoo.com with NNFMP; 17 Jan 2014 21:26:34 -0000 Received: from [127.0.0.1] by smtp210.mail.bf1.yahoo.com with NNFMP; 17 Jan 2014 21:26:34 -0000 X-Yahoo-Newman-Id: 182345.83763.bm@smtp210.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: p.3z1VkVM1lp.mssArkAwnUXdKLGLUN2.33.pfXeRUTeqzJ vsjBQRw7JEONfY0207rOWc.OgasOWAsV399C8_ee._jC3CZa6n.J9nzeJBcC 5Ov1I1enCWlA5eAGamasJgWPqIUxBccAgAzCehNsbsRs6u1uiU8kbYblPfT9 EpVqL4r04ZYUZH9UBjjZj8NzlcY4QVWmm4D1BPDkAWDZJU4REP0gn3.g_c3o bS1Yy7u5XBPHzfj2dXIA6cyziBOhpwMavUljcHZbOTMjY54jby1qFF4bHOEr L7JmVhDEJQG3UYHMNEoz9goPjt7Xsh94cNol5RHxhQfE4HKxEGW2PgWUg8hN 405W9pRe7DFnQCBb8vXqSv4iiQsMjebf12iWDQGowl7Ns6qPsg_FYwFCLD98 cajOZPUsrWM_ittrsG2lH5cmEL6ZPa4vBcpyraABH90D7AlzVDX.OyceGaFC 29.gxSwkF3s54obBC1g.d8kqR8wyvxGOlzhDIgkiRa3fWCSN6iHyp_BbED1a QZZWFYlsb38PYZ4easR4uy7vre52SV4P87PqxZEpR9iSABzy5tQ3WiYo- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf X-Rocket-Received: from [192.168.0.102] (pfg@190.157.126.109 with plain [63.250.193.228]) by smtp210.mail.bf1.yahoo.com with SMTP; 17 Jan 2014 13:26:34 -0800 PST Message-ID: <52D9A006.70106@FreeBSD.org> Date: Fri, 17 Jan 2014 16:26:30 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Luigi Rizzo Subject: Re: svn 260311 breaks gcc builds on releng9 ? References: <20140117201802.GB62555@onelab2.iet.unipi.it> <52D99783.9020909@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: FreeBSD Current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 21:26:42 -0000 On 17.01.2014 16:07, Luigi Rizzo wrote: > > > > On Fri, Jan 17, 2014 at 12:50 PM, Pedro Giffuni > wrote: > > Hello Luigi; > > > On 17.01.2014 15:18, Luigi Rizzo wrote: > > Hi, > I am seeing an odd problem which seems to be triggered by > svn260311 > > I have two machines running snapshots of stable/9 from last fall > (one 255898 sep.26, the other 258126 nov.14). All is amd64 > > Build a recent head (260311 and newer) with gcc fails on the > sep.26 machine: > > ... > 19:51:22 ===> gnu/usr.bin/cc/cc1plus (all) > PROG CC > /media/bsd10/usr/home/luigi/FreeBSD/head/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/main.c > ... > PROG CC > /media/bsd10/usr/home/luigi/FreeBSD/head/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/cp/except.c > parser.o: In function > `cp_parser_objc_tentative_protocol_refs_opt': > parser.c:(.text+0x14665): undefined reference to > `cp_objc_protocol_id_list' > *** [cc1plus-dummy] Error code 1 > 1 error > > but works on the newer one. > > svn 260310 builds on both. > > I am a bit unclear on what is going on because the missing symbol > (cp_objc_protocol_id_list) only appears in the source file > parser.c > and in a ChangeLog.apple file, so maybe it is generated and > the actual failure is at some earlier stage. > > Thanks for the report. > > Of course gcc can also have bugs but it would look like you may > not be doing a clean build or that some how object code from two > different builds got mixed up. > > > i thought so too, but i am building in a completely new dir > and i retried some 10 times rm -rf on the output dir, > resyncing the repo and checking diffs, etc. > > Also it is very suspicious that going back to 260310 makes > the problem disappear, and 260311 brings it back in. > > Anyways, it is very confusing indeed. > > > > JIC, the cp_obj_protocol_id_list stuff is obviously objc stuff > that we don't need at all and that crept in along with other > changes from Apple so I will remove it to see if it helps somehow. > > > ok thanks. > let me know if you want me to test a patch before committing, > since I have a way to reproduce the error (i am not upgrading > the offending system on purpose). > The Apple change was incomplete so I guess the compiler in head is not being strict enough. I removed the dead code and rebuilt. Should be fixed as r260831. Thank you for the report! Pedro. From owner-freebsd-current@FreeBSD.ORG Sat Jan 18 00:17:49 2014 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0F46C17D; Sat, 18 Jan 2014 00:17:49 +0000 (UTC) Received: from onelab2.iet.unipi.it (onelab2.iet.unipi.it [131.114.59.238]) by mx1.freebsd.org (Postfix) with ESMTP id C2D9718DA; Sat, 18 Jan 2014 00:17:48 +0000 (UTC) Received: by onelab2.iet.unipi.it (Postfix, from userid 275) id 9F94C7300A; Sat, 18 Jan 2014 01:20:08 +0100 (CET) Date: Sat, 18 Jan 2014 01:20:08 +0100 From: Luigi Rizzo To: Pedro Giffuni Subject: Re: svn 260311 breaks gcc builds on releng9 ? Message-ID: <20140118002008.GD65810@onelab2.iet.unipi.it> References: <20140117201802.GB62555@onelab2.iet.unipi.it> <52D99783.9020909@FreeBSD.org> <52D9A006.70106@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <52D9A006.70106@FreeBSD.org> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: FreeBSD Current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 00:17:49 -0000 On Fri, Jan 17, 2014 at 04:26:30PM -0500, Pedro Giffuni wrote: > On 17.01.2014 16:07, Luigi Rizzo wrote: ... > The Apple change was incomplete so I guess the compiler in head is not > being strict enough. I removed the dead code and rebuilt. > Should be fixed as r260831. > > Thank you for the report! thank you for the quick fix. cheers luigi