[ipsec-next:testing 4/6] net/xfrm/xfrm_state.c:1792:9: error: '__xfrm6_tmpl_sort_cmp' undeclared; did you mean 'xfrm_tmpl_sort'?

[ipsec-next:testing 4/6] net/xfrm/xfrm_state.c:1792:9: error: '__xfrm6_tmpl_sort_cmp' undeclared; did you mean 'xfrm_tmpl_sort'?

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 2341 bytes --]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git testing
head:   ca78a3eaad69bd08ba41c144c21881dc694d4a32
commit: 8dc6e3891a4be64c0cca5e8fe2c3ad33bc06543e [4/6] xfrm: remove state and template sort indirections from xfrm_state_afinfo
config: i386-randconfig-x003-201922 (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
        git checkout 8dc6e3891a4be64c0cca5e8fe2c3ad33bc06543e
        # save the attached .config to linux build tree
        make ARCH=i386 

If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   net/xfrm/xfrm_state.c: In function 'xfrm_tmpl_sort':
>> net/xfrm/xfrm_state.c:1792:9: error: '__xfrm6_tmpl_sort_cmp' undeclared (first use in this function); did you mean 'xfrm_tmpl_sort'?
            __xfrm6_tmpl_sort_cmp, 5);
            ^~~~~~~~~~~~~~~~~~~~~
            xfrm_tmpl_sort
   net/xfrm/xfrm_state.c:1792:9: note: each undeclared identifier is reported only once for each function it appears in
   net/xfrm/xfrm_state.c: In function 'xfrm_state_sort':
>> net/xfrm/xfrm_state.c:1806:9: error: '__xfrm6_state_sort_cmp' undeclared (first use in this function); did you mean '__xfrm6_state_addr_cmp'?
            __xfrm6_state_sort_cmp, 6);
            ^~~~~~~~~~~~~~~~~~~~~~
            __xfrm6_state_addr_cmp

vim +1792 net/xfrm/xfrm_state.c

  1783	
  1784	void
  1785	xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n,
  1786		       unsigned short family)
  1787	{
  1788		int i;
  1789	
  1790		if (family == AF_INET6)
  1791			__xfrm6_sort((void **)dst, (void **)src, n,
> 1792				     __xfrm6_tmpl_sort_cmp, 5);
  1793		else
  1794			for (i = 0; i < n; i++)
  1795				dst[i] = src[i];
  1796	}
  1797	
  1798	void
  1799	xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n,
  1800			unsigned short family)
  1801	{
  1802		int i;
  1803	
  1804		if (family == AF_INET6)
  1805			__xfrm6_sort((void **)dst, (void **)src, n,
> 1806				     __xfrm6_state_sort_cmp, 6);
  1807		else
  1808			for (i = 0; i < n; i++)
  1809				dst[i] = src[i];
  1810	}
  1811	#endif
  1812	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 28320 bytes --]

Re: [ipsec-next:testing 4/6] net/xfrm/xfrm_state.c:1792:9: error: '__xfrm6_tmpl_sort_cmp' undeclared; did you mean 'xfrm_tmpl_sort'?

[Florian Westphal]

kbuild test robot <lkp@intel.com> wrote:
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git testing
> head:   ca78a3eaad69bd08ba41c144c21881dc694d4a32
> commit: 8dc6e3891a4be64c0cca5e8fe2c3ad33bc06543e [4/6] xfrm: remove state and template sort indirections from xfrm_state_afinfo
> config: i386-randconfig-x003-201922 (attached as .config)
> compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
> reproduce:
>         git checkout 8dc6e3891a4be64c0cca5e8fe2c3ad33bc06543e
>         # save the attached .config to linux build tree
>         make ARCH=i386 
> If you fix the issue, kindly add following tag
> Reported-by: kbuild test robot <lkp@intel.com>
> 
> All errors (new ones prefixed by >>):
> 
>    net/xfrm/xfrm_state.c: In function 'xfrm_tmpl_sort':
> >> net/xfrm/xfrm_state.c:1792:9: error: '__xfrm6_tmpl_sort_cmp' undeclared (first use in this function); did you mean 'xfrm_tmpl_sort'?
>             __xfrm6_tmpl_sort_cmp, 5);
>             ^~~~~~~~~~~~~~~~~~~~~
>             xfrm_tmpl_sort
>    net/xfrm/xfrm_state.c:1792:9: note: each undeclared identifier is reported only once for each function it appears in
>    net/xfrm/xfrm_state.c: In function 'xfrm_state_sort':
> >> net/xfrm/xfrm_state.c:1806:9: error: '__xfrm6_state_sort_cmp' undeclared (first use in this function); did you mean '__xfrm6_state_addr_cmp'?
>             __xfrm6_state_sort_cmp, 6);
>             ^~~~~~~~~~~~~~~~~~~~~~
>             __xfrm6_state_addr_cmp

this lacks stubs for CONFIG_IPV6=n case.

Steffen, as this is still only in your testing branch, I suggest you
squash this snipped into commit 8dc6e3891a4be64c0cca5e8fe2c3ad33bc06543e
("xfrm: remove state and template sort indirections from xfrm_state_afinfo"),
it resolves this problem for me.  Otherwise, I can make a formal submit,
just let me know.

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1845,6 +1845,9 @@ static int __xfrm6_tmpl_sort_cmp(const void *p)
 	return 4;
 }
 #else
+static inline int __xfrm6_state_sort_cmp(const void *p) { return 5; }
+static inline int __xfrm6_tmpl_sort_cmp(const void *p) { return 4; }
+
 static inline void
 __xfrm6_sort(void **dst, void **src, int n,
 	     int (*cmp)(const void *p), int maxclass)

Re: [ipsec-next:testing 4/6] net/xfrm/xfrm_state.c:1792:9: error: '__xfrm6_tmpl_sort_cmp' undeclared; did you mean 'xfrm_tmpl_sort'?

[Steffen Klassert]

On Wed, Jun 05, 2019 at 02:40:45PM +0200, Florian Westphal wrote:
> 
> Steffen, as this is still only in your testing branch, I suggest you
> squash this snipped into commit 8dc6e3891a4be64c0cca5e8fe2c3ad33bc06543e
> ("xfrm: remove state and template sort indirections from xfrm_state_afinfo"),
> it resolves this problem for me.

Ok, I did that. Please doublecheck my work.

Re: [ipsec-next:testing 4/6] net/xfrm/xfrm_state.c:1792:9: error: '__xfrm6_tmpl_sort_cmp' undeclared; did you mean 'xfrm_tmpl_sort'?

[Florian Westphal]

Steffen Klassert <steffen.klassert@secunet.com> wrote:
> On Wed, Jun 05, 2019 at 02:40:45PM +0200, Florian Westphal wrote:
> > 
> > Steffen, as this is still only in your testing branch, I suggest you
> > squash this snipped into commit 8dc6e3891a4be64c0cca5e8fe2c3ad33bc06543e
> > ("xfrm: remove state and template sort indirections from xfrm_state_afinfo"),
> > it resolves this problem for me.
> 
> Ok, I did that. Please doublecheck my work.

Looks good to me, also, the updated ipsec-next/testing now builds with
CONFIG_IPV6=n.

Thanks,
Florian