Skip to contentSkip to conversation

linux-next: manual merge of the drm-msm-fixes tree with the origin tree

PATCH Mark Brown 3 participants 5 messages Feb 25

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

Today's linux-next merge of the drm-msm-fixes tree got a conflict in:

drivers/gpu/drm/msm/msm_iommu.c

between commits:

48634a9ea06a4 ("drm/msm: Adjust msm_iommu_pagetable_prealloc_allocate() allocation type") 69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types") bf4afc53b77ae ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")

from the origin tree and commit:

6f6f3535192dd ("drm/msm: Adjust msm_iommu_pagetable_prealloc_allocate() allocation type")

from the drm-msm-fixes tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

drivers/gpu/drm/msm/msm_iommu.c +0 -0
diff --combined drivers/gpu/drm/msm/msm_iommu.c
index 7d449e5202c5d,271baf4dc4e80..0000000000000
@@@ -332,7 -332,7 +332,7 @@@ msm_iommu_pagetable_prealloc_allocate(s
  	struct kmem_cache *pt_cache = get_pt_cache(mmu);
  	int ret;
  
 -	p->pages = kvmalloc_array(p->count, sizeof(*p->pages), GFP_KERNEL);
 +	p->pages = kvmalloc_objs(*p->pages, p->count);
  	if (!p->pages)
  		return -ENOMEM;
  
@@@ -521,7 -521,7 +521,7 @@@ struct msm_mmu *msm_iommu_pagetable_cre
  	if (WARN_ONCE(!ttbr1_cfg, "No per-process page tables"))
  		return ERR_PTR(-ENODEV);
  
 -	pagetable = kzalloc(sizeof(*pagetable), GFP_KERNEL);
 +	pagetable = kzalloc_obj(*pagetable);
  	if (!pagetable)
  		return ERR_PTR(-ENOMEM);
  
@@@ -734,7 -734,7 +734,7 @@@ struct msm_mmu *msm_iommu_new(struct de
  
  	iommu_set_pgtable_quirks(domain, quirks);
  
 -	iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);
 +	iommu = kzalloc_obj(*iommu);
  	if (!iommu) {
  		iommu_domain_free(domain);
  		return ERR_PTR(-ENOMEM);
#1 lore raw
Quoted 10 lines · Mark Brown

Hi all,

Today's linux-next merge of the drm-msm-fixes tree got a conflict in:

drivers/gpu/drm/msm/msm_iommu.c

between commits:

48634a9ea06a4 ("drm/msm: Adjust msm_iommu_pagetable_prealloc_allocate() allocation type")

Kees, why was it landed? And how? It was not Ack'ed (nor was it requested) to go through the non-drm-msm tree. There was no note that it got applied. What is going on?

Quoted 47 lines

69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types") bf4afc53b77ae ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")

from the origin tree and commit:

6f6f3535192dd ("drm/msm: Adjust msm_iommu_pagetable_prealloc_allocate() allocation type")

from the drm-msm-fixes tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

drivers/gpu/drm/msm/msm_iommu.c +0 -0
diff --combined drivers/gpu/drm/msm/msm_iommu.c
index 7d449e5202c5d,271baf4dc4e80..0000000000000
@@@ -332,7 -332,7 +332,7 @@@ msm_iommu_pagetable_prealloc_allocate(s
        struct kmem_cache *pt_cache = get_pt_cache(mmu);
        int ret;
 
 -      p->pages = kvmalloc_array(p->count, sizeof(*p->pages), GFP_KERNEL);
 +      p->pages = kvmalloc_objs(*p->pages, p->count);
        if (!p->pages)
                return -ENOMEM;
@@@ -521,7 -521,7 +521,7 @@@ struct msm_mmu *msm_iommu_pagetable_cre
        if (WARN_ONCE(!ttbr1_cfg, "No per-process page tables"))
                return ERR_PTR(-ENODEV);
 
 -      pagetable = kzalloc(sizeof(*pagetable), GFP_KERNEL);
 +      pagetable = kzalloc_obj(*pagetable);
        if (!pagetable)
                return ERR_PTR(-ENOMEM);
@@@ -734,7 -734,7 +734,7 @@@ struct msm_mmu *msm_iommu_new(struct de
 
        iommu_set_pgtable_quirks(domain, quirks);
 
 -      iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);
 +      iommu = kzalloc_obj(*iommu);
        if (!iommu) {
                iommu_domain_free(domain);
                return ERR_PTR(-ENOMEM);
Signature · 2 lines
With best wishes
Dmitry
#2 lore raw
Quoted 8 lines · Dmitry Baryshkov
Quoted 7 lines · Mark Brown

Hi all,

Today's linux-next merge of the drm-msm-fixes tree got a conflict in:

drivers/gpu/drm/msm/msm_iommu.c

Quoted 7 lines
Quoted 3 lines

between commits:

48634a9ea06a4 ("drm/msm: Adjust msm_iommu_pagetable_prealloc_allocate() allocation type")

Kees, why was it landed? And how? It was not Ack'ed (nor was it requested) to go through the non-drm-msm tree. There was no note that it got applied. What is going on?

It was a prerequisite for the tree-wide changes, so I had to send it to Linus ahead of the -rc1 release. Sorry for the collision there! I waited as long as I could, but the msm-fixes tree wasn't sent for -rc1, so I had to include the patch in the prep patches:
https://lore.kernel.org/lkml/202602191029.2F0E7F01@keescook/

Signature · 1 line
Kees Cook
#3 lore raw
Quoted 18 lines · Kees Cook
Quoted 8 lines · Dmitry Baryshkov
Quoted 7 lines · Mark Brown

Hi all,

Today's linux-next merge of the drm-msm-fixes tree got a conflict in:

drivers/gpu/drm/msm/msm_iommu.c

Quoted 7 lines
Quoted 3 lines

between commits:

48634a9ea06a4 ("drm/msm: Adjust msm_iommu_pagetable_prealloc_allocate() allocation type")

Kees, why was it landed? And how? It was not Ack'ed (nor was it requested) to go through the non-drm-msm tree. There was no note that it got applied. What is going on?

Quoted 5 lines

It was a prerequisite for the tree-wide changes, so I had to send it to Linus ahead of the -rc1 release. Sorry for the collision there! I waited as long as I could, but the msm-fixes tree wasn't sent for -rc1, so I had to include the patch in the prep patches:
https://lore.kernel.org/lkml/202602191029.2F0E7F01@keescook/

Was it coordinated with drm/msm maintainers? Not with me at least. Did we hear anything from you, like Would you ack merging it through the XYZ tree? Did we at least get the b4 ty or picked up, sorry, I was in a rush to merge my changes which were tested in linux-next? Nope. Is it how the community is expected to work? Not really.

Signature · 2 lines
With best wishes
Dmitry
#4 lore raw
Quoted 25 lines · Dmitry Baryshkov
Quoted 18 lines · Kees Cook
Quoted 8 lines · Dmitry Baryshkov
Quoted 7 lines · Mark Brown

Hi all,

Today's linux-next merge of the drm-msm-fixes tree got a conflict in:

drivers/gpu/drm/msm/msm_iommu.c

Quoted 7 lines
Quoted 3 lines

between commits:

48634a9ea06a4 ("drm/msm: Adjust msm_iommu_pagetable_prealloc_allocate() allocation type")

Kees, why was it landed? And how? It was not Ack'ed (nor was it requested) to go through the non-drm-msm tree. There was no note that it got applied. What is going on?

Quoted 5 lines

It was a prerequisite for the tree-wide changes, so I had to send it to Linus ahead of the -rc1 release. Sorry for the collision there! I waited as long as I could, but the msm-fixes tree wasn't sent for -rc1, so I had to include the patch in the prep patches:
https://lore.kernel.org/lkml/202602191029.2F0E7F01@keescook/

Quoted 5 lines

Was it coordinated with drm/msm maintainers? Not with me at least. Did we hear anything from you, like Would you ack merging it through the XYZ tree? Did we at least get the b4 ty or picked up, sorry, I was in a rush to merge my changes which were tested in linux-next? Nope. Is it how the community is expected to work? Not really.

I apologize for not communicating this in a more direct and timely fashion. It was a rare case, and I didn't follow the expected procedures. I'll be sure to do such notifications if there is ever need for such out-of-band patch handling like this again. It's been a lot of years since I did my last large-scale tree-wide refactoring, so I was a bit rusty.

Signature · 1 line
Kees Cook