Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Message-ID: <f17ed43b-7329-5566-a75e-befebd20d032@intel.com>
Date:   Tue, 26 Sep 2023 21:57:50 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.3.1
Subject: Re: [PATCH net-next 7/9] i40e: Move memory allocation structures to
 i40e_alloc.h
To:     Ivan Vecera <ivecera@redhat.com>, <netdev@vger.kernel.org>
CC:     <poros@redhat.com>, <mschmidt@redhat.com>,
        <jesse.brandeburg@intel.com>, <anthony.l.nguyen@intel.com>,
        <davem@davemloft.net>, <kuba@kernel.org>, <edumazet@google.com>,
        <pabeni@redhat.com>, <intel-wired-lan@lists.osuosl.org>,
        <linux-kernel@vger.kernel.org>
References: <20230926182710.2517901-1-ivecera@redhat.com>
 <20230926182710.2517901-8-ivecera@redhat.com>
Content-Language: en-US
From:   Przemek Kitszel <przemyslaw.kitszel@intel.com>
In-Reply-To: <20230926182710.2517901-8-ivecera@redhat.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VmE1RmpKaXJvUnFsU0tBamVyYTNjN1VQbXg2NTJlaTJDWDBlSFJ6OHJJdlZu?=
 =?utf-8?B?WUtkZG9YVDRyZ0tqaFBLOUZKQkJRbXcrZEIrektHa0p0azE0NVFjNmo3RFVF?=
 =?utf-8?B?WVhwUFAvTkRLZTJHWG40cnYwQ0FQekJaa29NcThJVEVrbkMyYno5VXZHNDQ2?=
 =?utf-8?B?cWIvM281eDd0TTNtZFA0eHhJdGN1WDhVS2RicFk5ZFNNbDg0QmYrd0VhdzQ4?=
 =?utf-8?B?NDdwTnh2bnVwaTd2eW9sdmxJUmhzc2hYczFvUG1mRVlWYlh1RU1YYVo0WTIw?=
 =?utf-8?B?c1VPeFdPRURURWJhYkprVUJhSE5uYTlFa1NCcVRGR2wrckhySzJtY0N0MTA3?=
 =?utf-8?B?V0pvTGk4akxiSm1ucmxwa2QrR21vMUZSQVVIekF0empUSEpkYTQ1OWsrbmVZ?=
 =?utf-8?B?bGlhbk1mQkVsSzQraG9qZWo2VFNSNU80bUV4bysxV2RBd0g1VTJXNXpTTitR?=
 =?utf-8?B?K0M5L2pRNUZYSWRqUG9FOThnQnBCMzFQd09Vc3F6Wlc5OWIwM0tPd3NmTFR0?=
 =?utf-8?B?TjA2ZVBxcEU0SzdDUnIvcVIrVGplWmlGTlU3TzIzY0FhNnYrN2NtOE9TL0FI?=
 =?utf-8?B?eWIxc0RrUXUwYmd5V0ttWHpTcDc3czBuYzBabmh4bGVYOFo2aDFhMU44dUFT?=
 =?utf-8?B?a2xRclNmL0xabzhYcXNwc0lPL0JDQjB5cjd4WjA4SXJJTFBXVWZTL2IwWXZ0?=
 =?utf-8?B?bWZzNXJkVzZpVjVMbnlacFZFMjhwUzd4V3cvYW1jTHpUTm02ZW1ZY1NNZDI5?=
 =?utf-8?B?MHVRUEJlVjhRcm9mb1B2THBCNXh0Q0kzbzlleVJmamMrRy96QmMzZE1GS3p0?=
 =?utf-8?B?YzlZMm5Pak1uWjRRVFM2ZmY3bU1WanRsTE5UaitiOEhScWtIS3JTWDFZWlRo?=
 =?utf-8?B?eUlXbXRuOGlwRWNxNERhcGYrNnlKTi9qaWdEcHVOWEZDdjdGQnZSdVNsRWlO?=
 =?utf-8?B?TUJEZGF3M2M5VWpJQ0VjSzBSamlUVTRlS1lId0Nwb3pQekU5dEpsb1poaGM3?=
 =?utf-8?B?S3NoUVZWUWdxeUlmU3IxcTdkQUpYeUUwb2s1bWs4SEFUcXN5SUl1YmtYUEJP?=
 =?utf-8?B?SGxxQzY5RGFOV2psa1ZaQm1Yc2JRU3FXNFV4Qyt2SG1JcEg0OVVkd3NVaHpX?=
 =?utf-8?B?Ui9HKzRxc0dsVFlMQXVINVVEenlqdllQVTJNazRhWVowc1hFcTFmek9Cb2VM?=
 =?utf-8?B?UU5VY1U0UmRSSXBuQ3NHZ1Jvd1YzNUV6bTdwRWlaRXpsQ0RSTC9ZbExSN09j?=
 =?utf-8?B?em5IVWVyanRXNi80cUllRzQxK0JpK21KcDhrRXI1TS90Yk5Rb3ozR0xCUXFx?=
 =?utf-8?B?eU1MaXlreVJJN2lUYTFRTGh3VFBjUDlnWXdzb3JpTXNJTzdId1NDZCtvVFdR?=
 =?utf-8?B?dEJFVnliUVJOTnhCTjdLdmJZSVhreTZYK2RTcEsxOUNlNGNFS3lvUEVKbDBX?=
 =?utf-8?B?RTJyY1Izb3N0RUU0L3R3em1MaGoxQlQ4RkdzMGluNTU4cXJvVmlvOStTTkRX?=
 =?utf-8?B?emhidzcwaHNnTXl0ZXdKd3Y2ZHZPUVFkdVpvbG53dFFLZ0JCN0ZlRklRRGdi?=
 =?utf-8?B?cEtycGZnVnBiY2lTUVlxR1p4UW9SeTZFNkZHYzJ2ckUxZnlUVkR4aEF6VFZy?=
 =?utf-8?B?N1I0Zi9IVXQvV05nSkhLb2MwRmtiaUFKdWVDNVpmWTcyTnd3MmRySU9xbDRs?=
 =?utf-8?B?ei9ITWFZZW9HM2x0Mi9NV2VwTEtyQmw0K3V6cFBWa1NFNnhRVGFnZ2prUnlO?=
 =?utf-8?B?aTg5ZHRxa1JDZE1tcjR5VVgwdjFPQ0xTOWFBSldtMm45b1YwNUpkUHNtR2Ev?=
 =?utf-8?B?a1ZvTUVoOWtiSTlEL1cxd0pWR0hKdmQxbFNIaXZzZ3dWSll5b3VxRFlKTFBp?=
 =?utf-8?B?dE5WWnNTK3NqWXVVZjZnaGpqQ0NuTFpOMWJVZitmbHZiQ21XMUdHbDNTV3Za?=
 =?utf-8?B?TXBPOWFVNWxxN3NrUWZXTEExb3dtcHRCNmlheE5GM1pCTlpjaFhORW15K2Fv?=
 =?utf-8?B?VWlLZ0txT1VMUmxDZnRrZERTQ1ZoaXBLN0VIeGQwMHZVRXkvRThDRG11azJC?=
 =?utf-8?B?eGUxeVRVZmdpeWlmVFF3Z2wzdnplbml3R21BTHN2c2NtNndmSUFrZlozaTRv?=
 =?utf-8?B?UFR4MzBLNVdVeVZibHNYSXNOcWNpVGVYbXY1Z0FZVXQySE9OYUJEZFBFL2dD?=
 =?utf-8?B?eXc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e0cfd19b-a24b-4f1f-5eab-08dbbecae2e0
X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3672.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 19:58:00.4019
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: BH6NSJYPnGq6CkL3jBTLQR+OtL5EANnULqPy62QOKES/XZqcls7POVLpx+PIaIUVqrIk955XlZtgd9bR3mnhAoWTb8HQ7zJR3PG/9Csei58=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8259
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 26 Sep 2023 12:58:19 -0700 (PDT)

On 9/26/23 20:27, Ivan Vecera wrote:
> Structures i40e_dma_mem & i40e_virt_mem are defined i40e_osdep.h while
> memory allocation functions that use them are declared in i40e_alloc.h
> Move them to i40e_alloc.h and remove this header file dependency on
> i40e_osdep.h header.
> 
> Due to removal of this dependency we have to include i40e_osdep.h in files
> that requires it.
> 
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> ---
>   drivers/net/ethernet/intel/i40e/i40e_adminq.c |  1 +
>   drivers/net/ethernet/intel/i40e/i40e_adminq.h |  2 +-
>   drivers/net/ethernet/intel/i40e/i40e_alloc.h  | 21 ++++++++++++++++++-
>   drivers/net/ethernet/intel/i40e/i40e_common.c |  1 +
>   drivers/net/ethernet/intel/i40e/i40e_dcb.c    |  1 +
>   drivers/net/ethernet/intel/i40e/i40e_diag.c   |  1 +
>   drivers/net/ethernet/intel/i40e/i40e_hmc.c    |  1 +
>   drivers/net/ethernet/intel/i40e/i40e_hmc.h    |  2 +-
>   .../net/ethernet/intel/i40e/i40e_lan_hmc.c    |  1 +
>   drivers/net/ethernet/intel/i40e/i40e_nvm.c    |  1 +
>   drivers/net/ethernet/intel/i40e/i40e_osdep.h  | 19 -----------------
>   11 files changed, 29 insertions(+), 22 deletions(-)

I very much like this series, but extending i40e_osdep.h usage asks for 
comment ;) - please try to reorder patches to have less dependency on it 
first, and afterwards do split
(IOW first remove&reduce, then split what's left)

(disclaimer: I have not double checked if that's possible)

> diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
> index 088ef4696818..bf4de913435e 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
> @@ -3,6 +3,7 @@
>   
>   #include <linux/delay.h>
>   #include "i40e_alloc.h"
> +#include "i40e_osdep.h"
>   #include "i40e_register.h"
>   #include "i40e_prototype.h"
>   
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.h b/drivers/net/ethernet/intel/i40e/i40e_adminq.h
> index 95c902700f63..2c0341469122 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_adminq.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.h
> @@ -6,7 +6,7 @@
>   
>   #include <linux/mutex.h>
>   #include "i40e_adminq_cmd.h"
> -#include "i40e_osdep.h"
> +#include "i40e_alloc.h"
>   
>   #define I40E_ADMINQ_DESC(R, i)   \
>   	(&(((struct i40e_aq_desc *)((R).desc_buf.va))[i]))
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_alloc.h b/drivers/net/ethernet/intel/i40e/i40e_alloc.h
> index 5d9a0b56133e..e0186495ef02 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_alloc.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_alloc.h
> @@ -4,7 +4,7 @@
>   #ifndef _I40E_ALLOC_H_
>   #define _I40E_ALLOC_H_
>   
> -#include "i40e_osdep.h"
> +#include <linux/types.h>
>   
>   struct i40e_hw;
>   
> @@ -21,6 +21,25 @@ enum i40e_memory_type {
>   	i40e_mem_reserved
>   };
>   
> +/* memory allocation tracking */
> +struct i40e_dma_mem {
> +	void *va;
> +	dma_addr_t pa;
> +	u32 size;
> +};
> +
> +struct i40e_virt_mem {
> +	void *va;
> +	u32 size;
> +};
> +
> +#define i40e_allocate_dma_mem(h, m, unused, s, a) \
> +			i40e_allocate_dma_mem_d(h, m, s, a)
> +#define i40e_free_dma_mem(h, m) i40e_free_dma_mem_d(h, m)
> +
> +#define i40e_allocate_virt_mem(h, m, s) i40e_allocate_virt_mem_d(h, m, s)
> +#define i40e_free_virt_mem(h, m) i40e_free_virt_mem_d(h, m)
> +
>   /* prototype for functions used for dynamic memory allocation */
>   int i40e_allocate_dma_mem(struct i40e_hw *hw,
>   			  struct i40e_dma_mem *mem,
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
> index 6d1042ca0317..8fb8f9e5c5d7 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_common.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
> @@ -7,6 +7,7 @@
>   #include <linux/pci.h>
>   #include "i40e_adminq_cmd.h"
>   #include "i40e_devids.h"
> +#include "i40e_osdep.h"
>   #include "i40e_prototype.h"
>   #include "i40e_register.h"
>   
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
> index 68602fc375f6..7d51e58d94bd 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
> @@ -3,6 +3,7 @@
>   
>   #include "i40e_alloc.h"
>   #include "i40e_dcb.h"
> +#include "i40e_osdep.h"
>   #include "i40e_prototype.h"
>   
>   /**
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_diag.c b/drivers/net/ethernet/intel/i40e/i40e_diag.c
> index b1ad7c4259b9..824f97931f57 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_diag.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_diag.c
> @@ -2,6 +2,7 @@
>   /* Copyright(c) 2013 - 2018 Intel Corporation. */
>   
>   #include "i40e_diag.h"
> +#include "i40e_osdep.h"
>   #include "i40e_prototype.h"
>   
>   /**
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_hmc.c
> index 0bc398757283..74b3a5b0bc4a 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_hmc.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.c
> @@ -3,6 +3,7 @@
>   
>   #include "i40e_alloc.h"
>   #include "i40e_hmc.h"
> +#include "i40e_osdep.h"
>   #include "i40e_type.h"
>   
>   /**
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_hmc.h b/drivers/net/ethernet/intel/i40e/i40e_hmc.h
> index 76610455cb90..78e6e9144331 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_hmc.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.h
> @@ -4,7 +4,7 @@
>   #ifndef _I40E_HMC_H_
>   #define _I40E_HMC_H_
>   
> -#include "i40e_osdep.h"
> +#include "i40e_alloc.h"
>   #include "i40e_register.h"
>   
>   #define I40E_HMC_MAX_BP_COUNT 512
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
> index 6f40c640e310..08f0c90acd9a 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
> @@ -4,6 +4,7 @@
>   #include "i40e_alloc.h"
>   #include "i40e_type.h"
>   #include "i40e_lan_hmc.h"
> +#include "i40e_osdep.h"
>   
>   /* lan specific interface functions */
>   
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
> index 77cdbfc19d47..2e8d2dd4b920 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
> @@ -3,6 +3,7 @@
>   
>   #include <linux/delay.h>
>   #include "i40e_alloc.h"
> +#include "i40e_osdep.h"
>   #include "i40e_prototype.h"
>   
>   /**
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_osdep.h b/drivers/net/ethernet/intel/i40e/i40e_osdep.h
> index 23be11a45761..f4f02dd722ba 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_osdep.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_osdep.h
> @@ -28,25 +28,6 @@ do {										\
>   #define rd64(a, reg)		readq((a)->hw_addr + (reg))
>   #define i40e_flush(a)		readl((a)->hw_addr + I40E_GLGEN_STAT)
>   
> -/* memory allocation tracking */
> -struct i40e_dma_mem {
> -	void *va;
> -	dma_addr_t pa;
> -	u32 size;
> -};
> -
> -#define i40e_allocate_dma_mem(h, m, unused, s, a) \
> -			i40e_allocate_dma_mem_d(h, m, s, a)
> -#define i40e_free_dma_mem(h, m) i40e_free_dma_mem_d(h, m)
> -
> -struct i40e_virt_mem {
> -	void *va;
> -	u32 size;
> -};
> -
> -#define i40e_allocate_virt_mem(h, m, s) i40e_allocate_virt_mem_d(h, m, s)
> -#define i40e_free_virt_mem(h, m) i40e_free_virt_mem_d(h, m)
> -
>   #define i40e_debug(h, m, s, ...)				\
>   do {								\
>   	if (((m) & (h)->debug_mask))				\