From 2b6d9ab908644fa19077b865573c2332c2c8c83c Mon Sep 17 00:00:00 2001 From: Pavel Zakharov Date: Tue, 9 Feb 2021 11:15:55 -0500 Subject: [PATCH 01/18] DLPX-71852 iSCSI: journal flooded with "Unable to locate Target IQN" messages (#2) --- drivers/target/iscsi/iscsi_target_login.c | 2 +- drivers/target/iscsi/iscsi_target_nego.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c index 1a9c50401bdb5..63de4a3431ae2 100644 --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c @@ -1154,7 +1154,7 @@ void iscsi_target_login_sess_out(struct iscsi_conn *conn, if (!new_sess) goto old_sess_out; - pr_err("iSCSI Login negotiation failed.\n"); + pr_debug("iSCSI Login negotiation failed.\n"); iscsit_collect_login_stats(conn, ISCSI_STATUS_CLS_INITIATOR_ERR, ISCSI_LOGIN_STATUS_INIT_ERR); if (!zero_tsih || !conn->sess) diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c index 32a2852352db1..5435f2b945d3c 100644 --- a/drivers/target/iscsi/iscsi_target_nego.c +++ b/drivers/target/iscsi/iscsi_target_nego.c @@ -1183,7 +1183,7 @@ int iscsi_target_locate_portal( */ tiqn = iscsit_get_tiqn_for_login(t_buf); if (!tiqn) { - pr_err("Unable to locate Target IQN: %s in" + pr_debug("Unable to locate Target IQN: %s in" " Storage Node\n", t_buf); iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR, ISCSI_LOGIN_STATUS_SVC_UNAVAILABLE); From b96dd198b31624bbe8ae5eb23fd460bde64ff9ef Mon Sep 17 00:00:00 2001 From: Don Brady Date: Thu, 25 Feb 2021 17:03:35 -0700 Subject: [PATCH 02/18] DLPX-74216 nfs-server restarts fail when order-5 allocations are exhausted (#3) From 8f95b92fccc4c0aceb3ab980e8d90a11f98dd94a Mon Sep 17 00:00:00 2001 From: Pavel Zakharov Date: Mon, 8 Mar 2021 18:11:08 -0500 Subject: [PATCH 03/18] DLPX-72065 Aborted iSCSI command never completes after LUN reset (#4) --- drivers/target/iscsi/iscsi_target_erl1.c | 23 +++++++++++++++++++---- drivers/target/target_core_transport.c | 3 ++- include/target/target_core_fabric.h | 1 + 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c index 0dd52f484fec3..10291b9bb708b 100644 --- a/drivers/target/iscsi/iscsi_target_erl1.c +++ b/drivers/target/iscsi/iscsi_target_erl1.c @@ -1102,6 +1102,18 @@ void iscsit_handle_dataout_timeout(struct timer_list *t) iscsit_inc_conn_usage_count(conn); + /* + * If the command was aborted, for instance following a LUN RESET, + * a dataout timeout might be normal. + */ + if (target_cmd_interrupted(&cmd->se_cmd)) { + pr_debug("DataOut timeout on interrupted cmd with" + " ITT[0x%08llx]\n", cmd->se_cmd.tag); + cmd->dataout_timer_flags &= ~ISCSI_TF_RUNNING; + iscsit_dec_conn_usage_count(conn); + return; + } + spin_lock_bh(&cmd->dataout_timeout_lock); if (cmd->dataout_timer_flags & ISCSI_TF_STOP) { spin_unlock_bh(&cmd->dataout_timeout_lock); @@ -1115,19 +1127,22 @@ void iscsit_handle_dataout_timeout(struct timer_list *t) if (!sess->sess_ops->ErrorRecoveryLevel) { pr_err("Unable to recover from DataOut timeout while" " in ERL=0, closing iSCSI connection for I_T Nexus" - " %s,i,0x%6phN,%s,t,0x%02x\n", + " %s,i,0x%6phN,%s,t,0x%02x, cmd ITT[0x%08llx]\n", sess->sess_ops->InitiatorName, sess->isid, - sess->tpg->tpg_tiqn->tiqn, (u32)sess->tpg->tpgt); + sess->tpg->tpg_tiqn->tiqn, (u32)sess->tpg->tpgt, + cmd->se_cmd.tag); goto failure; } if (++cmd->dataout_timeout_retries == na->dataout_timeout_retries) { pr_err("Command ITT: 0x%08x exceeded max retries" " for DataOUT timeout %u, closing iSCSI connection for" - " I_T Nexus %s,i,0x%6phN,%s,t,0x%02x\n", + " I_T Nexus %s,i,0x%6phN,%s,t,0x%02x," + " cmd ITT[0x%08llx]\n", cmd->init_task_tag, na->dataout_timeout_retries, sess->sess_ops->InitiatorName, sess->isid, - sess->tpg->tpg_tiqn->tiqn, (u32)sess->tpg->tpgt); + sess->tpg->tpg_tiqn->tiqn, (u32)sess->tpg->tpgt, + cmd->se_cmd.tag); goto failure; } diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index ac2d0e7d58ab7..a71b7dbc0bbb1 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -849,7 +849,7 @@ static void target_abort_work(struct work_struct *work) target_handle_abort(cmd); } -static bool target_cmd_interrupted(struct se_cmd *cmd) +bool target_cmd_interrupted(struct se_cmd *cmd) { int post_ret; @@ -868,6 +868,7 @@ static bool target_cmd_interrupted(struct se_cmd *cmd) return false; } +EXPORT_SYMBOL(target_cmd_interrupted); /* May be called from interrupt context so must not sleep. */ void target_complete_cmd_with_sense(struct se_cmd *cmd, u8 scsi_status, diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h index 3c5ade7a04a68..3aa4f48981ab5 100644 --- a/include/target/target_core_fabric.h +++ b/include/target/target_core_fabric.h @@ -176,6 +176,7 @@ sense_reason_t transport_generic_new_cmd(struct se_cmd *); void target_put_cmd_and_wait(struct se_cmd *cmd); void target_execute_cmd(struct se_cmd *cmd); +bool target_cmd_interrupted(struct se_cmd *cmd); int transport_generic_free_cmd(struct se_cmd *, int); From 368917abcf7e67dba25de73a5f532798546fb968 Mon Sep 17 00:00:00 2001 From: Don Brady Date: Tue, 6 Sep 2022 10:46:20 -0600 Subject: [PATCH 04/18] DLPX-82827 Fix for Solaris NFSv4 client mounts (#19) From c9c038191f25b3b585a73a2cf3c10126fb4797bd Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Tue, 8 Aug 2023 12:42:23 -0700 Subject: [PATCH 05/18] DLPX-83442 Disable various kernel modules which we don't use (#20) --- Makefile | 6 +- debian.aws/config/OVERRIDES | 230 ++++++++++++++++++++++++++++++++ debian.aws/dkms-versions | 1 - debian.master/dkms-versions | 2 - debian/rules.d/2-binary-arch.mk | 2 +- 5 files changed, 232 insertions(+), 9 deletions(-) create mode 100644 debian.aws/config/OVERRIDES diff --git a/Makefile b/Makefile index 48b89ef53ff88..7fb06d98081c0 100644 --- a/Makefile +++ b/Makefile @@ -518,9 +518,6 @@ LINUXINCLUDE := \ -I$(objtree)/include \ $(USERINCLUDE) -# UBUNTU: Include our third party driver stuff too -LINUXINCLUDE += -I$(srctree)/ubuntu/include - KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ @@ -675,7 +672,7 @@ endif ifeq ($(KBUILD_EXTMOD),) # Objects we will link into vmlinux / subdirs we need to visit core-y := init/ usr/ arch/$(SRCARCH)/ -drivers-y := drivers/ sound/ ubuntu/ +drivers-y := drivers/ sound/ drivers-$(CONFIG_SAMPLES) += samples/ drivers-$(CONFIG_NET) += net/ drivers-y += virt/ @@ -1351,7 +1348,6 @@ headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts $(if $(filter um, $(SRCARCH)), $(error Headers not exportable for UML)) $(Q)$(MAKE) $(hdr-inst)=include/uapi $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi - $(Q)$(MAKE) $(hdr-inst)=ubuntu/include dst=include oldheaders= # Deprecated. It is no-op now. PHONY += headers_check diff --git a/debian.aws/config/OVERRIDES b/debian.aws/config/OVERRIDES new file mode 100644 index 0000000000000..7708ff028551b --- /dev/null +++ b/debian.aws/config/OVERRIDES @@ -0,0 +1,230 @@ +# +# Disable various "net" modules which we don't use. +# +CONFIG_6LOWPAN=n +CONFIG_6LOWPAN_NHC=n +CONFIG_BT=n +CONFIG_CAIF=n +CONFIG_HAMRADIO=n +CONFIG_IEEE802154=n +CONFIG_NET_9P=n +CONFIG_NET_DSA=n +CONFIG_NFC=n +CONFIG_RFKILL=n +CONFIG_WIMAX=n +CONFIG_WIRELESS=n + +# +# Disable various "drivers" modules which we don't use. +# +CONFIG_ACCESSIBILITY=n +CONFIG_ATA=n +CONFIG_ATM_DRIVERS=n +CONFIG_AUXDISPLAY=n +CONFIG_BCMA=n +CONFIG_CONNECTOR=n +CONFIG_DAX=n +CONFIG_EISA=n +CONFIG_EXTCON=n +CONFIG_FPGA=n +CONFIG_FSI=n +CONFIG_GNSS=n +CONFIG_GPIOLIB=n +CONFIG_GREYBUS=n +CONFIG_HSI=n +CONFIG_I3C=n +CONFIG_IDE=n +CONFIG_IIO=n +CONFIG_INFINIBAND=n +CONFIG_INTERCONNECT=n +CONFIG_IPACK_BUS=n +CONFIG_LIBNVDIMM=n +CONFIG_MAILBOX=n +CONFIG_MCB=n +CONFIG_MD=n +CONFIG_MEDIA_SUPPORT=n +CONFIG_MEMSTICK=n +CONFIG_MMC=n +CONFIG_MTD=n +CONFIG_NEW_LEDS=n +CONFIG_NTB=n +CONFIG_NVM=n +CONFIG_NVMEM=n +CONFIG_OF=n +CONFIG_PARPORT=n +CONFIG_PARPORT_PANEL=n +CONFIG_PCCARD=n +CONFIG_PINCTRL=n +CONFIG_PMIC_OPREGION=n +CONFIG_PM_DEVFREQ=n +CONFIG_POWERCAP=n +CONFIG_PPS=n +CONFIG_RAPIDIO=n +CONFIG_REGULATOR=n +CONFIG_RESET_CONTROLLER=n +CONFIG_RTC_CLASS=n +CONFIG_SFI=n +CONFIG_SIOX=n +CONFIG_SLIMBUS=n +CONFIG_SOUNDWIRE=n +CONFIG_SPI=n +CONFIG_SPMI=n +CONFIG_STAGING=n +CONFIG_THERMAL=n +CONFIG_THUNDERBOLT=n +CONFIG_UIO=n +CONFIG_USB_SUPPORT=n +CONFIG_VFIO=n +CONFIG_W1=n + +# +# Disable various filesystem which we don't use. +# +CONFIG_9P_FS=n +CONFIG_ADFS_FS=n +CONFIG_AFFS_FS=n +CONFIG_AFS_FS=n +CONFIG_AUFS_FS=n +CONFIG_BEFS_FS=n +CONFIG_BFS_FS=n +CONFIG_BTRFS_FS=n +CONFIG_CEPH_FS=n +CONFIG_CODA_FS=n +CONFIG_ECRYPT_FS=n +CONFIG_EFS_FS=n +CONFIG_EROFS_FS=n +CONFIG_EXFAT_FS=n +CONFIG_EXT2_FS=n +CONFIG_EXT3_FS=n +CONFIG_F2FS_FS=n +CONFIG_FAT_FS=n +CONFIG_GFS2_FS=n +CONFIG_HFSPLUS_FS=n +CONFIG_HFS_FS=n +CONFIG_HPFS_FS=n +CONFIG_JFFS2_FS=n +CONFIG_JFS_FS=n +CONFIG_MINIX_FS=n +CONFIG_MSDOS_FS=n +CONFIG_NILFS2_FS=n +CONFIG_OCFS2_FS=n +CONFIG_OMFS_FS=n +CONFIG_ORANGEFS_FS=n +CONFIG_QNX4FS_FS=n +CONFIG_QNX6FS_FS=n +CONFIG_REISERFS_FS=n +CONFIG_REISERFS_FS=n +CONFIG_ROMFS_FS=n +CONFIG_SYSV_FS=n +CONFIG_UBIFS_FS=n +CONFIG_UDF_FS=n +CONFIG_UFS_FS=n +CONFIG_VFAT_FS=n +CONFIG_VXFS_FS=n +CONFIG_XFS_FS=n + +# +# Disable other misc. modules which we don't use. +# +CONFIG_AGP=n +CONFIG_ANDROID=n +CONFIG_AQUANTIA_PHY=n +CONFIG_ATALK=n +CONFIG_BATMAN_ADV=n +CONFIG_BCACHE=n +CONFIG_BE2ISCSI=n +CONFIG_BE2NET=n +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=n +CONFIG_BLK_DEV_RSXX=n +CONFIG_BNA=n +CONFIG_BNX2=n +CONFIG_BNX2X=n +CONFIG_BNXT=n +CONFIG_BROADCOM_PHY=n +CONFIG_CASSINI=n +CONFIG_CDROM=n +CONFIG_CEPH_LIB=n +CONFIG_CIFS=n +CONFIG_CRAMFS=n +CONFIG_CYCLADES=n +CONFIG_DRM=n +CONFIG_ENIC=n +CONFIG_FM10K=n +CONFIG_FORCEDETH=n +CONFIG_GENWQE=n +CONFIG_GVE=n +CONFIG_HABANA_AI=n +CONFIG_HID=n +CONFIG_HIO=n +CONFIG_HWMON=n +CONFIG_IAVF=n +CONFIG_ICE=n +CONFIG_INTEL_IOATDMA=n +CONFIG_INTEL_MEI=n +CONFIG_IONIC=n +CONFIG_JME=n +CONFIG_KVM=n +CONFIG_LIBFC=n +CONFIG_LIQUIDIO=n +CONFIG_MEGARAID_LEGACY=n +CONFIG_MEGARAID_MAILBOX=n +CONFIG_MEGARAID_MM=n +CONFIG_MEGARAID_NEWGEN=n +CONFIG_MEGARAID_SAS=n +CONFIG_MFD_MADERA=n +CONFIG_MLX4_CORE=n +CONFIG_MLX4_INFINIBAND=n +CONFIG_MLX5_CORE=n +CONFIG_MLX5_INFINIBAND=n +CONFIG_MLXSW_SPECTRUM=n +CONFIG_MSCC_OCELOT_SWITCH=n +CONFIG_MWAVE=n +CONFIG_NETXEN_NIC=n +CONFIG_NET_TEAM=n +CONFIG_NET_VENDOR_AQUANTIA=n +CONFIG_NET_VENDOR_ATHEROS=n +CONFIG_NET_VENDOR_CAVIUM=n +CONFIG_NET_VENDOR_CHELSIO=n +CONFIG_NET_VENDOR_CHELSIO=n +CONFIG_NET_VENDOR_MARVELL=n +CONFIG_NET_VENDOR_MICREL=n +CONFIG_NET_VENDOR_MYRI=n +CONFIG_NET_VENDOR_NETERION=n +CONFIG_NET_VENDOR_ROCKER=n +CONFIG_NFP=n +CONFIG_NOZOMI=n +CONFIG_QED=n +CONFIG_QLCNIC=n +CONFIG_RDS=n +CONFIG_REALTEK_PHY=n +CONFIG_SCIF=n +CONFIG_SCSI_ADVANSYS=n +CONFIG_SCSI_AIC7XXX=n +CONFIG_SCSI_AIC94XX=n +CONFIG_SCSI_ARCMSR=n +CONFIG_SCSI_BFA_FC=n +CONFIG_SCSI_ESAS2R=n +CONFIG_SCSI_GDTH=n +CONFIG_SCSI_HPSA=n +CONFIG_SCSI_IPS=n +CONFIG_SCSI_LPFC=n +CONFIG_SCSI_MVSAS=n +CONFIG_SCSI_MYRB=n +CONFIG_SCSI_MYRS=n +CONFIG_SCSI_PM8001=n +CONFIG_SCSI_PMCRAID=n +CONFIG_SCSI_QLA_FC=n +CONFIG_SCSI_SMARTPQI=n +CONFIG_SCSI_SNIC=n +CONFIG_SCSI_SYM53C8XX_2=n +CONFIG_SCSI_UFSHCD=n +CONFIG_SENSORS_LM93=n +CONFIG_SFC=n +CONFIG_SOUND=n +CONFIG_SSB=n +CONFIG_STMMAC_ETH=n +CONFIG_SXGBE_ETH=n +CONFIG_SYNCLINK=n +CONFIG_USB=n +CONFIG_VBOXGUEST=n +CONFIG_VOP=n diff --git a/debian.aws/dkms-versions b/debian.aws/dkms-versions index 4d9f3da79fbcc..8157c585ab838 100644 --- a/debian.aws/dkms-versions +++ b/debian.aws/dkms-versions @@ -1,2 +1 @@ zfs-linux 2.1.5-1ubuntu6~22.04.4 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms -v4l2loopback 0.12.7-2ubuntu2~22.04.1 modulename=v4l2loopback debpath=pool/universe/v/%package%/v4l2loopback-dkms_%version%_all.deb arch=amd64 rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms diff --git a/debian.master/dkms-versions b/debian.master/dkms-versions index 61a192034c879..8157c585ab838 100644 --- a/debian.master/dkms-versions +++ b/debian.master/dkms-versions @@ -1,3 +1 @@ zfs-linux 2.1.5-1ubuntu6~22.04.4 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms -backport-iwlwifi-dkms 9858-0ubuntu3.4 modulename=iwlwifi debpath=pool/universe/b/%package%/backport-iwlwifi-dkms_%version%_all.deb arch=amd64 rprovides=iwlwifi-modules rprovides=backport-iwlwifi-dkms type=standalone -v4l2loopback 0.12.7-2ubuntu2~22.04.1 modulename=v4l2loopback debpath=pool/universe/v/%package%/v4l2loopback-dkms_%version%_all.deb arch=amd64 rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 02e65da7b6047..227e6bee6e315 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -20,7 +20,7 @@ shlibdeps_opts = $(if $(CROSS_COMPILE),-- -l$(CROSS_COMPILE:%-=/usr/%)/lib) debian/scripts/fix-filenames: debian/scripts/fix-filenames.c $(CC) -o $@ $^ -$(stampdir)/stamp-prepare-%: config-prepare-check-% +$(stampdir)/stamp-prepare-%: $(stampdir)/stamp-prepare-tree-% @echo Debug: $@ @touch $@ $(stampdir)/stamp-prepare-tree-%: target_flavour = $* From c08a59994b2cb03f78011eca79880ab8f442f6a5 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Thu, 10 Nov 2022 13:52:40 -0800 Subject: [PATCH 06/18] TOOL-16649 CONFIG_MD is needed on the buildserver (#22) --- debian.aws/config/OVERRIDES | 1 - 1 file changed, 1 deletion(-) diff --git a/debian.aws/config/OVERRIDES b/debian.aws/config/OVERRIDES index 7708ff028551b..799e3f4eb8b88 100644 --- a/debian.aws/config/OVERRIDES +++ b/debian.aws/config/OVERRIDES @@ -41,7 +41,6 @@ CONFIG_IPACK_BUS=n CONFIG_LIBNVDIMM=n CONFIG_MAILBOX=n CONFIG_MCB=n -CONFIG_MD=n CONFIG_MEDIA_SUPPORT=n CONFIG_MEMSTICK=n CONFIG_MMC=n From cef038a7a19030be0d7aee16bdad8b0b9f620c41 Mon Sep 17 00:00:00 2001 From: Paul Dagnelie Date: Mon, 14 Nov 2022 13:49:55 -0800 Subject: [PATCH 07/18] target: login should wait until tx/rx threads have properly started. (#21) --- drivers/target/iscsi/iscsi_target.c | 2 ++ drivers/target/iscsi/iscsi_target_login.c | 3 +++ include/target/iscsi/iscsi_target_core.h | 1 + 3 files changed, 6 insertions(+) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 686a9e5918e21..347159235dfe9 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -3815,6 +3815,7 @@ int iscsi_target_tx_thread(void *arg) * connection recovery / failure event can be triggered externally. */ allow_signal(SIGINT); + complete(&conn->kthr_start_comp); while (!kthread_should_stop()) { /* @@ -4043,6 +4044,7 @@ int iscsi_target_rx_thread(void *arg) * connection recovery / failure event can be triggered externally. */ allow_signal(SIGINT); + complete(&conn->kthr_start_comp); /* * Wait for iscsi_post_login_handler() to complete before allowing * incoming iscsi/tcp socket I/O, and/or failing the connection. diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c index 63de4a3431ae2..6fe44a31161cf 100644 --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c @@ -647,6 +647,7 @@ int iscsit_start_kthreads(struct iscsi_conn *conn) ret = PTR_ERR(conn->tx_thread); goto out_bitmap; } + wait_for_completion(&conn->kthr_start_comp); conn->tx_thread_active = true; conn->rx_thread = kthread_run(iscsi_target_rx_thread, conn, @@ -656,6 +657,7 @@ int iscsit_start_kthreads(struct iscsi_conn *conn) ret = PTR_ERR(conn->rx_thread); goto out_tx; } + wait_for_completion(&conn->kthr_start_comp); conn->rx_thread_active = true; return 0; @@ -1104,6 +1106,7 @@ static struct iscsi_conn *iscsit_alloc_conn(struct iscsi_np *np) init_completion(&conn->rx_half_close_comp); init_completion(&conn->tx_half_close_comp); init_completion(&conn->rx_login_comp); + init_completion(&conn->kthr_start_comp); spin_lock_init(&conn->cmd_lock); spin_lock_init(&conn->conn_usage_lock); spin_lock_init(&conn->immed_queue_lock); diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h index 1eccb2ac7d029..853e9be511c51 100644 --- a/include/target/iscsi/iscsi_target_core.h +++ b/include/target/iscsi/iscsi_target_core.h @@ -552,6 +552,7 @@ struct iscsi_conn { struct completion conn_logout_comp; struct completion tx_half_close_comp; struct completion rx_half_close_comp; + struct completion kthr_start_comp; /* socket used by this connection */ struct socket *sock; void (*orig_data_ready)(struct sock *); From 76cf593eed0dc3c2689bdcebc97ac3d65130c8d8 Mon Sep 17 00:00:00 2001 From: Don Brady Date: Wed, 7 Dec 2022 14:08:36 -0700 Subject: [PATCH 08/18] DLPX-83701 Make function mnt_add_count() traceable (#24) --- fs/namespace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index 3cbedebd1749d..49155f1280491 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -163,7 +163,7 @@ void mnt_release_group_id(struct mount *mnt) /* * vfsmount lock must be held for read */ -static inline void mnt_add_count(struct mount *mnt, int n) +static noinline __noclone void mnt_add_count(struct mount *mnt, int n) { #ifdef CONFIG_SMP this_cpu_add(mnt->mnt_pcp->mnt_count, n); @@ -1590,7 +1590,8 @@ static int do_umount_root(struct super_block *sb) return ret; } -static int do_umount(struct mount *mnt, int flags) +/* force a bpftrace dynamic function probe here */ +static noinline __noclone int do_umount(struct mount *mnt, int flags) { struct super_block *sb = mnt->mnt.mnt_sb; int retval; From 5510197148b39fbcc5dc73ee63818a6f86b30a7c Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Wed, 1 Feb 2023 12:04:54 -0800 Subject: [PATCH 09/18] DLPX-84469 Users unable to connect to CIFS mounts (#28) --- debian.aws/config/OVERRIDES | 1 - 1 file changed, 1 deletion(-) diff --git a/debian.aws/config/OVERRIDES b/debian.aws/config/OVERRIDES index 799e3f4eb8b88..5d81c0d96473a 100644 --- a/debian.aws/config/OVERRIDES +++ b/debian.aws/config/OVERRIDES @@ -143,7 +143,6 @@ CONFIG_BROADCOM_PHY=n CONFIG_CASSINI=n CONFIG_CDROM=n CONFIG_CEPH_LIB=n -CONFIG_CIFS=n CONFIG_CRAMFS=n CONFIG_CYCLADES=n CONFIG_DRM=n From 6a11d4d34a27e78e0710c30027875e6082e109a0 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Wed, 1 Mar 2023 09:08:47 -0800 Subject: [PATCH 10/18] DLPX-84907 CVE-2022-3628 (#29) --- debian.aws/config/OVERRIDES | 1 + 1 file changed, 1 insertion(+) diff --git a/debian.aws/config/OVERRIDES b/debian.aws/config/OVERRIDES index 5d81c0d96473a..64866debb3553 100644 --- a/debian.aws/config/OVERRIDES +++ b/debian.aws/config/OVERRIDES @@ -75,6 +75,7 @@ CONFIG_UIO=n CONFIG_USB_SUPPORT=n CONFIG_VFIO=n CONFIG_W1=n +CONFIG_WLAN=n # # Disable various filesystem which we don't use. From cb3e8b546d0a3afecb265d665c1952b9fe295e99 Mon Sep 17 00:00:00 2001 From: Serapheim Dimitropoulos Date: Tue, 7 Mar 2023 13:36:24 -0800 Subject: [PATCH 11/18] DLPX-84985 target: iscsi: fix deadlock in the iSCSI login code (#30) --- drivers/target/iscsi/iscsi_target_login.c | 1 + drivers/target/iscsi/iscsi_target_nego.c | 48 ++++++++--------------- drivers/target/iscsi/iscsi_target_util.c | 28 +++++++++++++ drivers/target/iscsi/iscsi_target_util.h | 3 ++ include/target/iscsi/iscsi_target_core.h | 1 + 5 files changed, 50 insertions(+), 31 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c index 6fe44a31161cf..628d3eb5360e3 100644 --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c @@ -1117,6 +1117,7 @@ static struct iscsi_conn *iscsit_alloc_conn(struct iscsi_np *np) timer_setup(&conn->nopin_response_timer, iscsit_handle_nopin_response_timeout, 0); timer_setup(&conn->nopin_timer, iscsit_handle_nopin_timeout, 0); + timer_setup(&conn->login_timer, iscsit_login_timeout, 0); if (iscsit_conn_set_transport(conn, np->np_transport) < 0) goto free_conn; diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c index 5435f2b945d3c..1d360f213e98c 100644 --- a/drivers/target/iscsi/iscsi_target_nego.c +++ b/drivers/target/iscsi/iscsi_target_nego.c @@ -471,12 +471,18 @@ static int iscsi_target_do_login(struct iscsi_conn *, struct iscsi_login *); static bool __iscsi_target_sk_check_close(struct sock *sk) { - if (sk->sk_state == TCP_CLOSE_WAIT || sk->sk_state == TCP_CLOSE) { - pr_debug("__iscsi_target_sk_check_close: TCP_CLOSE_WAIT|TCP_CLOSE," + switch (sk->sk_state) { + case TCP_FIN_WAIT1: + case TCP_FIN_WAIT2: + case TCP_CLOSE_WAIT: + case TCP_LAST_ACK: + case TCP_CLOSE: + pr_debug("__iscsi_target_sk_check_close: socket closing," "returning TRUE\n"); return true; + default: + return false; } - return false; } static bool iscsi_target_sk_check_close(struct iscsi_conn *conn) @@ -534,25 +540,6 @@ static void iscsi_target_login_drop(struct iscsi_conn *conn, struct iscsi_login iscsi_target_login_sess_out(conn, zero_tsih, true); } -struct conn_timeout { - struct timer_list timer; - struct iscsi_conn *conn; -}; - -static void iscsi_target_login_timeout(struct timer_list *t) -{ - struct conn_timeout *timeout = from_timer(timeout, t, timer); - struct iscsi_conn *conn = timeout->conn; - - pr_debug("Entering iscsi_target_login_timeout >>>>>>>>>>>>>>>>>>>\n"); - - if (conn->login_kworker) { - pr_debug("Sending SIGINT to conn->login_kworker %s/%d\n", - conn->login_kworker->comm, conn->login_kworker->pid); - send_sig(SIGINT, conn->login_kworker, 1); - } -} - static void iscsi_target_do_login_rx(struct work_struct *work) { struct iscsi_conn *conn = container_of(work, @@ -561,7 +548,6 @@ static void iscsi_target_do_login_rx(struct work_struct *work) struct iscsi_np *np = login->np; struct iscsi_portal_group *tpg = conn->tpg; struct iscsi_tpg_np *tpg_np = conn->tpg_np; - struct conn_timeout timeout; int rc, zero_tsih = login->zero_tsih; bool state; @@ -599,14 +585,7 @@ static void iscsi_target_do_login_rx(struct work_struct *work) conn->login_kworker = current; allow_signal(SIGINT); - timeout.conn = conn; - timer_setup_on_stack(&timeout.timer, iscsi_target_login_timeout, 0); - mod_timer(&timeout.timer, jiffies + TA_LOGIN_TIMEOUT * HZ); - pr_debug("Starting login timer for %s/%d\n", current->comm, current->pid); - rc = conn->conn_transport->iscsit_get_login_rx(conn, login); - del_timer_sync(&timeout.timer); - destroy_timer_on_stack(&timeout.timer); flush_signals(current); conn->login_kworker = NULL; @@ -647,6 +626,7 @@ static void iscsi_target_do_login_rx(struct work_struct *work) goto err; } else if (rc == 1) { cancel_delayed_work(&conn->login_work); + iscsit_stop_login_timer(conn); iscsi_target_nego_release(conn); iscsi_post_login_handler(np, conn, zero_tsih); iscsit_deaccess_np(np, tpg, tpg_np); @@ -656,6 +636,7 @@ static void iscsi_target_do_login_rx(struct work_struct *work) err: iscsi_target_restore_sock_callbacks(conn); cancel_delayed_work(&conn->login_work); + iscsit_stop_login_timer(conn); iscsi_target_login_drop(conn, login); iscsit_deaccess_np(np, tpg, tpg_np); } @@ -1301,6 +1282,9 @@ int iscsi_target_start_negotiation( set_bit(LOGIN_FLAGS_INITIAL_PDU, &conn->login_flags); write_unlock_bh(&sk->sk_callback_lock); } + + iscsit_start_login_timer(conn); + /* * If iscsi_target_do_login returns zero to signal more PDU * exchanges are required to complete the login, go ahead and @@ -1319,8 +1303,10 @@ int iscsi_target_start_negotiation( iscsi_target_restore_sock_callbacks(conn); iscsi_remove_failed_auth_entry(conn); } - if (ret != 0) + if (ret != 0) { + iscsit_stop_login_timer(conn); iscsi_target_nego_release(conn); + } return ret; } diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c index 6dd5810e2af16..799d3f34a34f0 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c @@ -1040,6 +1040,34 @@ void iscsit_stop_nopin_timer(struct iscsi_conn *conn) spin_unlock_bh(&conn->nopin_timer_lock); } +void iscsit_login_timeout(struct timer_list *t) +{ + struct iscsi_conn *conn = from_timer(conn, t, login_timer); + + pr_debug("Entering iscsi_target_login_timeout >>>>>>>>>>>>>>>>>>>\n"); + + if (conn->login_kworker) { + pr_debug("Sending SIGINT to conn->login_kworker %s/%d\n", + conn->login_kworker->comm, conn->login_kworker->pid); + send_sig(SIGINT, conn->login_kworker, 1); + } else { + pr_debug("Shutting down the socket.\n"); + kernel_sock_shutdown(conn->sock, SHUT_RDWR); + } +} + +void iscsit_start_login_timer(struct iscsi_conn *conn) +{ + pr_debug("Login timer started\n"); + mod_timer(&conn->login_timer, jiffies + TA_LOGIN_TIMEOUT * HZ); +} + +void iscsit_stop_login_timer(struct iscsi_conn *conn) +{ + pr_debug("Login timer stopped\n"); + del_timer_sync(&conn->login_timer); +} + int iscsit_send_tx_data( struct iscsi_cmd *cmd, struct iscsi_conn *conn, diff --git a/drivers/target/iscsi/iscsi_target_util.h b/drivers/target/iscsi/iscsi_target_util.h index 8ee1c133a9b7b..3246caa7fa9b8 100644 --- a/drivers/target/iscsi/iscsi_target_util.h +++ b/drivers/target/iscsi/iscsi_target_util.h @@ -56,6 +56,9 @@ extern void iscsit_handle_nopin_timeout(struct timer_list *t); extern void __iscsit_start_nopin_timer(struct iscsi_conn *); extern void iscsit_start_nopin_timer(struct iscsi_conn *); extern void iscsit_stop_nopin_timer(struct iscsi_conn *); +extern void iscsit_login_timeout(struct timer_list *t); +extern void iscsit_start_login_timer(struct iscsi_conn *); +extern void iscsit_stop_login_timer(struct iscsi_conn *); extern int iscsit_send_tx_data(struct iscsi_cmd *, struct iscsi_conn *, int); extern int iscsit_fe_sendpage_sg(struct iscsi_cmd *, struct iscsi_conn *); extern int iscsit_tx_login_rsp(struct iscsi_conn *, u8, u8); diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h index 853e9be511c51..d4271744396e8 100644 --- a/include/target/iscsi/iscsi_target_core.h +++ b/include/target/iscsi/iscsi_target_core.h @@ -568,6 +568,7 @@ struct iscsi_conn { struct timer_list nopin_timer; struct timer_list nopin_response_timer; struct timer_list transport_timer; + struct timer_list login_timer; struct task_struct *login_kworker; /* Spinlock used for add/deleting cmd's from conn_cmd_list */ spinlock_t cmd_lock; From 552f42300c686fa218176cf025a1a4fd1b9c4446 Mon Sep 17 00:00:00 2001 From: Don Brady Date: Tue, 21 Mar 2023 14:52:27 -0600 Subject: [PATCH 12/18] DLPX-84995 NFSD: Never call nfsd_file_gc() in foreground paths (#35) The checks in nfsd_file_acquire() and nfsd_file_put() that directly invoke filecache garbage collection are intended to keep cache occupancy between a low- and high-watermark. The reason to limit the capacity of the filecache is to keep filecache lookups reasonably fast. However, invoking garbage collection at those points has some undesirable negative impacts. Files that are held open by NFSv4 clients often push the occupancy of the filecache over these watermarks. At that point: - Every call to nfsd_file_acquire() and nfsd_file_put() results in an LRU walk. This has the same effect on lookup latency as long chains in the hash table. - Garbage collection will then run on every nfsd thread, causing a lot of unnecessary lock contention. - Limiting cache capacity pushes out files used only by NFSv3 clients, which are the type of files the filecache is supposed to help. To address those negative impacts, remove the direct calls to the garbage collector. From f65f10aa900cb202038a05072675fb6301a12c63 Mon Sep 17 00:00:00 2001 From: sumedhbala-delphix <57050419+sumedhbala-delphix@users.noreply.github.com> Date: Tue, 2 May 2023 21:14:52 -0400 Subject: [PATCH 13/18] DLPX-84906 Disable frame buffer drivers PR URL: https://www.github.com/delphix/linux-kernel-aws/pull/36 --- debian.aws/config/OVERRIDES | 1 + 1 file changed, 1 insertion(+) diff --git a/debian.aws/config/OVERRIDES b/debian.aws/config/OVERRIDES index 64866debb3553..f0918b13aa0f3 100644 --- a/debian.aws/config/OVERRIDES +++ b/debian.aws/config/OVERRIDES @@ -26,6 +26,7 @@ CONFIG_CONNECTOR=n CONFIG_DAX=n CONFIG_EISA=n CONFIG_EXTCON=n +CONFIG_FB=n CONFIG_FPGA=n CONFIG_FSI=n CONFIG_GNSS=n From 45685fbf006b582832dc8797025eddaa0a9cf4bc Mon Sep 17 00:00:00 2001 From: Palash Gandhi <87093175+pgandhi-delphix@users.noreply.github.com> Date: Tue, 23 May 2023 08:13:41 -0700 Subject: [PATCH 14/18] DLPX-86177 Azure Accelerated networking broken because Mellanox drivers absent in kernel (#37) PR URL: https://www.github.com/delphix/linux-kernel-aws/pull/37 --- debian.aws/config/OVERRIDES | 5 ----- 1 file changed, 5 deletions(-) diff --git a/debian.aws/config/OVERRIDES b/debian.aws/config/OVERRIDES index f0918b13aa0f3..5d4505b6390da 100644 --- a/debian.aws/config/OVERRIDES +++ b/debian.aws/config/OVERRIDES @@ -172,11 +172,6 @@ CONFIG_MEGARAID_MM=n CONFIG_MEGARAID_NEWGEN=n CONFIG_MEGARAID_SAS=n CONFIG_MFD_MADERA=n -CONFIG_MLX4_CORE=n -CONFIG_MLX4_INFINIBAND=n -CONFIG_MLX5_CORE=n -CONFIG_MLX5_INFINIBAND=n -CONFIG_MLXSW_SPECTRUM=n CONFIG_MSCC_OCELOT_SWITCH=n CONFIG_MWAVE=n CONFIG_NETXEN_NIC=n From e9b211011ff40059169f957b63f8a26ec867cf87 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Tue, 27 Jun 2023 10:38:09 -0700 Subject: [PATCH 15/18] DLPX-86675 Disk quota exceeded when unpacking an upgrade image (#44) --- {debian.aws => debian.aws-5.15}/config/OVERRIDES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename {debian.aws => debian.aws-5.15}/config/OVERRIDES (99%) diff --git a/debian.aws/config/OVERRIDES b/debian.aws-5.15/config/OVERRIDES similarity index 99% rename from debian.aws/config/OVERRIDES rename to debian.aws-5.15/config/OVERRIDES index 5d4505b6390da..db46f8396fbac 100644 --- a/debian.aws/config/OVERRIDES +++ b/debian.aws-5.15/config/OVERRIDES @@ -18,6 +18,7 @@ CONFIG_WIRELESS=n # Disable various "drivers" modules which we don't use. # CONFIG_ACCESSIBILITY=n +CONFIG_AMD_PMC=n CONFIG_ATA=n CONFIG_ATM_DRIVERS=n CONFIG_AUXDISPLAY=n @@ -67,7 +68,6 @@ CONFIG_SFI=n CONFIG_SIOX=n CONFIG_SLIMBUS=n CONFIG_SOUNDWIRE=n -CONFIG_SPI=n CONFIG_SPMI=n CONFIG_STAGING=n CONFIG_THERMAL=n From 8500225c447773c0afc537b05c59d7909898e4a8 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Tue, 15 Aug 2023 11:45:03 -0700 Subject: [PATCH 16/18] DLPX-87344 Fix kernel merge conflict with upstream --- debian.aws-5.15/config/annotations | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.aws-5.15/config/annotations b/debian.aws-5.15/config/annotations index 065960d00b0e5..8d1f5a244a3c7 100644 --- a/debian.aws-5.15/config/annotations +++ b/debian.aws-5.15/config/annotations @@ -1,7 +1,7 @@ # Menu: HEADER # FORMAT: 4 -# ARCH: amd64 arm64 -# FLAVOUR: amd64-aws arm64-aws +# ARCH: amd64 +# FLAVOUR: amd64-aws include "../../debian.aws/config/annotations" From 8d1d1266e1380a9fec26f3c6364b324e04ec3e1e Mon Sep 17 00:00:00 2001 From: Palash Gandhi <87093175+palash-delphix@users.noreply.github.com> Date: Wed, 6 Sep 2023 20:19:54 -0700 Subject: [PATCH 17/18] DLPX-87710 upgrade from 6.0.16.0 to 15.0.0.0 failed because disk quota error (#46) PR URL: https://github.com/delphix/linux-kernel-aws/pull/46 --- debian.aws-5.15/config/OVERRIDES | 225 ---------------------------- debian.aws-5.15/config/annotations | 2 + debian.delphix/config/annotations | 230 +++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+), 225 deletions(-) delete mode 100644 debian.aws-5.15/config/OVERRIDES create mode 100644 debian.delphix/config/annotations diff --git a/debian.aws-5.15/config/OVERRIDES b/debian.aws-5.15/config/OVERRIDES deleted file mode 100644 index db46f8396fbac..0000000000000 --- a/debian.aws-5.15/config/OVERRIDES +++ /dev/null @@ -1,225 +0,0 @@ -# -# Disable various "net" modules which we don't use. -# -CONFIG_6LOWPAN=n -CONFIG_6LOWPAN_NHC=n -CONFIG_BT=n -CONFIG_CAIF=n -CONFIG_HAMRADIO=n -CONFIG_IEEE802154=n -CONFIG_NET_9P=n -CONFIG_NET_DSA=n -CONFIG_NFC=n -CONFIG_RFKILL=n -CONFIG_WIMAX=n -CONFIG_WIRELESS=n - -# -# Disable various "drivers" modules which we don't use. -# -CONFIG_ACCESSIBILITY=n -CONFIG_AMD_PMC=n -CONFIG_ATA=n -CONFIG_ATM_DRIVERS=n -CONFIG_AUXDISPLAY=n -CONFIG_BCMA=n -CONFIG_CONNECTOR=n -CONFIG_DAX=n -CONFIG_EISA=n -CONFIG_EXTCON=n -CONFIG_FB=n -CONFIG_FPGA=n -CONFIG_FSI=n -CONFIG_GNSS=n -CONFIG_GPIOLIB=n -CONFIG_GREYBUS=n -CONFIG_HSI=n -CONFIG_I3C=n -CONFIG_IDE=n -CONFIG_IIO=n -CONFIG_INFINIBAND=n -CONFIG_INTERCONNECT=n -CONFIG_IPACK_BUS=n -CONFIG_LIBNVDIMM=n -CONFIG_MAILBOX=n -CONFIG_MCB=n -CONFIG_MEDIA_SUPPORT=n -CONFIG_MEMSTICK=n -CONFIG_MMC=n -CONFIG_MTD=n -CONFIG_NEW_LEDS=n -CONFIG_NTB=n -CONFIG_NVM=n -CONFIG_NVMEM=n -CONFIG_OF=n -CONFIG_PARPORT=n -CONFIG_PARPORT_PANEL=n -CONFIG_PCCARD=n -CONFIG_PINCTRL=n -CONFIG_PMIC_OPREGION=n -CONFIG_PM_DEVFREQ=n -CONFIG_POWERCAP=n -CONFIG_PPS=n -CONFIG_RAPIDIO=n -CONFIG_REGULATOR=n -CONFIG_RESET_CONTROLLER=n -CONFIG_RTC_CLASS=n -CONFIG_SFI=n -CONFIG_SIOX=n -CONFIG_SLIMBUS=n -CONFIG_SOUNDWIRE=n -CONFIG_SPMI=n -CONFIG_STAGING=n -CONFIG_THERMAL=n -CONFIG_THUNDERBOLT=n -CONFIG_UIO=n -CONFIG_USB_SUPPORT=n -CONFIG_VFIO=n -CONFIG_W1=n -CONFIG_WLAN=n - -# -# Disable various filesystem which we don't use. -# -CONFIG_9P_FS=n -CONFIG_ADFS_FS=n -CONFIG_AFFS_FS=n -CONFIG_AFS_FS=n -CONFIG_AUFS_FS=n -CONFIG_BEFS_FS=n -CONFIG_BFS_FS=n -CONFIG_BTRFS_FS=n -CONFIG_CEPH_FS=n -CONFIG_CODA_FS=n -CONFIG_ECRYPT_FS=n -CONFIG_EFS_FS=n -CONFIG_EROFS_FS=n -CONFIG_EXFAT_FS=n -CONFIG_EXT2_FS=n -CONFIG_EXT3_FS=n -CONFIG_F2FS_FS=n -CONFIG_FAT_FS=n -CONFIG_GFS2_FS=n -CONFIG_HFSPLUS_FS=n -CONFIG_HFS_FS=n -CONFIG_HPFS_FS=n -CONFIG_JFFS2_FS=n -CONFIG_JFS_FS=n -CONFIG_MINIX_FS=n -CONFIG_MSDOS_FS=n -CONFIG_NILFS2_FS=n -CONFIG_OCFS2_FS=n -CONFIG_OMFS_FS=n -CONFIG_ORANGEFS_FS=n -CONFIG_QNX4FS_FS=n -CONFIG_QNX6FS_FS=n -CONFIG_REISERFS_FS=n -CONFIG_REISERFS_FS=n -CONFIG_ROMFS_FS=n -CONFIG_SYSV_FS=n -CONFIG_UBIFS_FS=n -CONFIG_UDF_FS=n -CONFIG_UFS_FS=n -CONFIG_VFAT_FS=n -CONFIG_VXFS_FS=n -CONFIG_XFS_FS=n - -# -# Disable other misc. modules which we don't use. -# -CONFIG_AGP=n -CONFIG_ANDROID=n -CONFIG_AQUANTIA_PHY=n -CONFIG_ATALK=n -CONFIG_BATMAN_ADV=n -CONFIG_BCACHE=n -CONFIG_BE2ISCSI=n -CONFIG_BE2NET=n -CONFIG_BLK_DEV_PCIESSD_MTIP32XX=n -CONFIG_BLK_DEV_RSXX=n -CONFIG_BNA=n -CONFIG_BNX2=n -CONFIG_BNX2X=n -CONFIG_BNXT=n -CONFIG_BROADCOM_PHY=n -CONFIG_CASSINI=n -CONFIG_CDROM=n -CONFIG_CEPH_LIB=n -CONFIG_CRAMFS=n -CONFIG_CYCLADES=n -CONFIG_DRM=n -CONFIG_ENIC=n -CONFIG_FM10K=n -CONFIG_FORCEDETH=n -CONFIG_GENWQE=n -CONFIG_GVE=n -CONFIG_HABANA_AI=n -CONFIG_HID=n -CONFIG_HIO=n -CONFIG_HWMON=n -CONFIG_IAVF=n -CONFIG_ICE=n -CONFIG_INTEL_IOATDMA=n -CONFIG_INTEL_MEI=n -CONFIG_IONIC=n -CONFIG_JME=n -CONFIG_KVM=n -CONFIG_LIBFC=n -CONFIG_LIQUIDIO=n -CONFIG_MEGARAID_LEGACY=n -CONFIG_MEGARAID_MAILBOX=n -CONFIG_MEGARAID_MM=n -CONFIG_MEGARAID_NEWGEN=n -CONFIG_MEGARAID_SAS=n -CONFIG_MFD_MADERA=n -CONFIG_MSCC_OCELOT_SWITCH=n -CONFIG_MWAVE=n -CONFIG_NETXEN_NIC=n -CONFIG_NET_TEAM=n -CONFIG_NET_VENDOR_AQUANTIA=n -CONFIG_NET_VENDOR_ATHEROS=n -CONFIG_NET_VENDOR_CAVIUM=n -CONFIG_NET_VENDOR_CHELSIO=n -CONFIG_NET_VENDOR_CHELSIO=n -CONFIG_NET_VENDOR_MARVELL=n -CONFIG_NET_VENDOR_MICREL=n -CONFIG_NET_VENDOR_MYRI=n -CONFIG_NET_VENDOR_NETERION=n -CONFIG_NET_VENDOR_ROCKER=n -CONFIG_NFP=n -CONFIG_NOZOMI=n -CONFIG_QED=n -CONFIG_QLCNIC=n -CONFIG_RDS=n -CONFIG_REALTEK_PHY=n -CONFIG_SCIF=n -CONFIG_SCSI_ADVANSYS=n -CONFIG_SCSI_AIC7XXX=n -CONFIG_SCSI_AIC94XX=n -CONFIG_SCSI_ARCMSR=n -CONFIG_SCSI_BFA_FC=n -CONFIG_SCSI_ESAS2R=n -CONFIG_SCSI_GDTH=n -CONFIG_SCSI_HPSA=n -CONFIG_SCSI_IPS=n -CONFIG_SCSI_LPFC=n -CONFIG_SCSI_MVSAS=n -CONFIG_SCSI_MYRB=n -CONFIG_SCSI_MYRS=n -CONFIG_SCSI_PM8001=n -CONFIG_SCSI_PMCRAID=n -CONFIG_SCSI_QLA_FC=n -CONFIG_SCSI_SMARTPQI=n -CONFIG_SCSI_SNIC=n -CONFIG_SCSI_SYM53C8XX_2=n -CONFIG_SCSI_UFSHCD=n -CONFIG_SENSORS_LM93=n -CONFIG_SFC=n -CONFIG_SOUND=n -CONFIG_SSB=n -CONFIG_STMMAC_ETH=n -CONFIG_SXGBE_ETH=n -CONFIG_SYNCLINK=n -CONFIG_USB=n -CONFIG_VBOXGUEST=n -CONFIG_VOP=n diff --git a/debian.aws-5.15/config/annotations b/debian.aws-5.15/config/annotations index 8d1f5a244a3c7..36c9ba432a7a7 100644 --- a/debian.aws-5.15/config/annotations +++ b/debian.aws-5.15/config/annotations @@ -48,3 +48,5 @@ CONFIG_LD_VERSION policy<{'amd64': '23400', 'arm64 CONFIG_PAHOLE_VERSION policy<{'amd64': '121', 'arm64': '121'}> CONFIG_SLS policy<{'amd64': '-'}> CONFIG_ZERO_CALL_USED_REGS policy<{'amd64': '-', 'arm64': '-'}> + +include "../../debian.delphix/config/annotations" diff --git a/debian.delphix/config/annotations b/debian.delphix/config/annotations new file mode 100644 index 0000000000000..d44429bdfe35c --- /dev/null +++ b/debian.delphix/config/annotations @@ -0,0 +1,230 @@ +# Menu: HEADER +# FORMAT: 4 +# ARCH: amd64 +# FLAVOUR: amd64-aws + +# +# Disable various "net" modules which we don't use. +# +CONFIG_6LOWPAN policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_6LOWPAN_NHC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BT policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_CAIF policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_HAMRADIO policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_IEEE802154 policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_9P policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_DSA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NFC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_RFKILL policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_WIMAX policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_WIRELESS policy<{'amd64': 'n', 'arm64': 'n'}> + +# +# Disable various "drivers" modules which we don't use. +# +CONFIG_ACCESSIBILITY policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_AMD_PMC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ATA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ATM_DRIVERS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_AUXDISPLAY policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BCMA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_CONNECTOR policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_DAX policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_EISA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_EXTCON policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_FB policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_FPGA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_FSI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_GNSS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_GPIOLIB policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_GREYBUS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_HSI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_I3C policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_IDE policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_IIO policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_INFINIBAND policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_INTERCONNECT policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_IPACK_BUS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_LIBNVDIMM policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MAILBOX policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MCB policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MEDIA_SUPPORT policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MEMSTICK policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MMC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MTD policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NEW_LEDS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NTB policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NVM policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NVMEM policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_OF policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_PARPORT policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_PARPORT_PANEL policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_PCCARD policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_PINCTRL policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_PMIC_OPREGION policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_PM_DEVFREQ policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_POWERCAP policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_PPS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_RAPIDIO policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_REGULATOR policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_RESET_CONTROLLER policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_RTC_CLASS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SFI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SIOX policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SLIMBUS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SOUNDWIRE policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SPMI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_STAGING policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_THERMAL policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_THUNDERBOLT policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_UIO policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_USB_SUPPORT policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_VFIO policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_W1 policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_WLAN policy<{'amd64': 'n', 'arm64': 'n'}> + +# +# Disable various filesystem which we don't use. +# +CONFIG_9P_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ADFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_AFFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_AFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_AUFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BEFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BTRFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_CEPH_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_CODA_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ECRYPT_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_EFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_EROFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_EXFAT_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_EXT2_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_EXT3_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_F2FS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_FAT_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_GFS2_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_HFSPLUS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_HFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_HPFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_JFFS2_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_JFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MINIX_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MSDOS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NILFS2_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_OCFS2_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_OMFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ORANGEFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_QNX4FS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_QNX6FS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_REISERFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_REISERFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ROMFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SYSV_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_UBIFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_UDF_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_UFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_VFAT_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_VXFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_XFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> + +# +# Disable other misc. modules which we don't use. +# +CONFIG_AGP policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ANDROID policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_AQUANTIA_PHY policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ATALK policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BATMAN_ADV policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BCACHE policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BE2ISCSI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BE2NET policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BLK_DEV_PCIESSD_MTIP32XX policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BLK_DEV_RSXX policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BNA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BNX2 policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BNX2X policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BNXT policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_BROADCOM_PHY policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_CASSINI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_CDROM policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_CEPH_LIB policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_CRAMFS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_CYCLADES policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_DRM policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ENIC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_FM10K policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_FORCEDETH policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_GENWQE policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_GVE policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_HABANA_AI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_HID policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_HIO policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_HWMON policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_IAVF policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_ICE policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_INTEL_IOATDMA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_INTEL_MEI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_IONIC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_JME policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_KVM policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_LIBFC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_LIQUIDIO policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MEGARAID_LEGACY policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MEGARAID_MAILBOX policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MEGARAID_MM policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MEGARAID_NEWGEN policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MEGARAID_SAS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MFD_MADERA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MSCC_OCELOT_SWITCH policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_MWAVE policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NETXEN_NIC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_TEAM policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_AQUANTIA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_ATHEROS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_CAVIUM policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_CHELSIO policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_CHELSIO policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_MARVELL policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_MICREL policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_MYRI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_NETERION policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NET_VENDOR_ROCKER policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NFP policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_NOZOMI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_QED policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_QLCNIC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_RDS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_REALTEK_PHY policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCIF policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_ADVANSYS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_AIC7XXX policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_AIC94XX policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_ARCMSR policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_BFA_FC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_ESAS2R policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_GDTH policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_HPSA policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_IPS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_LPFC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_MVSAS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_MYRB policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_MYRS policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_PM8001 policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_PMCRAID policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_QLA_FC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_SMARTPQI policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_SNIC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_SYM53C8XX_2 policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SCSI_UFSHCD policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SENSORS_LM93 policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SFC policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SOUND policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SSB policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_STMMAC_ETH policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SXGBE_ETH policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_SYNCLINK policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_USB policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_VBOXGUEST policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_VOP policy<{'amd64': 'n', 'arm64': 'n'}> From dbc3b147e67c893b8de666494a61607bcc8ca502 Mon Sep 17 00:00:00 2001 From: Palash Gandhi <87093175+palash-delphix@users.noreply.github.com> Date: Tue, 19 Sep 2023 08:03:03 -0700 Subject: [PATCH 18/18] DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts (#48) PR URL: https://www.github.com/delphix/linux-kernel-aws/pull/48 --- debian.aws-5.15/config/annotations | 1 - debian.delphix/config/annotations | 230 ----------------------------- 2 files changed, 231 deletions(-) delete mode 100644 debian.delphix/config/annotations diff --git a/debian.aws-5.15/config/annotations b/debian.aws-5.15/config/annotations index 36c9ba432a7a7..a497c2cc393fe 100644 --- a/debian.aws-5.15/config/annotations +++ b/debian.aws-5.15/config/annotations @@ -49,4 +49,3 @@ CONFIG_PAHOLE_VERSION policy<{'amd64': '121', 'arm64': CONFIG_SLS policy<{'amd64': '-'}> CONFIG_ZERO_CALL_USED_REGS policy<{'amd64': '-', 'arm64': '-'}> -include "../../debian.delphix/config/annotations" diff --git a/debian.delphix/config/annotations b/debian.delphix/config/annotations deleted file mode 100644 index d44429bdfe35c..0000000000000 --- a/debian.delphix/config/annotations +++ /dev/null @@ -1,230 +0,0 @@ -# Menu: HEADER -# FORMAT: 4 -# ARCH: amd64 -# FLAVOUR: amd64-aws - -# -# Disable various "net" modules which we don't use. -# -CONFIG_6LOWPAN policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_6LOWPAN_NHC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BT policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_CAIF policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_HAMRADIO policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_IEEE802154 policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_9P policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_DSA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NFC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_RFKILL policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_WIMAX policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_WIRELESS policy<{'amd64': 'n', 'arm64': 'n'}> - -# -# Disable various "drivers" modules which we don't use. -# -CONFIG_ACCESSIBILITY policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_AMD_PMC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ATA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ATM_DRIVERS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_AUXDISPLAY policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BCMA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_CONNECTOR policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_DAX policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_EISA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_EXTCON policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_FB policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_FPGA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_FSI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_GNSS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_GPIOLIB policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_GREYBUS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_HSI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_I3C policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_IDE policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_IIO policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_INFINIBAND policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_INTERCONNECT policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_IPACK_BUS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_LIBNVDIMM policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MAILBOX policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MCB policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MEDIA_SUPPORT policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MEMSTICK policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MMC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MTD policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NEW_LEDS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NTB policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NVM policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NVMEM policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_OF policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_PARPORT policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_PARPORT_PANEL policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_PCCARD policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_PINCTRL policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_PMIC_OPREGION policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_PM_DEVFREQ policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_POWERCAP policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_PPS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_RAPIDIO policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_REGULATOR policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_RESET_CONTROLLER policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_RTC_CLASS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SFI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SIOX policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SLIMBUS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SOUNDWIRE policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SPMI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_STAGING policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_THERMAL policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_THUNDERBOLT policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_UIO policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_USB_SUPPORT policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_VFIO policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_W1 policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_WLAN policy<{'amd64': 'n', 'arm64': 'n'}> - -# -# Disable various filesystem which we don't use. -# -CONFIG_9P_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ADFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_AFFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_AFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_AUFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BEFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BTRFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_CEPH_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_CODA_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ECRYPT_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_EFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_EROFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_EXFAT_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_EXT2_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_EXT3_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_F2FS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_FAT_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_GFS2_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_HFSPLUS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_HFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_HPFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_JFFS2_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_JFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MINIX_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MSDOS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NILFS2_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_OCFS2_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_OMFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ORANGEFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_QNX4FS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_QNX6FS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_REISERFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_REISERFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ROMFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SYSV_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_UBIFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_UDF_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_UFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_VFAT_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_VXFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_XFS_FS policy<{'amd64': 'n', 'arm64': 'n'}> - -# -# Disable other misc. modules which we don't use. -# -CONFIG_AGP policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ANDROID policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_AQUANTIA_PHY policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ATALK policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BATMAN_ADV policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BCACHE policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BE2ISCSI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BE2NET policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BLK_DEV_PCIESSD_MTIP32XX policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BLK_DEV_RSXX policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BNA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BNX2 policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BNX2X policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BNXT policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_BROADCOM_PHY policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_CASSINI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_CDROM policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_CEPH_LIB policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_CRAMFS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_CYCLADES policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_DRM policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ENIC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_FM10K policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_FORCEDETH policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_GENWQE policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_GVE policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_HABANA_AI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_HID policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_HIO policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_HWMON policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_IAVF policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ICE policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_INTEL_IOATDMA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_INTEL_MEI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_IONIC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_JME policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_KVM policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_LIBFC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_LIQUIDIO policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MEGARAID_LEGACY policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MEGARAID_MAILBOX policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MEGARAID_MM policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MEGARAID_NEWGEN policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MEGARAID_SAS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MFD_MADERA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MSCC_OCELOT_SWITCH policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_MWAVE policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NETXEN_NIC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_TEAM policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_AQUANTIA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_ATHEROS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_CAVIUM policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_CHELSIO policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_CHELSIO policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_MARVELL policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_MICREL policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_MYRI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_NETERION policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NET_VENDOR_ROCKER policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NFP policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_NOZOMI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_QED policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_QLCNIC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_RDS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_REALTEK_PHY policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCIF policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_ADVANSYS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_AIC7XXX policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_AIC94XX policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_ARCMSR policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_BFA_FC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_ESAS2R policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_GDTH policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_HPSA policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_IPS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_LPFC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_MVSAS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_MYRB policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_MYRS policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_PM8001 policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_PMCRAID policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_QLA_FC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_SMARTPQI policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_SNIC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_SYM53C8XX_2 policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SCSI_UFSHCD policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SENSORS_LM93 policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SFC policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SOUND policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SSB policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_STMMAC_ETH policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SXGBE_ETH policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_SYNCLINK policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_USB policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_VBOXGUEST policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_VOP policy<{'amd64': 'n', 'arm64': 'n'}>