Commit 4d34b9da authored by Hangbin Liu's avatar Hangbin Liu Committed by Wentao Guan
Browse files

netdevsim: print human readable IP address 

stable inclusion
from stable-v6.6.79
commit 30472935f708a0d770d88edf901756090b821e08
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBXANC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=30472935f708a0d770d88edf901756090b821e08



--------------------------------

commit c71bc6da6198a6d88df86094f1052bb581951d65 upstream.

Currently, IPSec addresses are printed in hexadecimal format, which is
not user-friendly. e.g.

  # cat /sys/kernel/debug/netdevsim/netdevsim0/ports/0/ipsec
  SA count=2 tx=20
  sa[0] rx ipaddr=0x00000000 00000000 00000000 0100a8c0
  sa[0]    spi=0x00000101 proto=0x32 salt=0x0adecc3a crypt=1
  sa[0]    key=0x3167608a ca4f1397 43565909 941fa627
  sa[1] tx ipaddr=0x00000000 00000000 00000000 00000000
  sa[1]    spi=0x00000100 proto=0x32 salt=0x0adecc3a crypt=1
  sa[1]    key=0x3167608a ca4f1397 43565909 941fa627

This patch updates the code to print the IPSec address in a human-readable
format for easier debug. e.g.

 # cat /sys/kernel/debug/netdevsim/netdevsim0/ports/0/ipsec
 SA count=4 tx=40
 sa[0] tx ipaddr=0.0.0.0
 sa[0]    spi=0x00000100 proto=0x32 salt=0x0adecc3a crypt=1
 sa[0]    key=0x3167608a ca4f1397 43565909 941fa627
 sa[1] rx ipaddr=192.168.0.1
 sa[1]    spi=0x00000101 proto=0x32 salt=0x0adecc3a crypt=1
 sa[1]    key=0x3167608a ca4f1397 43565909 941fa627
 sa[2] tx ipaddr=::
 sa[2]    spi=0x00000100 proto=0x32 salt=0x0adecc3a crypt=1
 sa[2]    key=0x3167608a ca4f1397 43565909 941fa627
 sa[3] rx ipaddr=2000::1
 sa[3]    spi=0x00000101 proto=0x32 salt=0x0adecc3a crypt=1
 sa[3]    key=0x3167608a ca4f1397 43565909 941fa627

Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Link: https://patch.msgid.link/20241010040027.21440-2-liuhangbin@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarHarshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 30472935f708a0d770d88edf901756090b821e08)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent f7cb4894

drivers/net/netdevsim/ipsec.c

+8 −4
Original line number Diff line number Diff line
@@ -39,10 +39,14 @@ static ssize_t nsim_dbg_netdev_ops_read(struct file *filp, 
		if (!sap->used)

			continue;



		if (sap->xs->props.family == AF_INET6)

			p += scnprintf(p, bufsize - (p - buf),

			       "sa[%i] %cx ipaddr=0x%08x %08x %08x %08x\n",

			       i, (sap->rx ? 'r' : 't'), sap->ipaddr[0],

			       sap->ipaddr[1], sap->ipaddr[2], sap->ipaddr[3]);

				       "sa[%i] %cx ipaddr=%pI6c\n",

				       i, (sap->rx ? 'r' : 't'), &sap->ipaddr);

		else

			p += scnprintf(p, bufsize - (p - buf),

				       "sa[%i] %cx ipaddr=%pI4\n",

				       i, (sap->rx ? 'r' : 't'), &sap->ipaddr[3]);

		p += scnprintf(p, bufsize - (p - buf),

			       "sa[%i]    spi=0x%08x proto=0x%x salt=0x%08x crypt=%d\n",

			       i, be32_to_cpu(sap->xs->id.spi),