Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2195952/?format=api
{ "id": 2195952, "url": "http://patchwork.ozlabs.org/api/patches/2195952/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260212140917.1443253-2-peter.maydell@linaro.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260212140917.1443253-2-peter.maydell@linaro.org>", "list_archive_url": null, "date": "2026-02-12T14:09:13", "name": "[1/5] hw/net/rocker: Don't keep pointer to h_proto as uint16_t* in OfDpaFlowPktFields", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "f997b08cf86adce96a41c1cefc09ad0a4202892e", "submitter": { "id": 5111, "url": "http://patchwork.ozlabs.org/api/people/5111/?format=api", "name": "Peter Maydell", "email": "peter.maydell@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260212140917.1443253-2-peter.maydell@linaro.org/mbox/", "series": [ { "id": 491981, "url": "http://patchwork.ozlabs.org/api/series/491981/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=491981", "date": "2026-02-12T14:09:12", "name": "net: mark eth_header, udp_header, tcp_header as QEMU_PACKED", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/491981/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2195952/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2195952/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=lMqRprPc;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fBcgh3t74z1xr1\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 13 Feb 2026 01:12:16 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vqXNt-0000hD-Ni; Thu, 12 Feb 2026 09:09:33 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)\n id 1vqXNm-0000fw-6S\n for qemu-devel@nongnu.org; Thu, 12 Feb 2026 09:09:27 -0500", "from mail-wm1-x336.google.com ([2a00:1450:4864:20::336])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)\n id 1vqXNj-0006Pt-BO\n for qemu-devel@nongnu.org; Thu, 12 Feb 2026 09:09:24 -0500", "by mail-wm1-x336.google.com with SMTP id\n 5b1f17b1804b1-48334ee0aeaso30010775e9.1\n for <qemu-devel@nongnu.org>; Thu, 12 Feb 2026 06:09:22 -0800 (PST)", "from lanath.. (wildly.archaic.org.uk. [81.2.115.145])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-4835dd0e327sm123266885e9.14.2026.02.12.06.09.19\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 12 Feb 2026 06:09:20 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1770905362; x=1771510162; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=2/c4UhHWbCQRd4FJDg3uOEjFMuAnPkaZruMWzUtSXGU=;\n b=lMqRprPcCVcRvDP9x8ucLSh6a6213H1EpsQUCLiSyeWTcRPUR0Oem2aa6/WtdSLDgn\n BS55wmL6dOaN2Ugedc+XWcm6Vg29cG1kCBdO8gc0eKesAukPyhjKR0HnMVKShu8yc0V5\n QxBYGrYKcJv/RpntPHy7kBq65y1lCKu0+Jndg0H08BQlryOoCkFM0FmdZL36IfBXL72X\n wfmy0qn14gMTrXrvoSYog7kFCnrW/znSSruoxB4N+BZqog93qS4i0fD4mnRCkcgEyq4h\n YDBBUU9jcMSTOYNWPU0fd9MlCLqVpcIJ8cJiV+gs6nlZn927lsWX+A85z5fQZXcCLEMD\n 2FEA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1770905362; x=1771510162;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=2/c4UhHWbCQRd4FJDg3uOEjFMuAnPkaZruMWzUtSXGU=;\n b=sUxIWbvlisolpmBgElGCenq5NUIFwUMTVFWuOS0S8DKkdOA9sk4OvtZ1NGJGT6oNd3\n ZK8dBkAQXD6h2cRVnNHUEZLbymOZjzMn/RI4XJwK73mXCDIlBOSCpb/tFTb40l295+Ob\n /jrqRuhcjKLOxQTMm/+hJTkxnmGzN2Rtk/P2JCBuHfnAjTXHkJWTI3PSrOomm+ocXzz7\n +g6/ODaScSawXMG+ogKy1ZPmlOfRuMg9thxx/kP7kjVTcNz0dVp4er2TUJ7/A370zADp\n HKSTgPeSvkNOOyOS1qQqIPObF6aebhvrKGj1PwW46ktjTEquo/XvTS+ejP5CowN5V5rz\n AYQw==", "X-Gm-Message-State": "AOJu0YxgWHmlILo4/r8CLfeDU7yMvQSP6Y3Jf4WvRiSAN5pVK+W7+uIC\n LXwG4ZKZ6KeKPK+Vw+vqDgcfz4Lp5zgxPQ65q7G+zCtaMbb//KnfX0W61FC7Ij0jKjKqY98mPKm\n B5m5F", "X-Gm-Gg": "AZuq6aJ6/Kpc3cq81wkALJa3LPxZhM2IkVFJLWl6T1q8mhq5Pq1VL9XYcxt7Lh2365A\n RgQCKnQrDljcyw8EXNKSH08t3gDFgLeuMr41oy53+hwO/HPMnssrNDNdQ+auog0NdxEYlz7DZfA\n 6RCWDuQZzQ6xBXdkXo3i+SU5qgGgI8jN1Jyqrd6vVjd595ZrdChGYbZ1hgzaQ7oV7umOOG2Wbd5\n X9ZQnxD6VhaGrFV72+CzCxr+sfcN826Q1EZZdAS23L153OnVJLnn3nks8fcZVB5m2ODg9KUvswZ\n CFTdh6WP3csZtDKaL4YOzbpR0weiDX+2fJljr7hH3LGpwwNgb4sjraaoole/iMdYsklUWPTbqiM\n fX5ahbPzdKFMsuFQvuxsKSVtsgBvry8pEemeYIFjZusWgga8UHQePH2SP4AHEArBv1+XZfUlKkl\n /CttAsr2a92+E+r8W8EpQELyE/gHO8rJEdctrwOnSZUd+YaenR9eaDcKvbfQ841SZFxcZiUSbSK\n rg85Jy2IMXaRhDfnu4O4y7EP3IQ+2A=", "X-Received": "by 2002:a05:600c:4f41:b0:483:6f7c:19f4 with SMTP id\n 5b1f17b1804b1-4836f7c1ab9mr7020955e9.30.1770905361788;\n Thu, 12 Feb 2026 06:09:21 -0800 (PST)", "From": "Peter Maydell <peter.maydell@linaro.org>", "To": "qemu-devel@nongnu.org", "Cc": "Jiri Pirko <jiri@resnulli.us>, Jason Wang <jasowang@redhat.com>,\n Dmitry Fleytman <dmitry.fleytman@gmail.com>,\n Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>,\n Patrick Venture <venture@google.com>", "Subject": "[PATCH 1/5] hw/net/rocker: Don't keep pointer to h_proto as uint16_t*\n in OfDpaFlowPktFields", "Date": "Thu, 12 Feb 2026 14:09:13 +0000", "Message-ID": "<20260212140917.1443253-2-peter.maydell@linaro.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260212140917.1443253-1-peter.maydell@linaro.org>", "References": "<20260212140917.1443253-1-peter.maydell@linaro.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2a00:1450:4864:20::336;\n envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.google.com", "X-Spam_score_int": "-20", "X-Spam_score": "-2.1", "X-Spam_bar": "--", "X-Spam_report": "(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "In rocker_of_dpa.c we assume that the h_proto field in an eth_header\nstruct is aligned, and we copy its address into a uint16_t* in the\nOfDpaFlowPktFields struct which we then dereference later. This\nisn't a safe assumption; it will also result in compilation failures\nwith gcc if we mark the eth_header struct as QEMU_PACKED because gcc\nwill not let you take the address of an unaligned struct field.\n\nMake the h_proto field in OfDpaFlowPktFields a void*, and make all\nthe places where we previously read through that pointer instead use\na new accessor function which allows for the possible lack of\nalignment.\n\n(Compare commit 5814c084679\n\"hw/net/virtio-net.c: Don't assume IP length field is aligned\"\nwhich fixed a similar problem elsewhere for an ip_header field.)\n\nSigned-off-by: Peter Maydell <peter.maydell@linaro.org>\n---\n hw/net/rocker/rocker_of_dpa.c | 19 ++++++++++++-------\n 1 file changed, 12 insertions(+), 7 deletions(-)", "diff": "diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c\nindex 16b9bc7a4b..814f19afc5 100644\n--- a/hw/net/rocker/rocker_of_dpa.c\n+++ b/hw/net/rocker/rocker_of_dpa.c\n@@ -143,7 +143,7 @@ typedef struct of_dpa_flow {\n typedef struct of_dpa_flow_pkt_fields {\n uint32_t tunnel_id;\n struct eth_header *ethhdr;\n- uint16_t *h_proto;\n+ void *h_proto; /* pointer to unaligned uint16_t data */\n struct vlan_header *vlanhdr;\n struct ip_header *ipv4hdr;\n struct ip6_header *ipv6hdr;\n@@ -196,6 +196,11 @@ typedef struct of_dpa_group {\n };\n } OfDpaGroup;\n \n+static uint16_t of_dpa_flow_pkt_h_proto(const OfDpaFlowPktFields *fields)\n+{\n+ return lduw_he_p(fields->h_proto);\n+}\n+\n static int of_dpa_mask2prefix(uint32_t mask)\n {\n return 32 - ctz32(ntohl(mask));\n@@ -395,7 +400,7 @@ static void of_dpa_flow_pkt_parse(OfDpaFlowContext *fc,\n fields->ethhdr = iov->iov_base;\n fields->h_proto = &fields->ethhdr->h_proto;\n \n- if (ntohs(*fields->h_proto) == ETH_P_VLAN) {\n+ if (ntohs(of_dpa_flow_pkt_h_proto(fields) == ETH_P_VLAN)) {\n sofar += sizeof(struct vlan_header);\n if (iov->iov_len < sofar) {\n DPRINTF(\"flow_pkt_parse underrun on vlan_header\\n\");\n@@ -405,7 +410,7 @@ static void of_dpa_flow_pkt_parse(OfDpaFlowContext *fc,\n fields->h_proto = &fields->vlanhdr->h_proto;\n }\n \n- switch (ntohs(*fields->h_proto)) {\n+ switch (ntohs(of_dpa_flow_pkt_h_proto(fields))) {\n case ETH_P_IP:\n sofar += sizeof(struct ip_header);\n if (iov->iov_len < sofar) {\n@@ -547,7 +552,7 @@ static void of_dpa_term_mac_build_match(OfDpaFlowContext *fc,\n {\n match->value.tbl_id = ROCKER_OF_DPA_TABLE_ID_TERMINATION_MAC;\n match->value.in_pport = fc->in_pport;\n- match->value.eth.type = *fc->fields.h_proto;\n+ match->value.eth.type = of_dpa_flow_pkt_h_proto(&fc->fields);\n match->value.eth.vlan_id = fc->fields.vlanhdr->h_tci;\n memcpy(match->value.eth.dst.a, fc->fields.ethhdr->h_dest,\n sizeof(match->value.eth.dst.a));\n@@ -643,7 +648,7 @@ static void of_dpa_unicast_routing_build_match(OfDpaFlowContext *fc,\n OfDpaFlowMatch *match)\n {\n match->value.tbl_id = ROCKER_OF_DPA_TABLE_ID_UNICAST_ROUTING;\n- match->value.eth.type = *fc->fields.h_proto;\n+ match->value.eth.type = of_dpa_flow_pkt_h_proto(&fc->fields);\n if (fc->fields.ipv4hdr) {\n match->value.ipv4.addr.dst = fc->fields.ipv4hdr->ip_dst;\n }\n@@ -672,7 +677,7 @@ of_dpa_multicast_routing_build_match(OfDpaFlowContext *fc,\n OfDpaFlowMatch *match)\n {\n match->value.tbl_id = ROCKER_OF_DPA_TABLE_ID_MULTICAST_ROUTING;\n- match->value.eth.type = *fc->fields.h_proto;\n+ match->value.eth.type = of_dpa_flow_pkt_h_proto(&fc->fields);\n match->value.eth.vlan_id = fc->fields.vlanhdr->h_tci;\n if (fc->fields.ipv4hdr) {\n match->value.ipv4.addr.src = fc->fields.ipv4hdr->ip_src;\n@@ -713,7 +718,7 @@ static void of_dpa_acl_build_match(OfDpaFlowContext *fc,\n sizeof(match->value.eth.src.a));\n memcpy(match->value.eth.dst.a, fc->fields.ethhdr->h_dest,\n sizeof(match->value.eth.dst.a));\n- match->value.eth.type = *fc->fields.h_proto;\n+ match->value.eth.type = of_dpa_flow_pkt_h_proto(&fc->fields);\n match->value.eth.vlan_id = fc->fields.vlanhdr->h_tci;\n match->value.width = FLOW_KEY_WIDTH(eth.type);\n if (fc->fields.ipv4hdr) {\n", "prefixes": [ "1/5" ] }