From patchwork Sat Feb 8 18:57:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 13966481 X-Patchwork-Delegate: kuba@kernel.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFBD115098A; Sat, 8 Feb 2025 18:58:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739041091; cv=none; b=ZgqqDcZZnVWzmM8vGkUSLygzZiTdYCntnJ3cAg/+rkafEUDFFkv5weCz+eRCr0svzKf+Y7cGNlt7I+NTBAyTVzQIsYaowNEpx+dgHkrfV3lgm94jT0e+MR6NGAcgHJclx+RO4wjCw4tpJgi8ff8p0VVGUHCMB8+67y6UhTWTyaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739041091; c=relaxed/simple; bh=sajzIyNNSUyrK0Pz0GieFDphBDiVEqEVBjHIrHQ0yIs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rGH+YxI6nEP7YC6pzlXWsFJzVbVqPJDYsVb1/PEVY3NYw8T2cGAHW5kCYW87Skw/lsPRrQMb0lpK8DWe7Pq4ieatyP/eQBQxr6Rna7mdInhkLPVm8OeF2Sh491hoEEvJMa3oa9bG7PtGgpTwSY1Jo0E43GyKMrttLgR6D2lJaOs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=GfKfUNFy; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="GfKfUNFy" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 518BjMrA007372; Sat, 8 Feb 2025 18:58:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=corp-2023-11-20; bh=65n3nMNYjMKKCqpVKVCbhxDBQZrAz RYDjSxMSnZwCdM=; b=GfKfUNFyG8zjCa8DqMEenI37gLfeds7cFsPMLRZXoPnJr /W2/GtnUFFywk5/Lo4lajqcrPb6+zv+rShJnaWSfSvU7k+j0NV4KlnX4uevIxmVF RNc844d0sCFTRhcviRkAooQW1s2RQbrC5N9JQmUyFAIjLNLgdBjelIJz5w8CD1XO FQvVfkyyTRebKe4Mk/Vwi3nITF61VDo+jzuHh/EMN441eWvG8BnBPwZjR2olp+Cd 7qagp8oSZL1IvBKYW0Rw1YhRJOtmnuLk0AGWTYI3kye8nch/H7ygXfNbtc1pPU7C byZIWZXRhz2mNpgU5dLgtnz02qO+zTvzrHNFyRotQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44p0s3rete-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 08 Feb 2025 18:58:02 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 518DmGn7017850; Sat, 8 Feb 2025 18:58:01 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44nwqc7xb1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 08 Feb 2025 18:58:01 +0000 Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 518Iw0gW035363; Sat, 8 Feb 2025 18:58:00 GMT Received: from ca-dev112.us.oracle.com (ca-dev112.us.oracle.com [10.129.136.47]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 44nwqc7xap-1; Sat, 08 Feb 2025 18:58:00 +0000 From: Harshit Mogalapalli To: stable@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, horms@kernel.org, jiri@resnulli.us, liuhangbin@gmail.com, kuba@kernel.org, netdev@vger.kernel.org, stfomichev@gmail.com, shannon.nelson@amd.com, darren.kenny@oracle.com, Harshit Mogalapalli Subject: [PATCH 6.1.y 1/2] netdevsim: print human readable IP address Date: Sat, 8 Feb 2025 10:57:54 -0800 Message-ID: <20250208185756.2998240-1-harshit.m.mogalapalli@oracle.com> X-Mailer: git-send-email 2.46.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-08_08,2025-02-07_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2501170000 definitions=main-2502080160 X-Proofpoint-GUID: yb5sK_xK0wjTdnIQXoIDa_TX5CS1Ns4c X-Proofpoint-ORIG-GUID: yb5sK_xK0wjTdnIQXoIDa_TX5CS1Ns4c X-Patchwork-Delegate: kuba@kernel.org From: Hangbin Liu [ Upstream commit c71bc6da6198a6d88df86094f1052bb581951d65 ] 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: Simon Horman Signed-off-by: Hangbin Liu Link: https://patch.msgid.link/20241010040027.21440-2-liuhangbin@gmail.com Signed-off-by: Jakub Kicinski (cherry picked from commit c71bc6da6198a6d88df86094f1052bb581951d65) [Harshit: backport to stable kernels] Signed-off-by: Harshit Mogalapalli --- drivers/net/netdevsim/ipsec.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/netdevsim/ipsec.c b/drivers/net/netdevsim/ipsec.c index feca55eef993..ec1fc1d3ea36 100644 --- a/drivers/net/netdevsim/ipsec.c +++ b/drivers/net/netdevsim/ipsec.c @@ -39,10 +39,14 @@ static ssize_t nsim_dbg_netdev_ops_read(struct file *filp, if (!sap->used) continue; - 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]); + if (sap->xs->props.family == AF_INET6) + p += scnprintf(p, bufsize - (p - buf), + "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), From patchwork Sat Feb 8 18:57:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 13966482 X-Patchwork-Delegate: kuba@kernel.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3846015098A; Sat, 8 Feb 2025 18:58:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739041095; cv=none; b=BjT5Z8h1i3/rfWjNHLs4N8Z2bMRxcEjfdIdlY2f57Y9scEKYCLGdUi8CtD96rDY4E4AWgLm5AUsntUvQNs9GJvNRB3EWjVgc+Ag8dzktyZXRE+nA+CXLw+MUO01rtyJ9nc4wbXWEOoW9QyAbTgB0RHUKhDkUMFXIEI455/vbHxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739041095; c=relaxed/simple; bh=QPw/tufNCFipVmsdv1e3sXTWfU4aMyQrNWI0/6GC4Gc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jkpAykZujVDMV9/NMAITDWEFzM+sLpuoWJpom5CNLH/yXZKvt3UXMJBcB+y5Wcr6Dff93G3eAyhZyKUhJ1hw3pfKNen3l0BkfE/qnpJlY+BzZSdRtuS1avBQk4ZmPmpMO+7sHoEP2fNzo/y0zold7klb8NETKT0Ts8WS9dZQeA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=ROWo4Sp6; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="ROWo4Sp6" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 518Fslqs005161; Sat, 8 Feb 2025 18:58:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2023-11-20; bh=jezfX q91rX7vzpsdyLM3jNK64iAOMhsPSU8cNBWupxk=; b=ROWo4Sp6MnmirYnXRIujQ WD5jjQ26kBbV4fgyKSTaTlBhbLDFUKXRy8Usv8Ju/uuIIYhEVqnqolkGLc7YNJD/ cFPYVOwNo4Ft8nNQM0fJ5UUmH6tABLATlD2PoF3haRT09j2ZCgKtzjlSsYiReJVQ htwRcz0mnFHfVCeVlQkpbiu+yjx0AtizrogtzBGJZsna6s1XdL+3wXPqSrsAaPJW clFbpX7QEgd3e6bS9TD4wlqRv6rinzIbcpr+DrwIpBwHi+Ak6qxVe2uEjbssiGBL SLLE2toyvRp6LXMLBEYZKIjLr3BzqnQm/6dOy1ZAbT/B1wih9sSzeDtQthapv5HV w== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44p0q28enw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 08 Feb 2025 18:58:06 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 518E5DsY017845; Sat, 8 Feb 2025 18:58:05 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44nwqc7xbt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 08 Feb 2025 18:58:05 +0000 Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 518Iw0gY035363; Sat, 8 Feb 2025 18:58:04 GMT Received: from ca-dev112.us.oracle.com (ca-dev112.us.oracle.com [10.129.136.47]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 44nwqc7xap-2; Sat, 08 Feb 2025 18:58:04 +0000 From: Harshit Mogalapalli To: stable@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, horms@kernel.org, jiri@resnulli.us, liuhangbin@gmail.com, kuba@kernel.org, netdev@vger.kernel.org, stfomichev@gmail.com, shannon.nelson@amd.com, darren.kenny@oracle.com, Stanislav Fomichev , Harshit Mogalapalli Subject: [PATCH 6.1.y 2/2] selftests: rtnetlink: update netdevsim ipsec output format Date: Sat, 8 Feb 2025 10:57:55 -0800 Message-ID: <20250208185756.2998240-2-harshit.m.mogalapalli@oracle.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250208185756.2998240-1-harshit.m.mogalapalli@oracle.com> References: <20250208185756.2998240-1-harshit.m.mogalapalli@oracle.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-08_08,2025-02-07_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2501170000 definitions=main-2502080160 X-Proofpoint-GUID: 3gvB2-l5oX1-hjih41LvIHMTpE1iwVVe X-Proofpoint-ORIG-GUID: 3gvB2-l5oX1-hjih41LvIHMTpE1iwVVe X-Patchwork-Delegate: kuba@kernel.org From: Hangbin Liu [ Upstream commit 3ec920bb978ccdc68a7dfb304d303d598d038cb1 ] After the netdevsim update to use human-readable IP address formats for IPsec, we can now use the source and destination IPs directly in testing. Here is the result: # ./rtnetlink.sh -t kci_test_ipsec_offload PASS: ipsec_offload Signed-off-by: Hangbin Liu Acked-by: Stanislav Fomichev Link: https://patch.msgid.link/20241010040027.21440-4-liuhangbin@gmail.com Signed-off-by: Jakub Kicinski (cherry picked from commit 3ec920bb978ccdc68a7dfb304d303d598d038cb1) [Harshit: backport to stable kernels] Signed-off-by: Harshit Mogalapalli --- tools/testing/selftests/net/rtnetlink.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index cafd14b1ed2a..ff1242f2afaa 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -813,10 +813,10 @@ kci_test_ipsec_offload() # does driver have correct offload info diff $sysfsf - << EOF SA count=2 tx=3 -sa[0] tx ipaddr=0x00000000 00000000 00000000 00000000 +sa[0] tx ipaddr=$dstip sa[0] spi=0x00000009 proto=0x32 salt=0x61626364 crypt=1 sa[0] key=0x34333231 38373635 32313039 36353433 -sa[1] rx ipaddr=0x00000000 00000000 00000000 037ba8c0 +sa[1] rx ipaddr=$srcip sa[1] spi=0x00000009 proto=0x32 salt=0x61626364 crypt=1 sa[1] key=0x34333231 38373635 32313039 36353433 EOF