Open Build Service

_service:tar_scm_kernel_repo:kernel.spec Changed

@@ -12,7 +12,7 @@
 
 %global KernelVer %{version}-%{release}.%{_target_cpu}
 
-%global hulkrelease 2402.4.0
+%global hulkrelease 2402.5.0
 
 %define with_patch 0
 
@@ -32,7 +32,7 @@
 
 Name:	 kernel
 Version: 4.19.90
-Release: %{hulkrelease}.0238
+Release: %{hulkrelease}.0239
 Summary: Linux Kernel
 License: GPLv2
 URL:	 http://www.kernel.org/
@@ -809,6 +809,22 @@
 
 %changelog
 
+* Wed Feb 21 2024 Zhang Changzhong <zhangchangzhong@huawei.com> - 4.19.90-2402.5.0.0239
+- !4601 v2  xen-netback: don't produce zero-size SKB frags
+- xen-netback: don't produce zero-size SKB frags
+- !4583  net: hns3: fix a bug and modify the hns3 driver version
+- net: hns3: update hns3 version to 24.2.1
+- net: hns3: fix tm port shapping of fibre port is incorrect after driver initialization
+- !4552 v4  CVE-2023-52340
+- !4526 v2  fs:/dcache.c: fix negative dentry flag warning in dentry_free
+- ipv6: fix kabi broken in struct dst_ops
+- ipv6: Document that max_size sysctl is deprecated
+- ipv6: remove max_size check inline with ipv4
+- !4538  fix kprobe reenter bug
+- arm64/openeuler_defconfig: add not set config to fix compiling error
+- tracing/kprobes: Do the notrace functions check without kprobes on ftrace
+- fs:/dcache.c: fix negative dentry flag warning in dentry_free
+
 * Mon Feb 05 2024 Zhang Changzhong <zhangchangzhong@huawei.com> - 4.19.90-2402.4.0.0238
 - !4454  netfilter: nf_tables: reject QUEUE/DROP verdict parameters
 - netfilter: nf_tables: reject QUEUE/DROP verdict parameters

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/Documentation/networking/ip-sysctl.txt Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/arch/arm64/configs/openeuler_defconfig Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/net/ethernet/hisilicon/hns3/hnae3.h Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_version.h Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/net/xen-netback/netback.c Changed

@@ -440,12 +440,25 @@
 	}
 
 	for (shinfo->nr_frags = 0; nr_slots > 0 && shinfo->nr_frags < MAX_SKB_FRAGS;
-	     shinfo->nr_frags++, gop++, nr_slots--) {
+	     nr_slots--) {
+		if (unlikely(!txp->size)) {
+			unsigned long flags;
+
+			spin_lock_irqsave(&queue->response_lock, flags);
+			make_tx_response(queue, txp, 0, XEN_NETIF_RSP_OKAY);
+			push_tx_responses(queue);
+			spin_unlock_irqrestore(&queue->response_lock, flags);
+			++txp;
+			continue;
+		}
+
 		index = pending_index(queue->pending_cons++);
 		pending_idx = queue->pending_ring[index];
 		xenvif_tx_create_map_op(queue, pending_idx, txp,
 				        txp == first ? extra_count : 0, gop);
 		frag_set_pending_idx(&frags[shinfo->nr_frags], pending_idx);
+		++shinfo->nr_frags;
+		++gop;
 
 		if (txp == first)
 			txp = txfrags;
@@ -458,20 +471,39 @@
 		shinfo = skb_shinfo(nskb);
 		frags = shinfo->frags;
 
-		for (shinfo->nr_frags = 0; shinfo->nr_frags < nr_slots;
-		     shinfo->nr_frags++, txp++, gop++) {
+		for (shinfo->nr_frags = 0; shinfo->nr_frags < nr_slots; ++txp) {
+			if (unlikely(!txp->size)) {
+				unsigned long flags;
+
+				spin_lock_irqsave(&queue->response_lock, flags);
+				make_tx_response(queue, txp, 0,
+						 XEN_NETIF_RSP_OKAY);
+				push_tx_responses(queue);
+				spin_unlock_irqrestore(&queue->response_lock,
+						       flags);
+				continue;
+			}
+
 			index = pending_index(queue->pending_cons++);
 			pending_idx = queue->pending_ring[index];
 			xenvif_tx_create_map_op(queue, pending_idx, txp, 0,
 						gop);
 			frag_set_pending_idx(&frags[shinfo->nr_frags],
 					     pending_idx);
+			++shinfo->nr_frags;
+			++gop;
 		}
 
-		skb_shinfo(skb)->frag_list = nskb;
-	} else if (nskb) {
+		if (shinfo->nr_frags) {
+			skb_shinfo(skb)->frag_list = nskb;
+			nskb = NULL;
+		}
+	}
+
+	if (nskb) {
 		/* A frag_list skb was allocated but it is no longer needed
-		 * because enough slots were converted to copy ops above.
+		 * because enough slots were converted to copy ops above or some
+		 * were empty.
 		 */
 		kfree_skb(nskb);
 	}

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/fs/dcache.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/kernel/trace/Kconfig Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/kernel/trace/trace_kprobe.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/net/ipv6/route.c Changed

@@ -2774,18 +2774,16 @@
 {
 	struct net *net = container_of(ops, struct net, ipv6.ip6_dst_ops);
 	int rt_min_interval = net->ipv6.sysctl.ip6_rt_gc_min_interval;
-	int rt_max_size = net->ipv6.sysctl.ip6_rt_max_size;
 	int rt_elasticity = net->ipv6.sysctl.ip6_rt_gc_elasticity;
 	int rt_gc_timeout = net->ipv6.sysctl.ip6_rt_gc_timeout;
 	unsigned long rt_last_gc = net->ipv6.ip6_rt_last_gc;
 	int entries;
 
 	entries = dst_entries_get_fast(ops);
-	if (entries > rt_max_size)
+	if (entries > ops->gc_thresh)
 		entries = dst_entries_get_slow(ops);
 
-	if (time_after(rt_last_gc + rt_min_interval, jiffies) &&
-	    entries <= rt_max_size)
+	if (time_after(rt_last_gc + rt_min_interval, jiffies))
 		goto out;
 
 	net->ipv6.ip6_rt_gc_expire++;
@@ -2795,7 +2793,7 @@
 		net->ipv6.ip6_rt_gc_expire = rt_gc_timeout>>1;
 out:
 	net->ipv6.ip6_rt_gc_expire -= net->ipv6.ip6_rt_gc_expire>>rt_elasticity;
-	return entries > rt_max_size;
+	return 0;
 }
 
 static int ip6_convert_metrics(struct net *net, struct fib6_info *rt,
@@ -5353,7 +5351,7 @@
 #endif
 
 	net->ipv6.sysctl.flush_delay = 0;
-	net->ipv6.sysctl.ip6_rt_max_size = 4096;
+	net->ipv6.sysctl.ip6_rt_max_size = INT_MAX;
 	net->ipv6.sysctl.ip6_rt_gc_min_interval = HZ / 2;
 	net->ipv6.sysctl.ip6_rt_gc_timeout = 60*HZ;
 	net->ipv6.sysctl.ip6_rt_gc_interval = 30*HZ;

_service:tar_scm_kernel_repo:SOURCE Changed

Changes of Revision 351