From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D5BBB46000; Thu, 23 Jan 2025 15:16:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6989E4028A; Thu, 23 Jan 2025 15:16:58 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6671840261 for ; Thu, 23 Jan 2025 15:16:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737641815; 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=w4SWL93t1Y8U2xS9MdUQKOasn6beBCUIxIVBRsKgnps=; b=A8P6IsFnCWVLEAT6YhaiCi6jEEsqCUgtNyu+8EzDL795rCfXHLIK7OM0e2bBvBZ1nt78sb 6cQlu/JwpW5EfdXIDpVNtWGIrVPkYIxTmSrXvktfYtm+gnn84dvuDJ9wMs3n9OKqahyRDI IbPGrBsatCs2z7PhUDYU/snZgf+AFYI= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-336-Iwzjtmf-N4GthqoxRiWk1A-1; Thu, 23 Jan 2025 09:16:53 -0500 X-MC-Unique: Iwzjtmf-N4GthqoxRiWk1A-1 X-Mimecast-MFC-AGG-ID: Iwzjtmf-N4GthqoxRiWk1A Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-3022741859eso5636151fa.2 for ; Thu, 23 Jan 2025 06:16:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737641812; x=1738246612; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w4SWL93t1Y8U2xS9MdUQKOasn6beBCUIxIVBRsKgnps=; b=fMTQEbvcbu1IkggszeOrueMFIC9j2YWQkxi2f7yq60J1TNaGQ5tDehRN24gcJCQYDV 7f0NSczaFnJP6Zrtrqm0IGH6qu8VUkpEQt8AsHlWbRKw12T7iFgDI33oK3I93OQUU4bE JF+Co5e/g45wCcd+VHeu0ME+kX2LSzQgcBakgCcjOsr2KqtBCx3jpyKQC3v29E8mZiwk 5ebRSZ3JtVE6m2WJR4SynsASMU8Bt8wsFrZFzEGwxMd3w+PX5L/lwNM6aioQwPxtQWpo amd+Il+P1SYX1uAjQ3P8Q5dFtF/H5rbQcRFN80YQd6va6qJ1dx8gjuyBKvFN2C+Pr9cs pwkQ== X-Gm-Message-State: AOJu0Yw+eKNjERKC1Ws1ybG7iVAp2I9F5cJAyjkCt7boBUi5zoqdz/O1 8AJL8iVYNKinNh8DkHLZSkpMdCwpV6xgcE90Hvj/QSeES8+G2+C9Q7dnHpB0/VgQ1vGRhesW0mL YmTMTP59fqOthqGlK/jDohYshGJ3lRnx1ujYYlRK/WNp8gcVxlpGTqf2fit1mo+URZRygAM0QDy 7Ot1/AMEh1gfcNZAg= X-Gm-Gg: ASbGncu33syCIpxpYfh6t+cajQyjA36Kucbnea5P8iwtv7k+Ye1zLNkTddTUeM5qCLl n67N+1XYxCKqfjY2vg6pH+W69iJOrJTI5C0O7xYiHJKoBnM/NghFKlA== X-Received: by 2002:a05:651c:2228:b0:302:4130:e19c with SMTP id 38308e7fff4ca-3072caa15c1mr89504961fa.19.1737641811926; Thu, 23 Jan 2025 06:16:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IEh6s0nfdbHIyQ9cSbYcXN/b5hSeuHTILzXD9pGNDrYDcZU22svMyhO/J/zOmn3EOA9pfA0Vi3xIwP9umovDjk= X-Received: by 2002:a05:651c:2228:b0:302:4130:e19c with SMTP id 38308e7fff4ca-3072caa15c1mr89504721fa.19.1737641811403; Thu, 23 Jan 2025 06:16:51 -0800 (PST) MIME-Version: 1.0 References: <20241122125418.2857301-1-bruce.richardson@intel.com> <20250120120016.1530274-1-bruce.richardson@intel.com> <20250120120016.1530274-2-bruce.richardson@intel.com> In-Reply-To: <20250120120016.1530274-2-bruce.richardson@intel.com> From: David Marchand Date: Thu, 23 Jan 2025 15:16:40 +0100 X-Gm-Features: AbW1kvZszsQaFlBvsQ6YOfZ3kN9fezCCiTwgzRPpXgajBVcbdZA2crjRvRiZvGA Message-ID: Subject: Re: [PATCH v5 01/25] net: move intel drivers to intel subdirectory To: Bruce Richardson , Thomas Monjalon Cc: dev@dpdk.org, Konstantin Ananyev , David Christensen , Wathsala Vithanage , Praveen Shetty , Ian Stokes , Vladimir Medvedkin , Anatoly Burakov , Jingjing Wu , Rosen Xu , Robin Jarry X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: rhW42mH0LpKGAXBnH-432rBfD-Z9b9sa7XTW6VBi7s0_1737641812 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Hello Bruce, Thomas, On Mon, Jan 20, 2025 at 1:00=E2=80=AFPM Bruce Richardson wrote: > > Consolidate all Intel HW NIC drivers into a driver/net/intel This > matches the layout used for drivers in the kernel, and potentially > enabling easier sharing among drivers. > > Signed-off-by: Bruce Richardson - This deserves a RN entry has it impacts how users select compiled drivers= . - Trying to select net/intel/* triggers a meson error: $ meson configure build -Denable_drivers=3Dnet/intel/* $ ninja -C build ... Message: drivers/net/intel/i40e: Defining dependency "net_i40e" ../drivers/net/intel/iavf/meson.build:33:46: ERROR: Unknown variable "static_rte_common_iavf". A full log can be found at /home/dmarchan/git/pub/dpdk.org/dedup/build/meson-logs/meson-log.txt FAILED: build.ninja /usr/bin/meson --internal regenerate /home/dmarchan/git/pub/dpdk.org/dedup = . - I see some remaining references to the old path. One is to be fixed: doc/guides/nics/ice.rst: These ICE_DBG_XXX are defined in ``drivers/net/ice/base/ice_type.h``. - Thomas, please have a look at this part. On the check-git-log.sh update, we will have many warnings with current upd= ate. Wrong headline prefix: net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel: align Tx queue struct field names net/intel: add prefix for driver-specific structs net/intel/common: merge ice and i40e Tx queue struct net/iavf: use common Tx queue structure net/ixgbe: use common Tx queue structure net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/ice: move Tx queue mbuf cleanup fn to common net/iavf: use common Tx queue mbuf cleanup fn net/ice: use vector SW ring for all vector paths net/intel/common: remove unneeded code net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria Invalid patch(es) found - checked 25 patches I tried to tweak this a bit, with the following heuristic: * if touching only net/intel/common, accept net/intel/common: * if touching multiple drivers under net/intel, then accept net/intel: as prefix, * if touching some net/intel/$drv (and optionnally net/intel/common), accept net/$drv, diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh index b2da013f6c..41c290f0ca 100755 --- a/devtools/check-git-log.sh +++ b/devtools/check-git-log.sh @@ -79,11 +79,18 @@ bad=3D$(for commit in $commits ; do [ -z "$(echo "$files" | grep -v '^\(drivers\|doc\|config\)/')" ] || continue drv=3D$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,3 | sort= -u) - # for drivers/net/intel/* use 2nd and 4th fields not 2nd and 3rd if [ "$drv" =3D "net/intel" ] ; then - drv=3D$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,4 | sort -u) + drvgrp=3D"net/intel" + drv=3D$(echo "$files" | grep '^drivers/' | grep -v '^drivers/net/intel/common' | + cut -d "/" -f 2,4 | sort -u) + if [ $(echo "$drv" | wc -l) -eq 0 ] ; then + drv=3D'net/intel/common:' + elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then + drv=3D'net/intel:' + fi + else + drvgrp=3D$(echo "$drv" | cut -d "/" -f 1 | uniq) fi - drvgrp=3D$(echo "$drv" | cut -d "/" -f 1 | uniq) if [ $(echo "$drvgrp" | wc -l) -gt 1 ] ; then echo "$headline" | grep -v '^drivers:' elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then Which then complains on patches in this series that touch many drivers (but have net/intel/common: as prefix where I would suggest net/intel: instead). Wrong headline prefix: net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel/common: merge ice and i40e Tx queue struct net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/iavf: use common Tx queue mbuf cleanup fn net/intel/common: remove unneeded code net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria --=20 David Marchand