From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Hannes Reinecke <hare@suse.com>,
Johannes Thumshirn <jthumshirn@suse.de>,
Christoph Hellwig <hch@lst.de>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Subject: [PATCH 4.9 02/47] scsi: sg: disable SET_FORCE_LOW_DMA
Date: Mon, 22 Jan 2018 09:45:13 +0100 [thread overview]
Message-ID: <20180122083925.819821436@linuxfoundation.org> (raw)
In-Reply-To: <20180122083925.568134913@linuxfoundation.org>
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <hare@suse.de>
commit 745dfa0d8ec26b24f3304459ff6e9eacc5c8351b upstream.
The ioctl SET_FORCE_LOW_DMA has never worked since the initial git
check-in, and the respective setting is nowadays handled correctly. So
disable it entirely.
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Tested-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/scsi/sg.c | 30 +++++++++---------------------
include/scsi/sg.h | 1 -
2 files changed, 9 insertions(+), 22 deletions(-)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -149,7 +149,6 @@ typedef struct sg_fd { /* holds the sta
struct list_head rq_list; /* head of request list */
struct fasync_struct *async_qp; /* used by asynchronous notification */
Sg_request req_arr[SG_MAX_QUEUE]; /* used as singly-linked list */
- char low_dma; /* as in parent but possibly overridden to 1 */
char force_packid; /* 1 -> pack_id input to read(), 0 -> ignored */
char cmd_q; /* 1 -> allow command queuing, 0 -> don't */
unsigned char next_cmd_len; /* 0: automatic, >0: use on next write() */
@@ -922,24 +921,14 @@ sg_ioctl(struct file *filp, unsigned int
/* strange ..., for backward compatibility */
return sfp->timeout_user;
case SG_SET_FORCE_LOW_DMA:
- result = get_user(val, ip);
- if (result)
- return result;
- if (val) {
- sfp->low_dma = 1;
- if ((0 == sfp->low_dma) && !sfp->res_in_use) {
- val = (int) sfp->reserve.bufflen;
- sg_remove_scat(sfp, &sfp->reserve);
- sg_build_reserve(sfp, val);
- }
- } else {
- if (atomic_read(&sdp->detaching))
- return -ENODEV;
- sfp->low_dma = sdp->device->host->unchecked_isa_dma;
- }
+ /*
+ * N.B. This ioctl never worked properly, but failed to
+ * return an error value. So returning '0' to keep compability
+ * with legacy applications.
+ */
return 0;
case SG_GET_LOW_DMA:
- return put_user((int) sfp->low_dma, ip);
+ return put_user((int) sdp->device->host->unchecked_isa_dma, ip);
case SG_GET_SCSI_ID:
if (!access_ok(VERIFY_WRITE, p, sizeof (sg_scsi_id_t)))
return -EFAULT;
@@ -1860,6 +1849,7 @@ sg_build_indirect(Sg_scatter_hold * schp
int sg_tablesize = sfp->parentdp->sg_tablesize;
int blk_size = buff_size, order;
gfp_t gfp_mask = GFP_ATOMIC | __GFP_COMP | __GFP_NOWARN;
+ struct sg_device *sdp = sfp->parentdp;
if (blk_size < 0)
return -EFAULT;
@@ -1885,7 +1875,7 @@ sg_build_indirect(Sg_scatter_hold * schp
scatter_elem_sz_prev = num;
}
- if (sfp->low_dma)
+ if (sdp->device->host->unchecked_isa_dma)
gfp_mask |= GFP_DMA;
if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
@@ -2148,8 +2138,6 @@ sg_add_sfp(Sg_device * sdp)
sfp->timeout = SG_DEFAULT_TIMEOUT;
sfp->timeout_user = SG_DEFAULT_TIMEOUT_USER;
sfp->force_packid = SG_DEF_FORCE_PACK_ID;
- sfp->low_dma = (SG_DEF_FORCE_LOW_DMA == 0) ?
- sdp->device->host->unchecked_isa_dma : 1;
sfp->cmd_q = SG_DEF_COMMAND_Q;
sfp->keep_orphan = SG_DEF_KEEP_ORPHAN;
sfp->parentdp = sdp;
@@ -2608,7 +2596,7 @@ static void sg_proc_debug_helper(struct
jiffies_to_msecs(fp->timeout),
fp->reserve.bufflen,
(int) fp->reserve.k_use_sg,
- (int) fp->low_dma);
+ (int) sdp->device->host->unchecked_isa_dma);
seq_printf(s, " cmd_q=%d f_packid=%d k_orphan=%d closed=0\n",
(int) fp->cmd_q, (int) fp->force_packid,
(int) fp->keep_orphan);
--- a/include/scsi/sg.h
+++ b/include/scsi/sg.h
@@ -197,7 +197,6 @@ typedef struct sg_req_info { /* used by
#define SG_DEFAULT_RETRIES 0
/* Defaults, commented if they differ from original sg driver */
-#define SG_DEF_FORCE_LOW_DMA 0 /* was 1 -> memory below 16MB on i386 */
#define SG_DEF_FORCE_PACK_ID 0
#define SG_DEF_KEEP_ORPHAN 0
#define SG_DEF_RESERVED_SIZE SG_SCATTER_SZ /* load time option */
next prev parent reply other threads:[~2018-01-22 8:45 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 8:45 [PATCH 4.9 00/47] 4.9.78-stable review Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 01/47] libnvdimm, btt: Fix an incompatibility in the log layout Greg Kroah-Hartman
2018-01-22 8:45 ` Greg Kroah-Hartman [this message]
2018-01-22 8:45 ` [PATCH 4.9 03/47] futex: Prevent overflow by strengthen input validation Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 04/47] ALSA: seq: Make ioctls race-free Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 05/47] ALSA: pcm: Remove yet superfluous WARN_ON() Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 06/47] ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 07/47] ALSA: hda - Apply the existing quirk to iMac 14,1 Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 08/47] timers: Unconditionally check deferrable base Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 09/47] af_key: fix buffer overread in verify_address_len() Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 10/47] af_key: fix buffer overread in parse_exthdrs() Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 11/47] iser-target: Fix possible use-after-free in connection establishment error Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 12/47] scsi: hpsa: fix volume offline state Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 13/47] sched/deadline: Zero out positive runtime after throttling constrained tasks Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 14/47] x86/retpoline: Fill RSB on context switch for affected CPUs Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 15/47] x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 16/47] objtool: Improve error message for bad file argument Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 17/47] x86/cpufeature: Move processor tracing out of scattered features Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 18/47] module: Add retpoline tag to VERMAGIC Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 19/47] x86/mm/pkeys: Fix fill_sig_info_pkey Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 20/47] x86/tsc: Fix erroneous TSC rate on Skylake Xeon Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 21/47] pipe: avoid round_pipe_size() nr_pages overflow on 32-bit Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 22/47] x86/apic/vector: Fix off by one in error path Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 23/47] perf tools: Fix build with ARCH=x86_64 Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 24/47] Input: ALPS - fix multi-touch decoding on SS4 plus touchpads Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 25/47] Input: 88pm860x-ts - fix child-node lookup Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 26/47] Input: twl6040-vibra " Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 27/47] Input: twl4030-vibra - fix sibling-node lookup Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 28/47] tracing: Fix converting enums from the map in trace_event_eval_update() Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 29/47] phy: work around phys references to usb-nop-xceiv devices Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 30/47] ARM: sunxi_defconfig: Enable CMA Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 31/47] ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7 Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 32/47] can: peak: fix potential bug in packet fragmentation Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 33/47] scripts/gdb/linux/tasks.py: fix get_thread_info Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 34/47] proc: fix coredump vs read /proc/*/stat race Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 35/47] libata: apply MAX_SEC_1024 to all LITEON EP1 series devices Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 36/47] workqueue: avoid hard lockups in show_workqueue_state() Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 37/47] dm btree: fix serious bug in btree_split_beneath() Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 38/47] dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6 Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 39/47] arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 40/47] x86/cpu, x86/pti: Do not enable PTI on AMD processors Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 41/47] usbip: fix warning in vhci_hcd_probe/lockdep_init_map Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 42/47] x86/mce: Make machine check speculation protected Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 43/47] retpoline: Introduce start/end markers of indirect thunk Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 44/47] kprobes/x86: Blacklist indirect thunk functions for kprobes Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 45/47] kprobes/x86: Disable optimizing on the function jumps to indirect thunk Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 46/47] x86/pti: Document fix wrong index Greg Kroah-Hartman
2018-01-22 8:45 ` [PATCH 4.9 47/47] x86/retpoline: Optimize inline assembler for vmexit_fill_RSB Greg Kroah-Hartman
2018-01-22 18:50 ` [PATCH 4.9 00/47] 4.9.78-stable review Naresh Kamboju
2018-01-22 19:09 ` Guenter Roeck
2018-01-22 20:08 ` Shuah Khan
2018-01-23 0:08 ` kernelci.org bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180122083925.819821436@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=jthumshirn@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).