November 2023 - Linux-stable-mirror

by Chuck Lever

Backport of upstream fixes to NFSD's duplicate reply cache. These have been hand-applied and tested with the same reproducer as was used to create the upstream fixes. --- Chuck Lever (8): NFSD: Refactor nfsd_reply_cache_free_locked() NFSD: Rename nfsd_reply_cache_alloc() NFSD: Replace nfsd_prune_bucket() NFSD: Refactor the duplicate reply cache shrinker NFSD: Remove svc_rqst::rq_cacherep NFSD: Rename struct svc_cacherep NFSD: Fix "start of NFS reply" pointer passed to nfsd_cache_update() NFSD: Fix checksum mismatches in the duplicate reply cache fs/nfsd/cache.h | 8 +- fs/nfsd/nfscache.c | 266 ++++++++++++++++++++++++------------- fs/nfsd/nfssvc.c | 20 ++- fs/nfsd/trace.h | 26 +++- include/linux/sunrpc/svc.h | 1 - 5 files changed, 218 insertions(+), 103 deletions(-) -- Chuck Lever

2 years

4
12
0 0

FAILED: patch "[PATCH] proc: sysctl: prevent aliased sysctls from getting passed to" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 8001f49394e353f035306a45bcf504f06fca6355 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023112228-racoon-mossy-ce5e@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 8001f49394e3 ("proc: sysctl: prevent aliased sysctls from getting passed to init") 1998f19324d2 ("fs: move pipe sysctls to is own file") 66ad398634c2 ("fs: move fs/exec.c sysctls into its own file") d1d8ac9edf10 ("fs: move shared sysctls to fs/sysctls.c") 54771613e8a7 ("sysctl: move maxolduid as a sysctl specific const") c8c0c239d5ab ("fs: move dcache sysctls to its own file") 204d5a24e155 ("fs: move fs stat sysctls to file_table.c") 1d67fe585049 ("fs: move inode sysctls to its own file") b1f2aff888af ("sysctl: share unsigned long const values") 3ba442d5331f ("fs: move binfmt_misc sysctl to its own file") 2452dcb9f7f2 ("sysctl: use SYSCTL_ZERO to replace some static int zero uses") d73840ec2f74 ("sysctl: use const for typically used max/min proc sysctls") f628867da46f ("sysctl: make ngroups_max const") bbe7a10ed83a ("hung_task: move hung_task sysctl interface to hung_task.c") 78e36f3b0dae ("sysctl: move some boundary constants from sysctl.c to sysctl_vals") 39c65a94cd96 ("mm/pagealloc: sysctl: change watermark_scale_factor max limit to 30%") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 8001f49394e353f035306a45bcf504f06fca6355 Mon Sep 17 00:00:00 2001 From: Krister Johansen <kjlx(a)templeofstupid.com> Date: Fri, 27 Oct 2023 14:46:40 -0700 Subject: [PATCH] proc: sysctl: prevent aliased sysctls from getting passed to init The code that checks for unknown boot options is unaware of the sysctl alias facility, which maps bootparams to sysctl values. If a user sets an old value that has a valid alias, a message about an invalid parameter will be printed during boot, and the parameter will get passed to init. Fix by checking for the existence of aliased parameters in the unknown boot parameter code. If an alias exists, don't return an error or pass the value to init. Signed-off-by: Krister Johansen <kjlx(a)templeofstupid.com> Cc: stable(a)vger.kernel.org Fixes: 0a477e1ae21b ("kernel/sysctl: support handling command line aliases") Signed-off-by: Luis Chamberlain <mcgrof(a)kernel.org> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index c88854df0b62..1c9635dddb70 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -1592,6 +1592,13 @@ static const char *sysctl_find_alias(char *param) return NULL; } +bool sysctl_is_alias(char *param) +{ + const char *alias = sysctl_find_alias(param); + + return alias != NULL; +} + /* Set sysctl value passed on kernel command line. */ static int process_sysctl_arg(char *param, char *val, const char *unused, void *arg) diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 09d7429d67c0..61b40ea81f4d 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -242,6 +242,7 @@ extern void __register_sysctl_init(const char *path, struct ctl_table *table, extern struct ctl_table_header *register_sysctl_mount_point(const char *path); void do_sysctl_args(void); +bool sysctl_is_alias(char *param); int do_proc_douintvec(struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos, int (*conv)(unsigned long *lvalp, @@ -287,6 +288,11 @@ static inline void setup_sysctl_set(struct ctl_table_set *p, static inline void do_sysctl_args(void) { } + +static inline bool sysctl_is_alias(char *param) +{ + return false; +} #endif /* CONFIG_SYSCTL */ int sysctl_max_threads(struct ctl_table *table, int write, void *buffer, diff --git a/init/main.c b/init/main.c index 436d73261810..e24b0780fdff 100644 --- a/init/main.c +++ b/init/main.c @@ -530,6 +530,10 @@ static int __init unknown_bootoption(char *param, char *val, { size_t len = strlen(param); + /* Handle params aliased to sysctls */ + if (sysctl_is_alias(param)) + return 0; + repair_env_string(param, val); /* Handle obsolete-style parameters */

2 years

3
2
0 0

[PATCH 4.14] mtd: rawnand: brcmnand: Fix ecc chunk calculation for erased page bitfips

by Yuta Hayama

From: Claire Lin <claire.lin(a)broadcom.com> commit 7f852cc1579297fd763789f8cd370639d0c654b6 upstream. In brcmstb_nand_verify_erased_page(), the ECC chunk pointer calculation while correcting erased page bitflips is wrong, fix it. Fixes: 02b88eea9f9c ("mtd: brcmnand: Add check for erased page bitflips") Signed-off-by: Claire Lin <claire.lin(a)broadcom.com> Reviewed-by: Ray Jui <ray.jui(a)broadcom.com> Signed-off-by: Kamal Dasu <kdasu.kdev(a)gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Signed-off-by: Yuta Hayama <hayama(a)lineo.co.jp> --- After applying e44b9a9c1357 ("mtd: nand: brcmnand: Zero bitflip is not an error"), the return value 0 of brcmstb_nand_verify_erased_page() is *correctly* interpreted as "no bit flips, no errors". However, that function still has the issue that it may incorrectly return 0 for a page that contains bitflips. Without this patch, the data buffer of the erased page could be passed to a upper layer (e.g. UBIFS) without bitflips being detected and corrected. In active stable, 4.14.y and 4.19.y seem to have a same issue. drivers/mtd/nand/brcmnand/brcmnand.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index fa66663df6e8..267bbba09afb 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -1753,6 +1753,7 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd, int bitflips = 0; int page = addr >> chip->page_shift; int ret; + void *ecc_chunk; if (!buf) { buf = chip->buffers->databuf; @@ -1769,7 +1770,9 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd, return ret; for (i = 0; i < chip->ecc.steps; i++, oob += sas) { - ret = nand_check_erased_ecc_chunk(buf, chip->ecc.size, + ecc_chunk = buf + chip->ecc.size * i; + ret = nand_check_erased_ecc_chunk(ecc_chunk, + chip->ecc.size, oob, sas, NULL, 0, chip->ecc.strength); if (ret < 0) -- 2.25.1

2 years

2
1
0 0

[for-4.19 0/2] backport "KVM: arm64: limit PMU version to PMUv3 for ARMv8.1"

by Zenghui Yu

We need to backport patch #1 as well because it introduced a helper used by patch #2. Andrew Murray (2): arm64: cpufeature: Extract capped perfmon fields KVM: arm64: limit PMU version to PMUv3 for ARMv8.1 arch/arm64/include/asm/cpufeature.h | 23 +++++++++++++++++++++++ arch/arm64/include/asm/sysreg.h | 6 ++++++ arch/arm64/kvm/sys_regs.c | 10 ++++++++++ 3 files changed, 39 insertions(+) -- 2.33.0

2 years

2
5
0 0

FAILED: patch "[PATCH] tracing/kprobes: Return EADDRNOTAVAIL when func matches" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x b022f0c7e404887a7c5229788fc99eff9f9a80d5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023102140-tartly-democrat-140d@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From b022f0c7e404887a7c5229788fc99eff9f9a80d5 Mon Sep 17 00:00:00 2001 From: Francis Laniel <flaniel(a)linux.microsoft.com> Date: Fri, 20 Oct 2023 13:42:49 +0300 Subject: [PATCH] tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols When a kprobe is attached to a function that's name is not unique (is static and shares the name with other functions in the kernel), the kprobe is attached to the first function it finds. This is a bug as the function that it is attaching to is not necessarily the one that the user wants to attach to. Instead of blindly picking a function to attach to what is ambiguous, error with EADDRNOTAVAIL to let the user know that this function is not unique, and that the user must use another unique function with an address offset to get to the function they want to attach to. Link: https://lore.kernel.org/all/20231020104250.9537-2-flaniel@linux.microsoft.c… Cc: stable(a)vger.kernel.org Fixes: 413d37d1eb69 ("tracing: Add kprobe-based event tracer") Suggested-by: Masami Hiramatsu <mhiramat(a)kernel.org> Signed-off-by: Francis Laniel <flaniel(a)linux.microsoft.com> Link: https://lore.kernel.org/lkml/20230819101105.b0c104ae4494a7d1f2eea742@kernel… Acked-by: Masami Hiramatsu (Google) <mhiramat(a)kernel.org> Signed-off-by: Masami Hiramatsu (Google) <mhiramat(a)kernel.org> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 3d7a180a8427..a8fef6ab0872 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -705,6 +705,25 @@ static struct notifier_block trace_kprobe_module_nb = { .priority = 1 /* Invoked after kprobe module callback */ }; +static int count_symbols(void *data, unsigned long unused) +{ + unsigned int *count = data; + + (*count)++; + + return 0; +} + +static unsigned int number_of_same_symbols(char *func_name) +{ + unsigned int count; + + count = 0; + kallsyms_on_each_match_symbol(count_symbols, func_name, &count); + + return count; +} + static int __trace_kprobe_create(int argc, const char *argv[]) { /* @@ -836,6 +855,31 @@ static int __trace_kprobe_create(int argc, const char *argv[]) } } + if (symbol && !strchr(symbol, ':')) { + unsigned int count; + + count = number_of_same_symbols(symbol); + if (count > 1) { + /* + * Users should use ADDR to remove the ambiguity of + * using KSYM only. + */ + trace_probe_log_err(0, NON_UNIQ_SYMBOL); + ret = -EADDRNOTAVAIL; + + goto error; + } else if (count == 0) { + /* + * We can return ENOENT earlier than when register the + * kprobe. + */ + trace_probe_log_err(0, BAD_PROBE_ADDR); + ret = -ENOENT; + + goto error; + } + } + trace_probe_log_set_index(0); if (event) { ret = traceprobe_parse_event_name(&event, &group, gbuf, @@ -1695,6 +1739,7 @@ static int unregister_kprobe_event(struct trace_kprobe *tk) } #ifdef CONFIG_PERF_EVENTS + /* create a trace_kprobe, but don't add it to global lists */ struct trace_event_call * create_local_trace_kprobe(char *func, void *addr, unsigned long offs, @@ -1705,6 +1750,24 @@ create_local_trace_kprobe(char *func, void *addr, unsigned long offs, int ret; char *event; + if (func) { + unsigned int count; + + count = number_of_same_symbols(func); + if (count > 1) + /* + * Users should use addr to remove the ambiguity of + * using func only. + */ + return ERR_PTR(-EADDRNOTAVAIL); + else if (count == 0) + /* + * We can return ENOENT earlier than when register the + * kprobe. + */ + return ERR_PTR(-ENOENT); + } + /* * local trace_kprobes are not added to dyn_event, so they are never * searched in find_trace_kprobe(). Therefore, there is no concern of diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index 02b432ae7513..850d9ecb6765 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -450,6 +450,7 @@ extern int traceprobe_define_arg_fields(struct trace_event_call *event_call, C(BAD_MAXACT, "Invalid maxactive number"), \ C(MAXACT_TOO_BIG, "Maxactive is too big"), \ C(BAD_PROBE_ADDR, "Invalid probed address or symbol"), \ + C(NON_UNIQ_SYMBOL, "The symbol is not unique"), \ C(BAD_RETPROBE, "Retprobe address must be an function entry"), \ C(NO_TRACEPOINT, "Tracepoint is not found"), \ C(BAD_ADDR_SUFFIX, "Invalid probed address suffix"), \

2 years

3
6
0 0

[PATCH 6.5 153/191] Input: xpad - add HyperX Clutch Gladiate Support

by Nguyen, Max

> Hi, > > We would like to apply this patch to version 6.1 of the LTS branch. > This is to add a project ID for Android support for a gamepad > controller. We would like it to apply sooner than waiting for the > next LTS branch due to project schedules. > > commite28a0974d749e5105d77233c0a84d35c37da047e > > Regards, > > Max > Hi Linux team, We would like to have this patch backported to LTS versions 4.19, 5.4, 5.10, and 5.15 as well. The main purpose would to add our device ID for support across older android devices. Feel free to let us know if there are any concerns or issues. > > *CAUTION: External Email * > > 6.5-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Max Nguyen <maxwell.nguyen(a)hp.com> > > commit e28a0974d749e5105d77233c0a84d35c37da047e upstream. > > Add HyperX controller support to xpad_device and xpad_table. > > Suggested-by: Chris Toledanes <chris.toledanes(a)hp.com> > Reviewed-by: Carl Ng <carl.ng(a)hp.com> > Signed-off-by: Max Nguyen <maxwell.nguyen(a)hp.com> > Reviewed-by: Rahul Rameshbabu <rrameshbabu(a)nvidia.com> > Link: > https://lore.kernel.org/r/20230906231514.4291-1-hphyperxdev@gmail.com > Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> > Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> > --- > drivers/input/joystick/xpad.c | 2 ++ > 1 file changed, 2 insertions(+) > > --- a/drivers/input/joystick/xpad.c > +++ b/drivers/input/joystick/xpad.c > @@ -130,6 +130,7 @@ static const struct xpad_device { > { 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 }, > { 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 }, > { 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 }, > + { 0x03f0, 0x0495, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE }, > { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, > { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, > { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, > @@ -458,6 +459,7 @@ static const struct usb_device_id xpad_t > { USB_INTERFACE_INFO('X', 'B', 0) }, /* Xbox USB-IF not-approved class */ > XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 controller */ > XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */ > + XPAD_XBOXONE_VENDOR(0x03f0), /* HP HyperX Xbox One controllers */ > XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster Xbox 360 controllers */ > XPAD_XBOX360_VENDOR(0x045e), /* Microsoft Xbox 360 controllers */ > XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft Xbox One controllers */ >

2 years

2
9
0 0

[PATCH 0/2] nfsd fixes for 6.6.y

by Chuck Lever

Backport of upstream fixes to NFSD's duplicate reply cache. These have been hand-applied and tested with the same reproducer as was used to create the upstream fixes. --- Chuck Lever (2): NFSD: Fix "start of NFS reply" pointer passed to nfsd_cache_update() NFSD: Fix checksum mismatches in the duplicate reply cache fs/nfsd/cache.h | 4 +-- fs/nfsd/nfscache.c | 64 +++++++++++++++++++++++++++++++--------------- fs/nfsd/nfssvc.c | 14 ++++++++-- 3 files changed, 57 insertions(+), 25 deletions(-) -- Chuck Lever

2 years

4
5
0 0

[PATCH 5.10] PCI: keystone: Drop __init from ks_pcie_add_pcie_{ep,port}()

by Nathan Chancellor

This commit has no upstream equivalent. After commit db5ebaeb8fda ("PCI: keystone: Don't discard .probe() callback") in 5.10, there are two modpost warnings when building with clang: WARNING: modpost: vmlinux.o(.text+0x5aa6dc): Section mismatch in reference from the function ks_pcie_probe() to the function .init.text:ks_pcie_add_pcie_port() The function ks_pcie_probe() references the function __init ks_pcie_add_pcie_port(). This is often because ks_pcie_probe lacks a __init annotation or the annotation of ks_pcie_add_pcie_port is wrong. WARNING: modpost: vmlinux.o(.text+0x5aa6f4): Section mismatch in reference from the function ks_pcie_probe() to the function .init.text:ks_pcie_add_pcie_ep() The function ks_pcie_probe() references the function __init ks_pcie_add_pcie_ep(). This is often because ks_pcie_probe lacks a __init annotation or the annotation of ks_pcie_add_pcie_ep is wrong. ks_pcie_add_pcie_ep() was removed in upstream commit a0fd361db8e5 ("PCI: dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code") and ks_pcie_add_pcie_port() was removed in upstream commit 60f5b73fa0f2 ("PCI: dwc: Remove unnecessary wrappers around dw_pcie_host_init()"), both of which happened before upstream commit 7994db905c0f ("PCI: keystone: Don't discard .probe() callback"). As neither of these removal changes are really suitable for stable, just remove __init from these functions in stable, as it is no longer a correct annotation after dropping __init from ks_pcie_probe(). Fixes: db5ebaeb8fda ("PCI: keystone: Don't discard .probe() callback") Reported-by: Naresh Kamboju <naresh.kamboju(a)linaro.org> Signed-off-by: Nathan Chancellor <nathan(a)kernel.org> --- This is not an issue in mainline but I still cc'd the author and committer of 7994db905c0f in case they would like to check my analysis. --- drivers/pci/controller/dwc/pci-keystone.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index 5b722287aac9..afaea201a5af 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -865,8 +865,8 @@ static irqreturn_t ks_pcie_err_irq_handler(int irq, void *priv) return ks_pcie_handle_error_irq(ks_pcie); } -static int __init ks_pcie_add_pcie_port(struct keystone_pcie *ks_pcie, - struct platform_device *pdev) +static int ks_pcie_add_pcie_port(struct keystone_pcie *ks_pcie, + struct platform_device *pdev) { struct dw_pcie *pci = ks_pcie->pci; struct pcie_port *pp = &pci->pp; @@ -978,8 +978,8 @@ static const struct dw_pcie_ep_ops ks_pcie_am654_ep_ops = { .get_features = &ks_pcie_am654_get_features, }; -static int __init ks_pcie_add_pcie_ep(struct keystone_pcie *ks_pcie, - struct platform_device *pdev) +static int ks_pcie_add_pcie_ep(struct keystone_pcie *ks_pcie, + struct platform_device *pdev) { int ret; struct dw_pcie_ep *ep; --- base-commit: 479e8b8925415420b31e2aa65f9b0db3dea2adf4 change-id: 20231128-5-10-fix-pci-keystone-modpost-warning-a8e886bdc0f7 Best regards, -- Nathan Chancellor <nathan(a)kernel.org>

2 years

3
2
0 0

[PATCH] RDMA/i40iw: Prevent zero-length STAG registration

by Shiraz Saleem

[ Upstream commit bb6d73d9add68ad270888db327514384dfa44958 ] Currently i40iw allows zero-length STAGs to be programmed in HW during the kernel mode fast register flow. Zero-length MR or STAG registration disable HW memory length checks. Improve gaps in bounds checking in irdma by preventing zero-length STAG or MR registrations except if the IB_PD_UNSAFE_GLOBAL_RKEY is set. This addresses the disclosure CVE-2023-25775. i40iw is replaced by irdma upstream starting 5.14, resulting in adjustments to upstream commit to support the older APIs. The kernel versions to apply this patch are 5.10.x 5.4.x 4.19.x 4.14.x. Fixes: d37498417947 ("i40iw: add files for iwarp interface") Signed-off-by: Shiraz Saleem <shiraz.saleem(a)intel.com> --- drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 6 ++++++ drivers/infiniband/hw/i40iw/i40iw_type.h | 2 ++ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 10 ++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c index 86d3f8aff329..2b18bb36e4e3 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c +++ b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c @@ -3033,6 +3033,9 @@ static enum i40iw_status_code i40iw_sc_alloc_stag( u64 header; enum i40iw_page_size page_size; + if (!info->total_len && !info->all_memory) + return -EINVAL; + page_size = (info->page_size == 0x200000) ? I40IW_PAGE_SIZE_2M : I40IW_PAGE_SIZE_4K; cqp = dev->cqp; wqe = i40iw_sc_cqp_get_next_send_wqe(cqp, scratch); @@ -3091,6 +3094,9 @@ static enum i40iw_status_code i40iw_sc_mr_reg_non_shared( u8 addr_type; enum i40iw_page_size page_size; + if (!info->total_len && !info->all_memory) + return -EINVAL; + page_size = (info->page_size == 0x200000) ? I40IW_PAGE_SIZE_2M : I40IW_PAGE_SIZE_4K; if (info->access_rights & (I40IW_ACCESS_FLAGS_REMOTEREAD_ONLY | I40IW_ACCESS_FLAGS_REMOTEWRITE_ONLY)) diff --git a/drivers/infiniband/hw/i40iw/i40iw_type.h b/drivers/infiniband/hw/i40iw/i40iw_type.h index c3babf3cbb8e..341aa6b1b6c1 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_type.h +++ b/drivers/infiniband/hw/i40iw/i40iw_type.h @@ -786,6 +786,7 @@ struct i40iw_allocate_stag_info { bool use_hmc_fcn_index; u8 hmc_fcn_index; bool use_pf_rid; + bool all_memory; }; struct i40iw_reg_ns_stag_info { @@ -804,6 +805,7 @@ struct i40iw_reg_ns_stag_info { bool use_hmc_fcn_index; u8 hmc_fcn_index; bool use_pf_rid; + bool all_memory; }; struct i40iw_fast_reg_stag_info { diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c index 533f3caecb7a..89654dc91d81 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c +++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c @@ -1494,7 +1494,8 @@ static int i40iw_handle_q_mem(struct i40iw_device *iwdev, static int i40iw_hw_alloc_stag(struct i40iw_device *iwdev, struct i40iw_mr *iwmr) { struct i40iw_allocate_stag_info *info; - struct i40iw_pd *iwpd = to_iwpd(iwmr->ibmr.pd); + struct ib_pd *pd = iwmr->ibmr.pd; + struct i40iw_pd *iwpd = to_iwpd(pd); enum i40iw_status_code status; int err = 0; struct i40iw_cqp_request *cqp_request; @@ -1511,6 +1512,7 @@ static int i40iw_hw_alloc_stag(struct i40iw_device *iwdev, struct i40iw_mr *iwmr info->stag_idx = iwmr->stag >> I40IW_CQPSQ_STAG_IDX_SHIFT; info->pd_id = iwpd->sc_pd.pd_id; info->total_len = iwmr->length; + info->all_memory = pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY; info->remote_access = true; cqp_info->cqp_cmd = OP_ALLOC_STAG; cqp_info->post_sq = 1; @@ -1563,6 +1565,8 @@ static struct ib_mr *i40iw_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type, iwmr->type = IW_MEMREG_TYPE_MEM; palloc = &iwpbl->pble_alloc; iwmr->page_cnt = max_num_sg; + /* Use system PAGE_SIZE as the sg page sizes are unknown at this point */ + iwmr->length = max_num_sg * PAGE_SIZE; mutex_lock(&iwdev->pbl_mutex); status = i40iw_get_pble(&iwdev->sc_dev, iwdev->pble_rsrc, palloc, iwmr->page_cnt); mutex_unlock(&iwdev->pbl_mutex); @@ -1659,7 +1663,8 @@ static int i40iw_hwreg_mr(struct i40iw_device *iwdev, { struct i40iw_pbl *iwpbl = &iwmr->iwpbl; struct i40iw_reg_ns_stag_info *stag_info; - struct i40iw_pd *iwpd = to_iwpd(iwmr->ibmr.pd); + struct ib_pd *pd = iwmr->ibmr.pd; + struct i40iw_pd *iwpd = to_iwpd(pd); struct i40iw_pble_alloc *palloc = &iwpbl->pble_alloc; enum i40iw_status_code status; int err = 0; @@ -1679,6 +1684,7 @@ static int i40iw_hwreg_mr(struct i40iw_device *iwdev, stag_info->total_len = iwmr->length; stag_info->access_rights = access; stag_info->pd_id = iwpd->sc_pd.pd_id; + stag_info->all_memory = pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY; stag_info->addr_type = I40IW_ADDR_TYPE_VA_BASED; stag_info->page_size = iwmr->page_size; -- 1.8.3.1

2 years

2
1
0 0

stable-rc/queue/5.10 baseline: 140 runs, 8 regressions (v5.10.202-53-ga1e0fa8fccd1b)

by kernelci.org bot

stable-rc/queue/5.10 baseline: 140 runs, 8 regressions (v5.10.202-53-ga1e0fa8fccd1b) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+----------------------------+------------ beaglebone-black | arm | lab-broonie | gcc-10 | omap2plus_defconfig | 1 qemu_x86_64 | x86_64 | lab-baylibre | gcc-10 | x86_64_defconfig+x86-board | 1 r8a77960-ulcb | arm64 | lab-collabora | gcc-10 | defconfig | 1 rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 2 sun50i-h6-pine-h64 | arm64 | lab-clabbe | gcc-10 | defconfig | 1 sun50i-h6-pine-h64 | arm64 | lab-collabora | gcc-10 | defconfig | 1 sun8i-h2-plus...ch-all-h3-cc | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F5.10/kernel/v5.10.20… Test: baseline Tree: stable-rc Branch: queue/5.10 Describe: v5.10.202-53-ga1e0fa8fccd1b URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: a1e0fa8fccd1b3bc456aad06901708c2127860d9 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+----------------------------+------------ beaglebone-black | arm | lab-broonie | gcc-10 | omap2plus_defconfig | 1 Details: https://kernelci.org/test/plan/id/6567d6f332c84ed2877e4a72 Results: 51 PASS, 4 FAIL, 1 SKIP Full config: omap2plus_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6567d6f332c84ed2877e4aab failing since 289 days (last pass: v5.10.167-127-g921934d621e4, first fail: v5.10.167-139-gf9519a5a1701) 2023-11-30T00:27:07.931034 <8>[ 15.930242] <LAVA_SIGNAL_ENDRUN 0_dmesg 289170_1.5.2.4.1> 2023-11-30T00:27:08.038077 / # # 2023-11-30T00:27:08.139821 export SHELL=/bin/sh 2023-11-30T00:27:08.140255 # 2023-11-30T00:27:08.242107 / # export SHELL=/bin/sh. /lava-289170/environment 2023-11-30T00:27:08.242756 2023-11-30T00:27:08.344697 / # . /lava-289170/environment/lava-289170/bin/lava-test-runner /lava-289170/1 2023-11-30T00:27:08.345575 2023-11-30T00:27:08.350522 / # /lava-289170/bin/lava-test-runner /lava-289170/1 2023-11-30T00:27:08.460290 + export 'TESTRUN_ID=1_bootrr' ... (11 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+----------------------------+------------ qemu_x86_64 | x86_64 | lab-baylibre | gcc-10 | x86_64_defconfig+x86-board | 1 Details: https://kernelci.org/test/plan/id/6567d6c5940bd375a07e4adf Results: 0 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-board Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.login: https://kernelci.org/test/case/id/6567d6c5940bd375a07e4ae0 new failure (last pass: v5.10.202-53-gc4c658517011c) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+----------------------------+------------ r8a77960-ulcb | arm64 | lab-collabora | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/6567d7940e4dd383ba7e4a81 Results: 4 PASS, 2 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6567d7940e4dd383ba7e4a8a failing since 7 days (last pass: v5.10.181-18-g1622068b57a4, first fail: v5.10.201-98-g6f84b6dba25c) 2023-11-30T00:36:22.860194 / # # 2023-11-30T00:36:22.960696 export SHELL=/bin/sh 2023-11-30T00:36:22.960823 # 2023-11-30T00:36:23.061275 / # export SHELL=/bin/sh. /lava-12127683/environment 2023-11-30T00:36:23.061391 2023-11-30T00:36:23.161909 / # . /lava-12127683/environment/lava-12127683/bin/lava-test-runner /lava-12127683/1 2023-11-30T00:36:23.162107 2023-11-30T00:36:23.174557 / # /lava-12127683/bin/lava-test-runner /lava-12127683/1 2023-11-30T00:36:23.227464 + export 'TESTRUN_ID=1_bootrr' 2023-11-30T00:36:23.227544 + cd /lav<8>[ 16.411753] <LAVA_SIGNAL_STARTRUN 1_bootrr 12127683_1.5.2.4.5> ... (28 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 2 Details: https://kernelci.org/test/plan/id/6567d85c4e745721217e4ab3 Results: 84 PASS, 2 FAIL, 1 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.rockchip-usb2phy1-probed: https://kernelci.org/test/case/id/6567d85c4e745721217e4abd failing since 260 days (last pass: v5.10.172-529-g06956b9e9396, first fail: v5.10.173-69-gfcbe6bd469ed) 2023-11-30T00:33:09.325843 <8>[ 61.179930] <LAVA_SIGNAL_TESTCASE TEST_CASE_ID=rockchip-usb2phy0-probed RESULT=fail> 2023-11-30T00:33:10.351089 /lava-12127712/1/../bin/lava-test-case 2023-11-30T00:33:10.362284 <8>[ 62.216856] <LAVA_SIGNAL_TESTCASE TEST_CASE_ID=rockchip-usb2phy1-probed RESULT=fail> * baseline.bootrr.rockchip-usb2phy0-probed: https://kernelci.org/test/case/id/6567d85c4e745721217e4abe failing since 260 days (last pass: v5.10.172-529-g06956b9e9396, first fail: v5.10.173-69-gfcbe6bd469ed) 2023-11-30T00:33:09.314397 /lava-12127712/1/../bin/lava-test-case platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+----------------------------+------------ sun50i-h6-pine-h64 | arm64 | lab-clabbe | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/6567d77c548e182d807e4a76 Results: 5 PASS, 1 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6567d77c548e182d807e4a7f failing since 7 days (last pass: v5.10.176-241-ga0049fd9c865, first fail: v5.10.201-98-g6f84b6dba25c) 2023-11-30T00:29:38.383483 <8>[ 16.926629] <LAVA_SIGNAL_ENDRUN 0_dmesg 445863_1.5.2.4.1> 2023-11-30T00:29:38.488555 / # # 2023-11-30T00:29:38.590202 export SHELL=/bin/sh 2023-11-30T00:29:38.590834 # 2023-11-30T00:29:38.691838 / # export SHELL=/bin/sh. /lava-445863/environment 2023-11-30T00:29:38.692433 2023-11-30T00:29:38.793495 / # . /lava-445863/environment/lava-445863/bin/lava-test-runner /lava-445863/1 2023-11-30T00:29:38.794409 2023-11-30T00:29:38.798814 / # /lava-445863/bin/lava-test-runner /lava-445863/1 2023-11-30T00:29:38.865861 + export 'TESTRUN_ID=1_bootrr' ... (11 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+----------------------------+------------ sun50i-h6-pine-h64 | arm64 | lab-collabora | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/6567d7954a44f812167e4a6d Results: 5 PASS, 1 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6567d7954a44f812167e4a76 failing since 7 days (last pass: v5.10.176-241-ga0049fd9c865, first fail: v5.10.201-98-g6f84b6dba25c) 2023-11-30T00:36:37.360881 / # # 2023-11-30T00:36:37.463224 export SHELL=/bin/sh 2023-11-30T00:36:37.463991 # 2023-11-30T00:36:37.565399 / # export SHELL=/bin/sh. /lava-12127684/environment 2023-11-30T00:36:37.566157 2023-11-30T00:36:37.667602 / # . /lava-12127684/environment/lava-12127684/bin/lava-test-runner /lava-12127684/1 2023-11-30T00:36:37.668833 2023-11-30T00:36:37.684045 / # /lava-12127684/bin/lava-test-runner /lava-12127684/1 2023-11-30T00:36:37.741871 + export 'TESTRUN_ID=1_bootrr' 2023-11-30T00:36:37.742384 + cd /lava-1212768<8>[ 18.201317] <LAVA_SIGNAL_STARTRUN 1_bootrr 12127684_1.5.2.4.5> ... (10 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+----------------------------+------------ sun8i-h2-plus...ch-all-h3-cc | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/6567d9827e5ed3e3c57e4a8c Results: 5 PASS, 1 FAIL, 1 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.202-53-ga1e0fa8fcc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6567d9827e5ed3e3c57e4a95 failing since 7 days (last pass: v5.10.165-77-g4600242c13ed, first fail: v5.10.201-98-g6f84b6dba25c) 2023-11-30T00:38:00.071862 / # # 2023-11-30T00:38:00.173135 export SHELL=/bin/sh 2023-11-30T00:38:00.173601 # 2023-11-30T00:38:00.274417 / # export SHELL=/bin/sh. /lava-3854054/environment 2023-11-30T00:38:00.274842 2023-11-30T00:38:00.375666 / # . /lava-3854054/environment/lava-3854054/bin/lava-test-runner /lava-3854054/1 2023-11-30T00:38:00.376367 2023-11-30T00:38:00.383949 / # /lava-3854054/bin/lava-test-runner /lava-3854054/1 2023-11-30T00:38:00.432016 + export 'TESTRUN_ID=1_bootrr' 2023-11-30T00:38:00.471769 + cd /lava-3854054/1/tests/1_bootrr ... (10 line(s) more)

2 years

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror November 2023