diff --git a/tuned-2.18.0-rhel-8-profiles.patch b/tuned-2.18.0-rhel-8-profiles.patch
index d1d575055acb0f36fcb4d5c2ff64cfcd7c02b3b9..889db7053217163bb1c7c4327c0d40015594030c 100644
--- a/tuned-2.18.0-rhel-8-profiles.patch
+++ b/tuned-2.18.0-rhel-8-profiles.patch
@@ -36,8 +36,8 @@ index 98c6b26..ebb3f7d 100644
 --- a/profiles/throughput-performance/tuned.conf
 +++ b/profiles/throughput-performance/tuned.conf
 @@ -58,9 +58,31 @@ vm.dirty_background_ratio = 10
- # and move them to swap cache
- vm.swappiness=10
+ # on older kernels
+ net.core.somaxconn=>2048
  
 +[scheduler]
 +# ktune sysctl settings for rhel6 servers, maximizing i/o throughput
diff --git a/tuned-2.18.0-sd-load-balance.patch b/tuned-2.18.0-sd-load-balance.patch
index d42600c27822a33e14651c4d9adeb87fd291c4ad..e53fe94edf1dee31d0346c38c9cd27e212c62d6a 100644
--- a/tuned-2.18.0-sd-load-balance.patch
+++ b/tuned-2.18.0-sd-load-balance.patch
@@ -69,9 +69,9 @@ index 979e40b..842e2bd 100644
  
 -cmd_isolcpus=${f:regex_search_ternary:${no_balance_cores}:\s*[0-9]: isolcpus=${no_balance_cores}:}
 -
- [sysctl]
- kernel.hung_task_timeout_secs = 600
- kernel.nmi_watchdog = 0
+ [sysfs]
+ /sys/bus/workqueue/devices/writeback/cpumask = ${not_isolated_cpumask}
+ /sys/devices/virtual/workqueue/cpumask = ${not_isolated_cpumask}
 @@ -68,4 +66,4 @@ priority=10
  initrd_remove_dir=True
  initrd_dst_img=tuned-initrd.img
diff --git a/tuned-2.19.0.tar.gz b/tuned-2.19.0.tar.gz
deleted file mode 100644
index c57313d82df5820e7d8fdab0ee9dd4c1758437bd..0000000000000000000000000000000000000000
Binary files a/tuned-2.19.0.tar.gz and /dev/null differ
diff --git a/tuned-2.21.0.tar.gz b/tuned-2.21.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8e7935b9f0e5ed965d2c3732e84f6bab238a36ba
Binary files /dev/null and b/tuned-2.21.0.tar.gz differ
diff --git a/tuned.spec b/tuned.spec
index 530708862d3b79c173e906483354b88c4929d1fc..c6cb52d0144b4238c7682e9b9a1d26ea8b21fc05 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -1,9 +1,9 @@
 Summary: A system tuning service for Linux
 Name: tuned
-Version: 2.19.0
-Release: 5
+Version: 2.21.0
+Release: 1
 License: GPLv2+
-Source0: https://github.com/redhat-performance/%{name}/archive/v%{version}%{?prerel2}.tar.gz#/%{name}-%{version}%{?prerel2}.tar.gz
+Source0: https://github.com/redhat-performance/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 URL: http://www.tuned-project.org/
 
 BuildArch: noarch
@@ -246,6 +246,7 @@ fi
 %{_prefix}/lib/%{name}
 
 %config(noreplace) %{_sysconfdir}/%{name}/cpu-partitioning-variables.conf
+%config(noreplace) %{_sysconfdir}/%{name}/cpu-partitioning-powersave-variables.conf
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}-main.conf
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/active_profile
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/profile_mode
@@ -255,7 +256,7 @@ fi
 %{_libexecdir}/%{name}/defirqaffinity*
 %{_libexecdir}/%{name}/pmqos-static*
 %{python3_sitelib}/%{name}
-%{_sysconfdir}/dbus-1/system.d/com.redhat.%{name}.conf
+%{_datadir}/dbus-1/system.d/com.redhat.%{name}.conf
 %verify(not size mtime md5) %{_sysconfdir}/modprobe.d/%{name}.conf
 %{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/%{name}.service
@@ -293,6 +294,30 @@ fi
 %{_mandir}/man7/tuned-profiles-spectrumscale-ece.7*
 
 %changelog
+* Thu Jan 25 2024 liuchao <liuchao173@huawei.com> - 2.21.0-1
+- upgrade to 2.21.0:
+  - api: fixed stop method not to require any parameter
+  - plugin_scheduler: fix perf fd leaks
+  - allow skipping rollback when restarting TuneD or switching profile
+  - function_calc_isolated_cores: no errors for offline CPUs
+  - sap-hana: new profile sap-hana-kvm-guest
+  - serialized SIGHUP handler to prevent possible bootcmdline corruption
+  - fixed possible traceback on SIGHUP
+  - updated manual pages to be consistent
+  - tuned-adm: better error message for unauthorized switch_profile
+  - plugin_sysctl: report reapplied sysctls only on different values
+  - plugin_cpu: added support for pm_qos_resume_latency_us
+  - plugin_cpu: added support for intel_pstate scaling driver
+  - plugin_scheduler: do not leak FDs from the perf
+  - profiles: new cpu-partitioning-powersave profile
+  - profiles: new profile for AWS EC2
+  - throughput-performance: set net.core.somaxconn to at least 2048
+  - API: added support for moving devices between instances
+  - added support for the API access through the Unix Domain Socket
+  - D-Bus: send tracebacks through D-Bus only in debug mode
+  - Makefile: added fix for python-3.12
+  - do not exit on duplicate config lines
+
 * Sat Jul 15 2023 hubin <hubin73@huawei.com> - 2.19.0-5
 - tuned: add application plugin and process monitor for app-sensor profile