From nobody Sun Apr 6 22:18:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1735332985; cv=none; d=zohomail.com; s=zohoarc; b=O4Hmy1pJHN+77bKRlswaDUG7I+6APBAoNgllonmKJL9XrBZxdtdGNKqK4AzAysbKwsniycjPkku7ZeTExi9A5IwmXZNibv2J/3r0Tr6ksOleAOxkmG9gTsG988/R0ojU5RPYPb9uigHxdQhVnfDrhJA/Q9B/8+RUe3jLk8kTTuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735332985; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VKcC7nTdfI8nzjSH6JgugYegoKJzVWa19B3cBatcvZM=; b=KdadlcfM6YnjQedA2TelvtfoEyYAhVpMSP3+N6eIZpEN1K+f4fsStqJkgSDZUG1DKD1iX7BWjHQvTcAYUGuX2ttDDS6ZZlGMcWrRysaGoW/cAbw3AsRjWwAqVhIQF3ZaOvdpk5HSz0HHs1UzDC0bBsf5G4rK8+GJfjHGc1RZjKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735332985923359.82033274368723; Fri, 27 Dec 2024 12:56:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRHML-00043D-Lz; Fri, 27 Dec 2024 15:55:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMK-00042S-6f for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:55:00 -0500 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMI-0000yD-RB for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:54:59 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A13FE5C1368; Fri, 27 Dec 2024 20:54:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BAB3C4CED6; Fri, 27 Dec 2024 20:54:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735332893; bh=AftUXuUWx9ZD4I5XBHONp6je4n2JUSbFwJicQRR9IxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pEf3ovt6kVsWjHKkSS0iwG2Hjk1iZpCd/CIej9PJTOKBfL22tPrEXFNlifu55pMel TDSG7GvEdZ4WM8unAa10+cYJw33ja8/LSaqxMFwrzycBHk/q8qqWhtldtKVdHd++Df Xox5C7KT3nI7POVxs6DDgcRm4iogEB1RmLIlTR265ua1H3yLS1MTIVRB/qX08RxsoV Hlh9bjzhcWZ8WyhuExnKBQCO7578sItWoGOT/HhEcAlS9iVobR18mnN7F5pfkM/dZ2 NEgmvvUVmYwbFZ1rv4/bBit6OdPh8NRs23WmKrtD9Y4uxXV9NVXtdPaeuMhQgv0j9b dNnh9YfGMeczg== From: deller@kernel.org To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson Cc: deller@gmx.de Subject: [PATCH v2 1/6] linux-user: netlink: Add missing IFA_PROTO to host_to_target_data_addr_rtattr() Date: Fri, 27 Dec 2024 21:54:44 +0100 Message-ID: <20241227205449.29311-2-deller@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241227205449.29311-1-deller@kernel.org> References: <20241227205449.29311-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2604:1380:4641:c500::1; envelope-from=deller@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.138, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1735332986268116600 Content-Type: text/plain; charset="utf-8" From: Helge Deller Fixes this warning: Unknown host IFA type: 11 Signed-off-by: Helge Deller Reviewed-by: Laurent Vivier --- linux-user/fd-trans.c | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c index c04a97c73a..a86ed2f4b4 100644 --- a/linux-user/fd-trans.c +++ b/linux-user/fd-trans.c @@ -1140,6 +1140,7 @@ static abi_long host_to_target_data_addr_rtattr(struc= t rtattr *rtattr) /* binary: depends on family type */ case IFA_ADDRESS: case IFA_LOCAL: + case IFA_PROTO: break; /* string */ case IFA_LABEL: --=20 2.47.0 From nobody Sun Apr 6 22:18:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1735332972; cv=none; d=zohomail.com; s=zohoarc; b=DvfoUwroYmkDHDNKv0CE8TRdClmpmNSqELMZjk8tdmfMyz/+HutfH6gBl4aTKyNsDHRlOiRKr/F30Py5dEDj7ydOh9yqPk/+phGh/3V75cvfr+I/EqfOaVX8jLoAij9BjpRiM9Kt3zimJ35bJSAvLMbSsPYntJR67o23LCf3Hx0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735332972; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5wG6eAk+a9dOckVouevIz5fhgSSeIJ62wjZF1SxMTE8=; b=I3DHH1sLpgEln2N7uNKbdpRljpr7wfrHgPctD4yYsZ8W7npXEjvzaOklH4IVq1hr5JUoiy+EvWpkZebH9CSo5N/4GmzO0R8wvxlL6Mrm9rqbXW2ZCSCmEVxoddNaVWAWCrhzsZ50z6fIxU+nBSE5CPw2Apn7ZKc6YscNbZelKLE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735332972415663.7999346995978; Fri, 27 Dec 2024 12:56:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRHMK-00042k-Uk; Fri, 27 Dec 2024 15:55:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMJ-00042B-D0 for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:54:59 -0500 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMH-0000xm-QC for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:54:59 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 07C8EA414AD; Fri, 27 Dec 2024 20:53:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 475CCC4CED4; Fri, 27 Dec 2024 20:54:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735332895; bh=++yLiwF1vMXtmMJcl0mx0RivzvJ7PQ5W2ExsxlhLhr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KT6atdWbuYOyc0uQEpri562gx5pUm57oimhFnTffrWu7zX7NJ4WyTqKpyw1cjXtbM RWhY6NGGBpfRFz2/8+l7p5WkTDTVvLP+gVDyqxUvto654Yd0A60971p3gJ7drUtSiN I88RSF1l7F/SV7VjhVaC+0UM9aQZXP39lkia3JBSqTA3t4a8tm9IFFHWlB65Cg6yQe H2FDNPz+Wu/k/lxcCZufRq5YuLP9B0mAgqgOX71xCo0X7NTlj5cZQstpF8p5p88iri uIxouMjR4zirHpmGaZK+Dlo9eBa+f/UwS8qrVrP7yB5aAl75BDOgRM8xPzgxIdpvrK CJTiJrW7dtPoQ== From: deller@kernel.org To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson Cc: deller@gmx.de Subject: [PATCH v2 2/6] linux-user: Use unique error messages for cmsg parsing Date: Fri, 27 Dec 2024 21:54:45 +0100 Message-ID: <20241227205449.29311-3-deller@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241227205449.29311-1-deller@kernel.org> References: <20241227205449.29311-1-deller@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2604:1380:45d1:ec00::3; envelope-from=deller@kernel.org; helo=nyc.source.kernel.org X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.138, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1735332974315116600 From: Helge Deller Avoid using the same error message for two different code paths as it complicates determining the one which actually triggered. Signed-off-by: Helge Deller Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- linux-user/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1ce4c79784..494323efba 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1825,7 +1825,7 @@ static inline abi_long target_to_host_cmsg(struct msg= hdr *msgh, *dst =3D tswap32(*dst); } } else { - qemu_log_mask(LOG_UNIMP, "Unsupported ancillary data: %d/%d\n", + qemu_log_mask(LOG_UNIMP, "Unsupported target ancillary data: %= d/%d\n", cmsg->cmsg_level, cmsg->cmsg_type); memcpy(data, target_data, len); } @@ -2047,7 +2047,7 @@ static inline abi_long host_to_target_cmsg(struct tar= get_msghdr *target_msgh, =20 default: unimplemented: - qemu_log_mask(LOG_UNIMP, "Unsupported ancillary data: %d/%d\n", + qemu_log_mask(LOG_UNIMP, "Unsupported host ancillary data: %d/= %d\n", cmsg->cmsg_level, cmsg->cmsg_type); memcpy(target_data, data, MIN(len, tgt_len)); if (tgt_len > len) { --=20 2.47.0 From nobody Sun Apr 6 22:18:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1735332975; cv=none; d=zohomail.com; s=zohoarc; b=bzMaFjmi/OW4YtwWZXldMQlmnCKRzGVImtetDICyEgr1sIrMwjGuHNDdQLakfMDM44+qIzXrvg/FDVxAYvDdvDfp/4Ah1bZIZbEeTP17/Rx698lAtWJBPruSWyTLuvLCmxFE2uyn8hlyOhxJ/qX6kd6+lCHQBCxmoHb1F7RiV+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735332975; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BtoKfb3dXk+S07guxrX+TMTm5iBlalgagWyvX0BbyAU=; b=CeT8GM18CdjtF38M2lRHrQtIIpqD4W+QShYpXnZye9DB4HIh9p14mYBqGqdLJB91zdDksfVy5KU86Voq8s+ymiK7t0Lrp0gYKCkDL+Ol9EyB4u98xPU0G8u4scg5no081tMo7bVmjTI8kYCTHCKnQbCjaEeJ08JIUBFHlZYYMbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735332975317848.9099602466758; Fri, 27 Dec 2024 12:56:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRHMK-00042l-VH; Fri, 27 Dec 2024 15:55:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMJ-000426-7s for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:54:59 -0500 Received: from nyc.source.kernel.org ([147.75.193.91]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMH-0000y2-Tt for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:54:58 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 9CFB3A41A1E; Fri, 27 Dec 2024 20:53:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEEF6C4CED6; Fri, 27 Dec 2024 20:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735332897; bh=Z3ILH7yeOybgi1/CJ1rwkFp19U43yvxFnde7k2lHHz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PlR8oqtUk8XOSQizVUGjjH29Y9ZUhjVs28/uA6qv8zFqpxElAFiWco/SbXyUATtaZ xYEEujWKEofrJl2X94vWoV6ZSav1567spsnCgvS0OaeMVxAeG4vUwsVLnDVz3oiHes lVgxk01fM1CPXYSIPDPHXYkRPlZVOLKb0HDeakRTrawKb/6lAyrj+W+50FVEA/OMmr caNcWJ+jrzNmKigJvP9Z9bXVuBnRcqLfgjPMwSKcRn6gQYXsiaKg3y7AiY9r1ZAQiM GSYi8wI1WrIGhX1j/XmjsZ1RJcDraVuPHOfMD1QtWMrUpfozWzYUqxGj9wcIdEM2TD 6wTQQuwGm6GnQ== From: deller@kernel.org To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson Cc: deller@gmx.de Subject: [PATCH v2 3/6] linux-user: netlink: Add IP_PKTINFO cmsg parsing Date: Fri, 27 Dec 2024 21:54:46 +0100 Message-ID: <20241227205449.29311-4-deller@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241227205449.29311-1-deller@kernel.org> References: <20241227205449.29311-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=147.75.193.91; envelope-from=deller@kernel.org; helo=nyc.source.kernel.org X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.138, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1735332976187116600 Content-Type: text/plain; charset="utf-8" From: Helge Deller Fixes those warnings: Unsupported host ancillary data: 0/8 Signed-off-by: Helge Deller --- linux-user/syscall.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 494323efba..bbe2560927 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1996,6 +1996,18 @@ static inline abi_long host_to_target_cmsg(struct ta= rget_msghdr *target_msgh, (void *) &errh->offender, sizeof(errh->offender)); break; } + case IP_PKTINFO: + { + struct in_pktinfo *pkti =3D data; + struct in_pktinfo *target_pkti =3D target_data; + + __put_user(pkti->ipi_ifindex, &target_pkti->ipi_ifindex); + host_to_target_sockaddr((unsigned long) &target_pkti->ipi_= spec_dst, + (void *) &pkti->ipi_spec_dst, sizeof(pkti->ipi_spec_ds= t)); + host_to_target_sockaddr((unsigned long) &target_pkti->ipi_= addr, + (void *) &pkti->ipi_addr, sizeof(pkti->ipi_addr)); + break; + } default: goto unimplemented; } --=20 2.47.0 From nobody Sun Apr 6 22:18:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1735332981; cv=none; d=zohomail.com; s=zohoarc; b=SiZuFov6RJOxlSdX+/x+jTzmvhzvE9cUS4tOgNXYsrIUo6cY6uff7CGFo78A/uODudIG+4IdxwjUFv3wTGMPqDXIFLwpnmqWE08GLCf471qSFXyeT1Sy1lH2YtQp1cg2kfaJKivxFIb89ruFVoNQEkwhhq8CZ1JWWOTxr8OxzM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735332981; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8AdP5Zv+2RdLRQGwHW6ewJo6MtWnMvXaYtodV5cidck=; b=nHKP8Er1lGuZh0Y187gQW1RhZZJ558k4xkSGrEtQ0q04qCCPyYn4BUZTbxLJZQeLAeqWQNQjOGTQjaScmIW8rCIgJK2tGfz9WctjBtcm+dk8NWPpbQ0ufjDyY4X5WrHNGYGbnaSZOWfdm8hYt4Rrrt6TgV2BgqU9xTdV6qDpBiI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735332981357415.0720595191134; Fri, 27 Dec 2024 12:56:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRHMN-00043e-7q; Fri, 27 Dec 2024 15:55:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHML-00042u-B9 for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:55:01 -0500 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMJ-0000yX-Vs for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:55:01 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 57D705C5F70; Fri, 27 Dec 2024 20:54:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E614C4CED4; Fri, 27 Dec 2024 20:54:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735332898; bh=7sDAkRnZ08OkWc2JgsOLVf4mCXc++peN2aQFHOAIuw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=keD6rvbYqU6y+xgFQS/zd4g7sl7zMjD34Di8Tx6+3HdSClVNU0bZjvA3/BBOgdrxh 6BUtwXmzp98X9AAkflf4HMcgiuxDMON6akYe9kSE9VMt05Kr3+R2PvIkr8GL+N3WI0 v9Lfel2BM1qex7+AmGHY+dkoOU0La/uUx1UgzDD5Rc/wx6ik73s5mjz3ShrHQqcV3U tlmGUBs+dru9nzYRXnIC968oznwVwS+XZNsLBgejY2dKXENYpXkYwhD2xcSYME8bCw 0sQ5iUe6+f+9X96NgGuf6rQ1S73zTTj26WMVp+ja83PHD52CaPHWPsM3dYTvQU9VNF AEB4Hvg5ZMtvQ== From: deller@kernel.org To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson Cc: deller@gmx.de Subject: [PATCH v2 4/6] linux-user: netlink: Add emulation of IP_MULTICAST_IF Date: Fri, 27 Dec 2024 21:54:47 +0100 Message-ID: <20241227205449.29311-5-deller@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241227205449.29311-1-deller@kernel.org> References: <20241227205449.29311-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2604:1380:4641:c500::1; envelope-from=deller@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.138, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1735332982380116600 Content-Type: text/plain; charset="utf-8" From: Helge Deller Share code with IP_ADD_MEMBERSHIP/IP_DROP_MEMBERSHIP. Signed-off-by: Helge Deller --- linux-user/syscall.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index bbe2560927..4360543e20 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2130,16 +2130,23 @@ static abi_long do_setsockopt(int sockfd, int level= , int optname, } ret =3D get_errno(setsockopt(sockfd, level, optname, &val, siz= eof(val))); break; + case IP_MULTICAST_IF: case IP_ADD_MEMBERSHIP: case IP_DROP_MEMBERSHIP: { struct ip_mreqn ip_mreq; struct target_ip_mreqn *target_smreqn; + int min_size; =20 QEMU_BUILD_BUG_ON(sizeof(struct ip_mreq) !=3D sizeof(struct target_ip_mreq)); =20 - if (optlen < sizeof (struct target_ip_mreq) || + if (optname =3D=3D IP_MULTICAST_IF) { + min_size =3D sizeof(struct in_addr); + } else { + min_size =3D sizeof(struct target_ip_mreq); + } + if (optlen < min_size || optlen > sizeof (struct target_ip_mreqn)) { return -TARGET_EINVAL; } @@ -2149,7 +2156,9 @@ static abi_long do_setsockopt(int sockfd, int level, = int optname, return -TARGET_EFAULT; } ip_mreq.imr_multiaddr.s_addr =3D target_smreqn->imr_multiaddr.= s_addr; - ip_mreq.imr_address.s_addr =3D target_smreqn->imr_address.s_ad= dr; + if (optlen >=3D sizeof(struct target_ip_mreq)) { + ip_mreq.imr_address.s_addr =3D target_smreqn->imr_address.= s_addr; + } if (optlen =3D=3D sizeof(struct target_ip_mreqn)) { ip_mreq.imr_ifindex =3D tswapal(target_smreqn->imr_ifindex= ); optlen =3D sizeof(struct ip_mreqn); --=20 2.47.0 From nobody Sun Apr 6 22:18:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1735332957; cv=none; d=zohomail.com; s=zohoarc; b=fZ5A0AIM6UyaM176sTClGttFtYUg3i0gn7r0iJMRo+EJY0t0A88XxSch/IVUqw4qhaOe1iLv3g9nn+CldGI7GLPVO1ZZlwR2XYDUbQYd18DyBrcf/rUcdK1nNGkgem2DlJ3CygCKVdy9jAFjuRNmW6usrxBxw15UymqPUQGTYtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735332957; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jG4jdCQY1oPBZnByRLtjEnEDmuHCTNecsCtMDa8liFg=; b=MTsqa+DcViPHmf47zPiD0TxgZIRrMvaSi3NpXgGCSeqcq1McF3/jK6mnRHdNM44R6DfN14yWxaCURfb8TF8YPx2/iY2RKV0PVXLFUmL7UyhDETZ//NDDlgVYqJLvEi3BwBx4YYxBNtZI/WIA3jht4i8zhYO06XyjJ7eU8Kwybno= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735332957418689.5253677153029; Fri, 27 Dec 2024 12:55:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRHMP-00044E-B2; Fri, 27 Dec 2024 15:55:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMN-00043f-FQ for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:55:03 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHML-0000yy-Mk for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:55:03 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id EBB295C1368; Fri, 27 Dec 2024 20:54:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E39DC4CED0; Fri, 27 Dec 2024 20:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735332900; bh=jtw0U5iFni1OhqXYBFO9Z1N+JowpM17V1JkgZiGBD6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oJLlFO8egQ+3Ca0zinMbbAFKsUNCHcXfIPOaQEdBscvPqHqGxT3NQZTD4tLDlvfUN peLLxxVwvTtpjENI04OltyRSEA8hSv7AbVPOFwBLrTa93v8KyEP8RhJitR0mKtFOAF jwhcOVoDcdlu0nrhQRwfsD4o9yEEP3UIMzpbnFaOWktM8zv/qkPhe7pMGmdW55iT/v 6pvWDexohMGo61THDT1EtYIlziuLl8Iz7nZnLvhJlTlXuZKH18maxi5WH+dpMrwvRV VWsL9XmthRlB2ka+ojLaQfbxE1lrkAmbBphppr/EAgVCG3x28AN0wkek4D7QZOcfMr jdP7CTw+AqVuQ== From: deller@kernel.org To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson Cc: deller@gmx.de Subject: [PATCH v2 5/6] linux-user: netlink: add netlink neighbour emulation Date: Fri, 27 Dec 2024 21:54:48 +0100 Message-ID: <20241227205449.29311-6-deller@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241227205449.29311-1-deller@kernel.org> References: <20241227205449.29311-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=139.178.84.217; envelope-from=deller@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.138, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1735332958428116600 Content-Type: text/plain; charset="utf-8" From: Helge Deller Fixes various warnings in the testsuite while building gupnp: gssdp-net-DEBUG: Failed to send netlink message: Operation not supported gupnp-context-DEBUG: Mismatch between host header and host IP (example.com= , expected: 127.0.0.1) gupnp-context-DEBUG: Mismatch between host header and host port (80, expec= ted 4711) gupnp-context-DEBUG: Mismatch between host header and host IP (192.168.1.2= , expected: 127.0.0.1) gupnp-context-DEBUG: Mismatch between host header and host IP (fe80::01, e= xpected: 127.0.0.1) gupnp-context-DEBUG: Mismatch between host header and host port (80, expec= ted 4711) gupnp-context-DEBUG: Failed to parse HOST header from request: Invalid IPv= 6 address ?[fe80::01%1]? in URI gupnp-context-DEBUG: Failed to parse HOST header from request: Invalid IPv= 6 address ?[fe80::01%eth0]? in URI gupnp-context-DEBUG: Failed to parse HOST header from request: Could not p= arse port ?:1? in URI gupnp-context-DEBUG: Mismatch between host header and host IP (example.com= , expected: ::1) gupnp-context-DEBUG: Mismatch between host header and host port (80, expec= ted 4711) gupnp-context-DEBUG: Mismatch between host header and host IP (example.com= , expected: ::1) gupnp-context-DEBUG: Mismatch between host header and host port (80, expec= ted 4711) gupnp-context-DEBUG: Mismatch between host header and host IP (example.com= , expected: ::1) Signed-off-by: Helge Deller Reviewed-by: Laurent Vivier --- linux-user/fd-trans.c | 100 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c index a86ed2f4b4..a5e6c6b6f2 100644 --- a/linux-user/fd-trans.c +++ b/linux-user/fd-trans.c @@ -25,12 +25,16 @@ #ifdef CONFIG_RTNETLINK #include #include +#include #endif #include "qemu.h" #include "user-internals.h" #include "fd-trans.h" #include "signal-common.h" =20 +#define NDM_RTA(r) ((struct rtattr*)(((char*)(r)) + \ + NLMSG_ALIGN(sizeof(struct ndmsg)))) + enum { QEMU_IFLA_BR_UNSPEC, QEMU_IFLA_BR_FORWARD_DELAY, @@ -1210,6 +1214,35 @@ static abi_long host_to_target_data_route_rtattr(str= uct rtattr *rtattr) return 0; } =20 +static abi_long host_to_target_data_neigh_rtattr(struct rtattr *rtattr) +{ + struct nda_cacheinfo *ndac; + uint32_t *u32; + + switch (rtattr->rta_type) { + case NDA_UNSPEC: + case NDA_DST: + case NDA_LLADDR: + break; + case NDA_PROBES: + u32 =3D RTA_DATA(rtattr); + *u32 =3D tswap32(*u32); + break; + case NDA_CACHEINFO: + ndac =3D RTA_DATA(rtattr); + ndac->ndm_confirmed =3D tswap32(ndac->ndm_confirmed); + ndac->ndm_used =3D tswap32(ndac->ndm_used); + ndac->ndm_updated =3D tswap32(ndac->ndm_updated); + ndac->ndm_refcnt =3D tswap32(ndac->ndm_refcnt); + break; + default: + qemu_log_mask(LOG_UNIMP, "Unknown host to target NEIGH type: %d\n", + rtattr->rta_type); + break; + } + return 0; +} + static abi_long host_to_target_link_rtattr(struct rtattr *rtattr, uint32_t rtattr_len) { @@ -1231,12 +1264,20 @@ static abi_long host_to_target_route_rtattr(struct = rtattr *rtattr, host_to_target_data_route_rtattr= ); } =20 +static abi_long host_to_target_neigh_rtattr(struct rtattr *rtattr, + uint32_t rtattr_len) +{ + return host_to_target_for_each_rtattr(rtattr, rtattr_len, + host_to_target_data_neigh_rtattr= ); +} + static abi_long host_to_target_data_route(struct nlmsghdr *nlh) { uint32_t nlmsg_len; struct ifinfomsg *ifi; struct ifaddrmsg *ifa; struct rtmsg *rtm; + struct ndmsg *ndm; =20 nlmsg_len =3D nlh->nlmsg_len; switch (nlh->nlmsg_type) { @@ -1263,6 +1304,17 @@ static abi_long host_to_target_data_route(struct nlm= sghdr *nlh) nlmsg_len - NLMSG_LENGTH(sizeof(*if= a))); } break; + case RTM_NEWNEIGH: + case RTM_DELNEIGH: + case RTM_GETNEIGH: + if (nlh->nlmsg_len >=3D NLMSG_LENGTH(sizeof(*ndm))) { + ndm =3D NLMSG_DATA(nlh); + ndm->ndm_ifindex =3D tswap32(ndm->ndm_ifindex); + ndm->ndm_state =3D tswap16(ndm->ndm_state); + host_to_target_neigh_rtattr(NDM_RTA(ndm), + nlmsg_len - NLMSG_LENGTH(sizeof(*ndm))= ); + } + break; case RTM_NEWROUTE: case RTM_DELROUTE: case RTM_GETROUTE: @@ -1410,6 +1462,35 @@ static abi_long target_to_host_data_addr_rtattr(stru= ct rtattr *rtattr) return 0; } =20 +static abi_long target_to_host_data_neigh_rtattr(struct rtattr *rtattr) +{ + struct nda_cacheinfo *ndac; + uint32_t *u32; + + switch (rtattr->rta_type) { + case NDA_UNSPEC: + case NDA_DST: + case NDA_LLADDR: + break; + case NDA_PROBES: + u32 =3D RTA_DATA(rtattr); + *u32 =3D tswap32(*u32); + break; + case NDA_CACHEINFO: + ndac =3D RTA_DATA(rtattr); + ndac->ndm_confirmed =3D tswap32(ndac->ndm_confirmed); + ndac->ndm_used =3D tswap32(ndac->ndm_used); + ndac->ndm_updated =3D tswap32(ndac->ndm_updated); + ndac->ndm_refcnt =3D tswap32(ndac->ndm_refcnt); + break; + default: + qemu_log_mask(LOG_UNIMP, "Unknown target NEIGH type: %d\n", + rtattr->rta_type); + break; + } + return 0; +} + static abi_long target_to_host_data_route_rtattr(struct rtattr *rtattr) { uint32_t *u32; @@ -1448,6 +1529,13 @@ static void target_to_host_addr_rtattr(struct rtattr= *rtattr, target_to_host_data_addr_rtattr); } =20 +static void target_to_host_neigh_rtattr(struct rtattr *rtattr, + uint32_t rtattr_len) +{ + target_to_host_for_each_rtattr(rtattr, rtattr_len, + target_to_host_data_neigh_rtattr); +} + static void target_to_host_route_rtattr(struct rtattr *rtattr, uint32_t rtattr_len) { @@ -1460,6 +1548,7 @@ static abi_long target_to_host_data_route(struct nlms= ghdr *nlh) struct ifinfomsg *ifi; struct ifaddrmsg *ifa; struct rtmsg *rtm; + struct ndmsg *ndm; =20 switch (nlh->nlmsg_type) { case RTM_NEWLINK: @@ -1486,6 +1575,17 @@ static abi_long target_to_host_data_route(struct nlm= sghdr *nlh) NLMSG_LENGTH(sizeof(*ifa))); } break; + case RTM_NEWNEIGH: + case RTM_DELNEIGH: + case RTM_GETNEIGH: + if (nlh->nlmsg_len >=3D NLMSG_LENGTH(sizeof(*ndm))) { + ndm =3D NLMSG_DATA(nlh); + ndm->ndm_ifindex =3D tswap32(ndm->ndm_ifindex); + ndm->ndm_state =3D tswap16(ndm->ndm_state); + target_to_host_neigh_rtattr(NDM_RTA(ndm), nlh->nlmsg_len - + NLMSG_LENGTH(sizeof(*ndm))); + } + break; case RTM_NEWROUTE: case RTM_DELROUTE: case RTM_GETROUTE: --=20 2.47.0 From nobody Sun Apr 6 22:18:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1735332994; cv=none; d=zohomail.com; s=zohoarc; b=Z8uMjsrIkgEw/kQJ+k2f4VNSa3rdnLEsji33c5YTu19+JX/J5UzsXEwLMDqxUgELY8/OoPl5+e+m/VX/1EaHuk0UJKg4mAE5RKy+ZRC5SABXSbKS9PetLEO6dsOQySRwAJuEx3ReLKBwmELvdmYKKX1KMqZA1ULr7kZj1T1arVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735332994; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CbMuvfjqMq+DEecgg76qganfd3wHUBACdzo7VpV3heM=; b=k2mzYGXjYrPWP9t3c5t/fr95IzgqM5/wHx0ey9Hkfu5lrTFDefMUWGYgTxBzdunsWQHGeI+8mweMEaYkjFZL+CJI1pznO6yNkrq+HLq+iWFFiI+++uMkuBgAwW5QEnXqWo6AkQPQlo0/wqyRhUaglCsB/3cr2SEEzRpkmjoXAFQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735332994496623.6805322756701; Fri, 27 Dec 2024 12:56:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRHMQ-00044V-Fu; Fri, 27 Dec 2024 15:55:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMO-000446-O0 for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:55:04 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRHMN-000124-8D for qemu-devel@nongnu.org; Fri, 27 Dec 2024 15:55:04 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A56B85C5F70; Fri, 27 Dec 2024 20:54:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1A78C4CED0; Fri, 27 Dec 2024 20:55:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735332901; bh=lZEjJ4XbotEJNSOPinIq1O73m1AqWJPsAYAqUEoSv38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=njj1eMLfJjiM/nvTuMtgxHUbm7MagROWLq3SzsTZ14RzkFsOqYyMqMquDJTFWn/da aKbJuqp1jQvobkReOu72IDrBJeP0G5AY8iJodZkiVQsvnZ4+py2NcTRUon6oMOQG1w 4RFe3815vTU+NnuZSapd8KOq5kpXNsteUkJSMY6cdByyGJd5KxttKxI9Ryzj9Ic4OB rK00r4A1EpMW7MNoml/JtUIYUJmyD9MgV2/oR/OsA7LAbTDtFLm0Beb3GEPW2zbqso eI3VWeoGtKFZ6qKvDsAs+n1xTnN09TtqHsfE+zT3THECXmJv0it1tLCMmzV1AAFXZE ZCCieBuI7dEZg== From: deller@kernel.org To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson Cc: deller@gmx.de Subject: [PATCH v2 6/6] linux-user: netlink: Add missing QEMU_IFLA entries Date: Fri, 27 Dec 2024 21:54:49 +0100 Message-ID: <20241227205449.29311-7-deller@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241227205449.29311-1-deller@kernel.org> References: <20241227205449.29311-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=139.178.84.217; envelope-from=deller@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.138, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1735332996288116600 Content-Type: text/plain; charset="utf-8" From: Helge Deller This fixes the following qemu warnings when building debian gupnp package: Unknown host QEMU_IFLA type: 61 Unknown host QEMU_IFLA type: 58 Unknown host QEMU_IFLA type: 59 Unknown host QEMU_IFLA type: 60 Unknown host QEMU_IFLA type: 32820 QEMU_IFLA type 32820 is actually NLA_NESTED | QEMU_IFLA_PROP_LIST (a nested entry), which is why rta_type needs to be masked with NLA_TYPE_MASK. Signed-off-by: Helge Deller Reviewed-by: Laurent Vivier --- linux-user/fd-trans.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c index a5e6c6b6f2..6a8775bb55 100644 --- a/linux-user/fd-trans.c +++ b/linux-user/fd-trans.c @@ -145,6 +145,14 @@ enum { QEMU_IFLA_PROTO_DOWN_REASON, QEMU_IFLA_PARENT_DEV_NAME, QEMU_IFLA_PARENT_DEV_BUS_NAME, + QEMU_IFLA_GRO_MAX_SIZE, + QEMU_IFLA_TSO_MAX_SIZE, + QEMU_IFLA_TSO_MAX_SEGS, + QEMU_IFLA_ALLMULTI, + QEMU_IFLA_DEVLINK_PORT, + QEMU_IFLA_GSO_IPV4_MAX_SIZE, + QEMU_IFLA_GRO_IPV4_MAX_SIZE, + QEMU_IFLA_DPLL_PIN, QEMU___IFLA_MAX }; =20 @@ -986,6 +994,22 @@ static abi_long host_to_target_data_vfinfo_nlattr(stru= ct nlattr *nlattr, return 0; } =20 +static abi_long host_to_target_data_prop_nlattr(struct nlattr *nlattr, + void *context) +{ + switch (nlattr->nla_type) { + /* string */ + case QEMU_IFLA_ALT_IFNAME: + break; + default: + qemu_log_mask(LOG_UNIMP, "Unknown host PROP type: %d\n", + nlattr->nla_type); + break; + } + return 0; +} + + static abi_long host_to_target_data_link_rtattr(struct rtattr *rtattr) { uint32_t *u32; @@ -994,7 +1018,7 @@ static abi_long host_to_target_data_link_rtattr(struct= rtattr *rtattr) struct rtnl_link_ifmap *map; struct linkinfo_context li_context; =20 - switch (rtattr->rta_type) { + switch (rtattr->rta_type & NLA_TYPE_MASK) { /* binary stream */ case QEMU_IFLA_ADDRESS: case QEMU_IFLA_BROADCAST: @@ -1032,6 +1056,12 @@ static abi_long host_to_target_data_link_rtattr(stru= ct rtattr *rtattr) case QEMU_IFLA_CARRIER_DOWN_COUNT: case QEMU_IFLA_MIN_MTU: case QEMU_IFLA_MAX_MTU: + case QEMU_IFLA_GRO_MAX_SIZE: + case QEMU_IFLA_TSO_MAX_SIZE: + case QEMU_IFLA_TSO_MAX_SEGS: + case QEMU_IFLA_ALLMULTI: + case QEMU_IFLA_GSO_IPV4_MAX_SIZE: + case QEMU_IFLA_GRO_IPV4_MAX_SIZE: u32 =3D RTA_DATA(rtattr); *u32 =3D tswap32(*u32); break; @@ -1127,6 +1157,10 @@ static abi_long host_to_target_data_link_rtattr(stru= ct rtattr *rtattr) return host_to_target_for_each_nlattr(RTA_DATA(rtattr), rtattr->rt= a_len, NULL, host_to_target_data_vfinfo_nl= attr); + case QEMU_IFLA_PROP_LIST: + return host_to_target_for_each_nlattr(RTA_DATA(rtattr), rtattr->rt= a_len, + NULL, + host_to_target_data_prop_nlat= tr); default: qemu_log_mask(LOG_UNIMP, "Unknown host QEMU_IFLA type: %d\n", rtattr->rta_type); --=20 2.47.0