Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2017-01-27 12:38:00 +0100
committerJohannes Thumshirn <jthumshirn@suse.de>2017-01-27 12:41:31 +0100
commitfdb76e165375196b30f2df1b14823d4df79d71da (patch)
tree30a4e640a13322ad37ec7c5c87521c7b83903f6c
parent13de4b79f4fd508370932166a8cbe25358694bdd (diff)
IB/rxe: Use BTH_PSN_MASK when ACKing duplicate sends
-rw-r--r--patches.drivers/0035-IB-rxe-Use-BTH_PSN_MASK-when-ACKing-duplicate-sends.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.drivers/0035-IB-rxe-Use-BTH_PSN_MASK-when-ACKing-duplicate-sends.patch b/patches.drivers/0035-IB-rxe-Use-BTH_PSN_MASK-when-ACKing-duplicate-sends.patch
new file mode 100644
index 0000000000..cc216a3728
--- /dev/null
+++ b/patches.drivers/0035-IB-rxe-Use-BTH_PSN_MASK-when-ACKing-duplicate-sends.patch
@@ -0,0 +1,38 @@
+From d1d325d9f0265c5698ac3b7a12533e74fc805bef Mon Sep 17 00:00:00 2001
+From: Andrew Boyer <andrew.boyer@dell.com>
+Date: Thu, 22 Dec 2016 08:54:36 -0500
+Subject: IB/rxe: Use BTH_PSN_MASK when ACKing duplicate sends
+Git-commit: 37b36193946e4fe7af2c3965e394eb311ab6601d
+Patch-mainline: v4.10-rc1
+References: FATE#322149
+
+Signed-off-by: Andrew Boyer <andrew.boyer@dell.com>
+Signed-off-by: Doug Ledford <dledford@redhat.com>
+Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
+
+---
+ drivers/infiniband/sw/rxe/rxe_resp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c
+index 7a36ec9..3435eff 100644
+--- a/drivers/infiniband/sw/rxe/rxe_resp.c
++++ b/drivers/infiniband/sw/rxe/rxe_resp.c
+@@ -1070,12 +1070,13 @@ static enum resp_states duplicate_request(struct rxe_qp *qp,
+ struct rxe_pkt_info *pkt)
+ {
+ enum resp_states rc;
++ u32 prev_psn = (qp->resp.psn - 1) & BTH_PSN_MASK;
+
+ if (pkt->mask & RXE_SEND_MASK ||
+ pkt->mask & RXE_WRITE_MASK) {
+ /* SEND. Ack again and cleanup. C9-105. */
+ if (bth_ack(pkt))
+- send_ack(qp, pkt, AETH_ACK_UNLIMITED, qp->resp.psn - 1);
++ send_ack(qp, pkt, AETH_ACK_UNLIMITED, prev_psn);
+ rc = RESPST_CLEANUP;
+ goto out;
+ } else if (pkt->mask & RXE_READ_MASK) {
+--
+1.8.5.6
+
diff --git a/series.conf b/series.conf
index 0a06bd2e9c..84610ffc2d 100644
--- a/series.conf
+++ b/series.conf
@@ -5377,6 +5377,7 @@
patches.drivers/0032-IB-rxe-Increase-max-number-of-completions-to-32k.patch
patches.drivers/0033-IB-core-Let-create_ah-return-extended-response-to-us.patch
patches.drivers/0034-IB-rxe-Fix-a-memory-leak-in-rxe_qp_cleanup.patch
+ patches.drivers/0035-IB-rxe-Use-BTH_PSN_MASK-when-ACKing-duplicate-sends.patch
# fate#322061 Hisilicon/Huawei Hip06d05 network
patches.drivers/arm64-hip-0001-net-hns-Add-support-of-Hip06-SoC-to-the-Hislicon-Net.patch