From nobody Mon Nov 14 19:02:12 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N9zFf4gB1z4hnGT; Mon, 14 Nov 2022 19:02:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N9zFf4CSfz3DfZ; Mon, 14 Nov 2022 19:02:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668452534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y/H9M1ttTQPj2Ipx+UXCdd2ldHswq2uRL1IruJJ0yv4=; b=KpzZ/XsVBzeu4mWf/kkCzYUg3rgWDTOO5icnyEyiC+ZmOApU7uD2wea5aylYt6qLXf4H9R U/M8SoLKvCO2NYroiTSHEIgx6qHiHhjIwRS/fC1D1uoU2clu6gUOjb93eBI/13/hZrioTx VkxPWS+f/HVMeikDYoIJx61FaXeX71BZ3z5a9rHFW23BBfItzGe0VfaGcpQ2Y2+7FAfu2d IlCL8cZbZJxtxkqHLcEN5Ndu8yWO+vWMXP5Xs0KDxpArUSPE3ERV0VUHmENFDDYxiporOO XYDtd/OMZ5yYrrpYWskUSqaAWhxPj6lGsYRSe4v0ni97eyxgh79qbcruwNQtnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668452534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y/H9M1ttTQPj2Ipx+UXCdd2ldHswq2uRL1IruJJ0yv4=; b=FOcyb+VA/wCDH7m5TVknjF4yxb46Sn3Dqf5YvZ8JatVyByUqmYYkgRROJmpadC4xNRmzI6 HCkmDgSUoefXaZlFUMdSTbA+PI5EKXXq1jHmym9YmQkrfpwLEs5fVwRxGNNa4xNRFI+9Oh Dedwhk9O37jtd64OPS7vQQoFMJexahUk7hDs35RZSGc5SZpDVYHkcK2zkdeJc3pUQTUrRf VvdFlDuWb8ICCIpQR082v/+Ow7GJsrl/2C+GgvhfDTNxqHRWLFpkTqTPGxi75tF1hOyk7L Lf8nZ5MSMiJfCmEkG2cXvqwv3DezRkMQ5BUjNnqTrFmHB8R0UFxyvt5v7fPrBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668452534; a=rsa-sha256; cv=none; b=VNUjrUVU/tnMJGKkssOtHYCjBC7+tBVHweNiQ4Bn7m4C2SKhNUB71FPhsF9LoLmLtuJfZX NuENjq37ktn+AjokHPGGA5G4Mu/YRTX1w8NLEcsSdo7NQ1qjsV6ZylRvrz8a067N8Hc7P1 JmE1/IotqmQd8uMudoa07GhB0erIIl5gwxbqRwZX0fXPShxBI+Dxu0ZUyaAsNoXoZHDo6E IVMlsAPhNtxyrw80PKA1cgjCzgWQevwl5wFV9IIYzeQ81gagbcOGNHpwfjisHH21ieaFbh ft3OqmbzcNl7UZsBt7QpabsGMR3bebr6fQkWNq7ggli92bDS/yXr9GBV/IG5Jg== Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4N9zFd72s6z1SC6; Mon, 14 Nov 2022 19:02:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <398bc3a8-435a-ae52-dec5-f803fa05fde8@FreeBSD.org> Date: Mon, 14 Nov 2022 11:02:12 -0800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: git: 5ae69e2f10da - stable/13 - Import the WireGuard driver from zx2c4.com. Content-Language: en-US To: Helge Oldach Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <202211141856.2AEIurO6021447@nuc.oldach.net> From: John Baldwin In-Reply-To: <202211141856.2AEIurO6021447@nuc.oldach.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 11/14/22 10:56 AM, Helge Oldach wrote: > Helge Oldach wrote on Mon, 14 Nov 2022 18:21:23 +0100 (CET): >> John Baldwin wrote on Mon, 14 Nov 2022 17:55:26 +0100 (CET): >>> On 11/12/22 9:42 AM, Helge Oldach wrote: >>>> John Baldwin wrote on Fri, 11 Nov 2022 23:04:20 +0100 (CET): >>>>> The branch stable/13 has been updated by jhb: >>>>> >>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=5ae69e2f10dacd750b0f0e9284fefcbe97eb0476 >>>>> >>>>> commit 5ae69e2f10dacd750b0f0e9284fefcbe97eb0476 >>>>> Author: John Baldwin >>>>> AuthorDate: 2022-10-28 20:36:12 +0000 >>>>> Commit: John Baldwin >>>>> CommitDate: 2022-11-11 21:44:11 +0000 >>>>> >>>>> Import the WireGuard driver from zx2c4.com. >>>> >>>> Is perhaps an #include missing in if_wg.c? >>>> >>>> I'm getting below error on stable/13-n252920-0baacb12181. After manually adding said header include, it compiles cleanly. >>> >>> Do you have a custom kernel config? >> >> Sort of: >> include MINIMAL >> nooption XENHVM >> nodevice xenpci > > Adding two more data points: > > make KERNCONF=GENERIC compiles without issues. > > The difference seems to be that GENERIC has option VIMAGE but MINIMAL has not: If I add option VIMAGE to my lightly-customized MINIMAL config, it compiles nicely as well. > > VIMAGE triggers inclusion of . However if_wg should not depend on VIMAGE of course. So I suspect the error I'm seeing is a side effect, and sys/proc.h should probably be included verbatim in if_wg.c to be on the safe side. (As mentioned, it is actually included upstream.) I will add the include. However, upstream has a lot of excessive #includes that I trimmed when importing into head. I had to add about 3-4 when merging back to stable/13, but it seems I need to add one more. There are also some missing bits for atomic_load/store_bool for the sanitizer kernel builds on stable/13 (but the commit to fix that in atomic_san.h doesn't merge cleanly, so I'm going to ask Mark about that one) -- John Baldwin