From patchwork Fri Feb 14 16:24:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Child X-Patchwork-Id: 13975216 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 58F5B267393; Fri, 14 Feb 2025 16:24:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550299; cv=none; b=d6FxkI6aFVLJAHY/5+k3zv+jmazcFwRdHPsOfmc3TLpNe5M11edVM76i/FFmemwDVLGLfJqFUduBlwKowBzCdRE3a/k0nf2jXYFUvMGdqD0+jhk0TNuU08hJmnpBmC5EoqufBJjgQUYI8qVxC2+PzC3P2Bac0sgEuLwYiMq8tQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550299; c=relaxed/simple; bh=0mTy7aT2DO+MQw1h7heKPjMWt+yyZdSNOVwiqs1Gz2s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KHO4KTkpYXgCVEHM+/4sg6EWv/BTa7ruOUnNRZiwYu/sh/ugwwCE1tNm1cH6q+PKWqV4/B3ref9S4JO5k9G+8C40EC2pR/XMVe+4X0vyqIywUVcGMUbjoQqitVe23xfkvVa8n+7J/k92A4UCWyvWAn6h2JNiGzONooYIPr+d+W4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=X6fS5qwO; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="X6fS5qwO" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51EAo29a032741; Fri, 14 Feb 2025 16:24:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=yFfZClgTIGahWWAji gU50EkYWifUgFkD4IIJI/BSD+c=; b=X6fS5qwO9I/mubzqM6sdbFIPwsB1Y+mQE mcUGeBIqMKM5Hp4HsPSorcXSgFMKT6wJdNpD0cVrluqYbrQr4IaJKCrQk8VnSlOj oaV4IWx3LJZPLbEiwfNyVrAB3sFJ9kDT+IpKdMcLil5+bMaPphw3JSx4xslVMjtl sZqet8LAUpKE254hYzPsMy+F5lpt7SPTU+F/+EmLhd1DbAuhAQAf0R/7SzPr1Pvb i2Wiq2taCP8AE8DPrItwNFd+qKJ7pIp+DB/NXR/28pID/rgi/0iCvfBY4uvqjUb1 VK7Fo3tAlgzdUpcbyOqcvRvZsS//ff2xmB1KiuAgRwr82bHr+Sp5g== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 44ssvacbb9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Feb 2025 16:24:55 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 51EEXLrf028236; Fri, 14 Feb 2025 16:24:53 GMT Received: from smtprelay02.dal12v.mail.ibm.com ([172.16.1.4]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 44phyyvkea-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Feb 2025 16:24:53 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 51EGOp5w27329044 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Feb 2025 16:24:51 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9A71858056; Fri, 14 Feb 2025 16:24:51 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6BDA15805A; Fri, 14 Feb 2025 16:24:51 +0000 (GMT) Received: from li-4c4c4544-0047-5210-804b-b8c04f323634.lan (unknown [9.61.91.157]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 14 Feb 2025 16:24:51 +0000 (GMT) From: Nick Child To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: haren@linux.ibm.com, ricklind@us.ibm.com, nick.child@ibm.com, jacob.e.keller@intel.com, horms@kernel.org, Nick Child Subject: [PATCH 1/3] hexdump: Implement macro for converting large buffers Date: Fri, 14 Feb 2025 10:24:34 -0600 Message-ID: <20250214162436.241359-2-nnac123@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214162436.241359-1-nnac123@linux.ibm.com> References: <20250214162436.241359-1-nnac123@linux.ibm.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: NgG4kIDWrONo9mMbLfKZvrBJbv4GqcbG X-Proofpoint-ORIG-GUID: NgG4kIDWrONo9mMbLfKZvrBJbv4GqcbG 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-14_07,2025-02-13_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 clxscore=1011 impostorscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502140114 Define for_each_line_in_hex_dump which loops over a buffer and calls hex_dump_to_buffer for each segment in the buffer. This allows the caller to decide what to do with the resulting string and is not limited by a specific printing format like print_hex_dump. Signed-off-by: Nick Child --- include/linux/printk.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/linux/printk.h b/include/linux/printk.h index 4217a9f412b2..559d4bfe0645 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -755,6 +755,27 @@ enum { extern int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize, char *linebuf, size_t linebuflen, bool ascii); +/** + * for_each_line_in_hex_dump - iterate over buffer, converting into hex ASCII + * @i: offset in @buff + * @rowsize: number of bytes to print per line; must be 16 or 32 + * @linebuf: where to put the converted data + * @linebuflen: total size of @linebuf, including space for terminating NUL + * IOW >= (@rowsize * 2) + ((@rowsize - 1 / @groupsize)) + 1 + * @groupsize: number of bytes to print at a time (1, 2, 4, 8; default = 1) + * @buf: data blob to dump + * @len: number of bytes in the @buf + */ + #define for_each_line_in_hex_dump(i, rowsize, linebuf, linebuflen, groupsize, \ + buf, len) \ + for ((i) = 0; \ + (i) < (len) && \ + hex_dump_to_buffer((unsigned char *)(buf) + (i), \ + min((len) - (i), rowsize), \ + (rowsize), (groupsize), (linebuf), \ + (linebuflen), false); \ + (i) += (rowsize) == 16 || (rowsize) == 32 ? (rowsize) : 16 \ + ) #ifdef CONFIG_PRINTK extern void print_hex_dump(const char *level, const char *prefix_str, int prefix_type, int rowsize, int groupsize, From patchwork Fri Feb 14 16:24:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Child X-Patchwork-Id: 13975219 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 083DA14D28C; Fri, 14 Feb 2025 16:25:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550308; cv=none; b=TIKCnD/aEX7E7622/ERh3YMahNLmuREpROk2oQSfZdvDDH2pTU531vnxQhLeivm1mngmXqv8bxNZDPTJzf3Li1ArNu3k6gOn1/6r0y113YtXEYGEctXkO+bASJhUonny8+E6QltWtHRuHlxleZg+HcISueoGF6uPzupw1edfO/A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550308; c=relaxed/simple; bh=MvxERc194WQJx36vLWPBEF+DLPnFAKH0/YV6FuaNUNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GWntc0rYq0HW6tx77mV+/JNenGyush0Gc81wkjklsWfTEKxzSyhKvzTktx5/sqa9IRS+emahu56Wit0OKopBH/KnOsyvA3/qANuxlRfy7UNuD6BeHsQeCqbh9uN81NfcYZY447o100+jUfa357qb9jTAObNlXo4As59VtWOL57E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=R59gBZ+4; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="R59gBZ+4" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51EFdcek032481; Fri, 14 Feb 2025 16:24:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=yG70bgF4eF0LbCZrC bJjOyXn2pmOX1dHX5jvropnH6A=; b=R59gBZ+4392p79qX19Ph8tJ7FR3iI2W7o J/Ninepujgqw6UHYoorf3Bj6yTIEdBUgdPRhsF2ZJOxlgCnMLsNw+4P2gyUYhJoD O05v4xyRqKB1LYRJdssgwocmKwCOwgQOhqluGowhZxAhp7k0iNurR7WPOFR3TsEg qoWnQ56aUqVGv2Ido9dDCj55/oGz9kgmjgSPtBv/tWiAa9xZt8g8fakzAtpEoqdi kwsN7y2rDuuZFyvpM0ltcvKN9CP7tWb+bzq0EuH/l8KECbVjLWWHN3ZM+n3ciJaF PGvw9jVDrAeXS7PEzIIPCsPjnbrCBSV7lrPFjiYRQ8qq7xNnkpBoQ== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 44t8nug6qh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Feb 2025 16:24:55 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 51EEbawB028197; Fri, 14 Feb 2025 16:24:54 GMT Received: from smtprelay02.dal12v.mail.ibm.com ([172.16.1.4]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 44phyyvked-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Feb 2025 16:24:54 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 51EGOpoa27329046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Feb 2025 16:24:52 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D83E55803F; Fri, 14 Feb 2025 16:24:51 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A1AA658061; Fri, 14 Feb 2025 16:24:51 +0000 (GMT) Received: from li-4c4c4544-0047-5210-804b-b8c04f323634.lan (unknown [9.61.91.157]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 14 Feb 2025 16:24:51 +0000 (GMT) From: Nick Child To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: haren@linux.ibm.com, ricklind@us.ibm.com, nick.child@ibm.com, jacob.e.keller@intel.com, horms@kernel.org, Nick Child Subject: [PATCH v2 2/3] hexdump: Use for_each macro in print_hex_dump Date: Fri, 14 Feb 2025 10:24:35 -0600 Message-ID: <20250214162436.241359-3-nnac123@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214162436.241359-1-nnac123@linux.ibm.com> References: <20250214162436.241359-1-nnac123@linux.ibm.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 9LXfp6siklWuK3QkpAUTEsSjRVu61PQb X-Proofpoint-ORIG-GUID: 9LXfp6siklWuK3QkpAUTEsSjRVu61PQb 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-14_07,2025-02-13_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 impostorscore=0 mlxscore=0 mlxlogscore=885 malwarescore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502140114 The looping logic in print_hex_dump can be handled by the macro for_each_line_in_hex_dump. Signed-off-by: Nick Child --- lib/hexdump.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/hexdump.c b/lib/hexdump.c index c3db7c3a7643..181b82dfe40d 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -263,19 +263,14 @@ void print_hex_dump(const char *level, const char *prefix_str, int prefix_type, const void *buf, size_t len, bool ascii) { const u8 *ptr = buf; - int i, linelen, remaining = len; + int i; unsigned char linebuf[32 * 3 + 2 + 32 + 1]; if (rowsize != 16 && rowsize != 32) rowsize = 16; - for (i = 0; i < len; i += rowsize) { - linelen = min(remaining, rowsize); - remaining -= rowsize; - - hex_dump_to_buffer(ptr + i, linelen, rowsize, groupsize, - linebuf, sizeof(linebuf), ascii); - + for_each_line_in_hex_dump(i, rowsize, linebuf, sizeof(linebuf), + groupsize, buf, len) { switch (prefix_type) { case DUMP_PREFIX_ADDRESS: printk("%s%s%p: %s\n", From patchwork Fri Feb 14 16:24:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Child X-Patchwork-Id: 13975218 X-Patchwork-Delegate: kuba@kernel.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 D8C217E0ED; Fri, 14 Feb 2025 16:25:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550306; cv=none; b=JBCvKhoXno+6j3vxtvfRi2BbQlxeJeJWhpqk8ekK1nYAazIPZbtNgAIbkuQJO1d+pmfdhF98T/LQnADP1oSlDH7hJkuoWpHyYYmPHRYnRYdsmmz7hLTEaTzDIr5H0WROkr5G1Y3rd2F02S4GesGGh+4iW50pxN1kh7KoItHISsg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739550306; c=relaxed/simple; bh=XGCrjKYWR6g/Oc7ffC1TNGQJ7GNX5TqlzKoNYIeqInk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NA6RYps2XyKRtV3tgWVFPHYRGeH6JYxlf6EeQAZzXMJ1muFZ4Dlf6MhVhwlurDFfoYyhoX6OKWeP6EaXLRkgXf+7J8z74Q/qqygi4qx7BuMBPgIEEGXYtxnx3uskbp4mQ/D6UxLf0NzsZHmqQD1bD52uQoXnvHY4FsMBlo1PAl8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=rKCvgizw; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="rKCvgizw" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51E7X0G3026210; Fri, 14 Feb 2025 16:24:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=HVK5Ba/d9bGUUzXzE oQTVrIVyX5umy5tq9OStFoQzHg=; b=rKCvgizwkuI/UlC27TdtP4Cbv5lvZBXxl F7kS1sc2mcfRCUPa5mE9jPM/cI4mpfhP/5OweCS078+5i7rcadlELWEntSjeTWDb QRowi/aAwXyibqBvxmgR16FjFVPmI3Q4kPAAHT/GA6tBh74PtHt4AMcLIN7VCeQM 6/FU5SVYZMyio6o3OIVTTUAxKq5TNtdwPTTdsYCK6BOeyXn8Oc8GsA3Nma7VepJF JEK3Lx7md3n24tkLSIjp+mC4+W9jtxDCMMJiMt5qhMbSNRaEv3mb7s7y7Sbhcfk/ 324Rdw9pBGcxaLSYJGPuRxm0fJW4lU4lFjo6I1pX0BpLw0GPVGJSQ== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 44t1hpte9f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Feb 2025 16:24:54 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 51EFHjEP016679; Fri, 14 Feb 2025 16:24:54 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 44pk3kmd4n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Feb 2025 16:24:54 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 51EGOqm418154226 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Feb 2025 16:24:52 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1BF135803F; Fri, 14 Feb 2025 16:24:52 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DF62258056; Fri, 14 Feb 2025 16:24:51 +0000 (GMT) Received: from li-4c4c4544-0047-5210-804b-b8c04f323634.lan (unknown [9.61.91.157]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 14 Feb 2025 16:24:51 +0000 (GMT) From: Nick Child To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: haren@linux.ibm.com, ricklind@us.ibm.com, nick.child@ibm.com, jacob.e.keller@intel.com, horms@kernel.org, Nick Child Subject: [PATCH v2 3/3] ibmvnic: Print data buffers with kernel API's Date: Fri, 14 Feb 2025 10:24:36 -0600 Message-ID: <20250214162436.241359-4-nnac123@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214162436.241359-1-nnac123@linux.ibm.com> References: <20250214162436.241359-1-nnac123@linux.ibm.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: M1vwKHZdR9uqW1AiZCVjq7v90PIzsE4x X-Proofpoint-GUID: M1vwKHZdR9uqW1AiZCVjq7v90PIzsE4x 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-14_07,2025-02-13_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 impostorscore=0 phishscore=0 spamscore=0 mlxlogscore=767 mlxscore=0 suspectscore=0 clxscore=1011 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502140114 X-Patchwork-Delegate: kuba@kernel.org Previously, data buffers that were to be printed were cast to 8 byte integers and printed. This can lead to buffer overflow if the length of the buffer is not a multiple of 8. Simplify and safeguard printing by using kernel provided functions to print these data blobs. Reviewed-by: Jacob Keller Signed-off-by: Nick Child --- drivers/net/ethernet/ibm/ibmvnic.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index e95ae0d39948..a8f1feb9a2e7 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -4834,6 +4834,7 @@ static int send_login(struct ibmvnic_adapter *adapter) struct device *dev = &adapter->vdev->dev; struct vnic_login_client_data *vlcd; dma_addr_t rsp_buffer_token; + unsigned char hex_str[16 * 3]; dma_addr_t buffer_token; size_t rsp_buffer_size; union ibmvnic_crq crq; @@ -4937,9 +4938,9 @@ static int send_login(struct ibmvnic_adapter *adapter) vnic_add_client_data(adapter, vlcd); netdev_dbg(adapter->netdev, "Login Buffer:\n"); - for (i = 0; i < (adapter->login_buf_sz - 1) / 8 + 1; i++) { - netdev_dbg(adapter->netdev, "%016lx\n", - ((unsigned long *)(adapter->login_buf))[i]); + for_each_line_in_hex_dump(i, 16, hex_str, sizeof(hex_str), 8, + adapter->login_buf, adapter->login_buf_sz) { + netdev_dbg(adapter->netdev, "%s\n", hex_str); } memset(&crq, 0, sizeof(crq)); @@ -5317,15 +5318,17 @@ static void handle_query_ip_offload_rsp(struct ibmvnic_adapter *adapter) { struct device *dev = &adapter->vdev->dev; struct ibmvnic_query_ip_offload_buffer *buf = &adapter->ip_offload_buf; + unsigned char hex_str[16 * 3]; int i; dma_unmap_single(dev, adapter->ip_offload_tok, sizeof(adapter->ip_offload_buf), DMA_FROM_DEVICE); netdev_dbg(adapter->netdev, "Query IP Offload Buffer:\n"); - for (i = 0; i < (sizeof(adapter->ip_offload_buf) - 1) / 8 + 1; i++) - netdev_dbg(adapter->netdev, "%016lx\n", - ((unsigned long *)(buf))[i]); + for_each_line_in_hex_dump(i, 16, hex_str, sizeof(hex_str), 8, buf, + sizeof(adapter->ip_offload_buf)) { + netdev_dbg(adapter->netdev, "%s\n", hex_str); + } netdev_dbg(adapter->netdev, "ipv4_chksum = %d\n", buf->ipv4_chksum); netdev_dbg(adapter->netdev, "ipv6_chksum = %d\n", buf->ipv6_chksum); @@ -5518,6 +5521,7 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq, struct net_device *netdev = adapter->netdev; struct ibmvnic_login_rsp_buffer *login_rsp = adapter->login_rsp_buf; struct ibmvnic_login_buffer *login = adapter->login_buf; + unsigned char hex_str[16 * 3]; u64 *tx_handle_array; u64 *rx_handle_array; int num_tx_pools; @@ -5556,9 +5560,10 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq, netdev->mtu = adapter->req_mtu - ETH_HLEN; netdev_dbg(adapter->netdev, "Login Response Buffer:\n"); - for (i = 0; i < (adapter->login_rsp_buf_sz - 1) / 8 + 1; i++) { - netdev_dbg(adapter->netdev, "%016lx\n", - ((unsigned long *)(adapter->login_rsp_buf))[i]); + for_each_line_in_hex_dump(i, 16, hex_str, sizeof(hex_str), 8, + adapter->login_rsp_buf, + adapter->login_rsp_buf_sz) { + netdev_dbg(adapter->netdev, "%s\n", hex_str); } /* Sanity checks */