Commits · 9c552e1ddd3658944787d75d90a42e1a2b74b7ea · nexedi / linux

13 Mar, 2014 2 commits

DAC960: remove sleep_on usage · 9c552e1d

Arnd Bergmann authored Feb 26, 2014

sleep_on and its variants are going away. The use of sleep_on() in
DAC960_V2_ExecuteUserCommand seems to be bogus because the command
by the time we get there, the command has completed already and
we just enter the timeout. Based on this interpretation, I concluded
that we can replace it with a simple msleep(1000) and rearrange the
code around it slightly.

The interruptible_sleep_on_timeout in DAC960_gam_ioctl seems equivalent
to the race-free version using wait_event_interruptible_timeout.
I left the driver to return -EINTR rather than -ERESTARTSYS to preserve
the timeout behavior.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jens Axboe <axboe@fb.com>

9c552e1d

mtip32xx: Use pci_enable_msi() instead of pci_enable_msi_range() · c94efe36

Alexander Gordeev authored Feb 25, 2014

Commit "mtip32xx: Use pci_enable_msix_range() instead of
pci_enable_msix()" was unnecessary, since pci_enable_msi()
function is not deprecated and is still preferable for
enabling the single MSI mode. This update reverts usage of
pci_enable_msi() function.

Besides, the changelog for that commit was bogus, since
mtip32xx driver uses MSI interrupt, not MSI-X.

Cc: Jens Axboe <axboe@kernel.dk>
Cc: Asai Thambi S P <asamymuthupa@micron.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>

c94efe36

21 Feb, 2014 7 commits

skd: Use pci_enable_msix_range() instead of pci_enable_msix() · a9df8625

Alexander Gordeev authored Feb 19, 2014

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>

a9df8625

skd: Use unified access to skdev->msix_entries throughout the code · 1bc5ce5d

Alexander Gordeev authored Feb 19, 2014

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>

1bc5ce5d

skd: Fix incomplete cleanup of MSI-X interrupt · 46817769

Alexander Gordeev authored Feb 19, 2014

When enabling MSI-X interrupts fails due to lack of memory
the call to pci_disable_msix() is missed and the device is
left with MSI-X interrupts enabled while the driver assumes
otherwise. This update fixes the described misbehaviour and
cleans up the code of skd_release_msix() function.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>

46817769

skd: Fix out of array boundary access · c5e3035c

Alexander Gordeev authored Feb 19, 2014

When enabling MSI-X, interrupts are requested for SKD_MAX_MSIX_COUNT
entries in skdev->msix_entries array, while the number of actually
allocated entries is skdev->msix_count. This might lead to an out of
boundary access in case number of allocated entries is less than
SKD_MAX_MSIX_COUNT. This update fixes the described misbehaviour.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>

c5e3035c

mtip32xx: Use pci_enable_msix_range() instead of pci_enable_msix() · f219ad82

Alexander Gordeev authored Feb 19, 2014

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Asai Thambi S P <asamymuthupa@micron.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>

f219ad82

mtip32xx: Remove superfluous call to pci_disable_msi() · cf91f39b

Alexander Gordeev authored Feb 19, 2014

There is no need to call pci_disable_msi() in case
the previous call to pci_enable_msi() failed
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Asai Thambi S P <asamymuthupa@micron.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>

cf91f39b

drbd: Fix future possible NULL pointer dereference · f597f6b8

Andreas Gruenbacher authored Feb 19, 2014

Right now every resource has exactly one connection. But we are preparing
for dynamic connections. I.e. in the future thre can be resources without
connections.

However smatch points this out as 'variable dereferenced before check',
which is correct.

This issue was introduced in
drbd: get_one_status(): Iterate over resource->devices instead of connection->peer_devices
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

f597f6b8

17 Feb, 2014 31 commits

drbd: Add drbd_thread->resource and make drbd_thread->connection optional · 2457b6d5

Andreas Gruenbacher authored Jul 21, 2011

In the drbd_thread "infrastructure" functions, only use the resource instead of
the connection. Make the connection field of drbd_thread optional. This will
allow to introduce threads which are not associated with a connection.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

2457b6d5

drbd: Use the right peer device · 6780139c

Andreas Gruenbacher authored Sep 13, 2011

in w_e_ (peer request) callbacks and in peer request I/O completion handlers
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

6780139c

drbd: Remove unused parameter of wire_flags_to_bio() · 81f0ffd2

Andreas Gruenbacher authored Aug 30, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

81f0ffd2

drbd: Get rid of first_peer_device() in handle_write_conflicts() · e33b32de
Andreas Gruenbacher authored Aug 30, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
e33b32de
drbd: In the worker thread, process drbd_work instead of drbd_device_work items · 6db7e50a
Andreas Gruenbacher authored Aug 26, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
6db7e50a

drbd: Turn w_make_ov_request and make_resync_request into "normal" functions · d448a2e1

Andreas Gruenbacher authored Aug 25, 2011

These functions are not used as drbd_work callbacks.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

d448a2e1

drbd: Make w_make_resync_request() static · 4d010392

Andreas Gruenbacher authored Aug 25, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

4d010392

drbd: struct drbd_peer_request: Use drbd_work instead of drbd_device_work · a8cd15ba
Andreas Gruenbacher authored Aug 25, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
a8cd15ba
drbd: struct after_conn_state_chg_work: Use drbd_work instead of drbd_device_work · 4c007603
Andreas Gruenbacher authored Aug 25, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
4c007603

drbd: Turn conn_flush_workqueue() into drbd_flush_workqueue() · b5043c5e

Andreas Gruenbacher authored Jul 28, 2011

The new function can flush any work queue, not just the work queue of the data
socket of a connection.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

b5043c5e

drbd: Create a dedicated struct drbd_device_work · 84b8c06b

Andreas Gruenbacher authored Jul 28, 2011

drbd_device_work is a work item that has a reference to a device,
while drbd_work is a more generic work item that does not carry
a reference to a device.

All callbacks get a pointer to a drbd_work instance, those callbacks
that expect a drbd_device_work use the container_of macro to get it.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

84b8c06b

drbd: Rename w_prev_work_done -> w_complete · 8682eae9

Andreas Gruenbacher authored Jul 25, 2011

Also move it to drbd_receiver.c and make it static.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

8682eae9

drbd: Move string function prototypes from linux/drbd.h to drbd_string.h · d9f65229
Andreas Gruenbacher authored Sep 01, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
d9f65229

drbd: Remove useless assertion · 137975c1

Andreas Gruenbacher authored Aug 24, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

137975c1

drbd: Kill drbd_task_to_thread_name() · c60b0251

Andreas Gruenbacher authored Aug 10, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

c60b0251

drbd: Pass a peer device to a number of fuctions · 69a22773

Andreas Gruenbacher authored Aug 09, 2011

These functions actually operate on a peer device, or
need a peer device.

drbd_prepare_command(), drbd_send_command(), drbd_send_sync_param()
drbd_send_uuids(), drbd_gen_and_send_sync_uuid(), drbd_send_sizes()
drbd_send_state(), drbd_send_current_state(), and drbd_send_state_req()
drbd_send_sr_reply(), drbd_send_ack(), drbd_send_drequest(),
drbd_send_drequest_csum(), drbd_send_ov_request(), drbd_send_dblock()
drbd_send_block(), drbd_send_out_of_sync(), recv_dless_read()
drbd_drain_block(), receive_bitmap_plain(), recv_resync_read()
read_in_block(), read_for_csum(), drbd_alloc_pages(), drbd_alloc_peer_req()
need_peer_seq(), update_peer_seq(), wait_for_and_update_peer_seq()
drbd_sync_handshake(), drbd_asb_recover_{0,1,2}p(), drbd_connected()
drbd_disconnected(), decode_bitmap_c() and recv_bm_rle_bits()
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

69a22773

drbd: Replace vnr_to_mdev() with conn_peer_device() · 9f4fe9ad

Andreas Gruenbacher authored Aug 09, 2011

The new function returns a peer device, which allows us to eliminate a few
instances of first_peer_device().
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

9f4fe9ad

drbd: drbd_csum_bio(), drbd_csum_ee(): Remove unused device argument · 79a3c8d3
Andreas Gruenbacher authored Aug 09, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
79a3c8d3

drbd: Function prototype cleanups · 753c6191

Andreas Gruenbacher authored Jul 22, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

753c6191

drbd: Rename drbdd_init() -> drbd_receiver() · 8fe60551

Andreas Gruenbacher authored Jul 22, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

8fe60551

drbd: Move cpu_mask from connection to resource · 625a6ba2

Andreas Gruenbacher authored Jul 22, 2011

Also fix drbd_calc_cpu_mask() to spread resources equally over all online cpus
independent of device minor numbers.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

625a6ba2

drbd: Define the size of res_opts->cpu_mask in a single place · f44d0436

Andreas Gruenbacher authored Jul 22, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

f44d0436

drbd: Move susp, susp_nod, susp_fen from connection to resource · 6bbf53ca
Andreas Gruenbacher authored Jul 08, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
6bbf53ca

drbd: Move conf_mutex from connection to resource · 0500813f

Andreas Gruenbacher authored Jul 07, 2011

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

0500813f

drbd: drbd_adm_prepare(): Only set adm_ctx.connection when a connection is requested · 3ab706fe

Andreas Gruenbacher authored Jul 06, 2011

Also change drbd_adm_connect() to expect a resource after it requested one.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

3ab706fe

drbd: Iterate over all connections · b6f85ef9

Andreas Gruenbacher authored Jul 06, 2011

in drbd_adm_down(), drbd_create_device() and drbd_set_role()
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

b6f85ef9

drbd: Rename net_conf variables old_conf -> old_net_conf and new_conf -> new_net_conf · 270eb5c9
Andreas Gruenbacher authored Jul 06, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
270eb5c9
drbd: drbd_create_device(): Take a resource instead of a connection argument · 59515a2e
Andreas Gruenbacher authored Jul 06, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
59515a2e
drbd: drbd_adm_new_resource(): Check if resource exists, not if it has any connections · 5c661042
Andreas Gruenbacher authored Jul 05, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
5c661042
drbd: get_one_status(): Iterate over resource->devices instead of connection->peer_devices · 251b8f8e
Andreas Gruenbacher authored Jul 05, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
251b8f8e
drbd: Rename drbd_{create,delete}_minor -> drbd_{create,delete}_device · f82795d6
Andreas Gruenbacher authored Jul 03, 2011
```
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
```
f82795d6