From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C6290A0540 for ; Thu, 7 Jul 2022 09:58:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C3339427F0; Thu, 7 Jul 2022 09:58:04 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 58047406B4 for ; Thu, 7 Jul 2022 09:58:04 +0200 (CEST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id AD9DF41016 for ; Thu, 7 Jul 2022 07:58:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180683; bh=JLDAGCcMuyjJ0gCcGiBUgO2wQgpPyBxy2VL08FJ33Gc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=C6tEMDU2TQ1psKwMDUrvWdQKN9/GE4NtLvevARq+w1PYY7xvgB1J+6r8FkohMF91c VUVGVnWfppSyuKG90NSs5dkREwcs4lQ6dC5/XsRrXIuNKKLfh0nct7zVnd7WjY/1wP 2YcVjMDHteA2RirobBM71jSOU9Phu8FwRVmASQU3TQbmHx4U/W3GSSSttWoXksl7h4 FiP5hgDG5OLECkkkfnCOe1cgF6OzOs+rWJfb4i98En6SyWhrPOUbyLHlxMzKSDE83Q zi2jn4buDz3Ou7SfiPCz9v2uFypERkx+YOYFz3WxMshxro6l3O/OWplRB0hP3MPM2I uTdd5xXqgDd2Q== Received: by mail-ej1-f70.google.com with SMTP id hd35-20020a17090796a300b0072a707cfac4so4416948ejc.8 for ; Thu, 07 Jul 2022 00:58:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JLDAGCcMuyjJ0gCcGiBUgO2wQgpPyBxy2VL08FJ33Gc=; b=LPe1lHh0IujBNxQ4u+AhkM+ebv7QNdqJvlhu47ZtxNNO7I31bqs7c2+FgJL4XZFDCE Ns3BJY/cZkJKpmGaykkcly31iXcLMl5jGR5M+OiPtvTHC9AMul0H73rqCKvCzfYFf2Im L7C0RirWYWNgyJ/RW7bsLNphSEC3s4iPM0OSDKUjKuZ4pnmZYhzfOmCtlPzK0WK7+CvW K9QXO7kwSUhflrb2Ofl0yERdEJZn5xcdYxseZQvt2s5TptebnhIsWcgGa8diiSd5b33d m1iqqWFCiazHq1RmLfFxDrbeSBpwj3n/8bkaaBofuN4tV2ct72B5SxexDNcT+/Szerlv 6kIQ== X-Gm-Message-State: AJIora/kaxnKLKqHeV1RLMG03aqKjZHU2vGW/4IS+szpn8hSqQQ/IwBy 3AXfSl6HPaOhSb69EpHruIGUieOnHVe5mruXEajqq0aFEGlKE0uxWcjDP8v6fd8cfm1TiZYeP3v z8dd8OevMvmSxqVcJEfEk6rgA X-Received: by 2002:aa7:c84d:0:b0:431:4226:70c9 with SMTP id g13-20020aa7c84d000000b00431422670c9mr60104978edt.51.1657180683477; Thu, 07 Jul 2022 00:58:03 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t0oGS/PDUqGBRivtTtb4ol1ekesdJux8GaoGyF8T0Bd04WEmwz1imPj12E2aehMqtHWA6qEQ== X-Received: by 2002:aa7:c84d:0:b0:431:4226:70c9 with SMTP id g13-20020aa7c84d000000b00431422670c9mr60104959edt.51.1657180683279; Thu, 07 Jul 2022 00:58:03 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id q21-20020aa7cc15000000b0042617ba638esm27392052edt.24.2022.07.07.00.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:02 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Ke Zhang Cc: Andrew Rybchenko , Ferruh Yigit , dpdk stable Subject: patch 'kni: use dedicated function to set MAC address' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:47 +0200 Message-Id: <20220707075522.194223-52-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/1093a40bd849732e0bb5dba21cb10b8e13fae444 Thanks. Christian Ehrhardt --- >From 1093a40bd849732e0bb5dba21cb10b8e13fae444 Mon Sep 17 00:00:00 2001 From: Ke Zhang Date: Wed, 8 Jun 2022 15:11:17 +0300 Subject: [PATCH] kni: use dedicated function to set MAC address MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit b99bd4a0aacab47165d045a6aeee88ee74744600 ] The warning info: warning: passing argument 1 of ‘memcpy’ discards ‘const’ qualifier from pointer target type Variable dev_addr is done const intentionally in v5.17 to prevent using it directly. See the following Linux kernel changeset for details: commit adeef3e32146 ("net: constify netdev->dev_addr") Used helper function was introduced earlier in v5.15. Fixes: ea6b39b5b847 ("kni: remove ethtool support") Signed-off-by: Ke Zhang Signed-off-by: Andrew Rybchenko Acked-by: Ferruh Yigit --- kernel/linux/kni/compat.h | 4 ++++ kernel/linux/kni/kni_misc.c | 9 +++++++-- kernel/linux/kni/kni_net.c | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 0db29a4a6f..3a86d12bbc 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -142,6 +142,10 @@ #define HAVE_TSK_IN_GUP #endif +#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE +#define HAVE_ETH_HW_ADDR_SET +#endif + #if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE #define HAVE_NETIF_RX_NI #endif diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c index f908ebcd82..12ece28a84 100644 --- a/kernel/linux/kni/kni_misc.c +++ b/kernel/linux/kni/kni_misc.c @@ -400,11 +400,16 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, pr_debug("mbuf_size: %u\n", kni->mbuf_size); /* if user has provided a valid mac address */ - if (is_valid_ether_addr(dev_info.mac_addr)) + if (is_valid_ether_addr(dev_info.mac_addr)) { +#ifdef HAVE_ETH_HW_ADDR_SET + eth_hw_addr_set(net_dev, dev_info.mac_addr); +#else memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN); - else +#endif + } else { /* Assign random MAC address. */ eth_hw_addr_random(net_dev); + } if (dev_info.mtu) net_dev->mtu = dev_info.mtu; diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index e54864c977..1270c367d8 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -756,7 +756,11 @@ kni_net_set_mac(struct net_device *netdev, void *p) return -EADDRNOTAVAIL; memcpy(req.mac_addr, addr->sa_data, netdev->addr_len); +#ifdef HAVE_ETH_HW_ADDR_SET + eth_hw_addr_set(netdev, addr->sa_data); +#else memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); +#endif kni = netdev_priv(netdev); ret = kni_net_process_request(kni, &req); -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.371636562 +0200 +++ 0052-kni-use-dedicated-function-to-set-MAC-address.patch 2022-07-07 09:54:10.941824469 +0200 @@ -1 +1 @@ -From b99bd4a0aacab47165d045a6aeee88ee74744600 Mon Sep 17 00:00:00 2001 +From 1093a40bd849732e0bb5dba21cb10b8e13fae444 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit b99bd4a0aacab47165d045a6aeee88ee74744600 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -48 +49 @@ -index 4f6dd373a3..0c3a86ee35 100644 +index f908ebcd82..12ece28a84 100644 @@ -51 +52 @@ -@@ -402,11 +402,16 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, +@@ -400,11 +400,16 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, @@ -71 +72 @@ -index 41805fcabf..779ee3451a 100644 +index e54864c977..1270c367d8 100644 @@ -74 +75 @@ -@@ -783,7 +783,11 @@ kni_net_set_mac(struct net_device *netdev, void *p) +@@ -756,7 +756,11 @@ kni_net_set_mac(struct net_device *netdev, void *p) @@ -84,2 +85,2 @@ - ret = kni_net_process_request(netdev, &req); - + kni = netdev_priv(netdev); + ret = kni_net_process_request(kni, &req);