From win-pv-devel-bounces@lists.xenproject.org Mon Aug 05 09:44:36 2024 Return-path: Envelope-to: archives@lists.xenproject.org Delivery-date: Mon, 05 Aug 2024 09:44:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.771930.1182362 (Exim 4.92) (envelope-from ) id 1sauGY-0001ad-69; Mon, 05 Aug 2024 09:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 771930.1182362; Mon, 05 Aug 2024 09:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sauGY-0001aW-3a; Mon, 05 Aug 2024 09:44:34 +0000 Received: by outflank-mailman (input) for mailman id 771930; Mon, 05 Aug 2024 09:44:33 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sauGX-0001aQ-HG for win-pv-devel@lists.xenproject.org; Mon, 05 Aug 2024 09:44:33 +0000 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [2a00:1450:4864:20::531]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5059fc37-530f-11ef-8776-851b0ebba9a2; Mon, 05 Aug 2024 11:44:31 +0200 (CEST) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-5ba482282d3so2030760a12.2 for ; Mon, 05 Aug 2024 02:44:30 -0700 (PDT) Received: from localhost.localdomain (host109-158-229-15.range109-158.btcentralplus.com. [109.158.229.15]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5bacbcf7b58sm2256677a12.83.2024.08.05.02.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 02:44:29 -0700 (PDT) X-BeenThere: win-pv-devel@lists.xenproject.org List-Id: Developer list for the Windows PV Drivers subproject List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: win-pv-devel-bounces@lists.xenproject.org Precedence: list Sender: "win-pv-devel" X-Inumbo-ID: 5059fc37-530f-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1722851070; x=1723455870; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zQegdoi+1yZATNkCDoB+0cJoEPSQ3QDrMuQsOQW13oQ=; b=hPaA14bavlNVGX8aCX8xYRBOWf4FXb79Smaisx/9QCyg7cwfiynvOyno/pOzCwB98Z BBgQzKqoCLG1kVfexsDTG1nUurtLzu6gMLgzmpUbhVFTiJufcWSi/FrgGaiSDPCXdwYT hy3dJCvCnfhR/vb4Ry3soQ0a3LhGWzg+TKlN0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722851070; x=1723455870; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zQegdoi+1yZATNkCDoB+0cJoEPSQ3QDrMuQsOQW13oQ=; b=lQJoxJaniSwlgODjV1VhosZG3mFW29CU+7E55dcpmC2DNhWlGW/ITFlCdzpu4Wds4V t4gYMk87al93kNS3y/SqQ7TXE7gWeCsJ6VughRPle47GfVFjUuw85Uotdv1C8RKXNF1g 25A41U+6mAtzndUMTbWI2IR6EhYeXlFiWmDw47PB5joOmffDFURq3g//scV1tPKj4PtP NFykrYzbXEv5PuwAAUdQExq8tcKInRyI6wwZWnXEHkMi/yF+6b2B8lwmr0qH3S4nkz/F pK5KYNoX1yXGdJvbYBYE7OsyejcPpGsto6SG5yDdNyhw9dTIi7wn2jfrGrq1ssLF/IwJ 35MQ== X-Gm-Message-State: AOJu0YzxU1H3EFMz6a9VE+5WA6m8ZHzvefaFB/+AUMBCRgIlDsKKkUPR N3TUdA58Uw/xVwLD+6MxceS9hCOl6dZomd3fhASpS38kA0N77n3vBba45IYEsXKIyOjt+4oLxmM = X-Google-Smtp-Source: AGHT+IFvpObEdzdLOR8JG4mh1sqm0+xL+Xj/I9M8ZNB4EpEFL8/pKIJ2slW/w0igIWzZu998IhmtjA== X-Received: by 2002:a05:6402:22db:b0:5b8:34a9:7fda with SMTP id 4fb4d7f45d1cf-5b834a9814dmr6709897a12.6.1722851069890; Mon, 05 Aug 2024 02:44:29 -0700 (PDT) From: Owen Smith To: win-pv-devel@lists.xenproject.org Cc: Owen Smith Subject: [PATCH 1/2] Report NDIS minor version as expected by OS Date: Mon, 5 Aug 2024 10:44:18 +0100 Message-ID: <20240805094418.219-1-owen.smith@cloud.com> X-Mailer: git-send-email 2.44.0.windows.1 In-Reply-To: <20240709104811.987-1-owen.smith@cloud.com> References: <20240709104811.987-1-owen.smith@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit WHQL requires NDIS minor versions to match the OS under test. For Server 2022, this requires NDIS version 6.85 and Server 2025 requires NDIS version 6.89. In order to build with EWDK 22000, the reported version is echoed from the call to NdisGetVersion() without requiring updated headers. Note: NDIS 6.89 does add support for UDP Receive Segment Coalescing Offload (URO), but XenNet does not support this new NDIS feature. Signed-off-by: Owen Smith --- src/xennet/miniport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/xennet/miniport.c b/src/xennet/miniport.c index 5dc9858..250b090 100644 --- a/src/xennet/miniport.c +++ b/src/xennet/miniport.c @@ -348,16 +348,16 @@ MiniportRegister( MiniportDriverCharacteristics.Header.Size = NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_3; MiniportDriverCharacteristics.Header.Revision = NDIS_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_3; - MiniportDriverCharacteristics.MajorNdisVersion = NDIS_MINIPORT_MAJOR_VERSION; // 6 - MiniportDriverCharacteristics.MinorNdisVersion = NDIS_MINIPORT_MINOR_VERSION; // 85 + MiniportDriverCharacteristics.MajorNdisVersion = (UCHAR)(NdisGetVersion() >> 16); + MiniportDriverCharacteristics.MinorNdisVersion = (UCHAR)(NdisGetVersion() & 0x00FF); } else #endif if (NdisGetVersion() >= NDIS_RUNTIME_VERSION_660) { MiniportDriverCharacteristics.MajorNdisVersion = 6; MiniportDriverCharacteristics.MinorNdisVersion = 60; } else { - MiniportDriverCharacteristics.MajorNdisVersion = NDIS_MINIPORT_MINIMUM_MAJOR_VERSION; // 6 - MiniportDriverCharacteristics.MinorNdisVersion = NDIS_MINIPORT_MINIMUM_MINOR_VERSION; // 30 + MiniportDriverCharacteristics.MajorNdisVersion = 6; + MiniportDriverCharacteristics.MinorNdisVersion = 30; } MiniportDriverCharacteristics.MajorDriverVersion = MAJOR_VERSION; -- 2.44.0.windows.1 From win-pv-devel-bounces@lists.xenproject.org Mon Aug 12 10:42:46 2024 Return-path: Envelope-to: archives@lists.xenproject.org Delivery-date: Mon, 12 Aug 2024 10:42:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.775439.1185657 (Exim 4.92) (envelope-from ) id 1sdSVf-0001d8-Mm; Mon, 12 Aug 2024 10:42:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775439.1185657; Mon, 12 Aug 2024 10:42:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdSVf-0001d0-Jl; Mon, 12 Aug 2024 10:42:43 +0000 Received: by outflank-mailman (input) for mailman id 775439; Mon, 12 Aug 2024 10:42:41 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdSVd-0001cu-LZ for win-pv-devel@lists.xenproject.org; Mon, 12 Aug 2024 10:42:41 +0000 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [2a00:1450:4864:20::42f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 99027745-5897-11ef-bc05-fd08da9f4363; Mon, 12 Aug 2024 12:42:40 +0200 (CEST) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-368526b1333so3079196f8f.1 for ; Mon, 12 Aug 2024 03:42:40 -0700 (PDT) Received: from [10.95.107.33] (54-240-197-227.amazon.com. [54.240.197.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36e4cfee74csm7107546f8f.48.2024.08.12.03.42.38 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Aug 2024 03:42:39 -0700 (PDT) X-BeenThere: win-pv-devel@lists.xenproject.org List-Id: Developer list for the Windows PV Drivers subproject List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: win-pv-devel-bounces@lists.xenproject.org Precedence: list Sender: "win-pv-devel" X-Inumbo-ID: 99027745-5897-11ef-bc05-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723459360; x=1724064160; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:organization:reply-to :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:from:to:cc:subject:date:message-id:reply-to; bh=zJCaSvNFgSCyy1l+02IVZljzHGf8/Tzpw9v8eWv8LKE=; b=hIyQGXZ0ubg9w5U/aBDbEFpKlK/fyqApUyoDXB+q2TPI8iIZ0wHNwiPyGGfo0T7Vby 4sWrjXpebI8QZPdN2zm9n6oDrT8ln03e88RvHvA6C/lkcht80BbG4sxohQmP+k6q3LrP sJNMih0hwKPpfMn2rErZrV4drTLMGVxU6LTWQAEtqWRbkFnpRx7rsm4byBukOIilTVh6 ZZjG4JBagas+xCoaHxI2DS12zf+aaGTEV+87aWe0illqw+fn3E84FcVe0fGAdYLYSiMc 0eP/cPc0obd4rEpz+XnZjcmyzAmuUbQKRbrwqV6zCz5TdYN/skeMqTPnKAUetJ/u5C0q Wd1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723459360; x=1724064160; h=content-transfer-encoding:in-reply-to:organization:reply-to :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zJCaSvNFgSCyy1l+02IVZljzHGf8/Tzpw9v8eWv8LKE=; b=PGXB3+vPN/sJviwlo31G3OKR3XNTxBr20RKbld8Bd2xkBqQm+us5KaprUZRbXp2BFe WmATU9nffRxx9DNdDXhIiK8RaxA4av6ZvPAN5qexYHUU0zwXeIrFRODCAAq9CsVUZwn/ zB3Dji07+dfk8PZGhqqso27eTpr2CdxEeeqff+Qq3SzrZoDVRfr2jpvhDjQoL8T5N9rb gxYhkyowK/OS8SRixGCqVs1hXdy2FaSPXlDN9ceSGuFcKQOw0wBvYzKqpUudBTTX0T8C K/c81TbY7gzVyRzkr+n23vkoWReWv+hKZU+sqwk/hH12F9HPt8hLLO8snHjVltK33bnb 9nUw== X-Gm-Message-State: AOJu0YwxJrMK5eU03ErZeVt10D1TMTTV6JXrcFRoc+elmThtM2rZ8jcl QwlW2cEW9X4j8EU3lp2GL+akWg66FLlB7tU1ACc8BeltG0naOfE8D2K7KHF1 X-Google-Smtp-Source: AGHT+IET6lAxc5GZuflY5A77RdX8DzQiSu/XY6tx6x9ULg/yMU7mBGSlUU55jbuS4BWYrMApQ2dISw== X-Received: by 2002:a5d:6705:0:b0:35f:fd7:6102 with SMTP id ffacd0b85a97d-36d6a85ca23mr5925418f8f.35.1723459359388; Mon, 12 Aug 2024 03:42:39 -0700 (PDT) From: Paul Durrant X-Google-Original-From: Paul Durrant Message-ID: <81775e31-d2a5-4c4e-84c2-b3b29ac0788b@xen.org> Date: Mon, 12 Aug 2024 11:42:38 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] Report NDIS minor version as expected by OS To: win-pv-devel@lists.xenproject.org References: <20240709104811.987-1-owen.smith@cloud.com> <20240805094418.219-1-owen.smith@cloud.com> Content-Language: en-US Reply-To: paul@xen.org Organization: Xen Project In-Reply-To: <20240805094418.219-1-owen.smith@cloud.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 05/08/2024 10:44, Owen Smith wrote: > WHQL requires NDIS minor versions to match the OS under test. > For Server 2022, this requires NDIS version 6.85 and Server 2025 requires > NDIS version 6.89. > In order to build with EWDK 22000, the reported version is echoed from the > call to NdisGetVersion() without requiring updated headers. > > Note: NDIS 6.89 does add support for UDP Receive Segment Coalescing Offload > (URO), but XenNet does not support this new NDIS feature. > > Signed-off-by: Owen Smith > --- > src/xennet/miniport.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > Acked-by: Paul Durrant > diff --git a/src/xennet/miniport.c b/src/xennet/miniport.c > index 5dc9858..250b090 100644 > --- a/src/xennet/miniport.c > +++ b/src/xennet/miniport.c > @@ -348,16 +348,16 @@ MiniportRegister( > MiniportDriverCharacteristics.Header.Size = NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_3; > MiniportDriverCharacteristics.Header.Revision = NDIS_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_3; > > - MiniportDriverCharacteristics.MajorNdisVersion = NDIS_MINIPORT_MAJOR_VERSION; // 6 > - MiniportDriverCharacteristics.MinorNdisVersion = NDIS_MINIPORT_MINOR_VERSION; // 85 > + MiniportDriverCharacteristics.MajorNdisVersion = (UCHAR)(NdisGetVersion() >> 16); > + MiniportDriverCharacteristics.MinorNdisVersion = (UCHAR)(NdisGetVersion() & 0x00FF); > } else > #endif > if (NdisGetVersion() >= NDIS_RUNTIME_VERSION_660) { > MiniportDriverCharacteristics.MajorNdisVersion = 6; > MiniportDriverCharacteristics.MinorNdisVersion = 60; > } else { > - MiniportDriverCharacteristics.MajorNdisVersion = NDIS_MINIPORT_MINIMUM_MAJOR_VERSION; // 6 > - MiniportDriverCharacteristics.MinorNdisVersion = NDIS_MINIPORT_MINIMUM_MINOR_VERSION; // 30 > + MiniportDriverCharacteristics.MajorNdisVersion = 6; > + MiniportDriverCharacteristics.MinorNdisVersion = 30; > } > > MiniportDriverCharacteristics.MajorDriverVersion = MAJOR_VERSION;