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 5659CA0545 for ; Mon, 20 Jun 2022 11:48:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 523C140150; Mon, 20 Jun 2022 11:48:18 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id B808340150 for ; Mon, 20 Jun 2022 11:48:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655718496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WP/16sucP+CZ/PmzO5UOvwiHeU6Nbh9P0LfJ33r4hrw=; b=AIWWw5xaLQLSnD5UlaTlXqHIZJ0if3YqtZaZqn3Uauv4EfoaPF7PoSgzwUf2SHT9/7Crc/ hlkAYJ86zl9md0lTUrEgVsea3HCtSjrSF4ssEa68WKyWm7Q0BbcKG83srFr83X5d3TJFk5 0vjmqUet7y1lehV9aMab1tBJV4fBRTE= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-462-bCR8V9Z0OyOH5vKrOPVbRQ-1; Mon, 20 Jun 2022 05:48:13 -0400 X-MC-Unique: bCR8V9Z0OyOH5vKrOPVbRQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B2F4382C972; Mon, 20 Jun 2022 09:48:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F31A400F3FF; Mon, 20 Jun 2022 09:48:11 +0000 (UTC) From: Kevin Traynor 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 21.11.2 Date: Mon, 20 Jun 2022 10:47:44 +0100 Message-Id: <20220620094752.1027299-11-ktraynor@redhat.com> In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com> References: <20220620094752.1027299-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/4cfe56040171e791b021d5490f8fd58c55b088fb Thanks. Kevin --- >From 4cfe56040171e791b021d5490f8fd58c55b088fb 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 @@ -143,4 +143,8 @@ #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 diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c index 38fcd7f4f2..feed12b568 100644 --- a/kernel/linux/kni/kni_misc.c +++ b/kernel/linux/kni/kni_misc.c @@ -405,9 +405,14 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, /* 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) diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index 41805fcabf..779ee3451a 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -784,5 +784,9 @@ kni_net_set_mac(struct net_device *netdev, void *p) 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 ret = kni_net_process_request(netdev, &req); -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-20 10:46:28.027675952 +0100 +++ 0011-kni-use-dedicated-function-to-set-MAC-address.patch 2022-06-20 10:46:27.787146838 +0100 @@ -1 +1 @@ -From b99bd4a0aacab47165d045a6aeee88ee74744600 Mon Sep 17 00:00:00 2001 +From 4cfe56040171e791b021d5490f8fd58c55b088fb Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit b99bd4a0aacab47165d045a6aeee88ee74744600 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -46 +47 @@ -index 4f6dd373a3..0c3a86ee35 100644 +index 38fcd7f4f2..feed12b568 100644 @@ -49 +50 @@ -@@ -403,9 +403,14 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, +@@ -405,9 +405,14 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,