Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nightly build: Update kernel versions #247

Merged
merged 2 commits into from
Jul 15, 2024
Merged

nightly build: Update kernel versions #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d3e87d
scst_local, qla2x00t-32gbit: Improve Linux kernel 6.10 porting
lnocturno Jul 15, 2024
00a2483
nightly build: Update kernel versions
lnocturno Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .github/workflows/run_regression_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ jobs:
fail-fast: false
matrix:
version: [
'6.9',
'6.8.9',
'6.10',
'6.9.9',
'6.8.12',
'6.7.12',
'6.6.30',
'6.1.90',
'5.15.158',
'5.10.216',
'5.4.275',
'4.19.313',
'6.6.40',
'6.1.99',
'5.15.162',
'5.10.221',
'5.4.279',
'4.19.317',
'4.14.336',
'4.9.337',
'3.18.140',
Expand Down
17 changes: 9 additions & 8 deletions nightly/conf/nightly.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,39 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
6.9 \
6.8.9-nc \
6.10 \
6.9.9-nc \
6.8.12-nc \
6.7.12-nc \
6.6.30-nc \
6.6.40-nc \
6.5.13-nc \
6.4.16-nc \
6.3.13-nc \
6.2.16-nc \
6.1.90-nc \
6.1.99-nc \
6.0.19-nc \
5.19.17-nc \
5.18.19-nc \
5.17.15-nc \
5.16.20-nc \
5.15.158-nc \
5.15.162-nc \
5.14.21-nc \
5.13.19-nc \
5.12.19-nc \
5.11.22-nc \
5.10.216-nc \
5.10.221-nc \
5.9.16-nc \
5.8.18-nc \
5.7.19-nc \
5.6.19-nc \
5.5.19-nc \
5.4.275-nc \
5.4.279-nc \
5.3.18-nc \
5.2.21-nc \
5.1.21-nc \
5.0.21-nc \
4.20.17-nc \
4.19.313-nc \
4.19.317-nc \
4.18.20-nc \
4.17.19-nc \
4.16.18-nc \
Expand Down
15 changes: 15 additions & 0 deletions qla2x00t-32gbit/include/trace/events/qla.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
#if !defined(_TRACE_QLA_H_) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_QLA_H_

#ifndef INSIDE_KERNEL_TREE
#include <linux/version.h>
#endif
#include <linux/tracepoint.h>

#undef TRACE_SYSTEM
Expand All @@ -22,11 +25,23 @@ DECLARE_EVENT_CLASS(qla_log_event,

TP_STRUCT__entry(
__string(buf, buf)
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
__dynamic_array(char, msg, QLA_MSG_MAX)
#else
__vstring(msg, vaf->fmt, vaf->va)
#endif
),
TP_fast_assign(
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0)
__assign_str(buf, buf);
#else
__assign_str(buf);
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
vsnprintf(__get_str(msg), QLA_MSG_MAX, vaf->fmt, *vaf->va);
#else
__assign_vstr(msg, vaf->fmt, vaf->va);
#endif
),

TP_printk("%s %s", __get_str(buf), __get_str(msg))
Expand Down
9 changes: 5 additions & 4 deletions scst_local/scst_local.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,6 +1033,7 @@ static int scst_local_change_queue_depth(struct scsi_device *sdev, int depth,

#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */

#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0)
static int scst_local_slave_alloc(struct scsi_device *sdev)
{
struct request_queue *q = sdev->request_queue;
Expand All @@ -1048,17 +1049,16 @@ static int scst_local_slave_alloc(struct scsi_device *sdev)
#endif
#endif

#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0)
/*
* vdisk_blockio requires that data buffers have block_size alignment
* and supports block sizes from 512 up to 4096. See also
* https://github.com/sahlberg/libiscsi/issues/302.
*/
blk_queue_dma_alignment(q, (4096 - 1));
#endif

return 0;
}
#endif

static int scst_local_slave_configure(struct scsi_device *sdev)
{
Expand Down Expand Up @@ -1381,10 +1381,11 @@ static const struct scsi_host_template scst_lcl_ini_driver_template = {
.name = SCST_LOCAL_NAME,
.queuecommand = scst_local_queuecommand,
.change_queue_depth = scst_local_change_queue_depth,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0)
.slave_alloc = scst_local_slave_alloc,
#else
.dma_alignment = (4096 - 1),
#endif
.slave_alloc = scst_local_slave_alloc,
.slave_configure = scst_local_slave_configure,
.eh_abort_handler = scst_local_abort,
.eh_device_reset_handler = scst_local_device_reset,
Expand Down